[Scummvm-git-logs] scummvm master -> 6d581fcfb4ab14f3bc59db9c951e01445441eedb
Strangerke
noreply at scummvm.org
Fri Apr 3 18:51:00 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
6d581fcfb4 WAYNESWORLD: Janitorial: Remove some double spaces
Commit: 6d581fcfb4ab14f3bc59db9c951e01445441eedb
https://github.com/scummvm/scummvm/commit/6d581fcfb4ab14f3bc59db9c951e01445441eedb
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-04-03T20:50:49+02:00
Commit Message:
WAYNESWORLD: Janitorial: Remove some double spaces
Changed paths:
engines/waynesworld/gamelogic.cpp
engines/waynesworld/gxlarchive.cpp
engines/waynesworld/gxlarchive.h
engines/waynesworld/intro.cpp
engines/waynesworld/waynesworld.cpp
diff --git a/engines/waynesworld/gamelogic.cpp b/engines/waynesworld/gamelogic.cpp
index 230f40ce3ba..bd27a4ece8a 100644
--- a/engines/waynesworld/gamelogic.cpp
+++ b/engines/waynesworld/gamelogic.cpp
@@ -122,10 +122,10 @@ static const int kRoom24MazeGarthPositionsY[] = { -1, -1, 129, 123, 124, 128, 12
static const int kRoom25MazeHolePositionsX[] = { 79, 289, 63, 183, 274, 75 };
static const int kRoom25MazeHolePositionsY[] = { 48, 37, 52, 59, 50, 64 };
-static const int kRoom31StarPositionsX[] = { 45, 65, 87, 107, 129 };
-static const int kRoom31StarPositionsY[] = { 27, 39, 50, 61, 74, 27, 39, 50, 62, 75, 26, 38, 50, 63, 76, 26, 38, 50, 63, 76, 25, 38, 51, 64, 77 };
-static const int kRoom31NumberPositionsX[] = { 77, 215, 224 };
-static const int kRoom31NumberPositionsY[] = { 130, 125, 135 };
+static const int kRoom31StarPositionsX[] = { 45, 65, 87, 107, 129 };
+static const int kRoom31StarPositionsY[] = { 27, 39, 50, 61, 74, 27, 39, 50, 62, 75, 26, 38, 50, 63, 76, 26, 38, 50, 63, 76, 25, 38, 51, 64, 77 };
+static const int kRoom31NumberPositionsX[] = { 77, 215, 224 };
+static const int kRoom31NumberPositionsY[] = { 130, 125, 135 };
static const int kRoom37CorrectSafeCombination[] = { 3, 5, 4, 8, 1, 8 };
@@ -615,7 +615,7 @@ void GameLogic::handleDialogReply(int index, int x, int y) {
_vm->playAnimationLoops("g1talk", 0, 2, 54, 81, 0, 100, 4);
break;
default:
- // _vm->waitSeconds(2);
+ // _vm->waitSeconds(2);
break;
}
_vm->waitSeconds(2);
@@ -8234,7 +8234,7 @@ void GameLogic::r37_climbLadderUp() {
workBackground->drawSurface(_vm->_backgroundSurface, 0, 0);
if (climbCtr < 10) {
workBackground->drawSurfaceTransparent(wclimbSprites[climbCtr % 4], 187, wayneLadderY);
- } else if (climbCtr > 12) {
+ } else if (climbCtr > 12) {
workBackground->drawSurfaceTransparent(_vm->_wayneSprites[0], 155, 26);
} else {
workBackground->drawSurfaceTransparent(wgetldlSprites[12 - climbCtr], 168, 26);
@@ -8774,7 +8774,7 @@ void GameLogic::r39_refreshRoomBackground() {
}
if (_r39_flags & 0x04) {
_vm->drawRoomImageToBackground("wshoot.pcx", 87, 90);
- } else if (_r39_flags & 0x08) {
+ } else if (_r39_flags & 0x08) {
_vm->drawRoomImageToBackground("gshoot.pcx", 88, 90);
}
}
diff --git a/engines/waynesworld/gxlarchive.cpp b/engines/waynesworld/gxlarchive.cpp
index 8a1347bbda4..4d14bda4242 100644
--- a/engines/waynesworld/gxlarchive.cpp
+++ b/engines/waynesworld/gxlarchive.cpp
@@ -71,7 +71,7 @@ GxlArchive::GxlArchive(const Common::String name) : _gxlFile(new Common::File())
_gxlFile->readUint32LE(); // date and time of the file
- // warning("file: %s offset: %d size: %d", header.filename, header.offset, header.size);
+ // warning("file: %s offset: %d size: %d", header.filename, header.offset, header.size);
_headers[header.filename].reset(new GxlHeader(header));
}
diff --git a/engines/waynesworld/gxlarchive.h b/engines/waynesworld/gxlarchive.h
index b58dfb7b79e..cc986340a49 100644
--- a/engines/waynesworld/gxlarchive.h
+++ b/engines/waynesworld/gxlarchive.h
@@ -36,7 +36,7 @@ namespace WaynesWorld {
struct GxlHeader {
int32 offset;
int32 size;
- char filename[GXL_FILENAME_MAX];
+ char filename[GXL_FILENAME_MAX];
};
typedef Common::HashMap<Common::Path, Common::ScopedPtr<GxlHeader>, Common::Path::IgnoreCase_Hash, Common::Path::IgnoreCase_EqualTo> GxlHeadersMap;
diff --git a/engines/waynesworld/intro.cpp b/engines/waynesworld/intro.cpp
index 932561d01d8..264dd245b0c 100644
--- a/engines/waynesworld/intro.cpp
+++ b/engines/waynesworld/intro.cpp
@@ -379,7 +379,7 @@ void WaynesWorldEngine::introPt6() {
GxlArchive *oa3Gxl = new GxlArchive("oa3");
for (int i = 0; i < 5; ++i) {
introPt6Surface[i] = new WWSurface(320, 200);
- Common::String filename = Common::String::format("sign%d.pcx", i);
+ Common::String filename = Common::String::format("sign%d.pcx", i);
drawImageToSurface(oa3Gxl, filename.c_str(), introPt6Surface[i], 0, 0);
}
diff --git a/engines/waynesworld/waynesworld.cpp b/engines/waynesworld/waynesworld.cpp
index b99353d51ec..b4f7d5dde8e 100644
--- a/engines/waynesworld/waynesworld.cpp
+++ b/engines/waynesworld/waynesworld.cpp
@@ -1631,7 +1631,7 @@ int WaynesWorldEngine::getAnimationTimerCounter(uint index) {
}
void WaynesWorldEngine::initStaticRoomObjects() {
- for (uint i = 0; i < kStaticRoomObjectsCount; i++)
+ for (uint i = 0; i < kStaticRoomObjectsCount; i++)
_staticRoomObjects[i] = kStaticRoomObjects[i];
}
@@ -1684,7 +1684,7 @@ void WaynesWorldEngine::drawStaticRoomObjects(int roomNum, int x, int y, int act
}
void WaynesWorldEngine::initRoomObjects() {
- for (int i = 0; i < kRoomObjectsCount; i++)
+ for (int i = 0; i < kRoomObjectsCount; i++)
_roomObjects[i] = kRoomObjects[i];
}
More information about the Scummvm-git-logs
mailing list