aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dists/msvc9/create_msvc9.bat6
-rw-r--r--engines/hopkins/dialogs.cpp64
-rw-r--r--engines/hopkins/hopkins.cpp18
-rw-r--r--engines/hopkins/hopkins.h2
4 files changed, 48 insertions, 42 deletions
diff --git a/dists/msvc9/create_msvc9.bat b/dists/msvc9/create_msvc9.bat
index 1622cd9037..8b6f289161 100644
--- a/dists/msvc9/create_msvc9.bat
+++ b/dists/msvc9/create_msvc9.bat
@@ -53,21 +53,21 @@ goto done
echo.
echo Creating project files with all engines enabled (stable and unstable)
echo.
-create_project ..\.. --enable-all-engines --msvc --msvc-version 9
+create_project ..\.. --enable-all-engines --msvc --msvc-version 9 --disable-taskbar --disable-freetype
goto done
:stable
echo.
echo Creating normal project files, with only the stable engines enabled
echo.
-create_project ..\.. --msvc --msvc-version 9
+create_project ..\.. --msvc --msvc-version 9 --disable-taskbar --disable-freetype
goto done
:tools
echo.
echo Creating tools project files
echo.
-create_project ..\.. --tools --msvc --msvc-version 9
+create_project ..\.. --tools --msvc --msvc-version 9 --disable-taskbar --disable-freetype
goto done
:clean_check
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index c3821e9ba2..e20409a3b4 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -243,13 +243,14 @@ void DialogsManager::showOptionsDialog() {
if (!_vm->_graphicsManager.MANU_SCROLL)
_vm->_globals.opt_scrtype = 2;
- if (_vm->_graphicsManager.MANU_SCROLL == 1)
+ else if (_vm->_graphicsManager.MANU_SCROLL == 1)
_vm->_globals.opt_scrtype = 1;
+
if (_vm->_globals.vitesse == 1)
_vm->_globals.opt_vitesse = 6;
- if (_vm->_globals.vitesse == 2)
+ else if (_vm->_globals.vitesse == 2)
_vm->_globals.opt_vitesse = 5;
- if (_vm->_globals.vitesse == 3)
+ else if (_vm->_globals.vitesse == 3)
_vm->_globals.opt_vitesse = 4;
_vm->_globals.opt_txt = !_vm->_soundManager.TEXTOFF ? 7 : 8;
@@ -259,33 +260,34 @@ void DialogsManager::showOptionsDialog() {
if (_vm->_globals.SVGA == 1)
_vm->_globals.opt_anm = 10;
- if (_vm->_globals.SVGA == 2)
+ else if (_vm->_globals.SVGA == 2)
_vm->_globals.opt_anm = 9;
- if (_vm->_globals.SVGA == 3)
+ else if (_vm->_globals.SVGA == 3)
_vm->_globals.opt_anm = 11;
+
if (_vm->_graphicsManager.SPEED_SCROLL == 1)
_vm->_globals.opt_scrspeed = 12;
- if (_vm->_graphicsManager.SPEED_SCROLL == 2)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 2)
_vm->_globals.opt_scrspeed = 13;
- if (_vm->_graphicsManager.SPEED_SCROLL == 4)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 4)
_vm->_globals.opt_scrspeed = 14;
- if (_vm->_graphicsManager.SPEED_SCROLL == 8)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 8)
_vm->_globals.opt_scrspeed = 15;
- if (_vm->_graphicsManager.SPEED_SCROLL == 16)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 16)
_vm->_globals.opt_scrspeed = 16;
- if (_vm->_graphicsManager.SPEED_SCROLL == 32)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 32)
_vm->_globals.opt_scrspeed = 17;
- if (_vm->_graphicsManager.SPEED_SCROLL == 48)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 48)
_vm->_globals.opt_scrspeed = 18;
- if (_vm->_graphicsManager.SPEED_SCROLL == 64)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 64)
_vm->_globals.opt_scrspeed = 19;
- if (_vm->_graphicsManager.SPEED_SCROLL == 128)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 128)
_vm->_globals.opt_scrspeed = 20;
- if (_vm->_graphicsManager.SPEED_SCROLL == 160)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 160)
_vm->_globals.opt_scrspeed = 21;
- if (_vm->_graphicsManager.SPEED_SCROLL == 320)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 320)
_vm->_globals.opt_scrspeed = 22;
- if (_vm->_graphicsManager.SPEED_SCROLL == 640)
+ else if (_vm->_graphicsManager.SPEED_SCROLL == 640)
_vm->_globals.opt_scrspeed = 23;
_vm->_eventsManager.VBL();
@@ -731,33 +733,37 @@ int DialogsManager::CHERCHE_PARTIE() {
}
if ((uint16)(yp - 388) <= 0x10u && xp > _vm->_graphicsManager.ofscroll + 273 && xp < _vm->_graphicsManager.ofscroll + 355)
slotNumber = 7;
- if (slotNumber == 1) {
+
+ switch (slotNumber) {
+ case 1:
_vm->_objectsManager.SL_X = 189;
_vm->_objectsManager.SL_Y = 111;
- }
- if (slotNumber == 2) {
+ break;
+ case 2:
_vm->_objectsManager.SL_X = 322;
_vm->_objectsManager.SL_Y = 111;
- }
- if (slotNumber == 3) {
+ break;
+ case 3:
_vm->_objectsManager.SL_X = 189;
_vm->_objectsManager.SL_Y = 202;
- }
- if (slotNumber == 4) {
+ break;
+ case 4:
_vm->_objectsManager.SL_X = 322;
_vm->_objectsManager.SL_Y = 202;
- }
- if (slotNumber == 5) {
+ break;
+ case 5:
_vm->_objectsManager.SL_X = 189;
_vm->_objectsManager.SL_Y = 293;
- }
- if (slotNumber == 6) {
+ break;
+ case 6:
_vm->_objectsManager.SL_X = 322;
_vm->_objectsManager.SL_Y = 293;
- }
- if (slotNumber == 7 || !slotNumber) {
+ break;
+ case 0:
+ case 7:
_vm->_objectsManager.SL_X = 0;
_vm->_objectsManager.SL_Y = 0;
+ break;
}
return slotNumber;
}
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 4ce2f0ec3d..0c76ab307d 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -2658,7 +2658,7 @@ void HopkinsEngine::OCEAN_HOME() {
_objectsManager.SETANISPR(0, 9);
}
-void HopkinsEngine::OCEAN(int16 a1, Common::String a2, Common::String a3, int16 a4, int16 a5, int16 a6, int16 a7, int16 a8, int16 a9) {
+void HopkinsEngine::OCEAN(int16 a1, Common::String a2, Common::String a3, int16 a4, int16 exit1, int16 exit2, int16 exit3, int16 exit4, int16 a9) {
_globals.PLAN_FLAG = false;
_graphicsManager.NOFADE = false;
_globals.NOMARCHE = false;
@@ -2681,13 +2681,13 @@ void HopkinsEngine::OCEAN(int16 a1, Common::String a2, Common::String a3, int16
else if (a1 == 91)
_objectsManager.INILINK("IM91");
- if (!a5)
+ if (!exit1)
_objectsManager.ZONE_OFF(1);
- if (!a6)
+ if (!exit2)
_objectsManager.ZONE_OFF(2);
- if (!a7)
+ if (!exit3)
_objectsManager.ZONE_OFF(3);
- if (!a8)
+ if (!exit4)
_objectsManager.ZONE_OFF(4);
if (!_globals.OCEAN_SENS)
_globals.OCEAN_SENS = a4;
@@ -2738,13 +2738,13 @@ void HopkinsEngine::OCEAN(int16 a1, Common::String a2, Common::String a3, int16
} while (!loopCond);
if (_globals.SORTIE == 1)
- _globals.SORTIE = a5;
+ _globals.SORTIE = exit1;
if (_globals.SORTIE == 2)
- _globals.SORTIE = a6;
+ _globals.SORTIE = exit2;
if (_globals.SORTIE == 3)
- _globals.SORTIE = a7;
+ _globals.SORTIE = exit3;
if (_globals.SORTIE == 4)
- _globals.SORTIE = a8;
+ _globals.SORTIE = exit4;
_graphicsManager.FADE_OUTW();
_objectsManager.SPRITE_OFF(0);
_globals.AFFLI = false;
diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h
index 73e57d336b..bd071eda0c 100644
--- a/engines/hopkins/hopkins.h
+++ b/engines/hopkins/hopkins.h
@@ -100,7 +100,7 @@ private:
int PWBASE();
void BTOCEAN();
void OCEAN_HOME();
- void OCEAN(int16 a1, Common::String a2, Common::String a3, int16 a4, int16 a5, int16 a6, int16 a7, int16 a8, int16 a9);
+ void OCEAN(int16 a1, Common::String a2, Common::String a3, int16 a4, int16 exit1, int16 exit2, int16 exit3, int16 exit4, int16 a9);
void Charge_Credits();
void CREDIT_AFFICHE(int startPosY, byte *buffer, char colour);
void Credits();
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-18 21:11:15 +0000