aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2013-01-07 04:55:27 -0800
committerStrangerke2013-01-07 04:55:27 -0800
commit8c611d91e77883a66e72ba7740890157e2e5123c (patch)
tree4a4c348ba4dbda61fd86fab3b5d524865f8fb7d8 /engines
parentb26f25455f642e31762c3ab2fb2e894b93044688 (diff)
parent6629fa7cc5a2a124b4507bb93ae6dea918036040 (diff)
downloadscummvm-rg350-8c611d91e77883a66e72ba7740890157e2e5123c.tar.gz
scummvm-rg350-8c611d91e77883a66e72ba7740890157e2e5123c.tar.bz2
scummvm-rg350-8c611d91e77883a66e72ba7740890157e2e5123c.zip
Merge pull request #5 from bluegr/hopkins
Hopkins: Some cleanup commits
Diffstat (limited to 'engines')
-rw-r--r--engines/hopkins/files.cpp2
-rw-r--r--engines/hopkins/font.cpp1
-rw-r--r--engines/hopkins/globals.cpp8
-rw-r--r--engines/hopkins/globals.h7
-rw-r--r--engines/hopkins/graphics.cpp4
-rw-r--r--engines/hopkins/graphics.h2
-rw-r--r--engines/hopkins/hopkins.cpp235
-rw-r--r--engines/hopkins/objects.cpp7
-rw-r--r--engines/hopkins/script.cpp2
-rw-r--r--engines/hopkins/sound.cpp165
-rw-r--r--engines/hopkins/talk.cpp14
11 files changed, 45 insertions, 402 deletions
diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 30570939d2..f0238205fd 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -92,7 +92,7 @@ void FileManager::constructFilename(const Common::String &folder, const Common::
Common::String folderToUse = folder;
// A lot of the code in the original engine based on COPIE_SEQ was used to determine
- // whether a file resided on the CD or hard disk. Since the ScummVM implementatoin
+ // whether a file resided on the CD or hard disk. Since the ScummVM implementation
// requires all the files in the same location, we only need to do a somewhat simpler
// check for animations that don't exist in the ANM folder, but rather in special
// sub-folders depending on the physical screen resolution being used.
diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp
index 4e2fda8d63..7d98742be3 100644
--- a/engines/hopkins/font.cpp
+++ b/engines/hopkins/font.cpp
@@ -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;
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index a8385f34a9..7d1786a0fd 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -120,10 +120,6 @@ Globals::Globals() {
PUBEXIT = false;
_speed = 1;
- INSTALL_TYPE = 1;
- MUSICVOL = 6;
- SOUNDVOL = 6;
- VOICEVOL = 6;
g_old_anim = 0;
g_old_sens = 0;
g_old_sens2 = 0;
@@ -135,7 +131,6 @@ Globals::Globals() {
NUM_FICHIER_OBJ = 0;
nbrligne = 0;
_boxWidth = 0;
- hauteur_boite = 0;
_forestFl = false;
_objectWidth = _objectHeight = 0;
_helicopterFl = false;
@@ -150,7 +145,6 @@ Globals::Globals() {
_screenId = 0;
NOSPRECRAN = false;
_prevScreenId = 0;
- Max_Propre_Gen = 0;
Max_Ligne_Long = 0;
Max_Perso_Y = 0;
Max_Propre = 0;
@@ -168,7 +162,6 @@ Globals::Globals() {
NOT_VERIF = false;
PERSO_TYPE = 0;
GOACTION = false;
- NECESSAIRE = false;
Compteur = 0;
_actionDirection = 0;
_actionDirection = 0;
@@ -339,7 +332,6 @@ void Globals::clearAll() {
police = g_PTRNUL;
police_h = 0;
police_l = 0;
- hauteur_boite = 0;
_boxWidth = 0;
_vm->_fontManager.clearAll();
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index 4aac3247ee..ddc64df078 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -334,7 +334,6 @@ public:
bool PUBEXIT;
int PERSO_TYPE;
uint _speed;
- int INSTALL_TYPE;
Common::String HOPIMAGE;
Common::String HOPANIM;
Common::String HOPLINK;
@@ -351,9 +350,6 @@ public:
Common::String FICH_ZONE;
Common::String FICH_TEXTE;
Common::String _curFilename;
- int SOUNDVOL;
- int MUSICVOL;
- int VOICEVOL;
bool _censorshipFl;
int g_old_anim;
int g_old_sens, g_old_sens2;
@@ -379,7 +375,6 @@ public:
int nbrligne; // Useless variable?
int _boxWidth;
byte *_inventoryObject;
- int hauteur_boite;
int GESTE_FLAG;
byte *_forestSprite;
bool _forestFl;
@@ -404,7 +399,6 @@ public:
int _prevScreenId;
int fmusic;
int Max_Propre;
- int Max_Propre_Gen;
int Max_Ligne_Long;
int Max_Perso_Y;
bool _disableInventFl;
@@ -426,7 +420,6 @@ public:
bool _cacheFl;
bool NOPARLE;
bool PLAN_FLAG;
- bool NECESSAIRE;
bool GOACTION;
int Compteur;
int _actionDirection;
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index d8d44a4641..828fc2d3ad 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -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)
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index e77c105a12..dd1df3c6e1 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -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);
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 77f755971a..1b181bee52 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -210,7 +210,6 @@ bool HopkinsEngine::runWin95Demo() {
case 1:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM01", "IM01", "ANIM01", "IM01", 2);
break;
@@ -247,7 +246,6 @@ bool HopkinsEngine::runWin95Demo() {
}
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM03", "IM03", "ANIM03", "IM03", 2);
@@ -262,7 +260,6 @@ bool HopkinsEngine::runWin95Demo() {
case 5:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.NOSPRECRAN = true;
_globals.Max_Perso_Y = 455;
@@ -279,7 +276,6 @@ bool HopkinsEngine::runWin95Demo() {
case 6:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 460;
_objectsManager.PERSONAGE2("IM06", "IM06", "ANIM06", "IM06", 2);
break;
@@ -294,13 +290,11 @@ bool HopkinsEngine::runWin95Demo() {
case 8:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM08", "IM08", "ANIM08", "IM08", 2);
break;
case 9:
- _globals.Max_Propre_Gen = 10;
_globals.Max_Propre = 15;
_globals.Max_Perso_Y = 440;
_globals.Max_Ligne_Long = 20;
@@ -319,7 +313,6 @@ bool HopkinsEngine::runWin95Demo() {
case 11:
_globals.NOSPRECRAN = true;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_globals.Max_Propre = 15;
_objectsManager.PERSONAGE2("IM11", "IM11", "ANIM11", "IM11", 2);
@@ -327,7 +320,6 @@ bool HopkinsEngine::runWin95Demo() {
break;
case 12:
- _globals.Max_Propre_Gen = 10;
_globals.Max_Propre = 15;
_globals.Max_Perso_Y = 450;
_globals.Max_Ligne_Long = 20;
@@ -545,7 +537,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 1:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM01", "IM01", "ANIM01", "IM01", 1);
break;
@@ -585,7 +576,6 @@ bool HopkinsEngine::runLinuxDemo() {
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM03", "IM03", "ANIM03", "IM03", 2);
@@ -600,7 +590,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 5:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 455;
_globals.NOSPRECRAN = true;
if (_globals._saveData->data[svField80]) {
@@ -616,7 +605,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 6:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 460;
_objectsManager.PERSONAGE2("IM06", "IM06", "ANIM06", "IM06", 2);
break;
@@ -631,7 +619,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 8:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM08", "IM08", "ANIM08", "IM08", 2);
break;
@@ -639,7 +626,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 9:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
if (!_globals._saveData->data[svField225])
@@ -658,7 +644,6 @@ bool HopkinsEngine::runLinuxDemo() {
_globals.NOSPRECRAN = true;
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM11", "IM11", "ANIM11", "IM11", 2);
_globals.NOSPRECRAN = false;
@@ -667,7 +652,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 12:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[svField225]) {
_globals.NOSPRECRAN = true;
@@ -680,7 +664,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 13:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM13", "IM13", "ANIM13", "IM13", 1);
break;
@@ -688,7 +671,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 14:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM14", "IM14", "ANIM14", "IM14", 1);
break;
@@ -702,7 +684,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 16:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[svField113] == 1) {
@@ -715,7 +696,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 25:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM25", "IM25", "ANIM25", "IM25", 30);
break;
@@ -723,7 +703,6 @@ bool HopkinsEngine::runLinuxDemo() {
case 26:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM26", "IM26", "ANIM26", "IM26", 30);
@@ -886,7 +865,6 @@ bool HopkinsEngine::runOS2Full() {
case 1:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM01", "IM01", "ANIM01", "IM01", 1);
break;
@@ -918,7 +896,6 @@ bool HopkinsEngine::runOS2Full() {
}
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM03", "IM03", "ANIM03", "IM03", 2);
@@ -933,7 +910,6 @@ bool HopkinsEngine::runOS2Full() {
case 5:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 455;
_globals.NOSPRECRAN = true;
if (_globals._saveData->data[80]) {
@@ -948,7 +924,6 @@ bool HopkinsEngine::runOS2Full() {
case 6:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM06", "IM06", "ANIM06", "IM06", 2);
break;
@@ -963,7 +938,6 @@ bool HopkinsEngine::runOS2Full() {
case 8:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM08", "IM08", "ANIM08", "IM08", 2);
break;
@@ -971,7 +945,6 @@ bool HopkinsEngine::runOS2Full() {
case 9:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[225])
_objectsManager.PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10);
@@ -989,7 +962,6 @@ bool HopkinsEngine::runOS2Full() {
_globals.NOSPRECRAN = true;
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM11", "IM11", "ANIM11", "IM11", 2);
_globals.NOSPRECRAN = false;
@@ -998,7 +970,6 @@ bool HopkinsEngine::runOS2Full() {
case 12:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[225]) {
_globals.NOSPRECRAN = true;
@@ -1010,7 +981,6 @@ bool HopkinsEngine::runOS2Full() {
case 13:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM13", "IM13", "ANIM13", "IM13", 1);
break;
@@ -1018,7 +988,6 @@ bool HopkinsEngine::runOS2Full() {
case 14:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM14", "IM14", "ANIM14", "IM14", 1);
break;
@@ -1032,7 +1001,6 @@ bool HopkinsEngine::runOS2Full() {
case 16:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[113] == 1)
_objectsManager.PERSONAGE2("IM16", "IM16A", "ANIM", "IM16", 7);
@@ -1045,7 +1013,6 @@ bool HopkinsEngine::runOS2Full() {
case 17:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[117] == 1)
_objectsManager.PERSONAGE2("IM17", "IM17A", "ANIM17", "IM17", 11);
@@ -1077,7 +1044,6 @@ bool HopkinsEngine::runOS2Full() {
_globals.NOSPRECRAN = true;
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM18", "IM18", "ANIM18", "IM18", 6);
break;
@@ -1085,7 +1051,6 @@ bool HopkinsEngine::runOS2Full() {
case 19:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[123])
_objectsManager.PERSONAGE2("IM19", "IM19A", "ANIM19", "IM19", 6);
@@ -1096,7 +1061,6 @@ bool HopkinsEngine::runOS2Full() {
case 20:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 10;
- _globals.Max_Propre_Gen = 8;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM20", "IM20", "ANIM20", "IM20", 6);
if (_globals._exitId == 17) {
@@ -1122,7 +1086,6 @@ bool HopkinsEngine::runOS2Full() {
case 22:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM22", "IM22", "ANIM22", "IM22", 6);
break;
@@ -1130,7 +1093,6 @@ bool HopkinsEngine::runOS2Full() {
case 23:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM23", "IM23", "ANIM23", "IM23", 6);
break;
@@ -1138,7 +1100,6 @@ bool HopkinsEngine::runOS2Full() {
case 24:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[181]) {
if (_globals._saveData->data[181] == 1 )
@@ -1150,7 +1111,6 @@ bool HopkinsEngine::runOS2Full() {
case 25:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM25", "IM25", "ANIM25", "IM25", 8);
break;
@@ -1158,7 +1118,6 @@ bool HopkinsEngine::runOS2Full() {
case 26:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM26", "IM26", "ANIM26", "IM26", 8);
break;
@@ -1166,7 +1125,6 @@ bool HopkinsEngine::runOS2Full() {
case 27:
_globals.Max_Propre = 10;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[177] == 1)
_objectsManager.PERSONAGE2("IM27", "IM27A", "ANIM27", "IM27", 27);
@@ -1179,7 +1137,6 @@ bool HopkinsEngine::runOS2Full() {
case 28:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_globals.NOSPRECRAN = true;
if (_globals._saveData->data[166] != 1 || _globals._saveData->data[167] != 1 )
@@ -1191,7 +1148,6 @@ bool HopkinsEngine::runOS2Full() {
case 29:
_globals.Max_Propre = 60;
_globals.Max_Ligne_Long = 50;
- _globals.Max_Propre_Gen = 50;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM29", "IM29", "ANIM29", "IM29", 1);
break;
@@ -1199,7 +1155,6 @@ bool HopkinsEngine::runOS2Full() {
case 30:
_globals.Max_Propre = 10;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM30", "IM30", "ANIM30", "IM30", 24);
@@ -1213,7 +1168,6 @@ bool HopkinsEngine::runOS2Full() {
case 32:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM32", "IM32", "ANIM32", "IM32", 2);
break;
@@ -1239,7 +1193,6 @@ bool HopkinsEngine::runOS2Full() {
case 41: {
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
_globals._forestFl = true;
@@ -1269,7 +1222,6 @@ bool HopkinsEngine::runOS2Full() {
case 51:
_globals.Max_Propre = 20;
_globals.Max_Ligne_Long = 10;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM51", "IM51", "ANIM51", "IM51", 14);
break;
@@ -1277,7 +1229,6 @@ bool HopkinsEngine::runOS2Full() {
case 52:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM52", "IM52", "ANIM52", "IM52", 14);
break;
@@ -1285,7 +1236,6 @@ bool HopkinsEngine::runOS2Full() {
case 54:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM54", "IM54", "ANIM54", "IM54", 14);
break;
@@ -1293,7 +1243,6 @@ bool HopkinsEngine::runOS2Full() {
case 55:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM55", "IM55", "ANIM55", "IM55", 14);
@@ -1302,7 +1251,6 @@ bool HopkinsEngine::runOS2Full() {
case 56:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM56", "IM56", "ANIM56", "IM56", 14);
@@ -1311,7 +1259,6 @@ bool HopkinsEngine::runOS2Full() {
case 57:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM57", "IM57", "ANIM57", "IM57", 14);
break;
@@ -1319,7 +1266,6 @@ bool HopkinsEngine::runOS2Full() {
case 58:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM58", "IM58", "ANIM58", "IM58", 14);
@@ -1328,7 +1274,6 @@ bool HopkinsEngine::runOS2Full() {
case 59:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM59", "IM59", "ANIM59", "IM59", 21);
@@ -1338,7 +1283,6 @@ bool HopkinsEngine::runOS2Full() {
case 60:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM60", "IM60", "ANIM60", "IM60", 21);
@@ -1355,7 +1299,6 @@ bool HopkinsEngine::runOS2Full() {
case 62:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM62", "IM62", NULL, "IM62", 21);
@@ -1365,7 +1308,6 @@ bool HopkinsEngine::runOS2Full() {
case 63:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM63", "IM63", "ANIM63", "IM63", 21);
@@ -1375,7 +1317,6 @@ bool HopkinsEngine::runOS2Full() {
case 64:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM64", "IM64", "ANIM64", "IM64", 21);
break;
@@ -1383,7 +1324,6 @@ bool HopkinsEngine::runOS2Full() {
case 65:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM65", "IM65", "ANIM65", "IM65", 21);
@@ -1393,7 +1333,6 @@ bool HopkinsEngine::runOS2Full() {
case 66:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM66", "IM66", "ANIM66", "IM66", 21);
@@ -1403,7 +1342,6 @@ bool HopkinsEngine::runOS2Full() {
case 67:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM67", "IM67", NULL, "IM67", 21);
@@ -1413,7 +1351,6 @@ bool HopkinsEngine::runOS2Full() {
case 68:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM68", "IM68", "ANIM68", "IM68", 21);
break;
@@ -1421,7 +1358,6 @@ bool HopkinsEngine::runOS2Full() {
case 69:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM69", "IM69", "ANIM69", "IM69", 21);
@@ -1431,7 +1367,6 @@ bool HopkinsEngine::runOS2Full() {
case 70:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM70", "IM70", NULL, "IM70", 21);
@@ -1441,7 +1376,6 @@ bool HopkinsEngine::runOS2Full() {
case 71:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM71", "IM71", "ANIM71", "IM71", 21);
@@ -1451,7 +1385,6 @@ bool HopkinsEngine::runOS2Full() {
case 73:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
if (_globals._saveData->data[318] == 1)
_objectsManager.PERSONAGE2("IM73", "IM73A", "ANIM73", "IM73", 21);
@@ -1528,7 +1461,6 @@ bool HopkinsEngine::runOS2Full() {
case 93:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
if (_globals._saveData->data[330])
_objectsManager.PERSONAGE2("IM93", "IM93c", "ANIM93", "IM93", 26);
@@ -1539,7 +1471,6 @@ bool HopkinsEngine::runOS2Full() {
case 94:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM94", "IM94", "ANIM94", "IM94", 19);
break;
@@ -1547,7 +1478,6 @@ bool HopkinsEngine::runOS2Full() {
case 95:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM95", "IM95", "ANIM95", "IM95", 19);
@@ -1556,7 +1486,6 @@ bool HopkinsEngine::runOS2Full() {
case 96:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM96", "IM96", "ANIM96", "IM96", 19);
@@ -1565,7 +1494,6 @@ bool HopkinsEngine::runOS2Full() {
case 97:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM97", "IM97", "ANIM97", "IM97", 19);
@@ -1592,7 +1520,6 @@ bool HopkinsEngine::runOS2Full() {
case 98:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM98", "IM98", "ANIM98", "IM98", 19);
break;
@@ -1600,7 +1527,6 @@ bool HopkinsEngine::runOS2Full() {
case 99:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM99", "IM99", "ANIM99", "IM99", 19);
break;
@@ -1788,7 +1714,6 @@ bool HopkinsEngine::runBeOSFull() {
case 1:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM01", "IM01", "ANIM01", "IM01", 1);
break;
@@ -1820,7 +1745,6 @@ bool HopkinsEngine::runBeOSFull() {
}
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM03", "IM03", "ANIM03", "IM03", 2);
@@ -1835,7 +1759,6 @@ bool HopkinsEngine::runBeOSFull() {
case 5:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 455;
_globals.NOSPRECRAN = true;
if (_globals._saveData->data[svField80]) {
@@ -1850,7 +1773,6 @@ bool HopkinsEngine::runBeOSFull() {
case 6:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM06", "IM06", "ANIM06", "IM06", 2);
break;
@@ -1865,7 +1787,6 @@ bool HopkinsEngine::runBeOSFull() {
case 8:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM08", "IM08", "ANIM08", "IM08", 2);
break;
@@ -1873,7 +1794,6 @@ bool HopkinsEngine::runBeOSFull() {
case 9:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
if (!_globals._saveData->data[svField225])
bombExplosion();
@@ -1890,7 +1810,6 @@ bool HopkinsEngine::runBeOSFull() {
_globals.NOSPRECRAN = true;
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM11", "IM11", "ANIM11", "IM11", 2);
_globals.NOSPRECRAN = false;
@@ -1899,7 +1818,6 @@ bool HopkinsEngine::runBeOSFull() {
case 12:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[svField225]) {
_globals.NOSPRECRAN = true;
@@ -1912,7 +1830,6 @@ bool HopkinsEngine::runBeOSFull() {
case 13:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM13", "IM13", "ANIM13", "IM13", 1);
break;
@@ -1920,7 +1837,6 @@ bool HopkinsEngine::runBeOSFull() {
case 14:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM14", "IM14", "ANIM14", "IM14", 1);
break;
@@ -1934,7 +1850,6 @@ bool HopkinsEngine::runBeOSFull() {
case 16:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[svField113] == 1) {
_objectsManager.PERSONAGE2("IM16", "IM16A", "ANIM16", "IM16", 7);
@@ -1946,7 +1861,6 @@ bool HopkinsEngine::runBeOSFull() {
case 17:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[svField117] == 1) {
_objectsManager.PERSONAGE2("IM17", "IM17A", "ANIM17", "IM17", 11);
@@ -1978,7 +1892,6 @@ bool HopkinsEngine::runBeOSFull() {
_globals.NOSPRECRAN = true;
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM18", "IM18", "ANIM18", "IM18", 6);
break;
@@ -1986,7 +1899,6 @@ bool HopkinsEngine::runBeOSFull() {
case 19:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[svField123])
_objectsManager.PERSONAGE2("IM19", "IM19A", "ANIM19", "IM19", 6);
@@ -1997,7 +1909,6 @@ bool HopkinsEngine::runBeOSFull() {
case 20:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 10;
- _globals.Max_Propre_Gen = 8;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM20", "IM20", "ANIM20", "IM20", 6);
if (_globals._exitId == 17) {
@@ -2023,7 +1934,6 @@ bool HopkinsEngine::runBeOSFull() {
case 22:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM22", "IM22", "ANIM22", "IM22", 6);
break;
@@ -2031,7 +1941,6 @@ bool HopkinsEngine::runBeOSFull() {
case 23:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM23", "IM23", "ANIM23", "IM23", 6);
break;
@@ -2039,7 +1948,6 @@ bool HopkinsEngine::runBeOSFull() {
case 24:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[svField181]) {
if (_globals._saveData->data[svField181] == 1)
@@ -2052,7 +1960,6 @@ bool HopkinsEngine::runBeOSFull() {
case 25:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM25", "IM25", "ANIM25", "IM25", 8);
break;
@@ -2060,7 +1967,6 @@ bool HopkinsEngine::runBeOSFull() {
case 26:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM26", "IM26", "ANIM26", "IM26", 8);
break;
@@ -2068,7 +1974,6 @@ bool HopkinsEngine::runBeOSFull() {
case 27:
_globals.Max_Propre = 10;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[svField177] == 1) {
_objectsManager.PERSONAGE2("IM27", "IM27A", "ANIM27", "IM27", 27);
@@ -2080,7 +1985,6 @@ bool HopkinsEngine::runBeOSFull() {
case 28:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_globals.NOSPRECRAN = true;
if (_globals._saveData->data[svField166] != 1 || _globals._saveData->data[svField167] != 1)
@@ -2092,7 +1996,6 @@ bool HopkinsEngine::runBeOSFull() {
case 29:
_globals.Max_Propre = 60;
_globals.Max_Ligne_Long = 50;
- _globals.Max_Propre_Gen = 50;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM29", "IM29", "ANIM29", "IM29", 1);
break;
@@ -2100,7 +2003,6 @@ bool HopkinsEngine::runBeOSFull() {
case 30:
_globals.Max_Propre = 10;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM30", "IM30", "ANIM30", "IM30", 24);
@@ -2114,7 +2016,6 @@ bool HopkinsEngine::runBeOSFull() {
case 32:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM32", "IM32", "ANIM32", "IM32", 2);
break;
@@ -2140,7 +2041,6 @@ bool HopkinsEngine::runBeOSFull() {
case 41: {
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
_globals._forestFl = true;
@@ -2171,7 +2071,6 @@ bool HopkinsEngine::runBeOSFull() {
case 51:
_globals.Max_Propre = 20;
_globals.Max_Ligne_Long = 10;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM51", "IM51", "ANIM51", "IM51", 14);
break;
@@ -2179,7 +2078,6 @@ bool HopkinsEngine::runBeOSFull() {
case 52:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM52", "IM52", "ANIM52", "IM52", 14);
break;
@@ -2187,7 +2085,6 @@ bool HopkinsEngine::runBeOSFull() {
case 54:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM54", "IM54", "ANIM54", "IM54", 14);
break;
@@ -2195,7 +2092,6 @@ bool HopkinsEngine::runBeOSFull() {
case 55:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM55", "IM55", "ANIM55", "IM55", 14);
@@ -2204,7 +2100,6 @@ bool HopkinsEngine::runBeOSFull() {
case 56:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM56", "IM56", "ANIM56", "IM56", 14);
@@ -2213,7 +2108,6 @@ bool HopkinsEngine::runBeOSFull() {
case 57:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM57", "IM57", "ANIM57", "IM57", 14);
break;
@@ -2221,7 +2115,6 @@ bool HopkinsEngine::runBeOSFull() {
case 58:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM58", "IM58", "ANIM58", "IM58", 14);
@@ -2230,7 +2123,6 @@ bool HopkinsEngine::runBeOSFull() {
case 59:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM59", "IM59", "ANIM59", "IM59", 21);
@@ -2240,7 +2132,6 @@ bool HopkinsEngine::runBeOSFull() {
case 60:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM60", "IM60", "ANIM60", "IM60", 21);
@@ -2257,7 +2148,6 @@ bool HopkinsEngine::runBeOSFull() {
case 62:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM62", "IM62", NULL, "IM62", 21);
@@ -2267,7 +2157,6 @@ bool HopkinsEngine::runBeOSFull() {
case 63:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM63", "IM63", "ANIM63", "IM63", 21);
@@ -2277,7 +2166,6 @@ bool HopkinsEngine::runBeOSFull() {
case 64:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM64", "IM64", "ANIM64", "IM64", 21);
break;
@@ -2285,7 +2173,6 @@ bool HopkinsEngine::runBeOSFull() {
case 65:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM65", "IM65", "ANIM65", "IM65", 21);
@@ -2295,7 +2182,6 @@ bool HopkinsEngine::runBeOSFull() {
case 66:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM66", "IM66", "ANIM66", "IM66", 21);
@@ -2305,7 +2191,6 @@ bool HopkinsEngine::runBeOSFull() {
case 67:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM67", "IM67", NULL, "IM67", 21);
@@ -2315,7 +2200,6 @@ bool HopkinsEngine::runBeOSFull() {
case 68:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM68", "IM68", "ANIM68", "IM68", 21);
break;
@@ -2323,7 +2207,6 @@ bool HopkinsEngine::runBeOSFull() {
case 69:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM69", "IM69", "ANIM69", "IM69", 21);
@@ -2333,7 +2216,6 @@ bool HopkinsEngine::runBeOSFull() {
case 70:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM70", "IM70", NULL, "IM70", 21);
@@ -2343,7 +2225,6 @@ bool HopkinsEngine::runBeOSFull() {
case 71:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM71", "IM71", "ANIM71", "IM71", 21);
@@ -2353,7 +2234,6 @@ bool HopkinsEngine::runBeOSFull() {
case 73:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
if (_globals._saveData->data[svField318] == 1) {
_objectsManager.PERSONAGE2("IM73", "IM73A", "ANIM73", "IM73", 21);
@@ -2429,7 +2309,6 @@ bool HopkinsEngine::runBeOSFull() {
case 93:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
if (_globals._saveData->data[svField330])
_objectsManager.PERSONAGE2("IM93", "IM93C", "ANIM93", "IM93", 26);
@@ -2440,7 +2319,6 @@ bool HopkinsEngine::runBeOSFull() {
case 94:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM94", "IM94", "ANIM94", "IM94", 19);
break;
@@ -2448,7 +2326,6 @@ bool HopkinsEngine::runBeOSFull() {
case 95:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM95", "IM95", "ANIM95", "IM95", 19);
@@ -2457,7 +2334,6 @@ bool HopkinsEngine::runBeOSFull() {
case 96:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM96", "IM96", "ANIM96", "IM96", 19);
@@ -2466,7 +2342,6 @@ bool HopkinsEngine::runBeOSFull() {
case 97:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM97", "IM97", "ANIM97", "IM97", 19);
@@ -2494,7 +2369,6 @@ bool HopkinsEngine::runBeOSFull() {
case 98:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM98", "IM98", "ANIM98", "IM98", 19);
break;
@@ -2502,7 +2376,6 @@ bool HopkinsEngine::runBeOSFull() {
case 99:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM99", "IM99", "ANIM99", "IM99", 19);
break;
@@ -2686,7 +2559,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
_globals.Max_Perso_Y = 435;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM01", "IM01", "ANIM01", "IM01", 1);
break;
@@ -2724,7 +2596,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 5;
_globals.NOSPRECRAN = true;
_globals.Max_Perso_Y = 450;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM03", "IM03", "ANIM03", "IM03", 2);
break;
@@ -2737,7 +2608,6 @@ bool HopkinsEngine::runWin95full() {
case 5:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.NOSPRECRAN = true;
_globals.Max_Perso_Y = 455;
if (_globals._saveData->data[svField80]) {
@@ -2752,7 +2622,6 @@ bool HopkinsEngine::runWin95full() {
case 6:
_globals.Max_Propre = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 460;
_globals.Max_Ligne_Long = 20;
_objectsManager.PERSONAGE2("IM06", "IM06", "ANIM06", "IM06", 2);
@@ -2768,7 +2637,6 @@ bool HopkinsEngine::runWin95full() {
case 8:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM08", "IM08", "ANIM08", "IM08", 2);
break;
@@ -2776,7 +2644,6 @@ bool HopkinsEngine::runWin95full() {
case 9:
_globals.Max_Ligne_Long = 20;
_globals.Max_Propre = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[svField225])
_objectsManager.PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10);
@@ -2792,7 +2659,6 @@ bool HopkinsEngine::runWin95full() {
case 11:
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
@@ -2801,7 +2667,6 @@ bool HopkinsEngine::runWin95full() {
break;
case 12:
- _globals.Max_Propre_Gen = 10;
_globals.Max_Ligne_Long = 20;
_globals.Max_Perso_Y = 450;
_globals.Max_Propre = 15;
@@ -2817,7 +2682,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
_globals.Max_Perso_Y = 440;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM13", "IM13", "ANIM13", "IM13", 1);
break;
@@ -2825,7 +2689,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
_globals.Max_Perso_Y = 440;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM14", "IM14", "ANIM14", "IM14", 1);
break;
@@ -2839,7 +2702,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Perso_Y = 450;
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
if (_globals._saveData->data[svField113] == 1) {
_objectsManager.PERSONAGE2("IM16", "IM16A", "ANIM16", "IM16", 7);
} else if (!_globals._saveData->data[svField113]) {
@@ -2849,7 +2711,6 @@ bool HopkinsEngine::runWin95full() {
case 17:
_globals.Max_Propre = 50;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.Max_Ligne_Long = 40;
if (_globals._saveData->data[svField117] == 1) {
@@ -2879,13 +2740,11 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 5;
_globals.Max_Perso_Y = 450;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM18", "IM18", "ANIM18", "IM18", 29);
break;
case 19:
_globals.Max_Perso_Y = 440;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
if (_globals._saveData->data[svField123])
@@ -2897,7 +2756,6 @@ bool HopkinsEngine::runWin95full() {
case 20:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 10;
- _globals.Max_Propre_Gen = 8;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM20", "IM20", "ANIM20", "IM20", 6);
if (_globals._exitId == 17) {
@@ -2919,7 +2777,6 @@ bool HopkinsEngine::runWin95full() {
case 22:
_globals.Max_Propre = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_globals.Max_Ligne_Long = 20;
_objectsManager.PERSONAGE2("IM22", "IM22", "ANIM22", "IM22", 6);
@@ -2927,7 +2784,6 @@ bool HopkinsEngine::runWin95full() {
case 23:
_globals.Max_Propre = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
_globals.Max_Ligne_Long = 20;
_objectsManager.PERSONAGE2("IM23", "IM23", "ANIM23", "IM23", 6);
@@ -2936,7 +2792,6 @@ bool HopkinsEngine::runWin95full() {
case 24:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[svField181]) {
if (_globals._saveData->data[svField181] == 1)
@@ -2948,7 +2803,6 @@ bool HopkinsEngine::runWin95full() {
case 25:
_globals.Max_Propre = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_globals.Max_Ligne_Long = 20;
_objectsManager.PERSONAGE2("IM25", "IM25", "ANIM25", "IM25", 30);
@@ -2958,13 +2812,11 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
_globals.Max_Perso_Y = 435;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM26", "IM26", "ANIM26", "IM26", 30);
break;
case 27:
_globals.Max_Perso_Y = 440;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Ligne_Long = 15;
_globals.Max_Propre = 10;
if (_globals._saveData->data[svField177] == 1) {
@@ -2977,7 +2829,6 @@ bool HopkinsEngine::runWin95full() {
case 28:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_globals.NOSPRECRAN = true;
if (_globals._saveData->data[svField166] != 1 || _globals._saveData->data[svField167] != 1)
@@ -2989,7 +2840,6 @@ bool HopkinsEngine::runWin95full() {
case 29:
_globals.Max_Propre = 60;
_globals.Max_Ligne_Long = 50;
- _globals.Max_Propre_Gen = 50;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM29", "IM29", "ANIM29", "IM29", 1);
break;
@@ -2999,7 +2849,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 15;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM30", "IM30", "ANIM30", "IM30", 24);
_globals.NOSPRECRAN = false;
break;
@@ -3010,7 +2859,6 @@ bool HopkinsEngine::runWin95full() {
case 32:
_globals.Max_Propre = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_globals.Max_Ligne_Long = 20;
_objectsManager.PERSONAGE2("IM32", "IM32", "ANIM32", "IM32", 2);
@@ -3035,8 +2883,7 @@ bool HopkinsEngine::runWin95full() {
case 39:
case 40:
case 41: {
- _globals.Max_Propre_Gen = 20;
- _globals.fmusic = 13;
+ _globals.fmusic = 13;
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
_globals.Max_Perso_Y = 435;
@@ -3066,7 +2913,6 @@ bool HopkinsEngine::runWin95full() {
case 51:
_globals.Max_Ligne_Long = 10;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
_globals.Max_Propre = 20;
_objectsManager.PERSONAGE2("IM51", "IM51", "ANIM51", "IM51", 14);
@@ -3075,7 +2921,6 @@ bool HopkinsEngine::runWin95full() {
case 52:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM52", "IM52", "ANIM52", "IM52", 14);
break;
@@ -3084,7 +2929,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
_globals.Max_Perso_Y = 440;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM54", "IM54", "ANIM54", "IM54", 14);
break;
@@ -3093,7 +2937,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Perso_Y = 460;
_globals.Max_Ligne_Long = 30;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM55", "IM55", "ANIM55", "IM55", 14);
break;
@@ -3102,7 +2945,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 30;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM56", "IM56", "ANIM56", "IM56", 14);
break;
@@ -3110,7 +2952,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
_globals.Max_Perso_Y = 440;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM57", "IM57", "ANIM57", "IM57", 14);
break;
@@ -3119,7 +2960,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 30;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM58", "IM58", "ANIM58", "IM58", 14);
break;
@@ -3128,7 +2968,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM59", "IM59", "ANIM59", "IM59", 21);
_globals.NOSPRECRAN = false;
break;
@@ -3138,7 +2977,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 30;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM60", "IM60", "ANIM60", "IM60", 21);
_globals.NOSPRECRAN = false;
break;
@@ -3155,7 +2993,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 8;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM62", "IM62", NULL, "IM62", 21);
_globals.NOSPRECRAN = false;
break;
@@ -3165,7 +3002,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 30;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM63", "IM63", "ANIM63", "IM63", 21);
_globals.NOSPRECRAN = false;
break;
@@ -3174,7 +3010,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
_globals.Max_Perso_Y = 435;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM64", "IM64", "ANIM64", "IM64", 21);
break;
@@ -3183,7 +3018,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 30;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM65", "IM65", "ANIM65", "IM65", 21);
_globals.NOSPRECRAN = false;
break;
@@ -3193,7 +3027,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM66", "IM66", "ANIM66", "IM66", 21);
_globals.NOSPRECRAN = false;
break;
@@ -3203,7 +3036,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 8;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM67", "IM67", NULL, "IM67", 21);
_globals.NOSPRECRAN = false;
break;
@@ -3212,7 +3044,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
_globals.Max_Perso_Y = 435;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM68", "IM68", "ANIM68", "IM68", 21);
break;
@@ -3221,7 +3052,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM69", "IM69", "ANIM69", "IM69", 21);
_globals.NOSPRECRAN = false;
break;
@@ -3231,7 +3061,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 8;
_globals.NOSPRECRAN = true;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_objectsManager.PERSONAGE2("IM70", "IM70", NULL, "IM70", 21);
_globals.NOSPRECRAN = false;
break;
@@ -3241,7 +3070,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM71", "IM71", "ANIM71", "IM71", 21);
_globals.NOSPRECRAN = false;
break;
@@ -3249,7 +3077,6 @@ bool HopkinsEngine::runWin95full() {
case 73:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
if (_globals._saveData->data[svField318] == 1) {
_objectsManager.PERSONAGE2("IM73", "IM73A", "ANIM73", "IM73", 21);
@@ -3325,7 +3152,6 @@ bool HopkinsEngine::runWin95full() {
case 93:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
if (_globals._saveData->data[svField330])
_objectsManager.PERSONAGE2("IM93", "IM93c", "ANIM93", "IM93", 29);
@@ -3337,7 +3163,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
_globals.Max_Perso_Y = 440;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM94", "IM94", "ANIM94", "IM94", 19);
break;
@@ -3346,7 +3171,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 5;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = false;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM95", "IM95", "ANIM95", "IM95", 19);
break;
@@ -3355,7 +3179,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Ligne_Long = 5;
_globals.NOSPRECRAN = true;
_globals.Max_Perso_Y = 435;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM96", "IM96", "ANIM96", "IM96", 19);
break;
@@ -3364,7 +3187,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 5;
_globals.NOSPRECRAN = true;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM97", "IM97", "ANIM97", "IM97", 19);
if (_globals._exitId == 18) {
_globals.iRegul = 1;
@@ -3387,7 +3209,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
_globals.Max_Perso_Y = 435;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM98", "IM98", "ANIM98", "IM98", 19);
break;
@@ -3395,7 +3216,6 @@ bool HopkinsEngine::runWin95full() {
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
_globals.Max_Perso_Y = 435;
- _globals.Max_Propre_Gen = 5;
_objectsManager.PERSONAGE2("IM99", "IM99", "ANIM99", "IM99", 19);
break;
@@ -3573,7 +3393,6 @@ bool HopkinsEngine::runLinuxFull() {
case 1:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM01", "IM01", "ANIM01", "IM01", 1);
break;
@@ -3611,7 +3430,6 @@ bool HopkinsEngine::runLinuxFull() {
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM03", "IM03", "ANIM03", "IM03", 2);
@@ -3626,7 +3444,6 @@ bool HopkinsEngine::runLinuxFull() {
case 5:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 455;
_globals.NOSPRECRAN = true;
if (_globals._saveData->data[svField80]) {
@@ -3641,7 +3458,6 @@ bool HopkinsEngine::runLinuxFull() {
case 6:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 460;
_objectsManager.PERSONAGE2("IM06", "IM06", "ANIM06", "IM06", 2);
break;
@@ -3656,7 +3472,6 @@ bool HopkinsEngine::runLinuxFull() {
case 8:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM08", "IM08", "ANIM08", "IM08", 2);
break;
@@ -3664,7 +3479,6 @@ bool HopkinsEngine::runLinuxFull() {
case 9:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
if (!_globals._saveData->data[svField225])
bombExplosion();
@@ -3681,7 +3495,6 @@ bool HopkinsEngine::runLinuxFull() {
_globals.NOSPRECRAN = true;
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM11", "IM11", "ANIM11", "IM11", 2);
_globals.NOSPRECRAN = false;
@@ -3690,7 +3503,6 @@ bool HopkinsEngine::runLinuxFull() {
case 12:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[svField225]) {
_globals.NOSPRECRAN = true;
@@ -3703,7 +3515,6 @@ bool HopkinsEngine::runLinuxFull() {
case 13:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM13", "IM13", "ANIM13", "IM13", 1);
break;
@@ -3711,7 +3522,6 @@ bool HopkinsEngine::runLinuxFull() {
case 14:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM14", "IM14", "ANIM14", "IM14", 1);
break;
@@ -3725,7 +3535,6 @@ bool HopkinsEngine::runLinuxFull() {
case 16:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[svField113] == 1) {
_objectsManager.PERSONAGE2("IM16", "IM16A", "ANIM16", "IM16", 7);
@@ -3737,7 +3546,6 @@ bool HopkinsEngine::runLinuxFull() {
case 17:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[svField117] == 1) {
_objectsManager.PERSONAGE2("IM17", "IM17A", "ANIM17", "IM17", 11);
@@ -3765,7 +3573,6 @@ bool HopkinsEngine::runLinuxFull() {
_globals.NOSPRECRAN = true;
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_objectsManager.PERSONAGE2("IM18", "IM18", "ANIM18", "IM18", 29);
break;
@@ -3773,7 +3580,6 @@ bool HopkinsEngine::runLinuxFull() {
case 19:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[svField123])
_objectsManager.PERSONAGE2("IM19", "IM19A", "ANIM19", "IM19", 6);
@@ -3784,7 +3590,6 @@ bool HopkinsEngine::runLinuxFull() {
case 20:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 10;
- _globals.Max_Propre_Gen = 8;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM20", "IM20", "ANIM20", "IM20", 6);
if (_globals._exitId == 17) {
@@ -3807,7 +3612,6 @@ bool HopkinsEngine::runLinuxFull() {
case 22:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM22", "IM22", "ANIM22", "IM22", 6);
break;
@@ -3815,7 +3619,6 @@ bool HopkinsEngine::runLinuxFull() {
case 23:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM23", "IM23", "ANIM23", "IM23", 6);
break;
@@ -3823,7 +3626,6 @@ bool HopkinsEngine::runLinuxFull() {
case 24:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
if (_globals._saveData->data[svField181]) {
if (_globals._saveData->data[svField181] == 1)
@@ -3836,7 +3638,6 @@ bool HopkinsEngine::runLinuxFull() {
case 25:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM25", "IM25", "ANIM25", "IM25", 30);
break;
@@ -3844,7 +3645,6 @@ bool HopkinsEngine::runLinuxFull() {
case 26:
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM26", "IM26", "ANIM26", "IM26", 30);
break;
@@ -3852,7 +3652,6 @@ bool HopkinsEngine::runLinuxFull() {
case 27:
_globals.Max_Propre = 10;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
if (_globals._saveData->data[svField177] == 1) {
_objectsManager.PERSONAGE2("IM27", "IM27A", "ANIM27", "IM27", 27);
@@ -3864,7 +3663,6 @@ bool HopkinsEngine::runLinuxFull() {
case 28:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 450;
_globals.NOSPRECRAN = true;
if (_globals._saveData->data[svField166] != 1 || _globals._saveData->data[svField167] != 1)
@@ -3876,7 +3674,6 @@ bool HopkinsEngine::runLinuxFull() {
case 29:
_globals.Max_Propre = 60;
_globals.Max_Ligne_Long = 50;
- _globals.Max_Propre_Gen = 50;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM29", "IM29", "ANIM29", "IM29", 1);
break;
@@ -3884,7 +3681,6 @@ bool HopkinsEngine::runLinuxFull() {
case 30:
_globals.Max_Propre = 10;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM30", "IM30", "ANIM30", "IM30", 24);
@@ -3898,7 +3694,6 @@ bool HopkinsEngine::runLinuxFull() {
case 32:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 20;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM32", "IM32", "ANIM32", "IM32", 2);
break;
@@ -3925,7 +3720,6 @@ bool HopkinsEngine::runLinuxFull() {
_globals.fmusic = 13;
_globals.Max_Propre = 50;
_globals.Max_Ligne_Long = 40;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals._disableInventFl = false;
_globals._forestFl = true;
@@ -3955,7 +3749,6 @@ bool HopkinsEngine::runLinuxFull() {
case 51:
_globals.Max_Propre = 20;
_globals.Max_Ligne_Long = 10;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM51", "IM51", "ANIM51", "IM51", 14);
break;
@@ -3963,7 +3756,6 @@ bool HopkinsEngine::runLinuxFull() {
case 52:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
_objectsManager.PERSONAGE2("IM52", "IM52", "ANIM52", "IM52", 14);
break;
@@ -3971,7 +3763,6 @@ bool HopkinsEngine::runLinuxFull() {
case 54:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM54", "IM54", "ANIM54", "IM54", 14);
break;
@@ -3979,7 +3770,6 @@ bool HopkinsEngine::runLinuxFull() {
case 55:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 460;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM55", "IM55", "ANIM55", "IM55", 14);
@@ -3988,7 +3778,6 @@ bool HopkinsEngine::runLinuxFull() {
case 56:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM56", "IM56", "ANIM56", "IM56", 14);
@@ -3997,7 +3786,6 @@ bool HopkinsEngine::runLinuxFull() {
case 57:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM57", "IM57", "ANIM57", "IM57", 14);
break;
@@ -4005,7 +3793,6 @@ bool HopkinsEngine::runLinuxFull() {
case 58:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM58", "IM58", "ANIM58", "IM58", 14);
@@ -4014,7 +3801,6 @@ bool HopkinsEngine::runLinuxFull() {
case 59:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM59", "IM59", "ANIM59", "IM59", 21);
@@ -4024,7 +3810,6 @@ bool HopkinsEngine::runLinuxFull() {
case 60:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 440;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM60", "IM60", "ANIM60", "IM60", 21);
@@ -4041,7 +3826,6 @@ bool HopkinsEngine::runLinuxFull() {
case 62:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM62", "IM62", NULL, "IM62", 21);
@@ -4051,7 +3835,6 @@ bool HopkinsEngine::runLinuxFull() {
case 63:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM63", "IM63", "ANIM63", "IM63", 21);
@@ -4061,7 +3844,6 @@ bool HopkinsEngine::runLinuxFull() {
case 64:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM64", "IM64", "ANIM64", "IM64", 21);
break;
@@ -4069,7 +3851,6 @@ bool HopkinsEngine::runLinuxFull() {
case 65:
_globals.Max_Propre = 40;
_globals.Max_Ligne_Long = 30;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM65", "IM65", "ANIM65", "IM65", 21);
@@ -4079,7 +3860,6 @@ bool HopkinsEngine::runLinuxFull() {
case 66:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM66", "IM66", "ANIM66", "IM66", 21);
@@ -4089,7 +3869,6 @@ bool HopkinsEngine::runLinuxFull() {
case 67:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM67", "IM67", NULL, "IM67", 21);
@@ -4099,7 +3878,6 @@ bool HopkinsEngine::runLinuxFull() {
case 68:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM68", "IM68", "ANIM68", "IM68", 21);
break;
@@ -4107,7 +3885,6 @@ bool HopkinsEngine::runLinuxFull() {
case 69:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM69", "IM69", "ANIM69", "IM69", 21);
@@ -4117,7 +3894,6 @@ bool HopkinsEngine::runLinuxFull() {
case 70:
_globals.Max_Propre = 8;
_globals.Max_Ligne_Long = 8;
- _globals.Max_Propre_Gen = 20;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM70", "IM70", NULL, "IM70", 21);
@@ -4127,7 +3903,6 @@ bool HopkinsEngine::runLinuxFull() {
case 71:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM71", "IM71", "ANIM71", "IM71", 21);
@@ -4137,7 +3912,6 @@ bool HopkinsEngine::runLinuxFull() {
case 73:
_globals.Max_Propre = 15;
_globals.Max_Ligne_Long = 15;
- _globals.Max_Propre_Gen = 10;
_globals.Max_Perso_Y = 445;
if (_globals._saveData->data[svField318] == 1) {
_objectsManager.PERSONAGE2("IM73", "IM73A", "ANIM73", "IM73", 21);
@@ -4213,7 +3987,6 @@ bool HopkinsEngine::runLinuxFull() {
case 93:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 445;
if (_globals._saveData->data[svField330])
_objectsManager.PERSONAGE2("IM93", "IM93c", "ANIM93", "IM93", 29);
@@ -4224,7 +3997,6 @@ bool HopkinsEngine::runLinuxFull() {
case 94:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 440;
_objectsManager.PERSONAGE2("IM94", "IM94", "ANIM94", "IM94", 19);
break;
@@ -4232,7 +4004,6 @@ bool HopkinsEngine::runLinuxFull() {
case 95:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM95", "IM95", "ANIM95", "IM95", 19);
@@ -4241,7 +4012,6 @@ bool HopkinsEngine::runLinuxFull() {
case 96:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM96", "IM96", "ANIM96", "IM96", 19);
@@ -4250,7 +4020,6 @@ bool HopkinsEngine::runLinuxFull() {
case 97:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_globals.NOSPRECRAN = true;
_objectsManager.PERSONAGE2("IM97", "IM97", "ANIM97", "IM97", 19);
@@ -4274,7 +4043,6 @@ bool HopkinsEngine::runLinuxFull() {
case 98:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM98", "IM98", "ANIM98", "IM98", 19);
break;
@@ -4282,7 +4050,6 @@ bool HopkinsEngine::runLinuxFull() {
case 99:
_globals.Max_Propre = 5;
_globals.Max_Ligne_Long = 5;
- _globals.Max_Propre_Gen = 5;
_globals.Max_Perso_Y = 435;
_objectsManager.PERSONAGE2("IM99", "IM99", "ANIM99", "IM99", 19);
break;
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index ec2dd6a546..9d2cae2cda 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -2263,7 +2263,6 @@ void ObjectsManager::PLAN_BETA() {
_vm->_eventsManager._gameKey = KEY_NONE;
_vm->_globals.Max_Propre = 1;
_vm->_globals.Max_Ligne_Long = 1;
- _vm->_globals.Max_Propre_Gen = 1;
_vm->_globals.Max_Perso_Y = 440;
_vm->_globals.NOSPRECRAN = true;
_vm->_globals.PLAN_FLAG = true;
@@ -3803,7 +3802,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 +3810,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");
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 2ab68d844d..941abebe22 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -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;
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 1925bac1b3..cf06046bbe 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -318,6 +318,16 @@ void SoundManager::playAnim_SOUND(int soundNumber) {
}
}
+static const char *modSounds[] = {
+ "appart", "ville", "Rock", "police", "deep"
+ "purgat", "riviere", "SUSPENS", "labo", "cadavre",
+ "cabane", "purgat2", "foret", "ile", "ile2",
+ "hopkins", "peur", "URAVOLGA", "BASE", "cadavre2",
+ "usine", "chien", "coeur", "stand", "ocean",
+ "base3", "gloop", "cant", "feel", "lost",
+ "tobac"
+};
+
void SoundManager::WSOUND(int soundNumber) {
if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) {
if (soundNumber > 27)
@@ -328,135 +338,7 @@ void SoundManager::WSOUND(int soundNumber) {
if (MOD_FLAG)
WSOUND_OFF();
- switch (soundNumber) {
- case 1:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("appart");
- else
- PLAY_MOD("appar");
- break;
- case 2:
- PLAY_MOD("ville");
- break;
- case 3:
- PLAY_MOD("Rock");
- break;
- case 4:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("police");
- else
- PLAY_MOD("polic");
- break;
- case 5:
- PLAY_MOD("deep");
- break;
- case 6:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("purgat");
- else
- PLAY_MOD("purga");
- break;
- case 7:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("riviere");
- else
- PLAY_MOD("rivie");
- break;
- case 8:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("SUSPENS");
- else
- PLAY_MOD("SUSPE");
- break;
- case 9:
- PLAY_MOD("labo");
- break;
- case 10:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("cadavre");
- else
- PLAY_MOD("cadav");
- break;
- case 11:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("cabane");
- else
- PLAY_MOD("caban");
- break;
- case 12:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("purgat2");
- else
- PLAY_MOD("purg2");
- break;
- case 13:
- PLAY_MOD("foret");
- break;
- case 14:
- PLAY_MOD("ile");
- break;
- case 15:
- PLAY_MOD("ile2");
- break;
- case 16:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("hopkins");
- else
- PLAY_MOD("hopki");
- break;
- case 17:
- PLAY_MOD("peur");
- break;
- case 18:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("URAVOLGA");
- else
- PLAY_MOD("peur");
- break;
- case 19:
- PLAY_MOD("BASE");
- break;
- case 20:
- if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
- PLAY_MOD("cadavre2");
- else
- PLAY_MOD("cada2");
- break;
- case 21:
- PLAY_MOD("usine");
- break;
- case 22:
- PLAY_MOD("chien");
- break;
- case 23:
- PLAY_MOD("coeur");
- break;
- case 24:
- PLAY_MOD("stand");
- break;
- case 25:
- PLAY_MOD("ocean");
- break;
- case 26:
- PLAY_MOD("base3");
- break;
- case 27:
- PLAY_MOD("gloop");
- break;
- case 28:
- PLAY_MOD("cant");
- break;
- case 29:
- PLAY_MOD("feel");
- break;
- case 30:
- PLAY_MOD("lost");
- break;
- case 31:
- PLAY_MOD("tobac");
- break;
- }
-
+ PLAY_MOD(modSounds[soundNumber - 1]);
old_music = soundNumber;
}
}
@@ -481,7 +363,24 @@ void SoundManager::WSOUND_OFF() {
void SoundManager::PLAY_MOD(const Common::String &file) {
if (_musicOffFl)
return;
- _vm->_fileManager.constructFilename(_vm->_globals.HOPMUSIC, file);
+ Common::String modFile = file;
+
+ // HACK
+ if (modFile == "URAVOLGA" && (_vm->getPlatform() == Common::kPlatformWindows || _vm->getPlatform() == Common::kPlatformLinux))
+ modFile = "peur";
+
+ // The Windows/Linux version chops off the music file names to 5 characters
+ if (modFile.size() > 5 && (_vm->getPlatform() == Common::kPlatformWindows || _vm->getPlatform() == Common::kPlatformLinux)) {
+ if (!modFile.hasSuffix("2")) {
+ while (modFile.size() > 5)
+ modFile.deleteLastChar();
+ } else {
+ while (modFile.size() > 4)
+ modFile.deleteLastChar();
+ modFile += "2";
+ }
+ }
+ _vm->_fileManager.constructFilename(_vm->_globals.HOPMUSIC, modFile);
if (MOD_FLAG) {
stopMusic();
delMusic();
@@ -715,15 +614,15 @@ void SoundManager::PLAY_SOUND2(const Common::String &file) {
}
void SoundManager::MODSetSampleVolume() {
- // No implementatoin needed
+ // No implementation needed
}
void SoundManager::MODSetVoiceVolume() {
- // No implementatoin needed
+ // No implementation needed
}
void SoundManager::MODSetMusicVolume(int volume) {
- // No implementatoin needed
+ // No implementation needed
}
void SoundManager::loadSample(int wavIndex, const Common::String &file) {
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index c87fcd7601..930e87df6c 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -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();
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-06 17:26:34 +0000