[Scummvm-git-logs] scummvm master -> 81db3babf265089d5e4b307c68331f95feecf817
neuromancer
noreply at scummvm.org
Sat Jul 20 11:54:47 UTC 2024
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
02be03a4a3 FREESCAPE: basic support for rock travel in castle for zx
e0678d0091 FREESCAPE: fix small glitch in title screen
716c300cb2 FREESCAPE: make sure the movement conditions are executed when a new area is loaded in castle
c52f5c063c FREESCAPE: removed invalid assertion
cd173ceacb FREESCAPE: added missing entrace in castle for zx
421f018a8c FREESCAPE: make sure number of keys is saved/loaded in castle
81db3babf2 FREESCAPE: do not reset to return to launcher flag
Commit: 02be03a4a35d7cab85646f50993bbd389f9d70c7
https://github.com/scummvm/scummvm/commit/02be03a4a35d7cab85646f50993bbd389f9d70c7
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-07-20T13:55:56+02:00
Commit Message:
FREESCAPE: basic support for rock travel in castle for zx
Changed paths:
engines/freescape/freescape.cpp
engines/freescape/language/8bitDetokeniser.h
engines/freescape/movement.cpp
diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index 25c448f5036..9eddfd80383 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -731,7 +731,8 @@ Common::Error FreescapeEngine::run() {
if (_shootingFrames == 0) {
if (_delayedShootObject) {
- executeObjectConditions(_delayedShootObject, true, false, false);
+ bool rockTravel = isCastle() && getGameBit(k8bitGameBitTravelRock);
+ executeObjectConditions(_delayedShootObject, true, rockTravel, false);
executeLocalGlobalConditions(true, false, false); // Only execute "on shot" room/global conditions
_delayedShootObject = nullptr;
}
diff --git a/engines/freescape/language/8bitDetokeniser.h b/engines/freescape/language/8bitDetokeniser.h
index 246deae6727..0b758760635 100644
--- a/engines/freescape/language/8bitDetokeniser.h
+++ b/engines/freescape/language/8bitDetokeniser.h
@@ -27,6 +27,7 @@
namespace Freescape {
enum {
+ k8bitGameBitTravelRock = 30,
k8bitVariableShield = 63,
k8bitVariableEnergy = 62,
k8bitVariableScore = 61,
diff --git a/engines/freescape/movement.cpp b/engines/freescape/movement.cpp
index 912c1248724..15948e204f2 100644
--- a/engines/freescape/movement.cpp
+++ b/engines/freescape/movement.cpp
@@ -209,6 +209,7 @@ void FreescapeEngine::shoot() {
_delayedShootObject = gobj;
}
+
executeLocalGlobalConditions(true, false, false); // Only execute "on shot" room/global conditions
}
Commit: e0678d0091756f5033f81800160e2d3598edc04f
https://github.com/scummvm/scummvm/commit/e0678d0091756f5033f81800160e2d3598edc04f
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-07-20T13:55:57+02:00
Commit Message:
FREESCAPE: fix small glitch in title screen
Changed paths:
engines/freescape/ui.cpp
diff --git a/engines/freescape/ui.cpp b/engines/freescape/ui.cpp
index 4f9307a3ddc..6a4eff72888 100644
--- a/engines/freescape/ui.cpp
+++ b/engines/freescape/ui.cpp
@@ -107,6 +107,10 @@ Graphics::Surface *FreescapeEngine::drawStringsInSurface(const Common::Array<Com
int x = isCastle() ? 45 : 55;
int y = isEclipse() || isCastle() ? 40 : 32;
+ if (isSpectrum() || isCPC()) {
+ black = _gfx->_texturePixelFormat.ARGBToColor(0x00, 0x00, 0x00, 0x00);
+ }
+
for (int i = 0; i < int(lines.size()); i++) {
drawStringInSurface(lines[i], x, y, front, black, surface);
y = y + 9;
Commit: 716c300cb2bb8c605490315b0d85e91625413d61
https://github.com/scummvm/scummvm/commit/716c300cb2bb8c605490315b0d85e91625413d61
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-07-20T13:55:57+02:00
Commit Message:
FREESCAPE: make sure the movement conditions are executed when a new area is loaded in castle
Changed paths:
engines/freescape/games/castle/castle.cpp
diff --git a/engines/freescape/games/castle/castle.cpp b/engines/freescape/games/castle/castle.cpp
index 2756bef3075..86b354bbc2f 100644
--- a/engines/freescape/games/castle/castle.cpp
+++ b/engines/freescape/games/castle/castle.cpp
@@ -112,6 +112,7 @@ void CastleEngine::gotoArea(uint16 areaID, int entranceID) {
Entrance *entrance = (Entrance *)_currentArea->entranceWithID(entranceID);
assert(entrance);
executeEntranceConditions(entrance);
+ executeMovementConditions();
}
}
Commit: c52f5c063c520ed52a55a61f3683d79a2a6204b0
https://github.com/scummvm/scummvm/commit/c52f5c063c520ed52a55a61f3683d79a2a6204b0
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-07-20T13:55:57+02:00
Commit Message:
FREESCAPE: removed invalid assertion
Changed paths:
engines/freescape/language/instruction.cpp
diff --git a/engines/freescape/language/instruction.cpp b/engines/freescape/language/instruction.cpp
index 78f648bff0d..19af2c2ebce 100644
--- a/engines/freescape/language/instruction.cpp
+++ b/engines/freescape/language/instruction.cpp
@@ -141,7 +141,6 @@ void FreescapeEngine::executeLocalGlobalConditions(bool shot, bool collided, boo
}
void FreescapeEngine::executeCode(FCLInstructionVector &code, bool shot, bool collided, bool timer, bool activated) {
- assert(!(shot && collided));
int ip = 0;
bool skip = false;
int codeSize = code.size();
Commit: cd173ceacb5a189da284e6d40b4b60184f5100a6
https://github.com/scummvm/scummvm/commit/cd173ceacb5a189da284e6d40b4b60184f5100a6
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-07-20T13:55:57+02:00
Commit Message:
FREESCAPE: added missing entrace in castle for zx
Changed paths:
engines/freescape/games/castle/zx.cpp
diff --git a/engines/freescape/games/castle/zx.cpp b/engines/freescape/games/castle/zx.cpp
index e71124198e6..11af3b09ffc 100644
--- a/engines/freescape/games/castle/zx.cpp
+++ b/engines/freescape/games/castle/zx.cpp
@@ -116,6 +116,7 @@ void CastleEngine::loadAssetsZXFullGame() {
it._value->addStructure(_areaMap[255]);
it._value->addObjectFromArea(164, _areaMap[255]);
+ it._value->addObjectFromArea(174, _areaMap[255]);
for (int16 id = 136; id < 140; id++) {
it._value->addObjectFromArea(id, _areaMap[255]);
}
Commit: 421f018a8c990a18b14ed934dc7739b8473420ee
https://github.com/scummvm/scummvm/commit/421f018a8c990a18b14ed934dc7739b8473420ee
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-07-20T13:55:57+02:00
Commit Message:
FREESCAPE: make sure number of keys is saved/loaded in castle
Changed paths:
engines/freescape/games/castle/castle.cpp
diff --git a/engines/freescape/games/castle/castle.cpp b/engines/freescape/games/castle/castle.cpp
index 86b354bbc2f..6a6ac8f1b16 100644
--- a/engines/freescape/games/castle/castle.cpp
+++ b/engines/freescape/games/castle/castle.cpp
@@ -701,10 +701,12 @@ void CastleEngine::selectCharacterScreen() {
}
Common::Error CastleEngine::saveGameStreamExtended(Common::WriteStream *stream, bool isAutosave) {
+ stream->writeUint32LE(_numberKeys);
return Common::kNoError;
}
Common::Error CastleEngine::loadGameStreamExtended(Common::SeekableReadStream *stream) {
+ _numberKeys = stream->readUint32LE();
return Common::kNoError;
}
Commit: 81db3babf265089d5e4b307c68331f95feecf817
https://github.com/scummvm/scummvm/commit/81db3babf265089d5e4b307c68331f95feecf817
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-07-20T13:55:57+02:00
Commit Message:
FREESCAPE: do not reset to return to launcher flag
Changed paths:
engines/freescape/events.cpp
diff --git a/engines/freescape/events.cpp b/engines/freescape/events.cpp
index 5f9bb45ec72..ad373986283 100644
--- a/engines/freescape/events.cpp
+++ b/engines/freescape/events.cpp
@@ -91,7 +91,7 @@ void EventManagerWrapper::pushEvent(Common::Event &event) {
void EventManagerWrapper::clearExitEvents() {
_delegate->resetQuit();
- _delegate->resetReturnToLauncher();
+ //_delegate->resetReturnToLauncher();
}
More information about the Scummvm-git-logs
mailing list