[Scummvm-git-logs] scummvm master -> ed6348ef73b5443d5aed1c51fb6000af4004a8b6
mduggan
noreply at scummvm.org
Sun Jun 12 05:52:11 UTC 2022
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5e00777108 ULTIMA8: Rename unk crusdader flag to crusaderTeleporting
ed6348ef73 ULTIMA8: Fix Crusader debug code (disabled by default)
Commit: 5e0077710897018cfa4dce1b909c68caea092dfe
https://github.com/scummvm/scummvm/commit/5e0077710897018cfa4dce1b909c68caea092dfe
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2022-06-12T10:30:04+09:00
Commit Message:
ULTIMA8: Rename unk crusdader flag to crusaderTeleporting
After inspecting the usecode, this flag seems to only be set and cleared on
teleport events. It has no real effect on the behavior of the C code but it's
nice to name it correctly.
Changed paths:
engines/ultima/ultima8/convert/crusader/convert_usecode_crusader.h
engines/ultima/ultima8/convert/crusader/convert_usecode_regret.h
engines/ultima/ultima8/ultima8.cpp
engines/ultima/ultima8/ultima8.h
engines/ultima/ultima8/usecode/regret_intrinsics.h
engines/ultima/ultima8/usecode/remorse_intrinsics.h
diff --git a/engines/ultima/ultima8/convert/crusader/convert_usecode_crusader.h b/engines/ultima/ultima8/convert/crusader/convert_usecode_crusader.h
index acfe733c23c..b8a9bef7c6e 100644
--- a/engines/ultima/ultima8/convert/crusader/convert_usecode_crusader.h
+++ b/engines/ultima/ultima8/convert/crusader/convert_usecode_crusader.h
@@ -159,11 +159,11 @@ const char* const ConvertUsecodeCrusader::_intrinsics[] = {
"void Item::I_andStatus(Item *, uint16 status)", // part of same coff set 01A, 031, 069, 06E, 099, 0B2, 0BF, 0C1, 0C3, 0E9, 0FC, 101, 104, 106, 108, 10A, 10C, 10E, 110, 114, 117, 11A, 128, 132
"byte Item::I_isCompletelyOn(Item *, uint16 other)",
// 0070
- "byte Ultima8Engine::I_getUnkCrusaderFlag(void)",
- "void Ultima8Engine::I_setUnkCrusaderFlag(void)",
+ "byte Ultima8Engine::I_getCrusaderTeleporting(void)",
+ "void Ultima8Engine::I_setCrusaderTeleporting(void)",
"void Ultima8Engine::I_setCruStasis(void)",
"void Actor::I_setDead(4 bytes)", // part of same coff set 021, 060, 073, 0A0, 0A8, 0D8, 0E7, 135
- "void Ultima8Engine::I_clrUnkCrusaderFlag(void)",
+ "void Ultima8Engine::I_clrCrusaderTeleporting(void)",
"void Ultima8Engine::I_clrCruStasis(void)",
"void AudioProcess::I_stopSFX(Item *)",
"int16 PaletteFaderProcess::I_fadeToBlack(void)", // fade to black, no args (40 frames)
diff --git a/engines/ultima/ultima8/convert/crusader/convert_usecode_regret.h b/engines/ultima/ultima8/convert/crusader/convert_usecode_regret.h
index d97f3a47262..0a7da114162 100644
--- a/engines/ultima/ultima8/convert/crusader/convert_usecode_regret.h
+++ b/engines/ultima/ultima8/convert/crusader/convert_usecode_regret.h
@@ -169,9 +169,9 @@ const char* const ConvertUsecodeRegret::_intrinsics[] = {
"Item::unequip(sint16)",
"Item::andStatus(void)",
"Item::move(uint16,uint16,uint8)",
- "Ultima8Engine::I_getUnkCrusaderFlag()",
- "Ultima8Engine::I_setUnkCrusaderFlag()",
- "Ultima8Engine::I_clrUnkCrusaderFlag()",
+ "Ultima8Engine::I_getCrusaderTeleporting()",
+ "Ultima8Engine::I_setCrusaderTeleporting()",
+ "Ultima8Engine::I_clrCrusaderTeleporting()",
"Actor::I_turnToward()",
"PaletteFaderProcess::I_fadeToBlack()",
// 0080
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 122f79c19c3..f9d9538d954 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -131,7 +131,7 @@ Ultima8Engine::Ultima8Engine(OSystem *syst, const Ultima::UltimaGameDescription
_avatarInStasis(false), _cruStasis(false), _paintEditorItems(false), _inversion(0),
_showTouching(false), _timeOffset(0), _hasCheated(false), _cheatsEnabled(false),
_fontOverride(false), _fontAntialiasing(false), _audioMixer(0), _inverterGump(nullptr),
- _lerpFactor(256), _inBetweenFrame(false), _unkCrusaderFlag(false), _moveKeyFrame(0),
+ _lerpFactor(256), _inBetweenFrame(false), _crusaderTeleporting(false), _moveKeyFrame(0),
_highRes(false) {
_instance = this;
}
@@ -1484,7 +1484,7 @@ void Ultima8Engine::save(Common::WriteStream *ws) {
ws->writeByte(s);
if (GAME_IS_CRUSADER) {
- uint8 f = (_unkCrusaderFlag ? 1 : 0);
+ uint8 f = (_crusaderTeleporting ? 1 : 0);
ws->writeByte(f);
}
@@ -1508,7 +1508,7 @@ bool Ultima8Engine::load(Common::ReadStream *rs, uint32 version) {
_avatarInStasis = (rs->readByte() != 0);
if (GAME_IS_CRUSADER) {
- _unkCrusaderFlag = (rs->readByte() != 0);
+ _crusaderTeleporting = (rs->readByte() != 0);
_cruStasis = false;
}
@@ -1603,20 +1603,20 @@ uint32 Ultima8Engine::I_getTimeInGameHours(const uint8 * /*args*/,
return get_instance()->getGameTimeInSeconds() / 900;
}
-uint32 Ultima8Engine::I_getUnkCrusaderFlag(const uint8 * /*args*/,
+uint32 Ultima8Engine::I_getCrusaderTeleporting(const uint8 * /*args*/,
unsigned int /*argsize*/) {
- return get_instance()->isUnkCrusaderFlag() ? 1 : 0;
+ return get_instance()->isCrusaderTeleporting() ? 1 : 0;
}
-uint32 Ultima8Engine::I_setUnkCrusaderFlag(const uint8 * /*args*/,
+uint32 Ultima8Engine::I_setCrusaderTeleporting(const uint8 * /*args*/,
unsigned int /*argsize*/) {
- get_instance()->setUnkCrusaderFlag(true);
+ get_instance()->setCrusaderTeleporting(true);
return 0;
}
-uint32 Ultima8Engine::I_clrUnkCrusaderFlag(const uint8 * /*args*/,
+uint32 Ultima8Engine::I_clrCrusaderTeleporting(const uint8 * /*args*/,
unsigned int /*argsize*/) {
- get_instance()->setUnkCrusaderFlag(false);
+ get_instance()->setCrusaderTeleporting(false);
return 0;
}
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index f53b8490300..9a5184d9d2b 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -122,7 +122,7 @@ private:
bool _hasCheated;
bool _cheatsEnabled;
unsigned int _inversion;
- bool _unkCrusaderFlag; //!< not sure what this is but it's only used in usecode for crusader, so just keep track of it..
+ bool _crusaderTeleporting; //!< Flag used by the usecode to know if Crusader is currently teleporting
uint32 _moveKeyFrame; //!< An imperfect way for the Crusader usecode to stop remote camera viewing.
bool _cruStasis; //!< A slightly different kind of stasis for Crusader that stops some keyboard events
private:
@@ -232,9 +232,9 @@ public:
INTRINSIC(I_getTimeInSeconds);
INTRINSIC(I_setTimeInGameHours);
INTRINSIC(I_avatarCanCheat);
- INTRINSIC(I_getUnkCrusaderFlag);
- INTRINSIC(I_setUnkCrusaderFlag);
- INTRINSIC(I_clrUnkCrusaderFlag);
+ INTRINSIC(I_getCrusaderTeleporting);
+ INTRINSIC(I_setCrusaderTeleporting);
+ INTRINSIC(I_clrCrusaderTeleporting);
INTRINSIC(I_makeAvatarACheater);
INTRINSIC(I_closeItemGumps);
INTRINSIC(I_setCruStasis);
@@ -263,11 +263,11 @@ public:
_showTouching = !_showTouching;
}
- bool isUnkCrusaderFlag() const {
- return _unkCrusaderFlag;
+ bool isCrusaderTeleporting() const {
+ return _crusaderTeleporting;
}
- void setUnkCrusaderFlag(bool flag) {
- _unkCrusaderFlag = flag;
+ void setCrusaderTeleporting(bool flag) {
+ _crusaderTeleporting = flag;
}
void setCruStasis(bool flag) {
_cruStasis = flag;
diff --git a/engines/ultima/ultima8/usecode/regret_intrinsics.h b/engines/ultima/ultima8/usecode/regret_intrinsics.h
index a6ff4fdbc2c..2fc29aa682b 100644
--- a/engines/ultima/ultima8/usecode/regret_intrinsics.h
+++ b/engines/ultima/ultima8/usecode/regret_intrinsics.h
@@ -161,9 +161,9 @@ Intrinsic RegretIntrinsics[] = {
Item::I_unequip, // Intrinsic078()
Item::I_andStatus, // Intrinsic079()
Item::I_move, // Intrinsic07A()
- Ultima8Engine::I_getUnkCrusaderFlag, // Intrinsic07B()
- Ultima8Engine::I_setUnkCrusaderFlag, // Intrinsic07C()
- Ultima8Engine::I_clrUnkCrusaderFlag, // Intrinsic07D()
+ Ultima8Engine::I_getCrusaderTeleporting, // Intrinsic07B()
+ Ultima8Engine::I_setCrusaderTeleporting, // Intrinsic07C()
+ Ultima8Engine::I_clrCrusaderTeleporting, // Intrinsic07D()
Actor::I_turnToward, // Intrinsic07E()
PaletteFaderProcess::I_fadeToBlack, // Intrinsic07F()
// 0080
@@ -549,9 +549,9 @@ Intrinsic RegretDemoIntrinsics[] = {
// 0x080
Item::I_andStatus, // Intrinsic080 10b0:25cf
Item::I_move, // Intrinsic081 10b0:1575
- Ultima8Engine::I_getUnkCrusaderFlag, // Intrinsic082 1008:0f1c
- Ultima8Engine::I_setUnkCrusaderFlag, // Intrinsic083 1008:0f20
- Ultima8Engine::I_clrUnkCrusaderFlag, // Intrinsic084 1008:0f16
+ Ultima8Engine::I_getCrusaderTeleporting, // Intrinsic082 1008:0f1c
+ Ultima8Engine::I_setCrusaderTeleporting, // Intrinsic083 1008:0f20
+ Ultima8Engine::I_clrCrusaderTeleporting, // Intrinsic084 1008:0f16
PaletteFaderProcess::I_fadeToBlack, // Intrinsic085 1418:071b
MainActor::I_clrKeycards, // Intrinsic086 10f8:4443
MusicProcess::I_pauseMusic, // Intrinsic087 1210:02b0
@@ -915,9 +915,9 @@ Intrinsic RegretDeIntrinsics[] = {
Item::I_unequip, // Intrinsic078 10b0:2a51
Item::I_andStatus, // Intrinsic079 10b0:25cf
Item::I_move, // Intrinsic07A 10b0:1575
- Ultima8Engine::I_getUnkCrusaderFlag, // Intrinsic07B 1008:0f1c
- Ultima8Engine::I_setUnkCrusaderFlag, // Intrinsic07C 1008:0f20
- Ultima8Engine::I_clrUnkCrusaderFlag, // Intrinsic07D 1008:0f16
+ Ultima8Engine::I_getCrusaderTeleporting, // Intrinsic07B 1008:0f1c
+ Ultima8Engine::I_setCrusaderTeleporting, // Intrinsic07C 1008:0f20
+ Ultima8Engine::I_clrCrusaderTeleporting, // Intrinsic07D 1008:0f16
Actor::I_turnToward, // Intrinsic07E 10f8:3961
PaletteFaderProcess::I_fadeToBlack, // Intrinsic07F 1418:071b
// 0x080
diff --git a/engines/ultima/ultima8/usecode/remorse_intrinsics.h b/engines/ultima/ultima8/usecode/remorse_intrinsics.h
index e251b821a99..eece6a1e1f5 100644
--- a/engines/ultima/ultima8/usecode/remorse_intrinsics.h
+++ b/engines/ultima/ultima8/usecode/remorse_intrinsics.h
@@ -152,11 +152,11 @@ Intrinsic RemorseIntrinsics[] = {
Item::I_andStatus, // void Intrinsic06E(6 bytes)
Item::I_isCompletelyOn,
// 0x070
- Ultima8Engine::I_getUnkCrusaderFlag, // int Intrinsic070(void)
- Ultima8Engine::I_setUnkCrusaderFlag, // void Intrinsic071(void)
+ Ultima8Engine::I_getCrusaderTeleporting, // int Intrinsic070(void)
+ Ultima8Engine::I_setCrusaderTeleporting, // void Intrinsic071(void)
Ultima8Engine::I_setCruStasis,
Actor::I_setDead,
- Ultima8Engine::I_clrUnkCrusaderFlag, // void Intrinsic074(void)
+ Ultima8Engine::I_clrCrusaderTeleporting, // void Intrinsic074(void)
Ultima8Engine::I_clrCruStasis,
AudioProcess::I_stopSFXCru, // takes Item *, from disasm
PaletteFaderProcess::I_fadeToBlack, // void Intrinsic077(void)
@@ -490,11 +490,11 @@ Intrinsic RemorseDemoIntrinsics[] = {
Item::I_getNpcNum, // Intrinsic06F 10a0:0c40
// 0x70
Item::I_andStatus, // Intrinsic070 10a0:258b
- Ultima8Engine::I_getUnkCrusaderFlag, // Intrinsic071 13e8:0e27
- Ultima8Engine::I_setUnkCrusaderFlag, // Intrinsic072 13e8:0e2b
+ Ultima8Engine::I_getCrusaderTeleporting, // Intrinsic071 13e8:0e27
+ Ultima8Engine::I_setCrusaderTeleporting, // Intrinsic072 13e8:0e2b
Ultima8Engine::I_setCruStasis, // Intrinsic073 13e8:0071
Actor::I_setDead, // Intrinsic074 10e8:2010
- Ultima8Engine::I_clrUnkCrusaderFlag, // Intrinsic075 13e8:0e21
+ Ultima8Engine::I_clrCrusaderTeleporting, // Intrinsic075 13e8:0e21
Ultima8Engine::I_clrCruStasis, // Intrinsic076 13e8:0077
AudioProcess::I_stopSFXCru, // Intrinsic077 10a0:39cf
PaletteFaderProcess::I_fadeToBlack, // Intrinsic078 1440:06e6
@@ -827,11 +827,11 @@ Intrinsic RemorseEsIntrinsics[] = {
UCMachine::I_true, // Intrinsic070 1050:00a1
Item::I_getNpcNum, // Intrinsic071 10a8:0c40
Item::I_andStatus, // Intrinsic072 10a8:258b
- Ultima8Engine::I_getUnkCrusaderFlag, // Intrinsic073 13e8:0e27
- Ultima8Engine::I_setUnkCrusaderFlag, // Intrinsic074 13e8:0e2b
+ Ultima8Engine::I_getCrusaderTeleporting, // Intrinsic073 13e8:0e27
+ Ultima8Engine::I_setCrusaderTeleporting, // Intrinsic074 13e8:0e2b
Ultima8Engine::I_setCruStasis, // Intrinsic075 13e8:0071
Actor::I_setDead, // Intrinsic076 10f0:2010
- Ultima8Engine::I_clrUnkCrusaderFlag, // Intrinsic077 13e8:0e21
+ Ultima8Engine::I_clrCrusaderTeleporting, // Intrinsic077 13e8:0e21
Ultima8Engine::I_clrCruStasis, // Intrinsic078 13e8:0077
AudioProcess::I_stopSFXCru, // Intrinsic079 10a8:39cf
PaletteFaderProcess::I_fadeToBlack, // Intrinsic07A 1440:06e6
@@ -1157,11 +1157,11 @@ Intrinsic RemorseFrIntrinsics[] = {
Item::I_getNpcNum, // Intrinsic06F 10a8:0c40
// 0x070
Item::I_andStatus, // Intrinsic070 10a8:258b
- Ultima8Engine::I_getUnkCrusaderFlag, // Intrinsic071 13e8:0e27
- Ultima8Engine::I_setUnkCrusaderFlag, // Intrinsic072 13e8:0e2b
+ Ultima8Engine::I_getCrusaderTeleporting, // Intrinsic071 13e8:0e27
+ Ultima8Engine::I_setCrusaderTeleporting, // Intrinsic072 13e8:0e2b
Ultima8Engine::I_setCruStasis, // Intrinsic073 13e8:0071
Actor::I_setDead, // Intrinsic074 10f0:2010
- Ultima8Engine::I_clrUnkCrusaderFlag, // Intrinsic075 13e8:0e21
+ Ultima8Engine::I_clrCrusaderTeleporting, // Intrinsic075 13e8:0e21
Ultima8Engine::I_clrCruStasis, // Intrinsic076 13e8:0077
AudioProcess::I_stopSFXCru, // Intrinsic077 10a8:39cf
PaletteFaderProcess::I_fadeToBlack, // Intrinsic078 1440:06e6
Commit: ed6348ef73b5443d5aed1c51fb6000af4004a8b6
https://github.com/scummvm/scummvm/commit/ed6348ef73b5443d5aed1c51fb6000af4004a8b6
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2022-06-12T10:33:03+09:00
Commit Message:
ULTIMA8: Fix Crusader debug code (disabled by default)
The code block inside an #if 0 is sometimes useful for testing but had a syntax
error. Fix that.
Changed paths:
engines/ultima/ultima8/games/start_crusader_process.cpp
diff --git a/engines/ultima/ultima8/games/start_crusader_process.cpp b/engines/ultima/ultima8/games/start_crusader_process.cpp
index b25c28ec2a2..363f6f43483 100644
--- a/engines/ultima/ultima8/games/start_crusader_process.cpp
+++ b/engines/ultima/ultima8/games/start_crusader_process.cpp
@@ -103,7 +103,7 @@ void StartCrusaderProcess::run() {
0x032E, 0x032F, 0x0330, 0x038C, 0x0332, 0x0333, 0x0334,
0x038E, 0x0388, 0x038A, 0x038D, 0x038B, 0x0386,
// Ammo
- 0x033D, 0x033E, 0x033F, 0x0340, 0x0341
+ 0x033D, 0x033E, 0x033F, 0x0340, 0x0341,
// No Regret Weapons
0x5F6, 0x5F5, 0x198,
// No Regret Ammo
More information about the Scummvm-git-logs
mailing list