aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2012-10-30 09:08:25 +1100
committerPaul Gilbert2012-10-30 09:08:25 +1100
commit39d2ead935ad81052e0a68daafcaa04021caf305 (patch)
tree6bcb452cda5657be08a4a9e9d5bfa5a4265090d2
parentbb7fd2b6f58c1fec85931ab2760547a61ad572ef (diff)
downloadscummvm-rg350-39d2ead935ad81052e0a68daafcaa04021caf305.tar.gz
scummvm-rg350-39d2ead935ad81052e0a68daafcaa04021caf305.tar.bz2
scummvm-rg350-39d2ead935ad81052e0a68daafcaa04021caf305.zip
HOPKINS: Method parameter renames in GraphicsManager class
-rw-r--r--engines/hopkins/graphics.cpp14
-rw-r--r--engines/hopkins/graphics.h8
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index f24955b9ec..bf6a900804 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -245,11 +245,11 @@ void GraphicsManager::CHARGE_ECRAN(const Common::String &file) {
memcpy(VESA_BUFFER, VESA_SCREEN, SCREEN_WIDTH * 2 * SCREEN_HEIGHT);
}
-void GraphicsManager::INIT_TABLE(int a1, int a2, byte *palette) {
+void GraphicsManager::INIT_TABLE(int minIndex, int maxIndex, byte *palette) {
for (int idx = 0; idx < 256; ++idx)
TABLE_COUL[idx] = idx;
- Trans_bloc(TABLE_COUL, palette, 256, a1, a2);
+ Trans_bloc(TABLE_COUL, palette, 256, minIndex, maxIndex);
for (int idx = 0; idx < 256; ++idx) {
byte v = TABLE_COUL[idx];
@@ -1270,7 +1270,7 @@ Video_Cont_Vbe16a:
}
}
-void GraphicsManager::Capture_Mem(const byte *srcSurface, byte *destSurface, int xs, int ys, unsigned int width, int height) {
+void GraphicsManager::Capture_Mem(const byte *srcSurface, byte *destSurface, int xs, int ys, int width, int height) {
const byte *srcP;
byte *destP;
int rowCount;
@@ -2285,7 +2285,7 @@ void GraphicsManager::INI_ECRAN2(const Common::String &file) {
OPTI_INI(file, 2);
}
-void GraphicsManager::OPTI_INI(const Common::String &file, int a2) {
+void GraphicsManager::OPTI_INI(const Common::String &file, int mode) {
int v2;
unsigned int v3;
int v6;
@@ -2304,7 +2304,7 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int a2) {
_vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, v13);
ptr = _vm->_fileManager.CHARGE_FICHIER(_vm->_globals.NFICHIER);
}
- if (!a2) {
+ if (!mode) {
v13 = file + ".spr";
if (g_PTRNUL != _vm->_globals.SPRITE_ECRAN)
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.LIBERE_FICHIER(_vm->_globals.SPRITE_ECRAN);
@@ -2343,7 +2343,7 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int a2) {
} while (v11 != 1);
}
_vm->_globals.dos_free2(ptr);
- if (a2 != 1) {
+ if (mode != 1) {
if (g_PTRNUL != _vm->_globals.COUCOU)
_vm->_globals.COUCOU = _vm->_globals.dos_free2(_vm->_globals.COUCOU);
@@ -2514,7 +2514,7 @@ void GraphicsManager::Plot_Hline(byte *surface, int xp, int yp, unsigned int wid
memset(surface + xp + nbrligne2 * yp, col, width);
}
-void GraphicsManager::Plot_Vline(byte *surface, int xp, int yp, int height, char col) {
+void GraphicsManager::Plot_Vline(byte *surface, int xp, int yp, int height, byte col) {
byte *v5;
int v6;
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index affbe01b77..510450795f 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -112,7 +112,7 @@ public:
void DD_UNLOCK() { DD_Unlock(); }
void Cls_Video();
void LOAD_IMAGE(const Common::String &file);
- void INIT_TABLE(int a1, int a2, byte *a3);
+ void INIT_TABLE(int minIndex, int maxIndex, byte *palette);
int SCROLL_ECRAN(int amount);
void Trans_bloc(byte *destP, const byte *srcP, int count, int minThreshold, int maxThreshold);
void Trans_bloc2(byte *surface, byte *col, int size);
@@ -148,7 +148,7 @@ public:
void Copy_Video_Vbe3(const byte *srcData);
void Copy_Video_Vbe16(const byte *srcData);
void Copy_Video_Vbe16a(const byte *srcData);
- void Capture_Mem(const byte *srcSurface, byte *destSurface, int xs, int ys, unsigned int width, int height);
+ void Capture_Mem(const byte *srcSurface, byte *destSurface, int xs, int ys, int width, int height);
/**
* Draws a sprite onto the screen
@@ -177,7 +177,7 @@ public:
void Affiche_Fonte(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int colour);
void INI_ECRAN(const Common::String &file);
void INI_ECRAN2(const Common::String &file);
- void OPTI_INI(const Common::String &file, int a2);
+ void OPTI_INI(const Common::String &file, int mode);
void NB_SCREEN();
void SHOW_PALETTE();
void videkey();
@@ -185,7 +185,7 @@ public:
void Copy_Video_Vbe(const byte *src);
void Reduc_Ecran(const byte *srcSruface, byte *destSurface, int xp, int yp, int width, int height, int zoom);
void Plot_Hline(byte *surface, int xp, int yp, unsigned int width, byte col);
- void Plot_Vline(byte *surface, int xp, int yp, int height, char col);
+ void Plot_Vline(byte *surface, int xp, int yp, int height, byte col);
};
} // End of namespace Hopkins