[Scummvm-git-logs] scummvm master -> 319fe8361efe7f6f096799d5e21dbdde40e532bc
Strangerke
noreply at scummvm.org
Fri Apr 3 18:04:26 UTC 2026
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
e3c6d72caa WAYNESWORLD:Add ADGF_DEMO to demos in detection_table
30282b8c56 WAYNESWORLD: Rename kDebugScript into kDebugLogic, add some debugC in gamelogic
d47ec3bcf2 WAYNESWORLD: Fix define name in gxlarchive
bd317b23a6 WAYNESWORLD: Fix some broken formatting in gxlarchive.cpp
319fe8361e WAYNESWORLD: Fix some broken formatting, improve decryption by not relying on char conversion (use a simple XOR instead)
Commit: e3c6d72caa51b7322e1af8c2f2203d628cbffcfa
https://github.com/scummvm/scummvm/commit/e3c6d72caa51b7322e1af8c2f2203d628cbffcfa
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-04-03T20:03:14+02:00
Commit Message:
WAYNESWORLD:Add ADGF_DEMO to demos in detection_table
Changed paths:
engines/waynesworld/detection_tables.h
diff --git a/engines/waynesworld/detection_tables.h b/engines/waynesworld/detection_tables.h
index fbd2bb85093..97efe61258d 100644
--- a/engines/waynesworld/detection_tables.h
+++ b/engines/waynesworld/detection_tables.h
@@ -52,7 +52,7 @@ static const ADGameDescription gameDescriptions[] = {
"CAPSPIN.GXL", "b9d2cd46b4ebe49fcf634b221f11f8df", 281089),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_UNSTABLE,
+ ADGF_DEMO | ADGF_UNSTABLE,
GUIO1(GUIO_NOASPECT)
},
@@ -63,7 +63,7 @@ static const ADGameDescription gameDescriptions[] = {
"CAP.GXL", "4823b4ae534716b8ea115ab34b7eac6b", 87864),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_UNSTABLE,
+ ADGF_DEMO | ADGF_UNSTABLE,
GUIO1(GUIO_NOASPECT)
},
Commit: 30282b8c56b29a9e62a2a6bab7b465eadc118376
https://github.com/scummvm/scummvm/commit/30282b8c56b29a9e62a2a6bab7b465eadc118376
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-04-03T20:03:15+02:00
Commit Message:
WAYNESWORLD: Rename kDebugScript into kDebugLogic, add some debugC in gamelogic
Changed paths:
engines/waynesworld/detection.cpp
engines/waynesworld/detection.h
engines/waynesworld/gamelogic.cpp
diff --git a/engines/waynesworld/detection.cpp b/engines/waynesworld/detection.cpp
index e0574e609f0..acf668c421c 100644
--- a/engines/waynesworld/detection.cpp
+++ b/engines/waynesworld/detection.cpp
@@ -32,7 +32,7 @@ static const PlainGameDescriptor waynesworldGames[] = {
#include "waynesworld/detection.h"
static const DebugChannelDef debugFlagList[] = {
- { WaynesWorld::kDebugScripts, "scripts", "Script debug level" },
+ { WaynesWorld::kDebugLogic, "logic", "Logic debug level" },
{ WaynesWorld::kDebugMessages, "messages", "Messages debug level" },
{ WaynesWorld::kDebugCore, "core", "Core debug level" },
DEBUG_CHANNEL_END
diff --git a/engines/waynesworld/detection.h b/engines/waynesworld/detection.h
index af7f9efea84..21fe708edc0 100644
--- a/engines/waynesworld/detection.h
+++ b/engines/waynesworld/detection.h
@@ -25,7 +25,7 @@
namespace WaynesWorld {
enum WaynesWorldDebugChannels {
- kDebugScripts = 1 << 0,
+ kDebugLogic = 1,
kDebugMessages,
kDebugCore
};
diff --git a/engines/waynesworld/gamelogic.cpp b/engines/waynesworld/gamelogic.cpp
index 6ad597a5389..230f40ce3ba 100644
--- a/engines/waynesworld/gamelogic.cpp
+++ b/engines/waynesworld/gamelogic.cpp
@@ -22,6 +22,7 @@
#include "waynesworld/gamelogic.h"
#include "common/memstream.h"
+#include "waynesworld/detection.h"
#include "waynesworld/graphics.h"
#include "waynesworld/gxlarchive.h"
#include "waynesworld/objectids.h"
@@ -474,6 +475,8 @@ int GameLogic::handleVerbClose() {
}
void GameLogic::handleVerbExtremeCloseupOf() {
+ debugC(5, kDebugLogic, "handleVerbExtremeCloseupOf() - %d", _vm->_objectNumber);
+
switch (_vm->_objectNumber) {
case kObjectIdInventoryPizzathonList:
displayExtremeCloseupOfPizzathonList();
@@ -529,6 +532,7 @@ int GameLogic::handleVerbGive() {
}
void GameLogic::handleDialogReply(int index, int x, int y) {
+ debugC(5, kDebugLogic, "handleDialogReply(%d, %d, %d)", index, x, y);
if (index < 537) {
_vm->displayText("c04r", index, 0, x, y, 0);
@@ -1035,7 +1039,8 @@ int GameLogic::getActorScaleFromY(int actorY) {
scale = actorY * 2 - 100;
break;
case 17:
- scale = actorY * 1.5 - 100;
+ case 27:
+ scale = actorY * 3 / 2 - 100;
break;
case 18:
scale = actorY - 15;
@@ -1046,9 +1051,6 @@ int GameLogic::getActorScaleFromY(int actorY) {
case 26:
scale = actorY * 3 / 2 - 95;
break;
- case 27:
- scale = actorY * 3 / 2 - 100;
- break;
case 28:
scale = actorY - 25;
break;
@@ -1060,13 +1062,13 @@ int GameLogic::getActorScaleFromY(int actorY) {
break;
case 32:
case 33:
- scale = actorY * 1.5 - 97;
+ scale = actorY * 3 / 2 - 97;
break;
case 34:
scale = actorY * 2 - 127;
break;
case 35:
- scale = actorY * 1.5 - 98;
+ scale = actorY * 3 / 2 - 98;
break;
case 36:
scale = actorY * 1.4 - 83;
@@ -1084,6 +1086,8 @@ int GameLogic::getActorScaleFromY(int actorY) {
}
void GameLogic::setPizzathonStatus(int flagNum) {
+ debugC(5, kDebugLogic, "setPizzathonStatus(%d)", flagNum);
+
switch (flagNum) {
case 1:
_pizzathonListFlags1 |= 0x08;
Commit: d47ec3bcf2c8dbb96131d645821da9212d46178e
https://github.com/scummvm/scummvm/commit/d47ec3bcf2c8dbb96131d645821da9212d46178e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-04-03T20:03:15+02:00
Commit Message:
WAYNESWORLD: Fix define name in gxlarchive
Changed paths:
engines/waynesworld/gxlarchive.h
diff --git a/engines/waynesworld/gxlarchive.h b/engines/waynesworld/gxlarchive.h
index 0a7c71cdeec..b58dfb7b79e 100644
--- a/engines/waynesworld/gxlarchive.h
+++ b/engines/waynesworld/gxlarchive.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef WAYNESWORLD_GXLARCHIVE
-#define WAYNESWORLD_GXLARCHIVE
+#ifndef WAYNESWORLD_GXLARCHIVE_H
+#define WAYNESWORLD_GXLARCHIVE_H
#include "common/archive.h"
#include "waynesworld/gamelogic.h"
Commit: bd317b23a69277eb5070b199ac38547455081532
https://github.com/scummvm/scummvm/commit/bd317b23a69277eb5070b199ac38547455081532
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-04-03T20:03:16+02:00
Commit Message:
WAYNESWORLD: Fix some broken formatting in gxlarchive.cpp
Changed paths:
engines/waynesworld/gxlarchive.cpp
diff --git a/engines/waynesworld/gxlarchive.cpp b/engines/waynesworld/gxlarchive.cpp
index 262e0f01791..8a1347bbda4 100644
--- a/engines/waynesworld/gxlarchive.cpp
+++ b/engines/waynesworld/gxlarchive.cpp
@@ -135,22 +135,16 @@ Image::PCXDecoder *GxlArchive::loadImage(const char *filename) {
error("loadImage() Could not find '%s'", searchName.c_str());
Image::PCXDecoder *pcx = new Image::PCXDecoder();
- if (pcx)
- {
+ if (pcx) {
Common::SeekableReadStream *pcxStr = createReadStreamForMember(pathName);
- if (pcxStr)
- {
+ if (pcxStr) {
if (!pcx->loadStream(*pcxStr))
error("loadImage() Could not process '%s'", searchName.c_str());
- }
- else
- {
+ } else {
warning("loadImage() failed to create read stream for \"%s\"", searchName.c_str());
}
delete pcxStr;
- }
- else
- {
+ } else {
error("loadImage() failed to allocate PCX decoder!");
}
@@ -159,13 +153,12 @@ Image::PCXDecoder *GxlArchive::loadImage(const char *filename) {
WWSurface *GxlArchive::loadSurfaceIntern(const char *filename) {
Image::PCXDecoder *imageDecoder = loadImage(filename);
- if (imageDecoder == nullptr)
- {
+ if (imageDecoder == nullptr) {
warning("%s() failed to load \"%s\"", __func__, filename);
return nullptr;
}
- if (imageDecoder->getSurface() == nullptr)
- {
+
+ if (imageDecoder->getSurface() == nullptr) {
warning("%s() failed to get surface data for \"%s\"", __func__, filename);
return nullptr;
}
Commit: 319fe8361efe7f6f096799d5e21dbdde40e532bc
https://github.com/scummvm/scummvm/commit/319fe8361efe7f6f096799d5e21dbdde40e532bc
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-04-03T20:03:17+02:00
Commit Message:
WAYNESWORLD: Fix some broken formatting, improve decryption by not relying on char conversion (use a simple XOR instead)
Changed paths:
engines/waynesworld/waynesworld.cpp
diff --git a/engines/waynesworld/waynesworld.cpp b/engines/waynesworld/waynesworld.cpp
index d9af9916b02..b99353d51ec 100644
--- a/engines/waynesworld/waynesworld.cpp
+++ b/engines/waynesworld/waynesworld.cpp
@@ -728,13 +728,10 @@ void WaynesWorldEngine::drawSpiralEffect(Graphics::Surface *surface, int x, int
}
void WaynesWorldEngine::drawRandomEffect(Graphics::Surface *surface, int x, int y, int grainWidth, int grainHeight) {
- if (surface)
- {
+ if (surface) {
ScreenEffect screenEffect(this, surface, x, y, grainWidth, grainHeight);
screenEffect.drawRandomEffect();
- }
- else
- {
+ } else {
warning("%s() x:%d y:%d missing surface!", __func__, x, y);
}
}
@@ -751,7 +748,7 @@ Common::String WaynesWorldEngine::loadString(const char *filename, int index, in
// Decrypt the string
uint i = 0;
for (; i < kMaxStringLen; i++) {
- textBuffer[i] += 0x80;
+ textBuffer[i] ^= 0x80;
if (textBuffer[i] == 0x2b)
break;
}
More information about the Scummvm-git-logs
mailing list