libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-19 16:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HOPKINS: Get rid of more unused/unnecessary globals

Browse Source
This commit is contained in:
Filippos Karapetis 2013-01-07 13:24:04 +02:00
parent aa0f860442
commit 30eeb9163d
8 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/hopkins/font.cpp
View File

@ -353,7 +353,6 @@ LABEL_57:
_text[idx]._pos.x = v73;
}
}
_vm->_globals.hauteur_boite = (_vm->_globals.police_h + 1) * lineCount + 2;
int posX = v73;
int posY = yp;
int saveWidth = _vm->_globals._boxWidth + 10;

3
engines/hopkins/globals.cpp
View File

@ -132,7 +132,6 @@ Globals::Globals() {
NUM_FICHIER_OBJ = 0;
nbrligne = 0;
_boxWidth = 0;
hauteur_boite = 0;
_forestFl = false;
_objectWidth = _objectHeight = 0;
_helicopterFl = false;
@ -165,7 +164,6 @@ Globals::Globals() {
NOT_VERIF = false;
PERSO_TYPE = 0;
GOACTION = false;
NECESSAIRE = false;
Compteur = 0;
_actionDirection = 0;
_actionDirection = 0;
@ -336,7 +334,6 @@ void Globals::clearAll() {
police = g_PTRNUL;
police_h = 0;
police_l = 0;
hauteur_boite = 0;
_boxWidth = 0;
_vm->_fontManager.clearAll();

2
engines/hopkins/globals.h
View File

@ -376,7 +376,6 @@ public:
int nbrligne; // Useless variable?
int _boxWidth;
byte *_inventoryObject;
int hauteur_boite;
int GESTE_FLAG;
byte *_forestSprite;
bool _forestFl;
@ -423,7 +422,6 @@ public:
bool _cacheFl;
bool NOPARLE;
bool PLAN_FLAG;
bool NECESSAIRE;
bool GOACTION;
int Compteur;
int _actionDirection;

4
engines/hopkins/graphics.cpp
View File

@ -1823,8 +1823,8 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int mode) {
_vm->_objectsManager._changeVerbFl = false;
}
void GraphicsManager::NB_SCREEN() {
if (!_vm->_globals.NECESSAIRE)
void GraphicsManager::NB_SCREEN(bool initPalette) {
if (initPalette)
initColorTable(50, 65, _palette);
if (_lineNbr == SCREEN_WIDTH)

2
engines/hopkins/graphics.h
View File

@ -166,7 +166,7 @@ public:
void INI_ECRAN(const Common::String &file);
void INI_ECRAN2(const Common::String &file);
void OPTI_INI(const Common::String &file, int mode);
void NB_SCREEN();
void NB_SCREEN(bool initPalette);
void SHOW_PALETTE();
void Copy_WinScan_Vbe(const byte *srcP, byte *destP);
void Copy_Video_Vbe(const byte *src);

6
engines/hopkins/objects.cpp
View File

@ -3803,7 +3803,7 @@ void ObjectsManager::handleSpecialGames() {
if (!_vm->_graphicsManager._lineNbr)
_vm->_graphicsManager._scrollOffset = 0;
_vm->_graphicsManager.NB_SCREEN();
_vm->_graphicsManager.NB_SCREEN(true);
_vm->_soundManager.SPECIAL_SOUND = 198;
PERSO_ON = true;
_vm->_animationManager.NO_SEQ = true;
@ -3811,9 +3811,7 @@ void ObjectsManager::handleSpecialGames() {
_vm->_animationManager.playAnim("otage.ANM", 1, 24, 500);
_vm->_animationManager.NO_SEQ = false;
_vm->_soundManager.SPECIAL_SOUND = 0;
_vm->_globals.NECESSAIRE = true;
_vm->_graphicsManager.NB_SCREEN();
_vm->_globals.NECESSAIRE = false;
_vm->_graphicsManager.NB_SCREEN(false);
_vm->_saveLoadManager.load("TEMP1.SCR", _vm->_graphicsManager._vesaScreen);
g_system->getSavefileManager()->removeSavefile("TEMP1.SCR");

2
engines/hopkins/script.cpp
View File

@ -2264,7 +2264,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.removeSprite(0);
_vm->_objectsManager.OPTI_ONE(6, 0, 15, 0);
_vm->_objectsManager.PERSO_ON = true;
_vm->_graphicsManager.NB_SCREEN();
_vm->_graphicsManager.NB_SCREEN(true);
_vm->_animationManager.NO_SEQ = true;
_vm->_animationManager.playSequence2("TUNNEL.SEQ", 1, 18, 20);
_vm->_animationManager.NO_SEQ = false;

14
engines/hopkins/talk.cpp
View File

@ -95,7 +95,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
if (!_vm->_graphicsManager._lineNbr)
_vm->_graphicsManager._scrollOffset = 0;
_vm->_graphicsManager.NB_SCREEN();
_vm->_graphicsManager.NB_SCREEN(true);
_vm->_objectsManager.PERSO_ON = true;
searchCharacterPalette(_paletteBufferIdx, false);
startCharacterAnim0(_paletteBufferIdx, false);
@ -126,11 +126,9 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
}
clearCharacterAnim();
_vm->_globals.NOPARLE = false;
_vm->_globals.NECESSAIRE = true;
_characterBuffer = _vm->_globals.freeMemory(_characterBuffer);
_characterSprite = _vm->_globals.freeMemory(_characterSprite);
_vm->_graphicsManager.NB_SCREEN();
_vm->_globals.NECESSAIRE = false;
_vm->_graphicsManager.NB_SCREEN(false);
_vm->_saveLoadManager.load("TEMP.SCR", _vm->_graphicsManager._vesaScreen);
g_system->getSavefileManager()->removeSavefile("TEMP.SCR");
@ -1116,9 +1114,9 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
if (!_vm->_graphicsManager._lineNbr)
_vm->_graphicsManager._scrollOffset = 0;
_vm->_graphicsManager.NB_SCREEN();
_vm->_graphicsManager.NB_SCREEN(true);
_paletteBufferIdx = 20 * (int16)READ_LE_UINT16((uint16 *)_characterBuffer + 42) + 110;
_vm->_graphicsManager.NB_SCREEN();
_vm->_graphicsManager.NB_SCREEN(true);
_vm->_objectsManager.PERSO_ON = true;
searchCharacterPalette(_paletteBufferIdx, true);
startCharacterAnim0(_paletteBufferIdx, false);
@ -1153,11 +1151,9 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
clearCharacterAnim();
clearCharacterAnim();
_vm->_globals.NOPARLE = false;
_vm->_globals.NECESSAIRE = true;
_characterBuffer = _vm->_globals.freeMemory(_characterBuffer);
_characterSprite = _vm->_globals.freeMemory(_characterSprite);
_vm->_graphicsManager.NB_SCREEN();
_vm->_globals.NECESSAIRE = false;
_vm->_graphicsManager.NB_SCREEN(false);
_vm->_linesManager.CLEAR_ZONE();
_vm->_linesManager.RESET_OBSTACLE();
_vm->_globals.resetCache();