Skip to content

Commit

Permalink
HOPKINS: Replace some more boolean values
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strangerke
Strangerke committed Oct 29, 2012
1 parent c078f3d commit a79cf7f
Show file tree
Hide file tree
Showing 8 changed files with 82 additions and 84 deletions.
74 changes: 37 additions & 37 deletions engines/hopkins/anim.cpp
View file
Expand Up @@ -70,7 +70,7 @@ void AnimationManager::PLAY_ANM(const Common::String &filename, uint32 rate1, ui
f.skip(14);
f.read(v10, nbytes);

if (CLS_ANM == 1) {
if (CLS_ANM == true) {
_vm->_graphicsManager.DD_Lock();
_vm->_graphicsManager.Cls_Video();
_vm->_graphicsManager.DD_Unlock();
Expand Down Expand Up @@ -117,7 +117,7 @@ void AnimationManager::PLAY_ANM(const Common::String &filename, uint32 rate1, ui
goto LABEL_25;
}
LABEL_53:
if (_vm->_graphicsManager.NOLOCK == 1)
if (_vm->_graphicsManager.NOLOCK == true)
goto LABEL_58;
_vm->_globals.dos_free2(ptr);
f.close();
Expand Down Expand Up @@ -184,9 +184,9 @@ void AnimationManager::PLAY_ANM(const Common::String &filename, uint32 rate1, ui
goto LABEL_58;
}
}
while (!_vm->shouldQuit() && _vm->_eventsManager.ESC_KEY != 1) {
if (REDRAW_ANIM() == 1) {
if (_vm->_graphicsManager.NOLOCK == 1)
while (!_vm->shouldQuit() && _vm->_eventsManager.ESC_KEY != true) {
if (REDRAW_ANIM() == true) {
if (_vm->_graphicsManager.NOLOCK == true)
break;
_vm->_globals.dos_free2(ptr);
f.close();
Expand Down Expand Up @@ -240,7 +240,7 @@ void AnimationManager::PLAY_ANM(const Common::String &filename, uint32 rate1, ui
_vm->_graphicsManager.FADE_LINUX = 0;
f.close();
_vm->_globals.dos_free2(ptr);
_vm->_graphicsManager.NOLOCK = 0;
_vm->_graphicsManager.NOLOCK = false;
}

// Play Anim 2
Expand Down Expand Up @@ -342,20 +342,20 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
_vm->_graphicsManager.DD_VBL();
}
_vm->_eventsManager.lItCounter = 0;
_vm->_eventsManager.ESC_KEY = 0;
_vm->_eventsManager.ESC_KEY = false;
_vm->_soundManager.LOAD_ANM_SOUND();
if (_vm->_globals.iRegul != 1)
break;
while (1) {
if (_vm->_eventsManager.ESC_KEY == 1)
if (_vm->_eventsManager.ESC_KEY == true)
goto LABEL_114;
if (REDRAW_ANIM() == 1)
if (REDRAW_ANIM() == true)
break;
_vm->_eventsManager.CONTROLE_MES();
if (_vm->_eventsManager.lItCounter >= a2)
goto LABEL_48;
}
if (_vm->_graphicsManager.NOLOCK == 1)
if (_vm->_graphicsManager.NOLOCK == true)
goto LABEL_114;
if (v8 == 1)
ptr = _vm->_globals.dos_free2(ptr);
Expand All @@ -373,7 +373,7 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.SCROLL = v11;
_vm->_graphicsManager.SCROLL_ECRAN(v11);
if (_vm->_graphicsManager.DOUBLE_ECRAN == 1) {
if (_vm->_graphicsManager.DOUBLE_ECRAN == true) {
_vm->_graphicsManager.SCANLINE(0x500u);
_vm->_graphicsManager.max_x = 1280;
_vm->_graphicsManager.DD_Lock();
Expand Down Expand Up @@ -459,9 +459,9 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
LABEL_88:
if (v5 == -1) {
if (_vm->_globals.iRegul == 1) {
while (_vm->_eventsManager.ESC_KEY != 1) {
if (REDRAW_ANIM() == 1) {
if (_vm->_graphicsManager.NOLOCK == 1)
while (_vm->_eventsManager.ESC_KEY != true) {
if (REDRAW_ANIM() == true) {
if (_vm->_graphicsManager.NOLOCK == true)
goto LABEL_114;
if (v8 == 1)
ptr = _vm->_globals.dos_free2(ptr);
Expand All @@ -479,7 +479,7 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.SCROLL = v11;
_vm->_graphicsManager.SCROLL_ECRAN(v11);
if (_vm->_graphicsManager.DOUBLE_ECRAN == 1) {
if (_vm->_graphicsManager.DOUBLE_ECRAN == true) {
_vm->_graphicsManager.SCANLINE(0x500u);
_vm->_graphicsManager.max_x = 1280;
_vm->_graphicsManager.DD_Lock();
Expand Down Expand Up @@ -524,9 +524,9 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
goto LABEL_114;
}
}
while (_vm->_eventsManager.ESC_KEY != 1) {
if (REDRAW_ANIM() == 1) {
if (_vm->_graphicsManager.NOLOCK == 1)
while (_vm->_eventsManager.ESC_KEY != true) {
if (REDRAW_ANIM() == true) {
if (_vm->_graphicsManager.NOLOCK == true)
break;
if (v8 == 1)
ptr = _vm->_globals.dos_free2(ptr);
Expand All @@ -544,7 +544,7 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.SCROLL = v11;
_vm->_graphicsManager.SCROLL_ECRAN(v11);
if (_vm->_graphicsManager.DOUBLE_ECRAN == 1) {
if (_vm->_graphicsManager.DOUBLE_ECRAN == true) {
_vm->_graphicsManager.SCANLINE(0x500u);
_vm->_graphicsManager.max_x = 1280;
_vm->_graphicsManager.DD_Lock();
Expand Down Expand Up @@ -586,7 +586,7 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
goto LABEL_77;
}
LABEL_114:
_vm->_graphicsManager.NOLOCK = 0;
_vm->_graphicsManager.NOLOCK = false;
f.close();

if (_vm->_graphicsManager.FADE_LINUX == 2 && !v8) {
Expand Down Expand Up @@ -642,7 +642,7 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.SCROLL = v11;
_vm->_graphicsManager.SCROLL_ECRAN(v11);
if (_vm->_graphicsManager.DOUBLE_ECRAN == 1) {
if (_vm->_graphicsManager.DOUBLE_ECRAN == true) {
_vm->_graphicsManager.SCANLINE(0x500u);
_vm->_graphicsManager.max_x = 1280;
_vm->_graphicsManager.DD_Lock();
Expand Down Expand Up @@ -1040,14 +1040,14 @@ void AnimationManager::PLAY_SEQ(int a1, const Common::String &a2, uint32 a3, uin
_vm->_graphicsManager.DD_VBL();
}
_vm->_eventsManager.lItCounter = 0;
_vm->_eventsManager.ESC_KEY = 0;
_vm->_eventsManager.ESC_KEY = false;
_vm->_soundManager.LOAD_ANM_SOUND();
if (_vm->_globals.iRegul == 1) {
do {
if (_vm->_eventsManager.ESC_KEY == 1) {
if (_vm->_eventsManager.ESC_KEY == true) {
if (!_vm->_eventsManager.NOESC)
goto LABEL_59;
_vm->_eventsManager.ESC_KEY = 0;
_vm->_eventsManager.ESC_KEY = false;
}
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
Expand All @@ -1070,10 +1070,10 @@ void AnimationManager::PLAY_SEQ(int a1, const Common::String &a2, uint32 a3, uin
f.read(v9, (int16)READ_LE_UINT16(v10 + 8));
if (_vm->_globals.iRegul == 1) {
do {
if (_vm->_eventsManager.ESC_KEY == 1) {
if (_vm->_eventsManager.ESC_KEY == true) {
if (!_vm->_eventsManager.NOESC)
goto LABEL_59;
_vm->_eventsManager.ESC_KEY = 0;
_vm->_eventsManager.ESC_KEY = false;
}
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
Expand Down Expand Up @@ -1102,18 +1102,18 @@ void AnimationManager::PLAY_SEQ(int a1, const Common::String &a2, uint32 a3, uin
} while (v5 != -1);
if (_vm->_globals.iRegul == 1) {
do {
if (_vm->_eventsManager.ESC_KEY == 1) {
if (_vm->_eventsManager.ESC_KEY == true) {
if (!_vm->_eventsManager.NOESC)
goto LABEL_59;
_vm->_eventsManager.ESC_KEY = 0;
_vm->_eventsManager.ESC_KEY = false;
}
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
} while (_vm->_eventsManager.lItCounter < a5);
}
_vm->_eventsManager.lItCounter = 0;
LABEL_59:
_vm->_graphicsManager.NOLOCK = 0;
_vm->_graphicsManager.NOLOCK = false;
f.close();

if (!NO_COUL) {
Expand Down Expand Up @@ -1205,22 +1205,22 @@ void AnimationManager::PLAY_SEQ2(const Common::String &a1, uint32 a2, uint32 a3,
_vm->_graphicsManager.DD_VBL();
}
_vm->_eventsManager.lItCounter = 0;
_vm->_eventsManager.ESC_KEY = 0;
_vm->_eventsManager.ESC_KEY = false;
_vm->_soundManager.LOAD_ANM_SOUND();
if (_vm->_globals.iRegul != 1)
break;
while (!_vm->shouldQuit()) {
if (_vm->_eventsManager.ESC_KEY == 1)
if (_vm->_eventsManager.ESC_KEY == true)
goto LABEL_54;
if (REDRAW_ANIM() == 1)
if (REDRAW_ANIM() == true)
break;
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
if (_vm->_eventsManager.lItCounter >= a2)
goto LABEL_23;
}
LABEL_48:
if (_vm->_graphicsManager.NOLOCK == 1)
if (_vm->_graphicsManager.NOLOCK == true)
goto LABEL_54;
if (v7 == 1)
ptr = _vm->_globals.dos_free2(ptr);
Expand Down Expand Up @@ -1268,8 +1268,8 @@ void AnimationManager::PLAY_SEQ2(const Common::String &a1, uint32 a2, uint32 a3,
LABEL_44:
if (v4) {
if (_vm->_globals.iRegul == 1) {
while (_vm->_eventsManager.ESC_KEY != 1) {
if (REDRAW_ANIM() == 1)
while (_vm->_eventsManager.ESC_KEY != true) {
if (REDRAW_ANIM() == true)
goto LABEL_48;
_vm->_eventsManager.CONTROLE_MES();
_vm->_soundManager.VERIF_SOUND();
Expand All @@ -1283,9 +1283,9 @@ void AnimationManager::PLAY_SEQ2(const Common::String &a1, uint32 a2, uint32 a3,
goto LABEL_54;
}
}
while (_vm->_eventsManager.ESC_KEY != 1) {
while (_vm->_eventsManager.ESC_KEY != true) {
_vm->_eventsManager.CONTROLE_MES();
if (REDRAW_ANIM() == 1)
if (REDRAW_ANIM() == true)
goto LABEL_48;
if (_vm->_eventsManager.lItCounter >= a3)
goto LABEL_33;
Expand Down
6 changes: 3 additions & 3 deletions engines/hopkins/dialogs.cpp
View file
Expand Up @@ -437,7 +437,7 @@ void DialogsManager::showInventory() {
}
}
}
if (VIRE_INVENT == 1)
if (VIRE_INVENT == true)
v20 = 1;
if (v20 == 1)
break;
Expand Down Expand Up @@ -529,7 +529,7 @@ void DialogsManager::TestForDialogOpening() {
if (!INVENTFLAG) {
DIALOG_KEY key = _vm->_eventsManager.GAME_KEY;
_vm->_eventsManager.GAME_KEY = KEY_NONE;
INVENTFLAG = 1;
INVENTFLAG = true;

switch (key) {
case KEY_INVENTORY:
Expand All @@ -548,7 +548,7 @@ void DialogsManager::TestForDialogOpening() {
break;
}

INVENTFLAG = 0;
INVENTFLAG = false;
_vm->_eventsManager.GAME_KEY = KEY_NONE;
}
}
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/events.cpp
View file
Expand Up @@ -408,7 +408,7 @@ void EventsManager::VBL() {
LABEL_65:
_vm->_globals.vitesse = 2;
lItCounter = 0;
if (_vm->_graphicsManager.DOUBLE_ECRAN != 1 || _vm->_graphicsManager.no_scroll == 1) {
if (_vm->_graphicsManager.DOUBLE_ECRAN != true || _vm->_graphicsManager.no_scroll == 1) {
_vm->_graphicsManager.Affiche_Segment_Vesa();
} else {
if (_vm->_graphicsManager.no_scroll != 2) {
Expand Down
1 change: 0 additions & 1 deletion engines/hopkins/globals.cpp
View file
Expand Up @@ -221,7 +221,6 @@ Globals::Globals() {
VOICEOFF = false;
CENSURE = false;
GESTE_FLAG = false;
redraw = false;
BPP_NOAFF = false;
DESACTIVE_INVENT = false;
FLAG_VISIBLE = false;
Expand Down
1 change: 0 additions & 1 deletion engines/hopkins/globals.h
View file
Expand Up @@ -386,7 +386,6 @@ class Globals {
byte *Bufferdecor;
byte *ADR_FICHIER_OBJ;
byte *PERSO;
bool redraw;
int OBJL, OBJH;
int Nouv_objet;
int HELICO;
Expand Down
8 changes: 4 additions & 4 deletions engines/hopkins/hopkins.cpp
View file
Expand Up @@ -646,7 +646,7 @@ void HopkinsEngine::INTRORUN() {
_globals.iRegul = 1;
_eventsManager.VBL();
_soundManager.WSOUND(16);
_animationManager.CLS_ANM = 1;
_animationManager.CLS_ANM = true;
_animationManager.PLAY_ANM("J1.anm", 12, 12, 50);
if (!_eventsManager.ESC_KEY) {
_soundManager.VOICE_MIX(1, 3);
Expand Down Expand Up @@ -681,7 +681,7 @@ void HopkinsEngine::INTRORUN() {
_globals.BPP_NOAFF = false;
_globals.iRegul = 1;
_graphicsManager.FADE_INW();
if (_graphicsManager.DOUBLE_ECRAN == 1) {
if (_graphicsManager.DOUBLE_ECRAN == true) {
_graphicsManager.no_scroll = 2;
v3 = 0;
_graphicsManager.SCROLL = 0;
Expand Down Expand Up @@ -858,7 +858,7 @@ void HopkinsEngine::INTRORUN() {

_graphicsManager.FADE_OUTW();
_graphicsManager.FIN_VISU();
_animationManager.CLS_ANM = 1;
_animationManager.CLS_ANM = true;
_soundManager.WSOUND(3);
_soundManager.SPECIAL_SOUND = 1;
_animationManager.PLAY_ANM("INTRO1.anm", 10, 24, 18);
Expand All @@ -878,7 +878,7 @@ void HopkinsEngine::INTRORUN() {
return;

if (!_eventsManager.ESC_KEY) {
_animationManager.CLS_ANM = 0;
_animationManager.CLS_ANM = false;
_graphicsManager.FADE_LINUX = 2;
_animationManager.PLAY_ANM("J4.anm", 12, 12, 1000);
}
Expand Down

0 comments on commit a79cf7f

Please sign in to comment.