Skip to content

Commit

Permalink
HOPKINS: Remove useless variable in MenuManager, some renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strangerke
Strangerke committed Dec 25, 2012
1 parent 40cd508 commit 657dfda
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 87 deletions.
4 changes: 2 additions & 2 deletions engines/hopkins/globals.cpp
View file
Expand Up @@ -136,7 +136,7 @@ Globals::Globals() {
nbrligne = 0;
largeur_boite = 0;
hauteur_boite = 0;
forest = false;
_forestFl = false;
_objectWidth = _objectHeight = 0;
_helicopterFl = false;
_catalogPos = 0;
Expand Down Expand Up @@ -409,7 +409,7 @@ void Globals::clearAll() {

ADR_FICHIER_OBJ = g_PTRNUL;
FORETSPR = g_PTRNUL;
forest = false;
_forestFl = false;

cache_souris = allocMemory(2500);
GESTE = g_PTRNUL;
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/globals.h
View file
Expand Up @@ -382,7 +382,7 @@ class Globals {
int hauteur_boite;
int GESTE_FLAG;
byte *FORETSPR;
bool forest;
bool _forestFl;
byte *COUCOU;
int16 *chemin;
byte *cache_souris;
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/graphics.cpp
View file
Expand Up @@ -1805,7 +1805,7 @@ void GraphicsManager::Affiche_Perfect(byte *surface, const byte *srcData, int xp
}

// Display Speed
void GraphicsManager::AFFICHE_SPEED(const byte *spriteData, int xp, int yp, int spriteIndex) {
void GraphicsManager::fastDisplay(const byte *spriteData, int xp, int yp, int spriteIndex) {
int width, height;

width = _vm->_objectsManager.getWidth(spriteData, spriteIndex);
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/graphics.h
View file
Expand Up @@ -165,7 +165,7 @@ class GraphicsManager {
int zoomIn(int v, int percentage);
int zoomOut(int v, int percentage);
void Affiche_Perfect(byte *surface, const byte *srcData, int xp300, int yp300, int frameIndex, int zoom1, int zoom2, int modeFlag);
void AFFICHE_SPEED(const byte *spriteData, int xp, int yp, int spriteIndex);
void fastDisplay(const byte *spriteData, int xp, int yp, int spriteIndex);
void SCOPY(const byte *surface, int x1, int y1, int width, int height, byte *destSurface, int destX, int destY);
void Copy_Mem(const byte *srcSurface, int x1, int y1, unsigned int width, int height, byte *destSurface, int destX, int destY);
void displayFont(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int colour);
Expand Down
32 changes: 16 additions & 16 deletions engines/hopkins/hopkins.cpp
View file
Expand Up @@ -196,7 +196,7 @@ bool HopkinsEngine::runWin95Demo() {
_globals._exitId = 0;

if (!_globals._exitId) {
_globals._exitId = _menuManager.MENU();
_globals._exitId = _menuManager.menu();
if (_globals._exitId == -1) {
_globals.PERSO = _globals.freeMemory(_globals.PERSO);
restoreSystem();
Expand Down Expand Up @@ -502,7 +502,7 @@ bool HopkinsEngine::runLinuxDemo() {
_globals._exitId = 0;

if (!_globals._exitId) {
_globals._exitId = _menuManager.MENU();
_globals._exitId = _menuManager.menu();
if (_globals._exitId == -1) {
if (!g_system->getEventManager()->shouldQuit())
PUBQUIT();
Expand Down Expand Up @@ -863,7 +863,7 @@ bool HopkinsEngine::runOS2Full() {
if (_globals._exitId == 300)
_globals._exitId = 0;
if (!_globals._exitId) {
_globals._exitId = _menuManager.MENU();
_globals._exitId = _menuManager.menu();
if (_globals._exitId == -1)
break;
}
Expand Down Expand Up @@ -1231,7 +1231,7 @@ bool HopkinsEngine::runOS2Full() {
_globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
_globals.forest = true;
_globals._forestFl = true;
_globals.NOSPRECRAN = true;
Common::String im = Common::String::format("IM%d", _globals._exitId);
_soundManager.WSOUND(13);
Expand All @@ -1244,7 +1244,7 @@ bool HopkinsEngine::runOS2Full() {
_globals.NOSPRECRAN = false;
if (_globals._exitId < 35 || _globals._exitId > 49 ) {
_globals.FORETSPR = _globals.freeMemory(_globals.FORETSPR);
_globals.forest = false;
_globals._forestFl = false;
_soundManager.DEL_SAMPLE(1);
}
break;
Expand Down Expand Up @@ -1750,7 +1750,7 @@ bool HopkinsEngine::runBeOSFull() {
if (_globals._exitId == 300)
_globals._exitId = 0;
if (!_globals._exitId) {
_globals._exitId = _menuManager.MENU();
_globals._exitId = _menuManager.menu();
if (_globals._exitId == -1) {
_globals.PERSO = _globals.freeMemory(_globals.PERSO);
restoreSystem();
Expand Down Expand Up @@ -2119,7 +2119,7 @@ bool HopkinsEngine::runBeOSFull() {
_globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
_globals.forest = true;
_globals._forestFl = true;
_globals.NOSPRECRAN = true;
Common::String im = Common::String::format("IM%d", _globals._exitId);
_soundManager.WSOUND(13);
Expand All @@ -2133,7 +2133,7 @@ bool HopkinsEngine::runBeOSFull() {
_globals.NOSPRECRAN = false;
if ((_globals._exitId < 35) || (_globals._exitId > 49)) {
_globals.FORETSPR = _globals.freeMemory(_globals.FORETSPR);
_globals.forest = false;
_globals._forestFl = false;
_soundManager.DEL_SAMPLE(1);
}
break;
Expand Down Expand Up @@ -2636,7 +2636,7 @@ bool HopkinsEngine::runWin95full() {
_globals._exitId = 0;

if (!_globals._exitId) {
_globals._exitId = _menuManager.MENU();
_globals._exitId = _menuManager.menu();
if (_globals._exitId == -1) {
_globals.PERSO = _globals.freeMemory(_globals.PERSO);
restoreSystem();
Expand Down Expand Up @@ -3007,7 +3007,7 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 40;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
_globals.forest = true;
_globals._forestFl = true;
_globals.NOSPRECRAN = true;
Common::String im = Common::String::format("IM%d", _globals._exitId);
_soundManager.WSOUND(13);
Expand All @@ -3020,7 +3020,7 @@ bool HopkinsEngine::runWin95full() {
_globals.NOSPRECRAN = false;
if (_globals._exitId < 35 || _globals._exitId > 49) {
_globals.FORETSPR = _globals.freeMemory(_globals.FORETSPR);
_globals.forest = false;
_globals._forestFl = false;
_soundManager.DEL_SAMPLE(1);
}
break;
Expand Down Expand Up @@ -3515,7 +3515,7 @@ bool HopkinsEngine::runLinuxFull() {
if (_globals._exitId == 300)
_globals._exitId = 0;
if (!_globals._exitId) {
_globals._exitId = _menuManager.MENU();
_globals._exitId = _menuManager.menu();
if (_globals._exitId == -1) {
_globals.PERSO = _globals.freeMemory(_globals.PERSO);
restoreSystem();
Expand Down Expand Up @@ -3885,7 +3885,7 @@ bool HopkinsEngine::runLinuxFull() {
_globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
_globals.forest = true;
_globals._forestFl = true;
_globals.NOSPRECRAN = true;
Common::String im = Common::String::format("IM%d", _globals._exitId);
_soundManager.WSOUND(13);
Expand All @@ -3898,7 +3898,7 @@ bool HopkinsEngine::runLinuxFull() {
_globals.NOSPRECRAN = false;
if (_globals._exitId < 35 || _globals._exitId > 49) {
_globals.FORETSPR = _globals.freeMemory(_globals.FORETSPR);
_globals.forest = false;
_globals._forestFl = false;
_soundManager.DEL_SAMPLE(1);
}
break;
Expand Down Expand Up @@ -4790,7 +4790,7 @@ void HopkinsEngine::restoreSystem() {
void HopkinsEngine::PUBQUIT() {
_globals.PUBEXIT = true;
_graphicsManager.RESET_SEGMENT_VESA();
_globals.forest = false;
_globals._forestFl = false;
_eventsManager._breakoutFl = false;
_globals._disableInventFl = true;
_graphicsManager.loadImage("BOX");
Expand Down Expand Up @@ -5761,7 +5761,7 @@ bool HopkinsEngine::displayAdultDisclaimer() {
_graphicsManager.max_x = SCREEN_WIDTH;
_graphicsManager.max_y = SCREEN_HEIGHT - 1;
_eventsManager._breakoutFl = false;
_globals.forest = false;
_globals._forestFl = false;
_globals._disableInventFl = true;
_globals._exitId = 0;

Expand Down
26 changes: 12 additions & 14 deletions engines/hopkins/menu.cpp
View file
Expand Up @@ -41,7 +41,7 @@ void MenuManager::setParent(HopkinsEngine *vm) {

enum MenuSelection { MENU_NONE = 0, PLAY_GAME = 1, LOAD_GAME = 2, OPTIONS = 3, INTRODUCTION = 4, QUIT = 5 };

int MenuManager::MENU() {
int MenuManager::menu() {
byte *spriteData = NULL;
MenuSelection menuIndex;
Common::Point mousePos;
Expand All @@ -57,7 +57,7 @@ int MenuManager::MENU() {

result = 0;
while (!g_system->getEventManager()->shouldQuit()) {
_vm->_globals.forest = false;
_vm->_globals._forestFl = false;
_vm->_eventsManager._breakoutFl = false;
_vm->_globals._disableInventFl = true;
_vm->_globals._exitId = 0;
Expand Down Expand Up @@ -166,27 +166,27 @@ int MenuManager::MENU() {
frame5Index = 1;
}

_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 259, frame1Index);
_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 291, frame2Index + 2);
_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 322, frame3Index + 4);
_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 354, frame4Index + 6);
_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 386, frame5Index + 8);
_vm->_graphicsManager.fastDisplay(spriteData, 230, 259, frame1Index);
_vm->_graphicsManager.fastDisplay(spriteData, 230, 291, frame2Index + 2);
_vm->_graphicsManager.fastDisplay(spriteData, 230, 322, frame3Index + 4);
_vm->_graphicsManager.fastDisplay(spriteData, 230, 354, frame4Index + 6);
_vm->_graphicsManager.fastDisplay(spriteData, 230, 386, frame5Index + 8);
_vm->_eventsManager.VBL();

if (_vm->_eventsManager.getMouseButton() == 1 && menuIndex != MENU_NONE)
selectionMade = true;
} while (!selectionMade);

if (menuIndex == PLAY_GAME) {
_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 259, 10);
_vm->_graphicsManager.fastDisplay(spriteData, 230, 259, 10);
_vm->_eventsManager.VBL();
_vm->_eventsManager.delay(200);
result = 1;
}
if (menuIndex != LOAD_GAME)
break;

_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 291, 11);
_vm->_graphicsManager.fastDisplay(spriteData, 230, 291, 11);
_vm->_eventsManager.VBL();
_vm->_eventsManager.delay(200);

Expand All @@ -204,23 +204,23 @@ int MenuManager::MENU() {
break;

// Options menu item selected
_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 322, 12);
_vm->_graphicsManager.fastDisplay(spriteData, 230, 322, 12);
_vm->_eventsManager.VBL();
_vm->_eventsManager.delay(200);

// Show the options dialog
_vm->_dialogsManager.showOptionsDialog();
}
if (menuIndex == INTRODUCTION) {
_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 354, 13);
_vm->_graphicsManager.fastDisplay(spriteData, 230, 354, 13);
_vm->_eventsManager.VBL();
_vm->_eventsManager.delay(200);
_vm->playIntro();
continue;
}

if ( menuIndex == QUIT) {
_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 386, 14);
_vm->_graphicsManager.fastDisplay(spriteData, 230, 386, 14);
_vm->_eventsManager.VBL();
_vm->_eventsManager.delay(200);
result = -1;
Expand All @@ -234,6 +234,4 @@ int MenuManager::MENU() {
return result;
}



} // End of namespace Hopkins
3 changes: 1 addition & 2 deletions engines/hopkins/menu.h
View file
Expand Up @@ -35,11 +35,10 @@ class MenuManager {
private:
HopkinsEngine *_vm;

byte MenuTxt[10600];
public:
void setParent(HopkinsEngine *vm);

int MENU();
int menu();
};

} // End of namespace Hopkins
Expand Down
10 changes: 5 additions & 5 deletions engines/hopkins/objects.cpp
View file
Expand Up @@ -2661,7 +2661,7 @@ void ObjectsManager::handleLeftButton() {
_vm->_globals.GOACTION = false;
v9 = _vm->_globals.chemin;
_vm->_globals.chemin = (int16 *)g_PTRNUL;
if (_vm->_globals.forest && ((uint16)(NUMZONE - 20) <= 1u || (uint16)(NUMZONE - 22) <= 1u)) {
if (_vm->_globals._forestFl && ((uint16)(NUMZONE - 20) <= 1u || (uint16)(NUMZONE - 22) <= 1u)) {
if (getSpriteY(0) <= 374 || getSpriteY(0) > 410) {
v10 = getSpriteX(0);
v11 = getSpriteY(0);
Expand Down Expand Up @@ -2752,7 +2752,7 @@ void ObjectsManager::PARADISE() {
result = _vm->_globals._saveData->data[svField1];
if (result && _vm->_globals._saveData->data[svField2] && result != 4 && result > 3) {
_vm->_fontManager.hideText(5);
if (!_vm->_globals.forest || ((uint16)(NUMZONE - 20) > 1u && (uint16)(NUMZONE - 22) > 1u)) {
if (!_vm->_globals._forestFl || ((uint16)(NUMZONE - 20) > 1u && (uint16)(NUMZONE - 22) > 1u)) {
if (_vm->_graphicsManager.DOUBLE_ECRAN) {
_vm->_graphicsManager.no_scroll = 2;
if (_vm->_eventsManager._startPos.x >= getSpriteX(0) - 320)
Expand Down Expand Up @@ -4122,11 +4122,11 @@ void ObjectsManager::BOB_VIVANT(int idx) {
v4 = *(_vm->_talkManager.ADR_ANIM + 2 * v1 + 8);
if ((int16)READ_LE_UINT16(_vm->_talkManager.ADR_ANIM + 2 * v1 + 4)) {
if (!_vm->_globals.NO_OFFSET)
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_talkManager._characterSprite,
_vm->_graphicsManager.fastDisplay(_vm->_talkManager._characterSprite,
_vm->_graphicsManager.ofscroll + v2, v3,
*(_vm->_talkManager.ADR_ANIM + 2 * v1 + 8));
if (_vm->_globals.NO_OFFSET)
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_talkManager._characterSprite, v2, v3, v4);
_vm->_graphicsManager.fastDisplay(_vm->_talkManager._characterSprite, v2, v3, v4);
}
}

Expand Down Expand Up @@ -4369,7 +4369,7 @@ void ObjectsManager::OPTI_ONE(int idx, int fromPosi, int destPosi, int a4) {
if (!a4)
stopBobAnimation(idx);
else if (a4 == 4) {
_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals._bob[idx]._spriteData,
_vm->_graphicsManager.fastDisplay(_vm->_globals._bob[idx]._spriteData,
_vm->_globals._bob[idx]._oldX, _vm->_globals._bob[idx]._oldY, _vm->_globals._bob[idx]._frameIndex);
stopBobAnimation(idx);
_vm->_eventsManager.VBL();
Expand Down

0 comments on commit 657dfda

Please sign in to comment.