[Scummvm-git-logs] scummvm master -> 520aa29a2164b949a2514e404685c7e35c299bb7
bluegr
noreply at scummvm.org
Thu Oct 24 17:34:50 UTC 2024
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9336c3f210 DARKSEED: Cleanup and fix naming conventions
ed2c4f1d87 DARKSEED: Cleanup and remove superfluous initializers
f60ada9da4 DARKSEED: Const correctness
0f44b3543d DARKSEED: Const correctness and remove superfluous variable assignments
b74a64c385 DARKSEED: Initialize class members
11b0b2907e DARKSEED: Mark unreachable code
9aa8b99c13 DARKSEED: Const correctness. Use while loop where needed
520aa29a21 DARKSEED: Cleanup
Commit: 9336c3f2102aca22870a40bbe6b32fa77377c1ae
https://github.com/scummvm/scummvm/commit/9336c3f2102aca22870a40bbe6b32fa77377c1ae
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-10-24T19:58:26+03:00
Commit Message:
DARKSEED: Cleanup and fix naming conventions
- Capitalize words in function names
- Remove unused includes
- Whitespace fixes
Changed paths:
engines/darkseed/animation.cpp
engines/darkseed/animation.h
engines/darkseed/anm.h
engines/darkseed/console.h
engines/darkseed/cutscene.cpp
engines/darkseed/cutscene.h
engines/darkseed/darkseed.cpp
engines/darkseed/darkseed.h
engines/darkseed/inventory.h
engines/darkseed/morph.h
engines/darkseed/nsp.h
engines/darkseed/objects.h
engines/darkseed/pic.h
engines/darkseed/player.cpp
engines/darkseed/player.h
engines/darkseed/room.h
engines/darkseed/sound.h
engines/darkseed/sprites.h
engines/darkseed/titlefont.h
engines/darkseed/tostext.h
engines/darkseed/usecode.cpp
engines/darkseed/usecode.h
diff --git a/engines/darkseed/animation.cpp b/engines/darkseed/animation.cpp
index 36c0e8e57eb..f6ff4568321 100644
--- a/engines/darkseed/animation.cpp
+++ b/engines/darkseed/animation.cpp
@@ -196,7 +196,7 @@ void Animation::updateAnimation() {
if (g_engine->_room->isOutside() && g_engine->_currentTimeInSeconds > 61200) {
g_engine->_room->restorePalette();
}
- g_engine->gotonextmorning();
+ g_engine->gotoNextMorning();
g_engine->playDayChangeCutscene();
}
}
@@ -236,7 +236,7 @@ void Animation::updateAnimation() {
if (!_objRestarted) {
_player->_frameIdx = _player->_animations.getAnimAt(1)._frameNo[_player->_animations.getAnimAt(1)._frameNo[_animIndexTbl[1]]];
} else {
- g_engine->gotonextmorning(); // TODO there might be some extra logic required from original function
+ g_engine->gotoNextMorning(); // TODO there might be some extra logic required from original function
_player->_position.x = 242;
_player->_position.y = 187;
g_engine->playDayChangeCutscene();
@@ -265,7 +265,7 @@ void Animation::updateAnimation() {
g_engine->changeToRoom(5);
}
if (_player->_isAutoWalkingToBed) {
- _player->setplayertowardsbedroom();
+ _player->setPlayerTowardsBedroom();
}
}
break;
@@ -352,7 +352,7 @@ void Animation::updateAnimation() {
_player->_walkTarget.y = 200;
_player->updateSprite();
if (_player->_isAutoWalkingToBed) {
- _player->setplayertowardsbedroom();
+ _player->setPlayerTowardsBedroom();
}
}
break;
@@ -428,7 +428,7 @@ void Animation::updateAnimation() {
if (_objRestarted) {
_isPlayingAnimation_maybe = true;
_objectVar[46] = 2;
- libanim(true);
+ libAnim(true);
}
break;
case 20: // receive card from delbert
@@ -473,7 +473,7 @@ void Animation::updateAnimation() {
int newRoomNumber = g_engine->_previousRoomNumber;
if (g_engine->_room->_roomNumber == 6) {
if (_player->_isAutoWalkingToBed && _objectVar[137] == 2) {
- g_engine->wongame();
+ g_engine->wonGame();
}
newRoomNumber = 10;
} else if (g_engine->_room->_roomNumber == 10) {
@@ -582,7 +582,7 @@ void Animation::updateAnimation() {
} else {
_objectVar[137] = 2;
_player->_isAutoWalkingToBed = true;
- _player->setplayertowardsbedroom();
+ _player->setPlayerTowardsBedroom();
}
}
break;
@@ -866,7 +866,7 @@ static constexpr uint8 dcopList[100] = {
2, 3, 2, 1
};
-void Animation::dcopanim() {
+void Animation::dCopAnim() {
_player->loadAnimations("dcopb.nsp");
g_engine->showFullscreenPic("dcopb.pic");
_animIndexTbl[0] = 0;
@@ -930,7 +930,7 @@ static constexpr uint8 sargoList[100] = {
3, 2, 1, 1
};
-void Animation::sargoanim() {
+void Animation::sargoAnim() {
g_engine->_cursor.showCursor(false);
_player->loadAnimations("sargo.nsp");
g_engine->showFullscreenPic("sargo.pic");
@@ -1038,7 +1038,7 @@ static constexpr uint8 keeperList[250] = {
0, 0
};
-void Animation::keeperanim() {
+void Animation::keeperAdmin() {
g_engine->_cursor.showCursor(false);
_player->loadAnimations("keeper.nsp");
g_engine->showFullscreenPic("keeper.pic");
@@ -1146,7 +1146,7 @@ static constexpr uint8 libList[100] = {
9, 8, 7, 6
};
-void Animation::libanim(bool pickingUpReservedBook) {
+void Animation::libAnim(bool pickingUpReservedBook) {
_player->loadAnimations("libparts.nsp");
g_engine->showFullscreenPic("libinlib.pic");
diff --git a/engines/darkseed/animation.h b/engines/darkseed/animation.h
index 67eaf13bda5..3b95596823f 100644
--- a/engines/darkseed/animation.h
+++ b/engines/darkseed/animation.h
@@ -47,11 +47,11 @@ public:
void advanceAnimationFrame(int nspAminIdx);
- void dcopanim();
- void sargoanim();
- void keeperanim();
+ void dCopAnim();
+ void sargoAnim();
+ void keeperAdmin();
void stuffPlayer();
- void libanim(bool pickingUpReservedBook);
+ void libAnim(bool pickingUpReservedBook);
public:
explicit Animation(Player *player, Objects &objectVar) : _player(player), _objectVar(objectVar) {}
diff --git a/engines/darkseed/anm.h b/engines/darkseed/anm.h
index 5ec86531e6f..dfa0397eb7f 100644
--- a/engines/darkseed/anm.h
+++ b/engines/darkseed/anm.h
@@ -24,6 +24,7 @@
#include "common/array.h"
#include "darkseed/img.h"
+
namespace Darkseed {
class Anm {
diff --git a/engines/darkseed/console.h b/engines/darkseed/console.h
index 2e1349dbe22..8d0792db797 100644
--- a/engines/darkseed/console.h
+++ b/engines/darkseed/console.h
@@ -24,7 +24,6 @@
#include "darkseed/gamefont.h"
#include "darkseed/sound.h"
-#include "darkseed/nsp.h"
#include "darkseed/tostext.h"
namespace Darkseed {
diff --git a/engines/darkseed/cutscene.cpp b/engines/darkseed/cutscene.cpp
index 31782dde20e..1f2f76ac98d 100644
--- a/engines/darkseed/cutscene.cpp
+++ b/engines/darkseed/cutscene.cpp
@@ -410,7 +410,7 @@ bool Cutscene::introScene() {
}
_movieStep++;
if (g_engine->_isLeftMouseClicked || g_engine->_isRightMouseClicked) {
- g_engine->zeromousebuttons();
+ g_engine->zeroMouseButtons();
if (_movieStep < 51) {
_movieStep = 51;
}
@@ -463,7 +463,7 @@ bool Cutscene::embryoInsertedScene() {
case 9:
if (stepAnim()) {
if (g_engine->_isLeftMouseClicked || g_engine->_isRightMouseClicked) {
- g_engine->zeromousebuttons();
+ g_engine->zeroMouseButtons();
if (_movieStep < 16) {
_movieStep = 16;
}
@@ -522,7 +522,7 @@ bool Cutscene::embryoInsertedScene() {
}
_movieStep++;
if (g_engine->_isLeftMouseClicked || g_engine->_isRightMouseClicked) {
- g_engine->zeromousebuttons();
+ g_engine->zeroMouseButtons();
if (_movieStep < 16) {
_movieStep = 16;
}
diff --git a/engines/darkseed/cutscene.h b/engines/darkseed/cutscene.h
index 02aa9e2d35f..39c5604197d 100644
--- a/engines/darkseed/cutscene.h
+++ b/engines/darkseed/cutscene.h
@@ -22,9 +22,6 @@
#ifndef DARKSEED_CUTSCENE_H
#define DARKSEED_CUTSCENE_H
-#include "common/rect.h"
-#include "common/str.h"
-#include "graphics/managed_surface.h"
#include "darkseed/pal.h"
#include "darkseed/titlefont.h"
#include "darkseed/morph.h"
diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index e5756936ec1..4020a014a24 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -98,7 +98,7 @@ Common::Error DarkseedEngine::run() {
}
while (!shouldQuit()) {
- gameloop();
+ gameLoop();
_restartGame = false;
if (!shouldQuit()) {
_cutscene.play('I');
@@ -156,7 +156,7 @@ bool DarkseedEngine::fadeStep() {
return _fadeStepCounter < 64;
}
-void DarkseedEngine::gameloop() {
+void DarkseedEngine::gameLoop() {
while (!shouldQuit() && !_restartGame) {
updateEvents();
if (_redrawFrame) {
@@ -196,7 +196,7 @@ void DarkseedEngine::gameloop() {
_animation->stuffPlayer();
}
} else {
- _animation->dcopanim();
+ _animation->dCopAnim();
changeToRoom(59, true);
_player->_position = {320, 200};
_player->updateSprite();
@@ -235,7 +235,7 @@ void DarkseedEngine::gameloop() {
if (_currentDay == 1 && _currentTimeInSeconds == 64800 && _room->_roomNumber != 16) {
_objectVar.setMoveObjectRoom(7, 253); // remove scotch from shop.
}
- if (_timeAdvanceEventSelected && _currentTimeInSeconds < 79200 && !_animation->_isPlayingAnimation_maybe && !_player->_isAutoWalkingToBed && !_player->_herowaiting) {
+ if (_timeAdvanceEventSelected && _currentTimeInSeconds < 79200 && !_animation->_isPlayingAnimation_maybe && !_player->_isAutoWalkingToBed && !_player->_heroWaiting) {
_timeAdvanceEventSelected = false;
if (((_room->_roomNumber == 30) || ((0 < _objectVar[141] && (_objectVar[141] < 4)))) ||
(((_room->_roomNumber == 31 || (_room->_roomNumber == 32)) &&
@@ -267,7 +267,7 @@ void DarkseedEngine::gameloop() {
_player->_walkToSequence = false;
_player->_actionToPerform = false;
_player->_isAutoWalkingToBed = true;
- _player->setplayertowardsbedroom();
+ _player->setPlayerTowardsBedroom();
_console->printTosText(944);
}
if (_currentTimeInSeconds > 79199 && !_player->_isAutoWalkingToBed) {
@@ -276,7 +276,7 @@ void DarkseedEngine::gameloop() {
}
if (!_animation->_isPlayingAnimation_maybe) {
if (_room->_roomNumber == 30) {
- gotosleepinjail();
+ gotoSleepInJail();
} else {
if (_room->_roomNumber != 10) {
// TODO release memory.
@@ -296,7 +296,7 @@ void DarkseedEngine::gameloop() {
}
}
if (_room->_roomNumber == 30 && _objectVar[1] == 0 && (_animation->_otherNspAnimationType_maybe != 40 || !_animation->_isPlayingAnimation_maybe || _currentTimeInSeconds > 79199)) {
- gotosleepinjail();
+ gotoSleepInJail();
}
updateDisplay(); // Aka serviceRoom()
@@ -315,23 +315,23 @@ void DarkseedEngine::gameloop() {
}
// if (((*(int *)&_CursorX < 70) || (570 < *(int *)&_CursorX)) && (*(int *)&_DrawCursorNum < 90)) { TODO do we need this restriction?
-// zeromousebuttons();
+// zeroMouseButtons();
// }
if (_player->_isAutoWalkingToBed ||
(_room->_roomNumber == 10 && _player->_position.x < 369 &&
((_currentDay == 3 && _currentTimeInSeconds > 43200) || _objectVar[88] != 0))) {
- zeromousebuttons();
+ zeroMouseButtons();
}
if ((_objectVar[141] > 0 && _objectVar[141] < 4) ||
_objectVar[141] == 9 ||
- _player->_herowaiting || _objectVar[141] == 10 || _objectVar[141] == 8) {
- zeromousebuttons();
+ _player->_heroWaiting || _objectVar[141] == 10 || _objectVar[141] == 8) {
+ zeroMouseButtons();
}
if (_room->_roomNumber == 32 && _currentDay == 2 &&
_currentTimeInSeconds > 64799 && _currentTimeInSeconds < 68401 &&
(_objectVar[141] == 5 || _objectVar[141] == 6 || _objectVar[141] == 4
|| _objectVar[141] == 12) && !_animation->_isPlayingAnimation_maybe) {
- zeromousebuttons();
+ zeroMouseButtons();
}
updateHeadache();
handleInput();
@@ -478,7 +478,7 @@ void DarkseedEngine::handleInput() {
if (_animation->_isPlayingAnimation_maybe) {
_animation->updateAnimation();
if (!_animation->_isPlayingAnimation_maybe && _player->_isAutoWalkingToBed) {
- _player->setplayertowardsbedroom();
+ _player->setPlayerTowardsBedroom();
}
return;
}
@@ -962,7 +962,7 @@ void DarkseedEngine::handleInput() {
}
_doorEnabled = false;
if (_player->_isAutoWalkingToBed && _player->isAtWalkTarget()) {
- _player->setplayertowardsbedroom();
+ _player->setPlayerTowardsBedroom();
}
} else {
if (_player->_walkTarget.x < _player->_position.x) {
@@ -1473,9 +1473,9 @@ void DarkseedEngine::handleObjCollision(int targetObjNum) {
// waitxticks(30); TODO do we need to add delay here?
return;
}
- _useCode->genericresponse(_actionMode, targetObjNum, 999);
+ _useCode->genericResponse(_actionMode, targetObjNum, 999);
} else {
- _useCode->genericresponse(_actionMode, targetObjNum, 999);
+ _useCode->genericResponse(_actionMode, targetObjNum, 999);
}
} else {
_console->printTosText(695);
@@ -1778,7 +1778,7 @@ void DarkseedEngine::lookCode(int objNum) {
}
}
if (objNum == 48 && _objectVar[48] == 0) {
- _animation->sargoanim();
+ _animation->sargoAnim();
return;
}
if (objNum == 35 && _cursor.getY() < 40) {
@@ -1808,7 +1808,7 @@ void DarkseedEngine::lookCode(int objNum) {
} else if (_objectVar[51] == 0) {
_console->printTosText(853);
_objectVar[51] = 1;
- _animation->keeperanim();
+ _animation->keeperAdmin();
_objectVar.setObjectRunningCode(72, 1);
_inventory.addItem(24);
_console->printTosText(959);
@@ -1878,15 +1878,15 @@ void DarkseedEngine::lookCode(int objNum) {
_console->printTosText(eyeTosIdx);
}
if (eyeTosIdx > 978) {
- _useCode->genericresponse(3, objNum, eyeTosIdx);
+ _useCode->genericResponse(3, objNum, eyeTosIdx);
}
return;
}
_console->addTextLine(Common::String::format("You see the %s.", _objectVar.getObjectName(objNum)));
}
-void DarkseedEngine::wongame() {
- error("implement wongame()"); // TODO
+void DarkseedEngine::wonGame() {
+ error("implement wonGame()"); // TODO
// _cutscene.play('Z');
}
@@ -1970,12 +1970,12 @@ void DarkseedEngine::updateHeadache() {
}
}
-void DarkseedEngine::gotosleepinjail() {
- gotonextmorning();
+void DarkseedEngine::gotoSleepInJail() {
+ gotoNextMorning();
playDayChangeCutscene();
}
-void DarkseedEngine::gotonextmorning() {
+void DarkseedEngine::gotoNextMorning() {
_currentDay++;
_objectVar[47] = 0;
_objectVar[62] = 0;
@@ -2077,7 +2077,7 @@ void DarkseedEngine::runObjects() {
int16 delbertSpriteIdx = 0;
if (_objectVar[141] == 8 && _room->_roomNumber == 31) {
// Fido brings back stick after player gives delbert the scotch.
- _player->_herowaiting = true;
+ _player->_heroWaiting = true;
if (_objectVar[45] == 3) {
_room->loadLocationSprites("deldrink.nsp");
_objectVar[141] = 9;
@@ -2089,11 +2089,11 @@ void DarkseedEngine::runObjects() {
if (delbertSpriteIdx != 9) {
_room->advanceFrame(0);
delbertSpriteIdx = _room->_locationSprites.getAnimAt(0)._frameNo[_room->_locObjFrame[0]];
- delthrowstick(delbertSpriteIdx);
+ delbertThrowStick(delbertSpriteIdx);
}
if (_objectVar[141] == 8) {
const Sprite &sprite = _room->_locationSprites.getSpriteAt(delbertSpriteIdx);
- delthrowstick(delbertSpriteIdx);
+ delbertThrowStick(delbertSpriteIdx);
g_engine->_sprites.addSpriteToDrawList(145, 140, &sprite, 240 - (sprite._height + 140), sprite._width, sprite._height, false);
}
}
@@ -2133,14 +2133,14 @@ void DarkseedEngine::runObjects() {
} else {
_objectVar[141] = 11;
_room->removeObjectFromRoom(141);
- _player->_herowaiting = false;
+ _player->_heroWaiting = false;
}
}
if (_objectVar[141] == 7 && _room->_roomNumber == 31) {
_room->advanceFrame(0);
delbertSpriteIdx = _room->_locationSprites.getAnimAt(0)._frameNo[_room->_locObjFrame[0]];
const Sprite &sprite = _room->_locationSprites.getSpriteAt(delbertSpriteIdx);
- delthrowstick(delbertSpriteIdx);
+ delbertThrowStick(delbertSpriteIdx);
g_engine->_sprites.addSpriteToDrawList(145, 140, &sprite, 240 - (sprite._height + 140), sprite._width, sprite._height, false);
_room->updateRoomObj(141, 145, sprite._width, 140, sprite._height);
}
@@ -2215,7 +2215,7 @@ void DarkseedEngine::runObjects() {
}
}
if (_objectVar[141] > 0 && _objectVar[141] < 4) {
- _player->_herowaiting = true;
+ _player->_heroWaiting = true;
if (_player->_walkToSequence == false && _player->_position.x != 290 && _player->_position.y != 209) {
_player->_walkTarget = {290, 209};
// TODO reset walk path here
@@ -2237,7 +2237,7 @@ void DarkseedEngine::runObjects() {
// waitxticks(240);
// }
} else if (_objectVar[141] == 4) {
- _player->_herowaiting = false;
+ _player->_heroWaiting = false;
}
_animation->_objRestarted = false;
}
@@ -2281,7 +2281,7 @@ void DarkseedEngine::runObjects() {
if (_animation->_objRestarted) {
_objectVar[141]++;
if (_objectVar[141] == 7) {
- _player->_herowaiting = false;
+ _player->_heroWaiting = false;
}
}
Common::Point delbertPosition = _objectVar.getMoveObjectPosition(141);
@@ -2298,11 +2298,11 @@ void DarkseedEngine::runObjects() {
_objectVar.setMoveObjectX(141, 395);
const Sprite &sprite = _room->_locationSprites.getSpriteAt(0);
g_engine->_sprites.addSpriteToDrawList(395, 132, &sprite, 240 - (sprite._height + 132), sprite._width, sprite._height, false);
- moveplayertodelbert();
+ movePlayerToDelbert();
if (!_player->_playerIsChangingDirection && !_player->_heroMoving) {
_console->printTosText(909);
_objectVar[141]++;
- _player->_herowaiting = true;
+ _player->_heroWaiting = true;
}
}
if (_room->_roomNumber == 32 && _currentDay == 2 && _objectVar[141] == 12) {
@@ -2318,7 +2318,7 @@ void DarkseedEngine::runObjects() {
_room->_locObjFrame[2] = 0;
_objectVar[141] = 4;
}
- moveplayertodelbert();
+ movePlayerToDelbert();
}
if (_objectVar.getObjectRunningCode(72) == 1 &&
(_room->_roomNumber < 10 || _room->_roomNumber == 60 || _room->_roomNumber == 61)) {
@@ -2390,7 +2390,7 @@ void DarkseedEngine::runObjects() {
}
if (((_objectVar.getObjectRunningCode(58) != 0) && (_objectVar[21] == 0)) && (_room->_roomNumber == 55)) {
if (_player->_position.x == 369) {
- rundrekethsequence();
+ runDrekethSequence();
}
if (_player->_heroMoving && _player->_walkTarget.x > 309) {
_player->_walkTarget = {369, 219};
@@ -2444,18 +2444,18 @@ void DarkseedEngine::runObjects() {
break;
case 900:
case 901:
- leavepackage();
+ leavePackage();
break;
}
if (_currentTimeInSeconds - 36000 > 901 && _objectVar._objectRunningCode[140] != 0) {
- leavepackage();
+ leavePackage();
}
}
}
-void DarkseedEngine::moveplayertodelbert() {
+void DarkseedEngine::movePlayerToDelbert() {
if (_room->_roomNumber == 32 && !_animation->_isPlayingAnimation_maybe) {
- _player->_herowaiting = true;
+ _player->_heroWaiting = true;
if (!_player->_heroMoving && _player->_position.x != 364 && _player->_position.y != 198) {
Common::Point oldCursor = g_engine->_cursor.getPosition();
Common::Point newTarget = {364, 198};
@@ -2472,11 +2472,11 @@ void DarkseedEngine::moveplayertodelbert() {
}
}
-void DarkseedEngine::rundrekethsequence() {
- error("implement rundrekethsequence()"); // TODO
+void DarkseedEngine::runDrekethSequence() {
+ error("implement runDrekethSequence()"); // TODO
}
-void DarkseedEngine::delthrowstick(int16 spriteNum) {
+void DarkseedEngine::delbertThrowStick(int16 spriteNum) {
if (_animation->_frameAdvanced && spriteNum == 8) {
Common::Point stickPos = {265, 150};
_objectVar.setMoveObjectPosition(19, stickPos);
@@ -2488,7 +2488,7 @@ void DarkseedEngine::delthrowstick(int16 spriteNum) {
}
}
-void DarkseedEngine::leavepackage() {
+void DarkseedEngine::leavePackage() {
int packageObjNum = _currentDay + 30;
int16 xPos = _currentDay * 10 + 299;
Common::Point packagePos = {xPos, 191};
@@ -2510,7 +2510,7 @@ void DarkseedEngine::removeFullscreenPic() {
}
}
-void DarkseedEngine::zeromousebuttons() {
+void DarkseedEngine::zeroMouseButtons() {
_isLeftMouseClicked = false;
_isRightMouseClicked = false;
}
diff --git a/engines/darkseed/darkseed.h b/engines/darkseed/darkseed.h
index 6f6046ad411..a1b7f0b3511 100644
--- a/engines/darkseed/darkseed.h
+++ b/engines/darkseed/darkseed.h
@@ -26,12 +26,10 @@
#include "common/system.h"
#include "common/error.h"
#include "common/fs.h"
-#include "common/hash-str.h"
#include "common/random.h"
#include "common/serializer.h"
#include "common/util.h"
#include "engines/engine.h"
-#include "engines/savestate.h"
#include "graphics/screen.h"
#include "darkseed/animation.h"
@@ -68,7 +66,6 @@ enum class FadeDirection : uint8 {
};
class DarkseedEngine : public Engine {
-private:
const ADGameDescription *_gameDescription;
Common::RandomSource _randomSource;
Pic *_fullscreenPic = nullptr;
@@ -142,13 +139,13 @@ public:
int16 _soundTimer = 0;
bool _printedcomeheredawson = false;
- void zeromousebuttons();
+ void zeroMouseButtons();
- void gotonextmorning();
+ void gotoNextMorning();
void playDayChangeCutscene();
- void wongame();
+ void wonGame();
void removeFullscreenPic();
@@ -184,11 +181,11 @@ public:
};
bool canLoadGameStateCurrently(Common::U32String *msg) override {
- return !_animation->_isPlayingAnimation_maybe && !_player->_isAutoWalkingToBed && !_player->_herowaiting;
+ return !_animation->_isPlayingAnimation_maybe && !_player->_isAutoWalkingToBed && !_player->_heroWaiting;
}
bool canSaveGameStateCurrently(Common::U32String *msg) override {
- return !_animation->_isPlayingAnimation_maybe && !_player->_isAutoWalkingToBed && !_player->_herowaiting;
+ return !_animation->_isPlayingAnimation_maybe && !_player->_isAutoWalkingToBed && !_player->_heroWaiting;
}
/**
@@ -239,21 +236,21 @@ public:
private:
void updateBaseSprites();
- void gameloop();
+ void gameLoop();
void updateEvents();
void handleInput();
void handlePointerAction();
void loadRoom(int roomNumber);
- void gotosleepinjail();
+ void gotoSleepInJail();
void updateHeadache();
void closeShops();
void initDelbertAtSide();
- void moveplayertodelbert();
- void rundrekethsequence();
- void delthrowstick(int16 spriteNum);
- void leavepackage();
+ void movePlayerToDelbert();
+ void runDrekethSequence();
+ void delbertThrowStick(int16 spriteNum);
+ void leavePackage();
};
extern DarkseedEngine *g_engine;
diff --git a/engines/darkseed/inventory.h b/engines/darkseed/inventory.h
index 77c9614203b..841d7258268 100644
--- a/engines/darkseed/inventory.h
+++ b/engines/darkseed/inventory.h
@@ -22,11 +22,9 @@
#ifndef DARKSEED_INVENTORY_H
#define DARKSEED_INVENTORY_H
-#include "common/list.h"
namespace Darkseed {
class Inventory {
-private:
Common::Array<uint8> _inventory;
int16 _inventoryLength = 0;
Common::Array<uint8> _iconList;
diff --git a/engines/darkseed/morph.h b/engines/darkseed/morph.h
index 2db15ca2b82..c6cc6bdbb8b 100644
--- a/engines/darkseed/morph.h
+++ b/engines/darkseed/morph.h
@@ -32,12 +32,12 @@ enum class MorphDirection : uint8 {
};
class Morph {
-private:
Common::Rect _area;
Graphics::ManagedSurface _src;
Graphics::ManagedSurface _dest;
MorphDirection _direction = MorphDirection::Forward;
int16 _stepCount = 0;
+
public:
explicit Morph(const Common::Rect &area);
@@ -47,6 +47,7 @@ public:
void start(MorphDirection direction);
bool morphStep();
+
private:
void draw(int16 drawIdx);
};
diff --git a/engines/darkseed/nsp.h b/engines/darkseed/nsp.h
index 08961adbdb1..64ae5c06960 100644
--- a/engines/darkseed/nsp.h
+++ b/engines/darkseed/nsp.h
@@ -23,8 +23,9 @@
#define DARKSEED_NSP_H
#include "common/array.h"
+#include "common/path.h"
+#include "common/stream.h"
#include "common/scummsys.h"
-#include "common/file.h"
#include "graphics/surface.h"
namespace Darkseed {
@@ -36,12 +37,12 @@ public:
uint16 _pitch;
Common::Array<uint8> _pixels;
-public:
Sprite(uint16 width, uint16 height, uint16 pitch);
bool loadData(Common::SeekableReadStream &readStream);
void draw(int x, int y, uint16 frameBottom = 0) const;
void draw(Graphics::Surface *dst, int x, int y, uint16 frameBottom = 0) const;
void drawScaled(int x, int y, int destWidth, int destHeight, bool flipX) const;
+
private:
void clipToScreen(int x, int y, uint16 frameBottom, uint16 *clippedWidth, uint16 *clippedHeight) const;
};
@@ -58,7 +59,6 @@ public:
};
class Nsp {
-private:
Common::Array<Sprite> _frames;
Common::Array<Obt> _animations;
diff --git a/engines/darkseed/objects.h b/engines/darkseed/objects.h
index 8ad407d1433..cc5345e5294 100644
--- a/engines/darkseed/objects.h
+++ b/engines/darkseed/objects.h
@@ -34,7 +34,6 @@ enum ObjType {
};
class Objects {
-private:
Common::Array<int16> _objectVar;
Common::Array<Common::Point> _moveObjectXY;
Common::Array<uint8> _moveObjectRoom;
@@ -42,7 +41,6 @@ private:
public:
Common::Array<int16> _objectRunningCode;
-public:
static constexpr int MAX_MOVED_OBJECTS = 42;
static constexpr int MAX_OBJECTS = 199;
Objects();
diff --git a/engines/darkseed/pic.h b/engines/darkseed/pic.h
index aa2209757bc..3f40f5b6893 100644
--- a/engines/darkseed/pic.h
+++ b/engines/darkseed/pic.h
@@ -29,7 +29,6 @@
namespace Darkseed {
class Pic {
-private:
uint16 _width = 0;
uint16 _height = 0;
Common::Array<uint8> _pixels;
@@ -54,6 +53,7 @@ public:
void draw();
void draw(int xOffset, int yOffset);
void drawRect(const Common::Rect &rect);
+
private:
bool load(Common::SeekableReadStream &readStream);
diff --git a/engines/darkseed/player.cpp b/engines/darkseed/player.cpp
index 5d2621fe02d..317a487c50f 100644
--- a/engines/darkseed/player.cpp
+++ b/engines/darkseed/player.cpp
@@ -343,7 +343,7 @@ void Player::createConnectorPathToDest() {
reverseConnectorList();
_walkTarget = origWalkTarget;
}
- OptimisePath();
+ optimisePath();
if (g_engine->_room->_roomNumber == 5 && _position.x < 321) {
_finalTarget = _walkTarget;
} else {
@@ -410,7 +410,7 @@ void Player::reverseConnectorList() {
}
}
-void Player::OptimisePath() {
+void Player::optimisePath() {
if (g_engine->_room->_roomNumber != 7 && g_engine->_room->_roomNumber != 32) {
while (_numConnectorsInWalkPath > 1) {
if (g_engine->_room->canWalkInLineToTarget(_connectorList[_numConnectorsInWalkPath - 2].x, _connectorList[_numConnectorsInWalkPath - 2].y, _walkTarget.x, _walkTarget.y)) {
@@ -428,7 +428,7 @@ static constexpr uint8 _closerroom[10] = {
7, 6
};
-void Player::setplayertowardsbedroom() {
+void Player::setPlayerTowardsBedroom() {
if (g_engine->_animation->_isPlayingAnimation_maybe) {
return;
}
diff --git a/engines/darkseed/player.h b/engines/darkseed/player.h
index 20e2c6a275c..4f4119db99c 100644
--- a/engines/darkseed/player.h
+++ b/engines/darkseed/player.h
@@ -23,12 +23,12 @@
#define DARKSEED_PLAYER_H
#include "common/rect.h"
+#include "common/path.h"
#include "darkseed/nsp.h"
namespace Darkseed {
class Player {
-private:
Nsp _cPlayerSprites;
Nsp _gPlayerSprites;
@@ -49,7 +49,7 @@ public:
bool _playerIsChangingDirection = false; // AKA _Rotating
bool _isAutoWalkingToBed = false;
bool _heroMoving = false; // maybe set to true while player is walking around the room.
- bool _herowaiting = false;
+ bool _heroWaiting = false;
int _walkPathIndex = -1;
uint16 _numConnectorsInWalkPath = 0;
Common::Array<Common::Point> _connectorList;
@@ -58,7 +58,6 @@ public:
Common::Point _walkToSequencePoint;
bool _flipSprite = false;
-public:
Player();
bool loadAnimations(const Common::Path &filename);
const Sprite &getSprite(int frameNo);
@@ -74,14 +73,14 @@ public:
int getWidth();
int getHeight();
void updatePlayerPositionAfterRoomChange();
- void setplayertowardsbedroom();
+ void setPlayerTowardsBedroom();
void walkToNextConnector();
private:
void createConnectorPathToDest();
Common::Point getClosestUnusedConnector(int16 x, int16 y, bool mustHaveCleanLine = false);
void reverseConnectorList();
- void OptimisePath();
+ void optimisePath();
};
} // namespace Darkseed
diff --git a/engines/darkseed/room.h b/engines/darkseed/room.h
index 73125e393d9..e2c5f26917c 100644
--- a/engines/darkseed/room.h
+++ b/engines/darkseed/room.h
@@ -54,8 +54,8 @@ struct RoomObjElement {
};
class Room {
-private:
bool _palLoaded = false;
+
public:
static constexpr int MAX_CONNECTORS = 12;
uint8 _roomNumber;
@@ -73,7 +73,6 @@ public:
uint16 _selectedObjIndex = 0;
int16 _collisionType = 0;
-public:
explicit Room(int roomNumber);
void initRoom();
@@ -107,6 +106,7 @@ public:
void darkenSky();
void loadLocationSprites(const Common::Path &path);
Common::Point getExitPointForRoom(uint8 roomNumber);
+
private:
bool load();
static Common::String stripSpaces(Common::String source);
diff --git a/engines/darkseed/sound.h b/engines/darkseed/sound.h
index 64ed4442973..0571c6610ca 100644
--- a/engines/darkseed/sound.h
+++ b/engines/darkseed/sound.h
@@ -30,10 +30,10 @@
namespace Darkseed {
class Sound {
-private:
Audio::Mixer *_mixer;
Audio::SoundHandle _speechHandle;
Common::Array<uint8> _didSpeech;
+
public:
explicit Sound(Audio::Mixer *mixer);
diff --git a/engines/darkseed/sprites.h b/engines/darkseed/sprites.h
index 0e9aa00bac8..e3f8f2388d7 100644
--- a/engines/darkseed/sprites.h
+++ b/engines/darkseed/sprites.h
@@ -40,8 +40,8 @@ struct SpriteDrawInstruction {
};
class Sprites {
-private:
Common::Array<SpriteDrawInstruction> _spriteDrawList;
+
public:
Sprites();
void addSpriteToDrawList(uint16 destX, uint16 destY, const Sprite *sprite, uint8 order, uint16 destW, uint16 destH, bool flip);
diff --git a/engines/darkseed/titlefont.h b/engines/darkseed/titlefont.h
index 66147d5fb31..9d0fca23a00 100644
--- a/engines/darkseed/titlefont.h
+++ b/engines/darkseed/titlefont.h
@@ -26,7 +26,6 @@
namespace Darkseed {
class TitleFont {
-private:
Anm _letters;
public:
diff --git a/engines/darkseed/tostext.h b/engines/darkseed/tostext.h
index 8f62589dad1..366953858ea 100644
--- a/engines/darkseed/tostext.h
+++ b/engines/darkseed/tostext.h
@@ -29,7 +29,6 @@
namespace Darkseed {
class TosText {
-private:
Common::StringArray _textArray;
uint16 _numEntries = 0;
diff --git a/engines/darkseed/usecode.cpp b/engines/darkseed/usecode.cpp
index 9cca32e03ba..a646c7a77f9 100644
--- a/engines/darkseed/usecode.cpp
+++ b/engines/darkseed/usecode.cpp
@@ -309,7 +309,7 @@ void Darkseed::UseCode::useCode(int objNum) {
if (handTosIdx != 0 && handTosIdx < 979) {
_console->printTosText(handTosIdx);
} else if (handTosIdx > 978) {
- // TODO genericresponse
+ // TODO genericResponse
}
if (objNum == 80) {
_console->printTosText(553 + (_objectVar[80] & 1));
@@ -331,7 +331,7 @@ void Darkseed::UseCode::useCode(int objNum) {
return;
}
if (objNum == 114) {
- gancanim();
+ gancAnim();
return;
}
if ((objNum == 28) && (_objectVar[28] == 2)) {
@@ -675,7 +675,7 @@ void Darkseed::UseCode::useCode(int objNum) {
void Darkseed::UseCode::useCodeGloves(int16 targetObjNum) {
if (targetObjNum == 113) {
- putobjunderpillow(14);
+ putObjUnderPillow(14);
return;
}
@@ -684,7 +684,7 @@ void Darkseed::UseCode::useCodeGloves(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(14, targetObjNum, tosIdx);
+ genericResponse(14, targetObjNum, tosIdx);
}
}
if (targetObjNum == 57) {
@@ -703,12 +703,12 @@ void Darkseed::UseCode::useCodeMoney(int16 targetObjNum) {
if (targetObjNum == 7) {
_console->printTosText(961);
} else if (targetObjNum == 113) {
- putobjunderpillow(8);
+ putObjUnderPillow(8);
}
} else if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(8, targetObjNum, tosIdx);
+ genericResponse(8, targetObjNum, tosIdx);
}
return;
}
@@ -722,7 +722,7 @@ void Darkseed::UseCode::useCodeMoney(int16 targetObjNum) {
void Darkseed::UseCode::useCodeJournal(int16 actionObjNum, int16 targetObjNum) {
if (targetObjNum == 113) {
- putobjunderpillow(actionObjNum);
+ putObjUnderPillow(actionObjNum);
} else if ((actionObjNum == 6) && (targetObjNum == 47)) {
_console->printTosText(46);
} else if ((actionObjNum == 6) && (targetObjNum == 100)) {
@@ -735,7 +735,7 @@ void Darkseed::UseCode::useCodeJournal(int16 actionObjNum, int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(6, targetObjNum, tosIdx);
+ genericResponse(6, targetObjNum, tosIdx);
}
}
}
@@ -786,7 +786,7 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
if (targetObjNum == 171) {
_console->printTosText(679);
} else if (targetObjNum == 129) {
- genericresponse(7, 129, 998);
+ genericResponse(7, 129, 998);
} else if (targetObjNum == 108) {
_console->printTosText(386);
} else if (targetObjNum == 110) {
@@ -794,25 +794,25 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
} else if (targetObjNum == 85) {
_console->printTosText(434);
} else if (targetObjNum == 194) {
- genericresponse(7, 194, 989);
+ genericResponse(7, 194, 989);
} else if (targetObjNum == 156) {
_console->printTosText(550);
} else if (targetObjNum == 172) {
- genericresponse(7, 172, 988);
+ genericResponse(7, 172, 988);
} else if (targetObjNum == 71) {
- genericresponse(7, 71, 987);
+ genericResponse(7, 71, 987);
} else if (targetObjNum == 101) {
- genericresponse(7, 101, 986);
+ genericResponse(7, 101, 986);
} else if (targetObjNum == 120) {
_console->printTosText(804);
} else if (targetObjNum == 184) {
- genericresponse(7, 184, 980);
+ genericResponse(7, 184, 980);
} else if (targetObjNum == 185) {
- genericresponse(7, 185, 982);
+ genericResponse(7, 185, 982);
} else if (targetObjNum == 121) {
- genericresponse(7, 121, 990);
+ genericResponse(7, 121, 990);
} else {
- genericresponse(7, targetObjNum, 999);
+ genericResponse(7, targetObjNum, 999);
}
} else {
_console->printTosText(632);
@@ -854,7 +854,7 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
} else if (actionObjNum == 38 && (targetObjNum == 123 || targetObjNum == 318)) {
_console->printTosText(320);
} else if (targetObjNum == 129) {
- genericresponse(actionObjNum, 129, 998);
+ genericResponse(actionObjNum, 129, 998);
} else if ((actionObjNum == 37) &&
((((((targetObjNum == 142 || (targetObjNum == 124)) ||
((targetObjNum == 137 || (((targetObjNum == 148 || (targetObjNum == 109)) || (targetObjNum == 59)))))) ||
@@ -879,13 +879,13 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
} else if ((actionObjNum == 38) && (targetObjNum == 145)) {
_console->printTosText(230);
} else if (targetObjNum == 112) {
- genericresponse(actionObjNum, 112, 996);
+ genericResponse(actionObjNum, 112, 996);
} else if ((actionObjNum == 38) && (targetObjNum == 49)) {
_console->printTosText(251);
} else if ((targetObjNum == 147) && (actionObjNum != 7)) {
_console->printTosText(319);
} else if (targetObjNum == 197) {
- genericresponse(actionObjNum, 197, 993);
+ genericResponse(actionObjNum, 197, 993);
} else if ((actionObjNum == 38) && (targetObjNum == 150)) {
_console->printTosText(354);
} else if (targetObjNum == 109) {
@@ -895,7 +895,7 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
_console->printTosText(374);
}
} else if (targetObjNum == 130) {
- genericresponse(actionObjNum, 130, 991);
+ genericResponse(actionObjNum, 130, 991);
} else if (targetObjNum == 108) {
_console->printTosText(386);
} else if (targetObjNum == 110) {
@@ -910,7 +910,7 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
} else if (actionObjNum == 40) {
_console->printTosText(446);
} else {
- genericresponse(actionObjNum, 121, 990);
+ genericResponse(actionObjNum, 121, 990);
}
} else if ((actionObjNum == 37) && (targetObjNum == 122)) {
_console->printTosText(451);
@@ -922,7 +922,7 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
} else if ((actionObjNum == 37) && (targetObjNum == 53)) {
_console->printTosText(492);
} else if (targetObjNum == 194) {
- genericresponse(actionObjNum, 194, 989);
+ genericResponse(actionObjNum, 194, 989);
} else if (targetObjNum == 153) {
_console->printTosText(405);
} else if ((actionObjNum == 37) && (targetObjNum == 154)) {
@@ -943,7 +943,7 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
} else if ((actionObjNum == 38) && ((162 < targetObjNum && (targetObjNum < 169)))) {
_console->printTosText(635);
} else if (targetObjNum == 172) {
- genericresponse(actionObjNum, 172, 988);
+ genericResponse(actionObjNum, 172, 988);
} else if ((actionObjNum == 37) && (targetObjNum == 174)) {
_console->printTosText(690);
} else if ((actionObjNum == 38) && (targetObjNum == 25)) {
@@ -951,11 +951,11 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
} else if ((actionObjNum == 40) && (targetObjNum == 26)) {
_console->printTosText(700);
} else if (targetObjNum == 71) {
- genericresponse(actionObjNum, 71, 987);
+ genericResponse(actionObjNum, 71, 987);
} else if ((actionObjNum == 39) && (targetObjNum == 44)) {
_console->printTosText(731);
} else if (targetObjNum == 101) {
- genericresponse(actionObjNum, 101, 986);
+ genericResponse(actionObjNum, 101, 986);
} else if (targetObjNum == 113) {
_console->printTosText(753);
} else if (targetObjNum == 41) {
@@ -971,11 +971,11 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
} else if ((actionObjNum == 38) && (targetObjNum == 119)) {
_console->printTosText(808);
} else if ((actionObjNum == 38) && (targetObjNum == 114)) {
- genericresponse(38, 114, 984);
+ genericResponse(38, 114, 984);
} else if (targetObjNum == 184) {
- genericresponse(actionObjNum, 184, 980);
+ genericResponse(actionObjNum, 184, 980);
} else if (targetObjNum == 185) {
- genericresponse(actionObjNum, 185, 982);
+ genericResponse(actionObjNum, 185, 982);
} else if ((actionObjNum == 38) && (targetObjNum == 79)) {
_console->printTosText(833);
} else if ((targetObjNum == 79) && (actionObjNum != 7)) {
@@ -983,7 +983,7 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
} else if ((actionObjNum == 38) && (targetObjNum == 58)) {
_console->printTosText(849);
} else {
- genericresponse(actionObjNum, targetObjNum, 999);
+ genericResponse(actionObjNum, targetObjNum, 999);
}
} else {
_console->printTosText(587);
@@ -999,7 +999,7 @@ void Darkseed::UseCode::useCrowBar(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(5, targetObjNum, tosIdx);
+ genericResponse(5, targetObjNum, tosIdx);
}
}
if (targetObjNum == 42) {
@@ -1060,29 +1060,29 @@ void UseCode::useCodeNewspaper(int16 targetObjNum) {
} else if (targetObjNum == 79) {
_console->printTosText(834);
} else if (targetObjNum == 185) {
- genericresponse(9, 185, 982);
+ genericResponse(9, 185, 982);
} else if (targetObjNum == 184) {
- genericresponse(9, 184, 980);
+ genericResponse(9, 184, 980);
} else if (targetObjNum == 71) {
- genericresponse(9, 71, 987);
+ genericResponse(9, 71, 987);
} else if (targetObjNum == 101) {
- genericresponse(9, 101, 986);
+ genericResponse(9, 101, 986);
} else if (targetObjNum == 172) {
- genericresponse(9, 172, 988);
+ genericResponse(9, 172, 988);
} else if (targetObjNum == 194) {
- genericresponse(9, 194, 989);
+ genericResponse(9, 194, 989);
} else if (targetObjNum == 121) {
- genericresponse(9, 121, 990);
+ genericResponse(9, 121, 990);
} else if (targetObjNum == 109) {
- genericresponse(9, 109, 992);
+ genericResponse(9, 109, 992);
} else if (targetObjNum == 130) {
- genericresponse(9, 130, 991);
+ genericResponse(9, 130, 991);
} else if (targetObjNum == 129) {
- genericresponse(9, 129, 998);
+ genericResponse(9, 129, 998);
} else if (targetObjNum == 112) {
- genericresponse(9, 112, 996);
+ genericResponse(9, 112, 996);
} else {
- genericresponse(9, targetObjNum, 999);
+ genericResponse(9, targetObjNum, 999);
}
}
@@ -1092,16 +1092,16 @@ void UseCode::useCodeLibraryCard(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(10, targetObjNum, tosIdx);
+ genericResponse(10, targetObjNum, tosIdx);
}
}
if (targetObjNum == 46) {
g_engine->_cursor.setCursorType(Pointer);
_inventory.removeItem(10);
- g_engine->_animation->libanim(false);
+ g_engine->_animation->libAnim(false);
_objectVar[10] = 1;
} else if (targetObjNum == 113) {
- putobjunderpillow(10);
+ putObjUnderPillow(10);
}
}
@@ -1111,7 +1111,7 @@ void UseCode::useCodeBobbyPin(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(11, targetObjNum, tosIdx);
+ genericResponse(11, targetObjNum, tosIdx);
}
}
@@ -1136,7 +1136,7 @@ void UseCode::useCodeBobbyPin(int16 targetObjNum) {
_inventory.removeItem(11);
}
} else if (targetObjNum == 113) {
- putobjunderpillow(11);
+ putObjUnderPillow(11);
}
}
@@ -1159,7 +1159,7 @@ void UseCode::useCodeKeys(int16 actionObjNum, int16 targetObjNum) {
_console->printTosText(707);
}
} else if (targetObjNum == 113) {
- putobjunderpillow(actionObjNum);
+ putObjUnderPillow(actionObjNum);
} else if ((actionObjNum == 26) &&
((((targetObjNum == 175 || (targetObjNum == 62)) || (targetObjNum == 176)) || (targetObjNum == 44)))) {
_console->printTosText(720);
@@ -1171,7 +1171,7 @@ void UseCode::useCodeKeys(int16 actionObjNum, int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(actionObjNum, targetObjNum, tosIdx);
+ genericResponse(actionObjNum, targetObjNum, tosIdx);
}
}
}
@@ -1187,21 +1187,21 @@ void UseCode::useCodeMirrorShard(int16 targetObjNum) {
} else if (targetObjNum == 124) {
_console->printTosText(20);
} else if (targetObjNum == 129) {
- genericresponse(15, 129, 998);
+ genericResponse(15, 129, 998);
} else if (targetObjNum == 23 || targetObjNum == 103 || targetObjNum == 170) {
- genericresponse(15, targetObjNum, 999);
+ genericResponse(15, targetObjNum, 999);
} else if (targetObjNum == 52) {
_console->printTosText(197);
} else if (targetObjNum == 112) {
_console->printTosText(235);
} else if (targetObjNum == 130) {
- genericresponse(15, 130, 991);
+ genericResponse(15, 130, 991);
} else if (targetObjNum == 108) {
_console->printTosText(386);
} else if (targetObjNum == 110) {
_console->printTosText(392);
} else {
- genericresponse(15, targetObjNum, 997);
+ genericResponse(15, targetObjNum, 997);
}
}
@@ -1211,7 +1211,7 @@ void UseCode::useCodeBinoculars(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(16, targetObjNum, tosIdx);
+ genericResponse(16, targetObjNum, tosIdx);
}
}
if ((targetObjNum == 162) && (g_engine->_room->_roomNumber == 36)) {
@@ -1230,11 +1230,11 @@ void UseCode::useCodeShovel(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(17, targetObjNum, tosIdx);
+ genericResponse(17, targetObjNum, tosIdx);
}
}
if (targetObjNum > 86 && targetObjNum < 99) {
- startdigging(targetObjNum + -87);
+ startDigging(targetObjNum + -87);
}
}
@@ -1244,7 +1244,7 @@ void UseCode::useCodeDelbertsCard(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(18, targetObjNum, tosIdx);
+ genericResponse(18, targetObjNum, tosIdx);
}
}
if (targetObjNum == 64) {
@@ -1262,7 +1262,7 @@ void UseCode::useCodeStick(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(19, targetObjNum, tosIdx);
+ genericResponse(19, targetObjNum, tosIdx);
}
}
if (targetObjNum == 116) {
@@ -1279,7 +1279,7 @@ void UseCode::useCodeAxeHandle(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(20, targetObjNum, tosIdx);
+ genericResponse(20, targetObjNum, tosIdx);
}
}
if (targetObjNum == 53) {
@@ -1293,7 +1293,7 @@ void UseCode::useCodeRope(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(23, targetObjNum, tosIdx);
+ genericResponse(23, targetObjNum, tosIdx);
}
}
if (targetObjNum == 61) {
@@ -1313,7 +1313,7 @@ void UseCode::useCodeMicroFilm(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(24, targetObjNum, tosIdx);
+ genericResponse(24, targetObjNum, tosIdx);
}
}
if (targetObjNum == 80) {
@@ -1325,7 +1325,7 @@ void UseCode::useCodeMicroFilm(int16 targetObjNum) {
_console->printTosText(964);
}
} else if (targetObjNum == 113) {
- putobjunderpillow(24);
+ putObjUnderPillow(24);
}
}
@@ -1357,14 +1357,14 @@ void UseCode::useCodeSpecialHammer(int16 actionObjNum, int16 targetObjNum) {
} else if ((actionObjNum == 25) && (targetObjNum == 79)) {
_console->printTosText(833);
} else if (actionObjNum == 25) {
- genericresponse(25, targetObjNum, 999);
+ genericResponse(25, targetObjNum, 999);
} else if (actionObjNum == 27) {
int16 tosIdx = getUseSpecialHammerTosIdx(targetObjNum);
if (tosIdx != 0) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(27, targetObjNum, tosIdx);
+ genericResponse(27, targetObjNum, tosIdx);
}
}
}
@@ -1386,7 +1386,7 @@ void UseCode::useCodeGun(int16 targetObjNum) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(28, targetObjNum, tosIdx);
+ genericResponse(28, targetObjNum, tosIdx);
}
}
if (targetObjNum == 53) {
@@ -1400,13 +1400,13 @@ void UseCode::useCodeMoversNote(int16 targetObjNum) {
} else if (targetObjNum == 172) { // original logic also duplicated this if statement and called a generic response
_console->printTosText(93);
} else if (targetObjNum == 129) {
- genericresponse(30, 129, 998);
+ genericResponse(30, 129, 998);
} else if (targetObjNum == 52) {
_console->printTosText(205);
} else if (targetObjNum == 145) {
_console->printTosText(222);
} else if (targetObjNum == 112) {
- genericresponse(30, 112, 996);
+ genericResponse(30, 112, 996);
} else if (targetObjNum == 146) {
_console->printTosText(289);
} else if (targetObjNum == 137) {
@@ -1414,23 +1414,23 @@ void UseCode::useCodeMoversNote(int16 targetObjNum) {
} else if (targetObjNum == 147) {
_console->printTosText(309);
} else if (targetObjNum == 197) {
- genericresponse(30, 197, 993);
+ genericResponse(30, 197, 993);
} else if (targetObjNum == 109) {
- genericresponse(30, 109, 992);
+ genericResponse(30, 109, 992);
} else if (targetObjNum == 130) {
- genericresponse(30, 130, 991);
+ genericResponse(30, 130, 991);
} else if (targetObjNum == 121) {
- genericresponse(30, 121, 990);
+ genericResponse(30, 121, 990);
} else if (targetObjNum == 194) {
- genericresponse(30, 194, 989);
+ genericResponse(30, 194, 989);
} else if (targetObjNum == 71) {
- genericresponse(30, 71, 987);
+ genericResponse(30, 71, 987);
} else if (targetObjNum == 101) {
- genericresponse(30, 101, 986);
+ genericResponse(30, 101, 986);
} else if (targetObjNum == 184) {
- genericresponse(30, 184, 980);
+ genericResponse(30, 184, 980);
} else if (targetObjNum == 185) {
- genericresponse(30, 185, 982);
+ genericResponse(30, 185, 982);
} else if (targetObjNum == 108) {
_console->printTosText(386);
} else if (targetObjNum == 110) {
@@ -1442,7 +1442,7 @@ void UseCode::useCodeMoversNote(int16 targetObjNum) {
} else if (targetObjNum == 159) {
_console->printTosText(577);
} else if (targetObjNum == 113) {
- putobjunderpillow(113);
+ putObjUnderPillow(113);
} else if (targetObjNum == 120) {
_console->printTosText(804);
} else if (targetObjNum == 188) {
@@ -1450,7 +1450,7 @@ void UseCode::useCodeMoversNote(int16 targetObjNum) {
} else if (targetObjNum == 48) {
_console->printTosText(860);
} else {
- genericresponse(30, targetObjNum, 999);
+ genericResponse(30, targetObjNum, 999);
}
}
@@ -1488,31 +1488,31 @@ void UseCode::useCodeBluePrints(int16 targetObjNum) {
} else if (targetObjNum == 48) {
_console->printTosText(868);
} else if (targetObjNum == 185) {
- genericresponse(34, 185, 982);
+ genericResponse(34, 185, 982);
} else if (targetObjNum == 184) {
- genericresponse(34, 184, 980);
+ genericResponse(34, 184, 980);
} else if (targetObjNum == 130) {
- genericresponse(34, 130, 991);
+ genericResponse(34, 130, 991);
} else if (targetObjNum == 197) {
- genericresponse(34, 197, 993);
+ genericResponse(34, 197, 993);
} else if (targetObjNum == 112) {
- genericresponse(34, 112, 996);
+ genericResponse(34, 112, 996);
} else if (targetObjNum == 129) {
- genericresponse(34, 129, 998);
+ genericResponse(34, 129, 998);
} else if (targetObjNum == 121) {
- genericresponse(34, 121, 990);
+ genericResponse(34, 121, 990);
} else if (targetObjNum == 194) {
- genericresponse(34, 194, 989);
+ genericResponse(34, 194, 989);
} else if (targetObjNum == 172) {
- genericresponse(34, 172, 988);
+ genericResponse(34, 172, 988);
} else if (targetObjNum == 71) {
- genericresponse(34, 71, 987);
+ genericResponse(34, 71, 987);
} else if (targetObjNum == 101) {
- genericresponse(34, 101, 986);
+ genericResponse(34, 101, 986);
} else if (targetObjNum == 113) {
- putobjunderpillow(34);
+ putObjUnderPillow(34);
} else {
- genericresponse(34, targetObjNum, 999);
+ genericResponse(34, targetObjNum, 999);
}
}
@@ -1520,14 +1520,14 @@ void UseCode::useCodeWatch(int16 targetObjNum) {
if (((targetObjNum == 61) || (targetObjNum == 194)) || (targetObjNum == 156)) {
g_engine->printTime();
} else if (targetObjNum == 113) {
- putobjunderpillow(35);
+ putObjUnderPillow(35);
} else {
int16 tosIdx = getUseWatchTosIdx(targetObjNum);
if (tosIdx != 0) {
if (tosIdx < 979) {
_console->printTosText(tosIdx);
} else {
- genericresponse(35, targetObjNum, tosIdx);
+ genericResponse(35, targetObjNum, tosIdx);
}
}
}
@@ -1549,7 +1549,7 @@ void UseCode::useCodeEmptyUrn(int16 targetObjNum) {
}
}
-void UseCode::genericresponse(int16 useObjNum, int16 targetObjNum, int16 tosIdx) {
+void UseCode::genericResponse(int16 useObjNum, int16 targetObjNum, int16 tosIdx) {
_genericResponseCounter++;
if (_genericResponseCounter > 4) {
_genericResponseCounter = 0;
@@ -1725,7 +1725,7 @@ void UseCode::genericresponse(int16 useObjNum, int16 targetObjNum, int16 tosIdx)
}
}
-void UseCode::putobjunderpillow(int objNum) {
+void UseCode::putObjUnderPillow(int objNum) {
_objectVar[113] = 1;
_inventory.removeItem(objNum);
_objectVar.setMoveObjectRoom(objNum, 250);
@@ -1735,8 +1735,8 @@ void UseCode::putobjunderpillow(int objNum) {
_console->printTosText(947);
}
-void UseCode::gancanim() {
- error("implement gancanim()"); // TODO
+void UseCode::gancAnim() {
+ error("implement gancAnim()"); // TODO
}
static constexpr bool diggingxflipTbl[12] = {
@@ -1745,7 +1745,7 @@ static constexpr bool diggingxflipTbl[12] = {
true, true, true, false
};
-void UseCode::startdigging(int16 targetObjNum) {
+void UseCode::startDigging(int16 targetObjNum) {
if (targetObjNum == 0) {
_player->loadAnimations("lgravedg.nsp");
g_engine->_animation->setupOtherNspAnimation(0, 21);
diff --git a/engines/darkseed/usecode.h b/engines/darkseed/usecode.h
index 426390d87f6..9b991ce8268 100644
--- a/engines/darkseed/usecode.h
+++ b/engines/darkseed/usecode.h
@@ -29,8 +29,8 @@
#include "darkseed/player.h"
namespace Darkseed {
+
class UseCode {
-private:
Console *_console = nullptr;
Player *_player = nullptr;
Objects &_objectVar;
@@ -40,7 +40,6 @@ private:
public:
UseCode(Console *console, Player *player, Objects &objectVar, Inventory &inventory);
-public:
void useCode(int objNum);
void useCodeGloves(int16 targetObjNum);
void useCodeMoney(int16 targetObjNum);
@@ -66,7 +65,7 @@ public:
void useCodeWatch(int16 targetObjNum);
void useCodeTinCup(int16 targetObjNum);
void useCodeEmptyUrn(int16 targetObjNum);
- void genericresponse(int16 useObjNum, int16 targetObjNum, int16 tosIdx);
+ void genericResponse(int16 useObjNum, int16 targetObjNum, int16 tosIdx);
private:
int getHandDescriptionTosIdx(uint16 objNum);
@@ -88,10 +87,10 @@ private:
int16 getUseGunTosIdx(uint16 objNum);
int16 getUseWatchTosIdx(uint16 objNum);
- void gancanim();
- void putobjunderpillow(int objNum);
+ void gancAnim();
+ void putObjUnderPillow(int objNum);
- void startdigging(int16 targetObjNum);
+ void startDigging(int16 targetObjNum);
};
} // namespace Darkseed
Commit: ed2c4f1d87efbfbc1be4d966da3376c2f465f9ab
https://github.com/scummvm/scummvm/commit/ed2c4f1d87efbfbc1be4d966da3376c2f465f9ab
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-10-24T20:24:08+03:00
Commit Message:
DARKSEED: Cleanup and remove superfluous initializers
Changed paths:
engines/darkseed/animation.h
engines/darkseed/debugconsole.cpp
engines/darkseed/debugconsole.h
diff --git a/engines/darkseed/animation.h b/engines/darkseed/animation.h
index 3b95596823f..aed1f4a56ad 100644
--- a/engines/darkseed/animation.h
+++ b/engines/darkseed/animation.h
@@ -26,7 +26,6 @@
namespace Darkseed {
class Animation {
-private:
Player *_player = nullptr;
Objects &_objectVar;
diff --git a/engines/darkseed/debugconsole.cpp b/engines/darkseed/debugconsole.cpp
index cdef24c0911..5c6b203a6a5 100644
--- a/engines/darkseed/debugconsole.cpp
+++ b/engines/darkseed/debugconsole.cpp
@@ -24,7 +24,7 @@
namespace Darkseed {
-DebugConsole::DebugConsole(TosText *tosText) : GUI::Debugger(), _tosText(tosText) {
+DebugConsole::DebugConsole(TosText *tosText) : _tosText(tosText) {
registerCmd("tostext", WRAP_METHOD(DebugConsole, Cmd_tostext));
registerCmd("dt", WRAP_METHOD(DebugConsole, Cmd_dt));
registerCmd("getvar", WRAP_METHOD(DebugConsole, Cmd_getvar));
diff --git a/engines/darkseed/debugconsole.h b/engines/darkseed/debugconsole.h
index 3ae67b32c00..cb128b5b14e 100644
--- a/engines/darkseed/debugconsole.h
+++ b/engines/darkseed/debugconsole.h
@@ -28,9 +28,8 @@
namespace Darkseed {
class DebugConsole : public GUI::Debugger {
-private:
TosText *_tosText;
-private:
+
bool Cmd_tostext(int argc, const char **argv);
bool Cmd_dt(int argc, const char **argv);
bool Cmd_getvar(int argc, const char **argv);
@@ -43,6 +42,7 @@ private:
bool Cmd_changeDay(int argc, const char **argv);
bool validateObjVarIndex(int16 varIdx);
void printDayAndTime();
+
public:
DebugConsole(TosText *tostext);
~DebugConsole() override;
Commit: f60ada9da41f24e6bb874cad0a5169e4e96854f7
https://github.com/scummvm/scummvm/commit/f60ada9da41f24e6bb874cad0a5169e4e96854f7
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-10-24T20:26:24+03:00
Commit Message:
DARKSEED: Const correctness
Also, enclose defines with calculations in parentheses
Changed paths:
engines/darkseed/anm.cpp
engines/darkseed/anm.h
engines/darkseed/cursor.cpp
engines/darkseed/cursor.h
engines/darkseed/cutscene.cpp
engines/darkseed/cutscene.h
engines/darkseed/nsp.h
engines/darkseed/pal.cpp
engines/darkseed/pal.h
engines/darkseed/sound.cpp
engines/darkseed/sound.h
diff --git a/engines/darkseed/anm.cpp b/engines/darkseed/anm.cpp
index 42d8579d252..a3ecf75f564 100644
--- a/engines/darkseed/anm.cpp
+++ b/engines/darkseed/anm.cpp
@@ -50,7 +50,7 @@ bool Anm::getImg(uint16 index, Img &img, bool includesPosition) {
return false;
}
-int Anm::numImages() {
+int Anm::numImages() const {
return _numRecords;
}
diff --git a/engines/darkseed/anm.h b/engines/darkseed/anm.h
index dfa0397eb7f..876a05a9866 100644
--- a/engines/darkseed/anm.h
+++ b/engines/darkseed/anm.h
@@ -37,7 +37,7 @@ private:
public:
bool load(const Common::Path &filename, int deltaOffset = 0);
bool getImg(uint16 index, Img &img, bool includesPosition = true);
- int numImages();
+ int numImages() const;
};
} // namespace Darkseed
diff --git a/engines/darkseed/cursor.cpp b/engines/darkseed/cursor.cpp
index aff01768268..1d8a3e27246 100644
--- a/engines/darkseed/cursor.cpp
+++ b/engines/darkseed/cursor.cpp
@@ -44,19 +44,19 @@ void Cursor::updatePosition(int16 x, int16 y) {
// debug("mouse at (%d,%d)", _x, _y);
}
-int Cursor::getWidth() {
+int Cursor::getWidth() const {
return g_engine->_baseSprites.getSpriteAt(_currentCursorType)._width;
}
-int Cursor::getHeight() {
+int Cursor::getHeight() const {
return g_engine->_baseSprites.getSpriteAt(_currentCursorType)._height;
}
-const Sprite &Darkseed::Cursor::getSprite() {
+const Sprite &Darkseed::Cursor::getSprite() const {
return g_engine->_baseSprites.getSpriteAt(_currentCursorType);
}
-const Sprite &Darkseed::Cursor::getSpriteForType(Darkseed::CursorType cursorType) {
+const Sprite &Darkseed::Cursor::getSpriteForType(Darkseed::CursorType cursorType) const {
return g_engine->_baseSprites.getSpriteAt(cursorType);
}
diff --git a/engines/darkseed/cursor.h b/engines/darkseed/cursor.h
index aff5c0a9c73..95890e67722 100644
--- a/engines/darkseed/cursor.h
+++ b/engines/darkseed/cursor.h
@@ -47,7 +47,7 @@ public:
void showCursor(bool showCursor);
void setCursorType(enum CursorType newType);
- CursorType getCursorType() {
+ CursorType getCursorType() const {
return _currentCursorType;
}
@@ -65,10 +65,10 @@ public:
return _position.y;
}
- int getWidth();
- int getHeight();
- const Sprite &getSprite();
- const Sprite &getSpriteForType(CursorType cursorType);
+ int getWidth() const;
+ int getHeight() const;
+ const Sprite &getSprite() const;
+ const Sprite &getSpriteForType(CursorType cursorType) const;
void updatePosition(int16 x, int16 y);
};
diff --git a/engines/darkseed/cutscene.cpp b/engines/darkseed/cutscene.cpp
index 1f2f76ac98d..40afb2900d5 100644
--- a/engines/darkseed/cutscene.cpp
+++ b/engines/darkseed/cutscene.cpp
@@ -69,6 +69,8 @@ void Cutscene::update() {
case 'Z' :
_movieStep = 9999;
break;
+ default:
+ break;
}
if (_movieStep == 9999) {
@@ -1083,7 +1085,7 @@ void Cutscene::registTime() {
_startTime = g_system->getMillis();
}
-bool Cutscene::waitTime(int16 duration) {
+bool Cutscene::waitTime(int16 duration) const {
return g_system->getMillis() < _startTime + (duration * 100);
}
diff --git a/engines/darkseed/cutscene.h b/engines/darkseed/cutscene.h
index 39c5604197d..378b85396d0 100644
--- a/engines/darkseed/cutscene.h
+++ b/engines/darkseed/cutscene.h
@@ -29,7 +29,6 @@
namespace Darkseed {
class Cutscene {
-private:
char _cutsceneId = 0;
uint16 _movieStep = 9999;
TitleFont *_titleFont = nullptr;
@@ -46,7 +45,7 @@ public:
Cutscene() {}
virtual ~Cutscene();
void play(char cutsceneId);
- bool isPlaying() {
+ bool isPlaying() const {
return _movieStep != 9999;
}
void update();
@@ -67,7 +66,7 @@ private:
void putHouse();
void registTime();
- bool waitTime(int16 duration);
+ bool waitTime(int16 duration) const;
void freeMorph();
};
diff --git a/engines/darkseed/nsp.h b/engines/darkseed/nsp.h
index 64ae5c06960..01ab2c5d296 100644
--- a/engines/darkseed/nsp.h
+++ b/engines/darkseed/nsp.h
@@ -64,12 +64,12 @@ class Nsp {
public:
bool load(const Common::Path &filename);
- bool containsSpriteAt(int index) {
+ bool containsSpriteAt(int index) const {
return (int)_frames.size() > index;
}
const Sprite &getSpriteAt(int index) const;
const Obt &getAnimAt(int index);
- int16 getTotalAnim() {
+ int16 getTotalAnim() const {
return (int16)_animations.size();
}
int16 getMaxSpriteWidth();
diff --git a/engines/darkseed/pal.cpp b/engines/darkseed/pal.cpp
index e1fcdb0b124..a83c8a71fea 100644
--- a/engines/darkseed/pal.cpp
+++ b/engines/darkseed/pal.cpp
@@ -26,7 +26,7 @@
namespace Darkseed {
#define DARKSEED_NUM_PAL_ENTRIES 16
-#define DARKSEED_PAL_SIZE DARKSEED_NUM_PAL_ENTRIES * 3
+#define DARKSEED_PAL_SIZE (DARKSEED_NUM_PAL_ENTRIES * 3)
Pal::Pal(const Pal &pal) {
load(pal);
@@ -77,7 +77,7 @@ void Pal::updatePalette(int delta, const Pal &targetPal, bool shouldInstallPalet
}
}
-void Pal::installPalette() {
+void Pal::installPalette() const {
g_system->getPaletteManager()->setPalette(_palData, 0, DARKSEED_NUM_PAL_ENTRIES);
}
diff --git a/engines/darkseed/pal.h b/engines/darkseed/pal.h
index ec85194a188..670eac5a661 100644
--- a/engines/darkseed/pal.h
+++ b/engines/darkseed/pal.h
@@ -27,14 +27,13 @@
namespace Darkseed {
#define DARKSEED_NUM_PAL_ENTRIES 16
-#define DARKSEED_PAL_SIZE DARKSEED_NUM_PAL_ENTRIES * 3
+#define DARKSEED_PAL_SIZE (DARKSEED_NUM_PAL_ENTRIES * 3)
class Pal {
public:
byte _palData[DARKSEED_PAL_SIZE];
-public:
Pal() {};
Pal(const Pal &pal);
void loadFromScreen();
@@ -42,7 +41,7 @@ public:
bool load(const Common::Path &filename, bool shouldInstallPalette = true);
void clear();
void updatePalette(int delta, const Pal &targetPal, bool shouldInstallPalette = true);
- void installPalette();
+ void installPalette() const;
};
} // namespace Darkseed
diff --git a/engines/darkseed/sound.cpp b/engines/darkseed/sound.cpp
index fe506ff8643..7d2cca9e81f 100644
--- a/engines/darkseed/sound.cpp
+++ b/engines/darkseed/sound.cpp
@@ -49,7 +49,7 @@ void Sound::playTosSpeech(int tosIdx) {
_didSpeech[tosIdx] = 1;
}
-bool Sound::isPlayingSpeech() {
+bool Sound::isPlayingSpeech() const {
return _mixer->isSoundHandleActive(_speechHandle);
}
diff --git a/engines/darkseed/sound.h b/engines/darkseed/sound.h
index 0571c6610ca..661f0c58d06 100644
--- a/engines/darkseed/sound.h
+++ b/engines/darkseed/sound.h
@@ -40,7 +40,7 @@ public:
Common::Error sync(Common::Serializer &s);
void playTosSpeech(int tosIdx);
- bool isPlayingSpeech();
+ bool isPlayingSpeech() const;
void waitForSpeech();
void resetSpeech();
};
Commit: 0f44b3543d5e5eb845c35ac5ab224c0dd97cc605
https://github.com/scummvm/scummvm/commit/0f44b3543d5e5eb845c35ac5ab224c0dd97cc605
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-10-24T20:28:21+03:00
Commit Message:
DARKSEED: Const correctness and remove superfluous variable assignments
These variables are always assigned in the code further on, so there's
no reason for another superfluous assignment
Changed paths:
engines/darkseed/room.cpp
engines/darkseed/room.h
diff --git a/engines/darkseed/room.cpp b/engines/darkseed/room.cpp
index d57c9dd1665..16dc15c4b2a 100644
--- a/engines/darkseed/room.cpp
+++ b/engines/darkseed/room.cpp
@@ -199,7 +199,7 @@ bool Room::load() {
return true;
}
-Common::String Room::stripSpaces(Common::String source) {
+Common::String Room::stripSpaces(const Common::String &source) {
Common::String out;
const char *src = source.c_str();
for (uint i = 0; i < source.size(); i++) {
@@ -328,8 +328,8 @@ int Room::CheckCursorAndMovedObjects() {
for (int i = 0; i < Objects::MAX_MOVED_OBJECTS; i++) {
if (g_engine->_objectVar.getMoveObjectRoom(i) == _roomNumber) {
Common::Point movedObjPos = g_engine->_objectVar.getMoveObjectPosition(i);
- int16 spriteWidth = 0;
- int16 spriteHeight = 0;
+ int16 spriteWidth;
+ int16 spriteHeight;
if (i == 22) {
uint8 spriteIdx = g_engine->_objectVar.getVar(5) != 0 ? 1 : 0;
const Sprite &sprite = _locationSprites.getSpriteAt(spriteIdx);
@@ -464,7 +464,7 @@ bool Room::canWalkInLineToTarget(int srcX, int srcY, int destX, int destY) {
iVar4 = 0;
if ((iVar1 < 0) || (0 < destY)) {
if ((iVar1 < 1) && (destY < 1)) {
- iVar2 = -iVar1;
+ //iVar2 = -iVar1; // TODO: Unused
if (-iVar1 <= -destY) { //destY == iVar1 || SBORROW2(iVar2,-destY) != iVar2 + destY < 0) { //-iVar1 <= -destY
while (srcX != destX) {
iVar4 = iVar4 - iVar1;
@@ -475,7 +475,7 @@ bool Room::canWalkInLineToTarget(int srcX, int srcY, int destX, int destY) {
srcY = srcY + -1;
iVar2 = canWalkAtLocation(srcX, srcY);
if (iVar2 == 0) {
- return 0;
+ return false;
}
}
} else {
@@ -488,7 +488,7 @@ bool Room::canWalkInLineToTarget(int srcX, int srcY, int destX, int destY) {
srcX = srcX + -1;
iVar2 = canWalkAtLocation(srcX, srcY);
if (iVar2 == 0) {
- return 0;
+ return false;
}
}
}
@@ -504,7 +504,7 @@ bool Room::canWalkInLineToTarget(int srcX, int srcY, int destX, int destY) {
srcY = srcY + 1;
iVar2 = canWalkAtLocation(srcX, srcY);
if (iVar2 == 0) {
- return 0;
+ return false;
}
}
} else {
@@ -517,12 +517,12 @@ bool Room::canWalkInLineToTarget(int srcX, int srcY, int destX, int destY) {
srcX = srcX + -1;
iVar2 = canWalkAtLocation(srcX, srcY);
if (iVar2 == 0) {
- return 0;
+ return false;
}
}
}
} else {
- iVar2 = iVar1;
+ //iVar2 = iVar1; // TODO: Unused
if (destY < iVar1) {
while (srcX != destX) {
iVar4 = iVar4 + destY;
@@ -533,7 +533,7 @@ bool Room::canWalkInLineToTarget(int srcX, int srcY, int destX, int destY) {
srcX = srcX + 1;
iVar2 = canWalkAtLocation(srcX, srcY);
if (iVar2 == 0) {
- return 0;
+ return false;
}
}
} else {
@@ -546,7 +546,7 @@ bool Room::canWalkInLineToTarget(int srcX, int srcY, int destX, int destY) {
srcY = srcY + 1;
iVar2 = canWalkAtLocation(srcX, srcY);
if (iVar2 == 0) {
- return 0;
+ return false;
}
}
}
@@ -563,7 +563,7 @@ bool Room::canWalkInLineToTarget(int srcX, int srcY, int destX, int destY) {
srcX = srcX + 1;
iVar2 = canWalkAtLocation(srcX, srcY);
if (iVar2 == 0) {
- return 0;
+ return false;
}
}
} else {
@@ -576,7 +576,7 @@ bool Room::canWalkInLineToTarget(int srcX, int srcY, int destX, int destY) {
srcY = srcY + -1;
iVar2 = canWalkAtLocation(srcX, srcY);
if (iVar2 == 0) {
- return 0;
+ return false;
}
}
}
@@ -750,7 +750,7 @@ int Room::getObjectUnderCursor() {
return objIdx;
}
-bool Room::isOutside() {
+bool Room::isOutside() const {
bool isRoomOutside;
if (_roomNumber == 61) {
@@ -819,7 +819,7 @@ void Room::runRoomObjects() {
break;
}
case 2: {
- int spriteNum = 0;
+ int spriteNum;
if (_roomNumber == 17 && g_engine->_animation->_isPlayingAnimation_maybe && g_engine->_animation->_otherNspAnimationType_maybe == 19 && _locObjFrame[roomObjIdx] == 4) {
advanceLocAnimFrame(roomObjIdx + 1);
spriteNum = _locationSprites.getAnimAt(1)._frameNo[_locObjFrame[roomObjIdx + 1]];
diff --git a/engines/darkseed/room.h b/engines/darkseed/room.h
index e2c5f26917c..0227f922265 100644
--- a/engines/darkseed/room.h
+++ b/engines/darkseed/room.h
@@ -94,7 +94,7 @@ public:
bool canWalkInLineToTarget(int x, int y, int targetX, int targetY);
void printRoomDescriptionText() const;
void calculateScaledSpriteDimensions(int width, int height, int curYPosition);
- bool isOutside();
+ bool isOutside() const;
bool isGiger();
void runRoomObjects();
void removeObjectFromRoom(int16 objNum);
@@ -109,7 +109,7 @@ public:
private:
bool load();
- static Common::String stripSpaces(Common::String source);
+ static Common::String stripSpaces(const Common::String &source);
void drawTrunk();
void advanceLocAnimFrame(int roomObjIdx);
};
Commit: b74a64c385fa085d5130f7742c9cf8c5c7be89b0
https://github.com/scummvm/scummvm/commit/b74a64c385fa085d5130f7742c9cf8c5c7be89b0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-10-24T20:28:58+03:00
Commit Message:
DARKSEED: Initialize class members
Changed paths:
engines/darkseed/img.h
diff --git a/engines/darkseed/img.h b/engines/darkseed/img.h
index 2545f58d07d..d596e8d21ca 100644
--- a/engines/darkseed/img.h
+++ b/engines/darkseed/img.h
@@ -29,13 +29,13 @@
namespace Darkseed {
class Img {
-private:
- uint16 _x;
- uint16 _y;
- uint16 _width;
- uint16 _height;
- byte _mode;
+ uint16 _x = 0;
+ uint16 _y = 0;
+ uint16 _width = 0;
+ uint16 _height = 0;
+ byte _mode = 0;
Common::Array<uint8> _pixels;
+
public:
bool load(const Common::Path &filename);
bool load(Common::SeekableReadStream &readStream);
Commit: 11b0b2907eca805bab05df4cda2d3d64475635f3
https://github.com/scummvm/scummvm/commit/11b0b2907eca805bab05df4cda2d3d64475635f3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-10-24T20:29:31+03:00
Commit Message:
DARKSEED: Mark unreachable code
Also, add default switch case
Changed paths:
engines/darkseed/usecode.cpp
diff --git a/engines/darkseed/usecode.cpp b/engines/darkseed/usecode.cpp
index a646c7a77f9..b776d247d50 100644
--- a/engines/darkseed/usecode.cpp
+++ b/engines/darkseed/usecode.cpp
@@ -186,6 +186,9 @@ void Darkseed::UseCode::useCode(int objNum) {
break;
case 4:
_console->printTosText(653);
+ break;
+ default:
+ break;
}
return;
}
@@ -643,8 +646,9 @@ void Darkseed::UseCode::useCode(int objNum) {
} else {
_objectVar[68] = 2;
}
- } else {
- _objectVar[68] = 0;
+ // TODO: Unreachable code
+ //} else {
+ // _objectVar[68] = 0;
}
} else {
_console->addTextLine("You touch the surface of the ornate sigil.");
Commit: 9aa8b99c13dbfed7f6097d7e5f31649343e2e79d
https://github.com/scummvm/scummvm/commit/9aa8b99c13dbfed7f6097d7e5f31649343e2e79d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-10-24T20:30:26+03:00
Commit Message:
DARKSEED: Const correctness. Use while loop where needed
Changed paths:
engines/darkseed/player.cpp
engines/darkseed/player.h
diff --git a/engines/darkseed/player.cpp b/engines/darkseed/player.cpp
index 317a487c50f..3cdb1751309 100644
--- a/engines/darkseed/player.cpp
+++ b/engines/darkseed/player.cpp
@@ -31,7 +31,7 @@ Player::Player() {
_connectorList.resize(Room::MAX_CONNECTORS);
}
-const Sprite &Player::getSprite(int frameNo) {
+const Sprite &Player::getSprite(int frameNo) const {
if (g_engine->_room->isGiger()) {
return _gPlayerSprites.getSpriteAt(frameNo);
} else {
@@ -116,6 +116,8 @@ void Player::changeDirection(int16 oldDir, int16 newDir) {
_playerWalkFrameDeltaOffset = -1;
}
break;
+ default:
+ break;
}
}
}
@@ -186,7 +188,7 @@ void Player::calculateWalkTarget() {
if (!g_engine->_room->canWalkAtLocation(_walkTarget.x, _walkTarget.y)) {
int ty = _walkTarget.y;
- for (; !g_engine->_room->canWalkAtLocation(_walkTarget.x, ty) && ty <= 233;) {
+ while (!g_engine->_room->canWalkAtLocation(_walkTarget.x, ty) && ty <= 233) {
ty += 4;
}
if (ty < 235) {
diff --git a/engines/darkseed/player.h b/engines/darkseed/player.h
index 4f4119db99c..0bfc252a637 100644
--- a/engines/darkseed/player.h
+++ b/engines/darkseed/player.h
@@ -60,7 +60,7 @@ public:
Player();
bool loadAnimations(const Common::Path &filename);
- const Sprite &getSprite(int frameNo);
+ const Sprite &getSprite(int frameNo) const;
void updateSprite();
void draw();
Commit: 520aa29a2164b949a2514e404685c7e35c299bb7
https://github.com/scummvm/scummvm/commit/520aa29a2164b949a2514e404685c7e35c299bb7
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-10-24T20:34:07+03:00
Commit Message:
DARKSEED: Cleanup
- Const correctness
- Assign boolean values to boolean variables
- Remove superfluous variable assignments
- Remove superfluous null check
- Remove superfluous ternary operator
- Add missing switch default case
Changed paths:
engines/darkseed/animation.cpp
engines/darkseed/darkseed.cpp
engines/darkseed/darkseed.h
diff --git a/engines/darkseed/animation.cpp b/engines/darkseed/animation.cpp
index f6ff4568321..7bc6874ab04 100644
--- a/engines/darkseed/animation.cpp
+++ b/engines/darkseed/animation.cpp
@@ -60,7 +60,7 @@ void Animation::setupOtherNspAnimation(int nspAnimIdx, int animId) {
// LoadModeSong(7);
// PlaySound(0,6,-1);
// }
- _scaleSequence = 1;
+ _scaleSequence = true;
break;
case 4:
case 14:
@@ -470,7 +470,7 @@ void Animation::updateAnimation() {
// TODO
if (_objectVar.getObjectRunningCode(140) == 0 || g_engine->_room->_roomNumber != 6) {
g_engine->_previousRoomNumber = g_engine->_room->_roomNumber;
- int newRoomNumber = g_engine->_previousRoomNumber;
+ int newRoomNumber;
if (g_engine->_room->_roomNumber == 6) {
if (_player->_isAutoWalkingToBed && _objectVar[137] == 2) {
g_engine->wonGame();
@@ -725,6 +725,8 @@ void Animation::updateAnimation() {
_player->_direction = 2;
_player->updateSprite();
break;
+ default:
+ break;
}
}
if (_frameAdvanced && _animIndexTbl[0] == 1) {
diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index 4020a014a24..56d1a729cc6 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -26,17 +26,13 @@
#include "common/system.h"
#include "engines/util.h"
#include "darkseed/darkseed.h"
-#include "darkseed/anm.h"
#include "darkseed/console.h"
#include "darkseed/detection.h"
#include "darkseed/debugconsole.h"
-#include "graphics/palette.h"
-#include "darkseed/img.h"
#include "darkseed/nsp.h"
#include "darkseed/pal.h"
#include "darkseed/pic.h"
#include "darkseed/room.h"
-#include "darkseed/titlefont.h"
namespace Darkseed {
@@ -847,9 +843,10 @@ void DarkseedEngine::handleInput() {
}
if (!_animation->_isPlayingAnimation_maybe) {
// walk to destination point
- int walkXDelta = 0;
- int walkYDelta = 0;
+ int walkXDelta;
+ int walkYDelta;
int local_a = _scaledWalkSpeed_maybe * 16;
+
if (_player->_direction == 0 || _player->_direction == 2) {
local_a = local_a / 3;
}
@@ -888,8 +885,8 @@ void DarkseedEngine::handleInput() {
_player->_position.x == _player->_walkTarget.x) {
bVar1 = true;
}
- int local_6 = 0;
- int local_4 = 0;
+ int local_6;
+ int local_4;
if (_player->_walkTarget.x < _player->_position.x) {
if (_player->_position.x - _player->_walkTarget.x <= walkXDelta) {
local_6 = _player->_position.x - _player->_walkTarget.x;
@@ -1440,14 +1437,14 @@ void DarkseedEngine::updateDisplay() { // AKA ServiceRoom
}
}
-Common::Path DarkseedEngine::getRoomFilePath(const Common::Path &filename) {
+Common::Path DarkseedEngine::getRoomFilePath(const Common::Path &filename) const {
if (isCdVersion()) {
return Common::Path("room").join(filename);
}
return filename;
}
-Common::Path DarkseedEngine::getPictureFilePath(const Common::Path &filename) {
+Common::Path DarkseedEngine::getPictureFilePath(const Common::Path &filename) const {
if (isCdVersion()) {
return Common::Path("picture").join(filename);
}
@@ -1897,9 +1894,8 @@ void DarkseedEngine::printTime() {
}
void DarkseedEngine::showFullscreenPic(const Common::Path &filename) {
- if (_fullscreenPic) {
- delete _fullscreenPic;
- }
+ delete _fullscreenPic;
+
_fullscreenPic = new Pic();
if (!_fullscreenPic->load(filename)) {
delete _fullscreenPic;
@@ -2272,7 +2268,7 @@ void DarkseedEngine::runObjects() {
}
int spriteY = delbertPosition.y - sprite._height;
if (_objectVar[141] < 4) {
- g_engine->_sprites.addSpriteToDrawList(spriteX, spriteY, &sprite, 240 - delbertPosition.y, sprite._width, sprite._height, _objectVar[141] == 3 ? true : false);
+ g_engine->_sprites.addSpriteToDrawList(spriteX, spriteY, &sprite, 240 - delbertPosition.y, sprite._width, sprite._height, _objectVar[141] == 3);
}
}
if (_room->_roomNumber == 32 && _currentDay == 2 && _currentTimeInSeconds > 64799 && (_objectVar[141] == 5 || _objectVar[141] == 6)) {
@@ -2446,6 +2442,8 @@ void DarkseedEngine::runObjects() {
case 901:
leavePackage();
break;
+ default:
+ break;
}
if (_currentTimeInSeconds - 36000 > 901 && _objectVar._objectRunningCode[140] != 0) {
leavePackage();
diff --git a/engines/darkseed/darkseed.h b/engines/darkseed/darkseed.h
index a1b7f0b3511..f3a1da0434c 100644
--- a/engines/darkseed/darkseed.h
+++ b/engines/darkseed/darkseed.h
@@ -169,7 +169,7 @@ public:
return _randomSource.getRandomNumber(maxNum);
}
- bool isCdVersion() {
+ bool isCdVersion() const {
return getFeatures() & ADGF_CD;
}
@@ -208,8 +208,8 @@ public:
return syncResult;
}
- Common::Path getRoomFilePath(const Common::Path &filename);
- Common::Path getPictureFilePath(const Common::Path &filename);
+ Common::Path getRoomFilePath(const Common::Path &filename) const;
+ Common::Path getPictureFilePath(const Common::Path &filename) const;
void fadeIn(const Pal &palette);
void fadeOut();
More information about the Scummvm-git-logs
mailing list