[Scummvm-git-logs] scummvm master -> 74aeee4d658291b71ad0461876cbef0eb59b8c42
bluegr
noreply at scummvm.org
Tue Sep 10 16:49:52 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
74aeee4d65 JANITORIAL: SCUMM: Fix occurrences typos in code
Commit: 74aeee4d658291b71ad0461876cbef0eb59b8c42
https://github.com/scummvm/scummvm/commit/74aeee4d658291b71ad0461876cbef0eb59b8c42
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-10T19:49:48+03:00
Commit Message:
JANITORIAL: SCUMM: Fix occurrences typos in code
Changed paths:
engines/scumm/insane/insane.cpp
engines/scumm/insane/insane.h
engines/scumm/insane/insane_enemy.cpp
engines/scumm/insane/insane_iact.cpp
engines/scumm/insane/insane_scenes.cpp
diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp
index 514d06d6647..19b1b20ed10 100644
--- a/engines/scumm/insane/insane.cpp
+++ b/engines/scumm/insane/insane.cpp
@@ -468,7 +468,7 @@ void Insane::init_actStruct(int actornum, int actnum, int32 actorval, byte state
}
void Insane::init_enemyStruct(int n, int32 handler, int32 initializer,
- int16 occurences, int32 maxdamage, int32 isEmpty,
+ int16 occurrences, int32 maxdamage, int32 isEmpty,
int32 weapon, int32 sound, const char *filename,
int32 costume4, int32 costume6, int32 costume5,
int16 costumevar, int32 maxframe, int32 apprAnim) {
@@ -476,7 +476,7 @@ void Insane::init_enemyStruct(int n, int32 handler, int32 initializer,
_enemy[n].handler = handler;
_enemy[n].initializer = initializer;
- _enemy[n].occurences = occurences;
+ _enemy[n].occurrences = occurrences;
_enemy[n].maxdamage = maxdamage;
_enemy[n].isEmpty = isEmpty;
_enemy[n].weapon = weapon;
@@ -684,15 +684,15 @@ void Insane::readState() { // PATCH
_posBrokenCar = readArray(326);
_val54d = readArray(327);
_posFatherTorque = readArray(328);
- _enemy[EN_TORQUE].occurences = readArray(337);
- _enemy[EN_ROTT1].occurences = readArray(329);
- _enemy[EN_ROTT2].occurences = readArray(330);
- _enemy[EN_ROTT3].occurences = readArray(331);
- _enemy[EN_VULTF1].occurences = readArray(332);
- _enemy[EN_VULTM1].occurences = readArray(333);
- _enemy[EN_VULTF2].occurences = readArray(334);
- _enemy[EN_VULTM2].occurences = readArray(335);
- _enemy[EN_CAVEFISH].occurences = readArray(336);
+ _enemy[EN_TORQUE].occurrences = readArray(337);
+ _enemy[EN_ROTT1].occurrences = readArray(329);
+ _enemy[EN_ROTT2].occurrences = readArray(330);
+ _enemy[EN_ROTT3].occurrences = readArray(331);
+ _enemy[EN_VULTF1].occurrences = readArray(332);
+ _enemy[EN_VULTM1].occurrences = readArray(333);
+ _enemy[EN_VULTF2].occurrences = readArray(334);
+ _enemy[EN_VULTM2].occurrences = readArray(335);
+ _enemy[EN_CAVEFISH].occurrences = readArray(336);
_enemy[EN_VULTM2].isEmpty = readArray(340);
_enemy[EN_VULTF2].isEmpty = readArray(339);
_enemy[EN_CAVEFISH].isEmpty = readArray(56);
diff --git a/engines/scumm/insane/insane.h b/engines/scumm/insane/insane.h
index 90a77c61938..8b7a9fed326 100644
--- a/engines/scumm/insane/insane.h
+++ b/engines/scumm/insane/insane.h
@@ -180,7 +180,7 @@ class Insane {
struct enemy {
int32 handler;
int32 initializer;
- int16 occurences;
+ int16 occurrences;
int32 maxdamage;
int32 isEmpty;
int32 weapon;
@@ -333,7 +333,7 @@ class Insane {
void init_actStruct(int actornum, int actnum, int32 actorval, byte state,
int32 room, int32 animtilt, int32 tilt, int32 frame);
void init_enemyStruct(int n, int32 handler, int32 initializer,
- int16 occurences, int32 maxdamage, int32 isEmpty,
+ int16 occurrences, int32 maxdamage, int32 isEmpty,
int32 field_14, int32 sound, const char *filename,
int32 costume4, int32 costume6, int32 costume5,
int16 field_2C, int32 field_30, int32 field_34);
diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp
index e5079e64b7c..be81e94d46d 100644
--- a/engines/scumm/insane/insane_enemy.cpp
+++ b/engines/scumm/insane/insane_enemy.cpp
@@ -196,7 +196,7 @@ int32 Insane::enemy0handler(int32 actor1, int32 actor2, int32 probability) {
case 6:
if (!_enemyState[EN_ROTT1][7]) {
_enemyState[EN_ROTT1][7] = 1;
- if (_enemy[EN_ROTT1].occurences)
+ if (_enemy[EN_ROTT1].occurrences)
prepareScenePropScene(55, 0, 0);
}
break;
diff --git a/engines/scumm/insane/insane_iact.cpp b/engines/scumm/insane/insane_iact.cpp
index 08f0397b290..09e0a5f9b67 100644
--- a/engines/scumm/insane/insane_iact.cpp
+++ b/engines/scumm/insane/insane_iact.cpp
@@ -187,7 +187,7 @@ void Insane::chooseEnemy() {
if (readArray(58) != 0)
_enemy[EN_TORQUE].isEmpty = 1;
- if (_enemy[EN_TORQUE].occurences == 0) {
+ if (_enemy[EN_TORQUE].occurrences == 0) {
_currEnemy = EN_TORQUE;
_metEnemiesListTail++;
_metEnemiesList[_metEnemiesListTail] = EN_TORQUE;
diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp
index d438004b004..3f12701cb63 100644
--- a/engines/scumm/insane/insane_scenes.cpp
+++ b/engines/scumm/insane/insane_scenes.cpp
@@ -160,15 +160,15 @@ void Insane::runScene(int arraynum) {
writeArray(54, _actor[0].inventory[INV_WRENCH]);
writeArray(55, _actor[0].inventory[INV_DUST]);
writeArray(56, _enemy[EN_CAVEFISH].isEmpty);
- writeArray(337, _enemy[EN_TORQUE].occurences);
- writeArray(329, _enemy[EN_ROTT1].occurences);
- writeArray(330, _enemy[EN_ROTT2].occurences);
- writeArray(331, _enemy[EN_ROTT3].occurences);
- writeArray(332, _enemy[EN_VULTF1].occurences);
- writeArray(333, _enemy[EN_VULTM1].occurences);
- writeArray(334, _enemy[EN_VULTF2].occurences);
- writeArray(335, _enemy[EN_VULTM2].occurences);
- writeArray(336, _enemy[EN_CAVEFISH].occurences);
+ writeArray(337, _enemy[EN_TORQUE].occurrences);
+ writeArray(329, _enemy[EN_ROTT1].occurrences);
+ writeArray(330, _enemy[EN_ROTT2].occurrences);
+ writeArray(331, _enemy[EN_ROTT3].occurrences);
+ writeArray(332, _enemy[EN_VULTF1].occurrences);
+ writeArray(333, _enemy[EN_VULTM1].occurrences);
+ writeArray(334, _enemy[EN_VULTF2].occurrences);
+ writeArray(335, _enemy[EN_VULTM2].occurrences);
+ writeArray(336, _enemy[EN_CAVEFISH].occurrences);
writeArray(339, _enemy[EN_VULTF2].isEmpty);
writeArray(340, _enemy[EN_VULTM2].isEmpty);
}
@@ -764,7 +764,7 @@ void Insane::setEnemyCostumes() {
_actor[1].tilt = 0;
_actor[1].weapon = -1;
_actor[1].weaponClass = 2;
- _enemy[_currEnemy].occurences++;
+ _enemy[_currEnemy].occurrences++;
_actor[1].maxdamage = _enemy[_currEnemy].maxdamage;
_actor[1].enemyHandler = _enemy[_currEnemy].handler;
_actor[1].animWeaponClass = 0;
@@ -1339,7 +1339,7 @@ void Insane::postCase12(byte *renderBitmap, int32 codecparam, int32 setupsan12,
case EN_ROTT2:
turnBen(true);
- if (_enemy[EN_ROTT2].occurences <= 1)
+ if (_enemy[EN_ROTT2].occurrences <= 1)
prepareScenePropScene(32, 0, 1);
else
prepareScenePropScene(33, 0, 1);
@@ -1347,25 +1347,25 @@ void Insane::postCase12(byte *renderBitmap, int32 codecparam, int32 setupsan12,
case EN_ROTT3:
turnBen(true);
- if (_enemy[EN_ROTT3].occurences <= 1)
+ if (_enemy[EN_ROTT3].occurrences <= 1)
prepareScenePropScene(25, 0, 1);
break;
case EN_VULTF1:
turnBen(true);
- if (_enemy[EN_VULTF1].occurences <= 1)
+ if (_enemy[EN_VULTF1].occurrences <= 1)
prepareScenePropScene(2, 0, 1);
break;
case EN_VULTF2:
turnBen(true);
- if (_enemy[EN_VULTF2].occurences <= 1)
+ if (_enemy[EN_VULTF2].occurrences <= 1)
prepareScenePropScene(9, 0, 1);
else
prepareScenePropScene(16, 0, 1);
break;
case EN_VULTM2:
- if (_enemy[EN_VULTM2].occurences <= 1) {
+ if (_enemy[EN_VULTM2].occurrences <= 1) {
turnBen(false);
prepareScenePropScene(18, 0, 1);
_battleScene = false;
@@ -1387,7 +1387,7 @@ void Insane::postCase12(byte *renderBitmap, int32 codecparam, int32 setupsan12,
} else {
switch (_currEnemy) {
case EN_VULTM2:
- if (_enemy[EN_VULTM2].occurences <= 1)
+ if (_enemy[EN_VULTM2].occurrences <= 1)
turnBen(false);
else
turnBen(true);
More information about the Scummvm-git-logs
mailing list