[Scummvm-git-logs] scummvm master -> 6e7f0157fcb5988b4db205335d218fd1009cd1b8
bluegr
noreply at scummvm.org
Mon May 13 06:48:45 UTC 2024
This automated email contains information about 13 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
be6399d565 WINTERMUTE: Remove superfluous void in functions with no parameters
7c7625134b WATCHMAKER: Remove superfluous void in functions with no parameters
d2bc3aea2f ULTIMA: NUVIE: Remove empty protected sections
8bf89f10d6 ULTIMA8: Remove superfluous protected section
40d62bd6bc AGOS: Use true/false keywords for boolean variables
808f5c66c6 AVALANCE: Use true/false keywords for boolean variables
a2dad68dda BLADERUNNER: Use true/false keywords for boolean variables
6625df5ac4 KYRA: Use true/false keywords for boolean variables
3bd3a29353 MM: MM1: Use true/false keywords for boolean variables
f4244cc700 NGI: Use true/false keywords for boolean variables
5883b01307 PINK: Use true/false keywords for boolean variables
2f46b58ef5 TITANIC: Use true/false keywords for boolean variables
6e7f0157fc ULTIMA: NUVIE: Use true/false keywords for boolean variables
Commit: be6399d565a1e99502a6da034e1bef42f541e5ff
https://github.com/scummvm/scummvm/commit/be6399d565a1e99502a6da034e1bef42f541e5ff
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:27+03:00
Commit Message:
WINTERMUTE: Remove superfluous void in functions with no parameters
Changed paths:
engines/wintermute/ad/ad_attach_3dx.cpp
engines/wintermute/base/base_named_object.cpp
engines/wintermute/base/font/base_font_truetype.cpp
engines/wintermute/base/font/base_font_truetype.h
engines/wintermute/base/gfx/xframe_node.cpp
engines/wintermute/base/particles/part_emitter.cpp
engines/wintermute/base/particles/part_emitter.h
engines/wintermute/base/particles/part_force.cpp
engines/wintermute/base/particles/part_force.h
engines/wintermute/base/particles/part_particle.cpp
engines/wintermute/base/particles/part_particle.h
engines/wintermute/base/save_thumb_helper.cpp
engines/wintermute/base/save_thumb_helper.h
engines/wintermute/debugger.cpp
engines/wintermute/persistent.h
engines/wintermute/utils/crc.cpp
engines/wintermute/utils/crc.h
engines/wintermute/video/video_subtitler.cpp
engines/wintermute/video/video_subtitler.h
engines/wintermute/video/video_theora_player.cpp
engines/wintermute/video/video_theora_player.h
diff --git a/engines/wintermute/ad/ad_attach_3dx.cpp b/engines/wintermute/ad/ad_attach_3dx.cpp
index 01e366a55f2..06238a21130 100644
--- a/engines/wintermute/ad/ad_attach_3dx.cpp
+++ b/engines/wintermute/ad/ad_attach_3dx.cpp
@@ -46,7 +46,7 @@ AdAttach3DX::AdAttach3DX(BaseGame *inGame, BaseObject *owner) : AdObject3D(inGam
}
//////////////////////////////////////////////////////////////////////////
-AdAttach3DX::~AdAttach3DX(void) {
+AdAttach3DX::~AdAttach3DX() {
_owner = nullptr; // ref only
}
diff --git a/engines/wintermute/base/base_named_object.cpp b/engines/wintermute/base/base_named_object.cpp
index adafec3e55d..40cf6a100d7 100644
--- a/engines/wintermute/base/base_named_object.cpp
+++ b/engines/wintermute/base/base_named_object.cpp
@@ -46,7 +46,7 @@ BaseNamedObject::BaseNamedObject(TDynamicConstructor, TDynamicConstructor) {
}
//////////////////////////////////////////////////////////////////////////
-BaseNamedObject::~BaseNamedObject(void) {
+BaseNamedObject::~BaseNamedObject() {
delete[] _name;
_name = nullptr;
}
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index ee68b569138..aa2846ebc77 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -64,7 +64,7 @@ BaseFontTT::BaseFontTT(BaseGame *inGame) : BaseFont(inGame) {
}
//////////////////////////////////////////////////////////////////////////
-BaseFontTT::~BaseFontTT(void) {
+BaseFontTT::~BaseFontTT() {
clearCache();
for (uint32 i = 0; i < _layers.size(); i++) {
diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h
index 3b918878cd6..9de1a110dcd 100644
--- a/engines/wintermute/base/font/base_font_truetype.h
+++ b/engines/wintermute/base/font/base_font_truetype.h
@@ -96,7 +96,7 @@ public:
public:
DECLARE_PERSISTENT(BaseFontTT, BaseFont)
BaseFontTT(BaseGame *inGame);
- ~BaseFontTT(void) override;
+ ~BaseFontTT() override;
int getTextWidth(const byte *text, int maxLength = -1) override;
int getTextHeight(const byte *text, int width) override;
diff --git a/engines/wintermute/base/gfx/xframe_node.cpp b/engines/wintermute/base/gfx/xframe_node.cpp
index 90fc3c6813b..0655a8e6a42 100644
--- a/engines/wintermute/base/gfx/xframe_node.cpp
+++ b/engines/wintermute/base/gfx/xframe_node.cpp
@@ -53,7 +53,7 @@ FrameNode::FrameNode(BaseGame *inGame) : BaseNamedObject(inGame) {
}
//////////////////////////////////////////////////////////////////////////
-FrameNode::~FrameNode(void) {
+FrameNode::~FrameNode() {
// remove child frames
for (uint32 i = 0; i < _frames.size(); i++) {
delete _frames[i];
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 21826610104..a82b1e4ca27 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -93,7 +93,7 @@ PartEmitter::PartEmitter(BaseGame *inGame, BaseScriptHolder *owner) : BaseObject
//////////////////////////////////////////////////////////////////////////
-PartEmitter::~PartEmitter(void) {
+PartEmitter::~PartEmitter() {
for (uint32 i = 0; i < _particles.size(); i++) {
delete _particles[i];
}
diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h
index ebf8d519c7a..4641db394a6 100644
--- a/engines/wintermute/base/particles/part_emitter.h
+++ b/engines/wintermute/base/particles/part_emitter.h
@@ -40,7 +40,7 @@ public:
DECLARE_PERSISTENT(PartEmitter, BaseObject)
PartEmitter(BaseGame *inGame, BaseScriptHolder *Owner);
- ~PartEmitter(void) override;
+ ~PartEmitter() override;
int32 _fadeOutTime;
diff --git a/engines/wintermute/base/particles/part_force.cpp b/engines/wintermute/base/particles/part_force.cpp
index 2f1416126e1..cbc35560cb0 100644
--- a/engines/wintermute/base/particles/part_force.cpp
+++ b/engines/wintermute/base/particles/part_force.cpp
@@ -40,7 +40,7 @@ PartForce::PartForce(BaseGame *inGame) : BaseNamedObject(inGame) {
//////////////////////////////////////////////////////////////////////////
-PartForce::~PartForce(void) {
+PartForce::~PartForce() {
}
diff --git a/engines/wintermute/base/particles/part_force.h b/engines/wintermute/base/particles/part_force.h
index 0d2c89df520..fdb6e5725f0 100644
--- a/engines/wintermute/base/particles/part_force.h
+++ b/engines/wintermute/base/particles/part_force.h
@@ -42,7 +42,7 @@ public:
};
PartForce(BaseGame *inGame);
- ~PartForce(void) override;
+ ~PartForce() override;
Vector2 _pos;
Vector2 _direction;
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index 80cdea79c8f..4cb3f997265 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -62,7 +62,7 @@ PartParticle::PartParticle(BaseGame *inGame) : BaseClass(inGame) {
//////////////////////////////////////////////////////////////////////////
-PartParticle::~PartParticle(void) {
+PartParticle::~PartParticle() {
delete _sprite;
_sprite = nullptr;
}
diff --git a/engines/wintermute/base/particles/part_particle.h b/engines/wintermute/base/particles/part_particle.h
index 7d4d8fe7965..c00e0afe51d 100644
--- a/engines/wintermute/base/particles/part_particle.h
+++ b/engines/wintermute/base/particles/part_particle.h
@@ -46,7 +46,7 @@ public:
};
PartParticle(BaseGame *inGame);
- ~PartParticle(void) override;
+ ~PartParticle() override;
float _growthRate;
bool _exponentialGrowth;
diff --git a/engines/wintermute/base/save_thumb_helper.cpp b/engines/wintermute/base/save_thumb_helper.cpp
index 56de37ff71d..36dfdd513b2 100644
--- a/engines/wintermute/base/save_thumb_helper.cpp
+++ b/engines/wintermute/base/save_thumb_helper.cpp
@@ -40,7 +40,7 @@ SaveThumbHelper::SaveThumbHelper(BaseGame *inGame) : _gameRef(inGame) {
}
//////////////////////////////////////////////////////////////////////////
-SaveThumbHelper::~SaveThumbHelper(void) {
+SaveThumbHelper::~SaveThumbHelper() {
delete _thumbnail;
_thumbnail = nullptr;
delete _scummVMThumb;
diff --git a/engines/wintermute/base/save_thumb_helper.h b/engines/wintermute/base/save_thumb_helper.h
index 7829b0dc0db..f7c3f07b63d 100644
--- a/engines/wintermute/base/save_thumb_helper.h
+++ b/engines/wintermute/base/save_thumb_helper.h
@@ -35,7 +35,7 @@ class BaseGame;
class SaveThumbHelper {
public:
SaveThumbHelper(BaseGame *inGame);
- virtual ~SaveThumbHelper(void);
+ virtual ~SaveThumbHelper();
bool storeThumbnail(bool doFlip = false);
bool storeScummVMThumbNail(bool doFlip = false);
diff --git a/engines/wintermute/debugger.cpp b/engines/wintermute/debugger.cpp
index 7d1f745a72f..e55c2f860a3 100644
--- a/engines/wintermute/debugger.cpp
+++ b/engines/wintermute/debugger.cpp
@@ -55,7 +55,7 @@ Console::Console(WintermuteEngine *vm) : GUI::Debugger(), _engineRef(vm) {
registerCmd(TOP_CMD, WRAP_METHOD(Console, Cmd_Top));
}
-Console::~Console(void) {
+Console::~Console() {
}
bool Console::Cmd_Help(int argc, const char **argv) {
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index bdbee3c8371..cf3932eac51 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -33,7 +33,7 @@ namespace Wintermute {
class BasePersistenceManager;
// persistence support
-typedef void *(*PERSISTBUILD)(void);
+typedef void *(*PERSISTBUILD)();
typedef bool(*PERSISTLOAD)(void *, BasePersistenceManager *);
typedef void(*SYS_INSTANCE_CALLBACK)(void *instance, void *data);
} // End of namespace Wintermute
@@ -44,7 +44,7 @@ namespace Wintermute {
#define DECLARE_PERSISTENT(className, parentClass)\
static const char _className[];\
- static void *persistBuild(void);\
+ static void *persistBuild();\
const char *getClassName() override;\
static bool persistLoad(void* Instance, BasePersistenceManager* PersistMgr);\
className(TDynamicConstructor p1, TDynamicConstructor p2) : parentClass(p1, p2) { /*memset(this, 0, sizeof(class_name));*/ };\
diff --git a/engines/wintermute/utils/crc.cpp b/engines/wintermute/utils/crc.cpp
index a9781500fa4..8f82ab7724d 100644
--- a/engines/wintermute/utils/crc.cpp
+++ b/engines/wintermute/utils/crc.cpp
@@ -145,7 +145,7 @@ crc crcTable[256];
*
*********************************************************************/
void
-crcInit(void) {
+crcInit() {
crc remainder;
int dividend;
unsigned char bit;
@@ -218,7 +218,7 @@ crcFast(unsigned char const message[], int nBytes) {
-crc crc_initialize(void) {
+crc crc_initialize() {
crcInit();
return INITIAL_REMAINDER;
}
diff --git a/engines/wintermute/utils/crc.h b/engines/wintermute/utils/crc.h
index 77c2ea267f1..990f838d41f 100644
--- a/engines/wintermute/utils/crc.h
+++ b/engines/wintermute/utils/crc.h
@@ -72,11 +72,11 @@ typedef uint32 crc;
#endif
-void crcInit(void);
+void crcInit();
crc crcSlow(unsigned char const message[], int nBytes);
crc crcFast(unsigned char const message[], int nBytes);
-extern "C" crc crc_initialize(void);
+extern "C" crc crc_initialize();
extern "C" crc crc_process_byte(unsigned char byteVal, crc remainder);
extern "C" crc crc_finalize(crc remainder);
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp
index 55b0b4125b6..13d714b47d0 100644
--- a/engines/wintermute/video/video_subtitler.cpp
+++ b/engines/wintermute/video/video_subtitler.cpp
@@ -40,7 +40,7 @@ VideoSubtitler::VideoSubtitler(BaseGame *inGame): BaseClass(inGame) {
_showSubtitle = false;
}
-VideoSubtitler::~VideoSubtitler(void) {
+VideoSubtitler::~VideoSubtitler() {
_subtitles.clear();
}
diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h
index 07d12c2f1f7..d603ea5b4cc 100644
--- a/engines/wintermute/video/video_subtitler.h
+++ b/engines/wintermute/video/video_subtitler.h
@@ -36,7 +36,7 @@ namespace Wintermute {
class VideoSubtitler : public BaseClass {
public:
VideoSubtitler(BaseGame *inGame);
- ~VideoSubtitler(void) override;
+ ~VideoSubtitler() override;
bool loadSubtitles(const Common::String &filename, const Common::String &subtitleFile);
void display();
void update(uint32 frame);
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index e1e6f1cbf1f..45521daf357 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -89,7 +89,7 @@ void VideoTheoraPlayer::SetDefaults() {
}
//////////////////////////////////////////////////////////////////////////
-VideoTheoraPlayer::~VideoTheoraPlayer(void) {
+VideoTheoraPlayer::~VideoTheoraPlayer() {
cleanup();
delete _subtitler;
}
diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h
index 03300bda368..4e2bc075f96 100644
--- a/engines/wintermute/video/video_theora_player.h
+++ b/engines/wintermute/video/video_theora_player.h
@@ -52,7 +52,7 @@ public:
DECLARE_PERSISTENT(VideoTheoraPlayer, BaseClass)
VideoTheoraPlayer(BaseGame *inGame);
- ~VideoTheoraPlayer(void) override;
+ ~VideoTheoraPlayer() override;
// external objects
Common::SeekableReadStream *_file;
Commit: 7c7625134bf2fba98da5c60f4bccf0ca81ce3f23
https://github.com/scummvm/scummvm/commit/7c7625134bf2fba98da5c60f4bccf0ca81ce3f23
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:27+03:00
Commit Message:
WATCHMAKER: Remove superfluous void in functions with no parameters
Changed paths:
engines/watchmaker/3d/geometry.cpp
engines/watchmaker/3d/loader.cpp
engines/watchmaker/3d/render/opengl_2d.cpp
engines/watchmaker/3d/render/render.cpp
engines/watchmaker/classes/do_camera.cpp
engines/watchmaker/classes/do_camera.h
engines/watchmaker/classes/do_keyboard.cpp
engines/watchmaker/classes/do_sound.cpp
engines/watchmaker/console.h
engines/watchmaker/init/nl_parse.cpp
engines/watchmaker/ll/ll_anim.cpp
engines/watchmaker/ll/ll_sound.cpp
engines/watchmaker/ll/ll_string.cpp
engines/watchmaker/ll/ll_util.cpp
engines/watchmaker/main.cpp
engines/watchmaker/t2d/t2d.cpp
engines/watchmaker/t2d/t2d_internal.h
engines/watchmaker/windows_hacks.cpp
diff --git a/engines/watchmaker/3d/geometry.cpp b/engines/watchmaker/3d/geometry.cpp
index 48100fc8087..641d3f7736d 100644
--- a/engines/watchmaker/3d/geometry.cpp
+++ b/engines/watchmaker/3d/geometry.cpp
@@ -528,7 +528,7 @@ t3dF32 Cosine_Interpolate(t3dF32 a, t3dF32 b, t3dF32 x) {
/* -----------------10/06/99 15.55-------------------
* SelectRandomNumbers
* --------------------------------------------------*/
-void SelectRandomNumbers(void) {
+void SelectRandomNumbers() {
error("TODO: SelectRandomNumbers");
#if 0
while (!isprime(skyval1 = (uint32)rand() % 100));
@@ -624,7 +624,7 @@ t3dF32 PerlinNoise_2D(t3dF32 x, t3dF32 y, t3dF32 persistence, uint32 NumberOfOct
/* -----------------10/06/99 15.57-------------------
* t3dCreateProceduralSky
* --------------------------------------------------*/
-void t3dCreateProceduralSky(void) {
+void t3dCreateProceduralSky() {
unsigned short *p;
int32 i, j, pitch;
t3dF32 f, x, y, xstep, ystep;
@@ -1146,7 +1146,7 @@ void t3dResetPipeline() {
/* -----------------10/06/99 15.58-------------------
* t3dReleaseParticles
* --------------------------------------------------*/
-void t3dReleaseParticles(void) {
+void t3dReleaseParticles() {
for (int i = 0; i < MAX_PARTICLES; i++) {
t3dFree(Particles[i].ParticlePos);
Particles[i].Material.clear();
@@ -1199,7 +1199,7 @@ uint8 CheckAndClip(t3dV3F *start, t3dV3F *end, t3dNORMAL *n) {
/* -----------------10/06/99 15.50-------------------
* t3dCheckWithFloor
* --------------------------------------------------*/
-t3dF32 t3dCheckWithFloor(void) {
+t3dF32 t3dCheckWithFloor() {
extern t3dF32 CurFloorY;
t3dVERTEX a, b, c;
t3dNORMAL bbn;
@@ -3045,7 +3045,7 @@ uint8 t3dPointInFrustum(t3dV3F pos) {
* -----------------10/06/99 15.54-------------------
* t3dTransformSky
* --------------------------------------------------*/
-void t3dTransformSky(void) {
+void t3dTransformSky() {
gVertex *gv;
t3dBODY *sky = t3dSky;
t3dBODY *sun = nullptr; //s t3dSun;
@@ -3270,7 +3270,7 @@ void QueueMaterialList(MaterialTable &MatList, unsigned int NumMat, signed short
/* -----------------08/03/2000 15.13-----------------
* ProcessMaterialList
* --------------------------------------------------*/
-void ProcessMaterialList(void) {
+void ProcessMaterialList() {
for (uint32 i = 0; i < t3dNumMaterialLists; i++) {
rBuildMaterialList(*t3dMaterialList[i].mat_list, t3dMaterialList[i].num_mat, t3dMaterialList[i].matrix);
}
@@ -3300,7 +3300,7 @@ static int SortMesh(const void *element1, const void *element2) {
/* -----------------10/06/99 15.51-------------------
* t3dSortMeshes
* --------------------------------------------------*/
-void t3dSortMeshes(void) {
+void t3dSortMeshes() {
qsort((void *)&t3d_VisibleMeshes[0], (size_t)t3d_NumMeshesVisible, sizeof(t3dMESH *),
SortMesh);
}
@@ -3379,7 +3379,7 @@ void t3dProcessPortal(t3dMESH *mesh, t3dCAMERA *cam) {
/* -----------------10/06/99 15.51-------------------
* t3dProcessPortals
* --------------------------------------------------*/
-void t3dProcessPortals(void) {
+void t3dProcessPortals() {
uint32 i;
if (t3dNumPortals > 5)
diff --git a/engines/watchmaker/3d/loader.cpp b/engines/watchmaker/3d/loader.cpp
index 35c179cb59c..22f318f9d0c 100644
--- a/engines/watchmaker/3d/loader.cpp
+++ b/engines/watchmaker/3d/loader.cpp
@@ -155,7 +155,7 @@ public:
}
}
- _t3dLOADLIST* getFromLoadList(void) {
+ _t3dLOADLIST* getFromLoadList() {
for (int a = 0; a < MAX_T3D_LOADLIST_ITEMS; a++) {
if (!t3dLoadList[a].pname.empty())
return &t3dLoadList[a];
diff --git a/engines/watchmaker/3d/render/opengl_2d.cpp b/engines/watchmaker/3d/render/opengl_2d.cpp
index e1495b49918..cba57af4550 100644
--- a/engines/watchmaker/3d/render/opengl_2d.cpp
+++ b/engines/watchmaker/3d/render/opengl_2d.cpp
@@ -100,7 +100,7 @@ void rGetExtends(int *x1, int *y1, int *x2, int *y2) {
}
//************************************************************************************************************************
-void rResetExtends(void) {
+void rResetExtends() {
gBlitterExtends.left = 99999999;
gBlitterExtends.top = 99999999;
gBlitterExtends.right = -99999999;
diff --git a/engines/watchmaker/3d/render/render.cpp b/engines/watchmaker/3d/render/render.cpp
index 8ceae6b5204..e08dcbf5711 100644
--- a/engines/watchmaker/3d/render/render.cpp
+++ b/engines/watchmaker/3d/render/render.cpp
@@ -72,7 +72,7 @@ bool rSetZBufferState(bool state) {
/* -----------------25/06/99 11.14-------------------
* Renderizza il cielo senza considerare lo zbuffer
* --------------------------------------------------*/
-void RenderSky(void) {
+void RenderSky() {
unsigned int i;
bool hres;
gBatchBlock *bb;
@@ -122,7 +122,7 @@ void RenderSky(void) {
/* -----------------31/05/99 10.19-------------------
* Renderizza la Geometria
* --------------------------------------------------*/
-void RenderGeometry(void) {
+void RenderGeometry() {
signed short int LastViewMatrixNum, LastTexture1, LastTexture2;
gBatchBlock *bb;
bool hres = false;
@@ -395,7 +395,7 @@ void RenderGeometry(void) {
/* -----------------31/05/99 10.55-------------------
* Renderizza la scena
* --------------------------------------------------*/
-bool rRenderScene(void) {
+bool rRenderScene() {
unsigned int i, j;
bool hres;
//static unsigned int dwFrameCount = 0;
diff --git a/engines/watchmaker/classes/do_camera.cpp b/engines/watchmaker/classes/do_camera.cpp
index 806617d30b6..2e8d64e9ce8 100644
--- a/engines/watchmaker/classes/do_camera.cpp
+++ b/engines/watchmaker/classes/do_camera.cpp
@@ -523,7 +523,7 @@ void doCamera(WGame &game) {
/* -----------------09/11/98 10.27-------------------
* ResetCameraSource
* --------------------------------------------------*/
-void ResetCameraSource(void) {
+void ResetCameraSource() {
t3dLastCameraIndex = 255;
t3dCurCameraIndex = 255;
}
@@ -531,7 +531,7 @@ void ResetCameraSource(void) {
/* -----------------09/11/98 10.27-------------------
* ResetCameraTarget
* --------------------------------------------------*/
-void ResetCameraTarget(void) {
+void ResetCameraTarget() {
t3dVectFill(&OldCameraTarget, 0.0f);
}
diff --git a/engines/watchmaker/classes/do_camera.h b/engines/watchmaker/classes/do_camera.h
index 20ba394446a..f1208993613 100644
--- a/engines/watchmaker/classes/do_camera.h
+++ b/engines/watchmaker/classes/do_camera.h
@@ -35,8 +35,8 @@ void GetCameraTarget(Init &init, t3dV3F *Target);
t3dCAMERA *PickCamera(t3dBODY *b, unsigned char in);
void doCamera(WGame &game);
void GetRealCharPos(Init &init, t3dV3F *Target, int32 oc, uint8 bn);
-void ResetCameraTarget(void);
-void ResetCameraSource(void);
+void ResetCameraTarget();
+void ResetCameraSource();
void ProcessCamera(WGame &game);
uint8 GetCameraIndexUnderPlayer(int32 pl);
void StartAnimCamera(WGame &game);
diff --git a/engines/watchmaker/classes/do_keyboard.cpp b/engines/watchmaker/classes/do_keyboard.cpp
index a8763047572..2c69bd0b25b 100644
--- a/engines/watchmaker/classes/do_keyboard.cpp
+++ b/engines/watchmaker/classes/do_keyboard.cpp
@@ -132,7 +132,7 @@ bool DInputNonExclusiveMouse() {
/* -----------------25/08/98 10.42-------------------
* HandleFirstPerson
* --------------------------------------------------*/
-void HandleFirstPersonView(void) {
+void HandleFirstPersonView() {
t3dF32 dist;
t3dV3F d, n;
diff --git a/engines/watchmaker/classes/do_sound.cpp b/engines/watchmaker/classes/do_sound.cpp
index 388969f32ca..95f31599245 100644
--- a/engines/watchmaker/classes/do_sound.cpp
+++ b/engines/watchmaker/classes/do_sound.cpp
@@ -60,7 +60,7 @@ bool InitMusic() {
return true;
}
-bool ListenerUpdate(void) {
+bool ListenerUpdate() {
sListener CurListener;
CurListener.flDistanceFactor = 1.0f;
diff --git a/engines/watchmaker/console.h b/engines/watchmaker/console.h
index 17812885148..48ca0cdebb3 100644
--- a/engines/watchmaker/console.h
+++ b/engines/watchmaker/console.h
@@ -29,7 +29,7 @@ namespace Watchmaker {
class Console : public GUI::Debugger {
public:
explicit Console();
- ~Console(void) override {}
+ ~Console() override {}
};
} // End of namespace Watchmaker
diff --git a/engines/watchmaker/init/nl_parse.cpp b/engines/watchmaker/init/nl_parse.cpp
index 8fb8126851a..f4709a6aaa0 100644
--- a/engines/watchmaker/init/nl_parse.cpp
+++ b/engines/watchmaker/init/nl_parse.cpp
@@ -28,7 +28,7 @@ namespace Watchmaker {
unsigned int jStringLimit = J_MAXSTRLEN, jTillEOL = 0, jUsingComments = 0;
// PELS: supporto per il parsing dei .nl **********************************
-static void (*ErrorFunc)(void) = nullptr;
+static void (*ErrorFunc)() = nullptr;
int ParseError(const char *ln, ...) {
char err[J_MAXSTRLEN];
diff --git a/engines/watchmaker/ll/ll_anim.cpp b/engines/watchmaker/ll/ll_anim.cpp
index 7d9af542ef7..1cc86f35dc4 100644
--- a/engines/watchmaker/ll/ll_anim.cpp
+++ b/engines/watchmaker/ll/ll_anim.cpp
@@ -90,7 +90,7 @@ extern uint32 WideScreen_EndTime;
/* -----------------01/06/98 11.57-------------------
* PopATF
* --------------------------------------------------*/
-uint16 PopATF(void) {
+uint16 PopATF() {
uint16 v, a;
if (CurATFStack[CurActiveAnim] > 0)
diff --git a/engines/watchmaker/ll/ll_sound.cpp b/engines/watchmaker/ll/ll_sound.cpp
index 5948770942d..b4dd6b6066f 100644
--- a/engines/watchmaker/ll/ll_sound.cpp
+++ b/engines/watchmaker/ll/ll_sound.cpp
@@ -24,12 +24,12 @@
namespace Watchmaker {
-bool mInitMusicSystem(void) {
+bool mInitMusicSystem() {
warning("STUBBED: mInitMusicSystem");
return true;
}
-bool mCloseMusicSystem(void) {
+bool mCloseMusicSystem() {
warning("STUBBED: mCloseMusicSystem");
return true;
}
@@ -44,12 +44,12 @@ bool mPlayMusic(const char *FileName) {
return true;
}
-bool mStopMusic(void) {
+bool mStopMusic() {
warning("STUBBED: mStopMusic");
return true;
}
-bool mRestoreMixerVolume(void) {
+bool mRestoreMixerVolume() {
warning("STUBBED: mRestoreMixerVolume");
return true;
}
@@ -69,7 +69,7 @@ bool sStopSound(int32 index) {
return true;
}
-bool sStopAllSounds(void) {
+bool sStopAllSounds() {
warning("STUBBED: sStopAllSounds");
return true;
}
diff --git a/engines/watchmaker/ll/ll_string.cpp b/engines/watchmaker/ll/ll_string.cpp
index 43a45b79995..29516614c75 100644
--- a/engines/watchmaker/ll/ll_string.cpp
+++ b/engines/watchmaker/ll/ll_string.cpp
@@ -55,7 +55,7 @@ void Text(uint16 x, uint16 y, uint16 dx, char *text) {
/* -----------------17/03/98 17.48-------------------
* ClearText
* --------------------------------------------------*/
-void ClearText(void) {
+void ClearText() {
if (!(bUseWith & UW_ON)) {
TheString.x = 0;
TheString.y = 0;
diff --git a/engines/watchmaker/ll/ll_util.cpp b/engines/watchmaker/ll/ll_util.cpp
index 422f2d28a77..3c12f42c4bb 100644
--- a/engines/watchmaker/ll/ll_util.cpp
+++ b/engines/watchmaker/ll/ll_util.cpp
@@ -459,7 +459,7 @@ bool SetBndLevel(WGame &game, const char *roomname, int32 lev) {
/* -----------------17/12/00 17.59-------------------
* PrintLoading
* --------------------------------------------------*/
-void PrintLoading(void) {
+void PrintLoading() {
warning("STUBBED: PrintLoading");
#if 0
// Stampa la scritta loading
diff --git a/engines/watchmaker/main.cpp b/engines/watchmaker/main.cpp
index 1de01c6b4bc..8fe16243d89 100644
--- a/engines/watchmaker/main.cpp
+++ b/engines/watchmaker/main.cpp
@@ -139,7 +139,7 @@ void CloseSys(WGame &game) {
/* -----------------16/10/98 12.07-------------------
* ReadTime
* --------------------------------------------------*/
-uint32 ReadTime(void) {
+uint32 ReadTime() {
// LARGE_INTEGER t;
// QueryPerformanceCounter( &t );
return (t3dReadTime());
diff --git a/engines/watchmaker/t2d/t2d.cpp b/engines/watchmaker/t2d/t2d.cpp
index f8f2f494032..ec645cdc8b9 100644
--- a/engines/watchmaker/t2d/t2d.cpp
+++ b/engines/watchmaker/t2d/t2d.cpp
@@ -175,7 +175,7 @@ int32 diarioCurrentPage;
//Varabili PDA
int32 StartAcquiring;
//Funzioni e Variabili PDAHelp
-void (*HelpFunc)(void);
+void (*HelpFunc)();
//Funzioni e Variabili PDALog
extern int32 t3dCurTime;
void SetPDALogItem(Init &init, int32 log_item);
@@ -893,7 +893,7 @@ void AddKeyToString(char Key, char *String, int MaxChars) {
}
//Gestione Tastiera
-void T2DResetKeyboard(void) {
+void T2DResetKeyboard() {
t2dKeyTableT = 0;
t2dKeyTableH = 0;
}
@@ -5506,7 +5506,7 @@ void CaricaSaves(WGame &game) {
t3dForceNOFastFile(0);
}
-void SortSaves(void) {
+void SortSaves() {
warning("STUBBED: SortSaves");
#if 0
qsort(Saves, NSaves, sizeof(SavesS), CompareSaves);
@@ -5596,7 +5596,7 @@ void RefreshSaveImg(WGame &game, int Pos, uint8 Type) {
}
-void PDA_Tone_Acquire_Help_Func(void) {
+void PDA_Tone_Acquire_Help_Func() {
t2dBUTTON *b;
t2dWINDOW *w;
@@ -5623,7 +5623,7 @@ void PDA_Tone_Acquire_Help_Func(void) {
// Event( EventClass::MC_T2D, ME_T2DSETWINDOW, MP_WAITA, T2D_WIN_PDA_TONE, 0, FALSE, NULL, NULL, NULL );
}
-void SetHelpWin(Fonts &fonts, void (*Func)(void), int NArg, ...) {
+void SetHelpWin(Fonts &fonts, void (*Func)(), int NArg, ...) {
va_list vl;
char *Text = nullptr;
int i, Dx = 0, Dy = 0;
diff --git a/engines/watchmaker/t2d/t2d_internal.h b/engines/watchmaker/t2d/t2d_internal.h
index e9d5adce279..9d6251f54b5 100644
--- a/engines/watchmaker/t2d/t2d_internal.h
+++ b/engines/watchmaker/t2d/t2d_internal.h
@@ -556,7 +556,7 @@ struct SavesS {
void ChangeExclusiveMouseMode();
void PDA_Tone_Acquire_Help_Func();
-void SetHelpWin(Fonts &fonts, void (*Func)(void), int NArg, ...);
+void SetHelpWin(Fonts &fonts, void (*Func)(), int NArg, ...);
void CaricaSaves(WGame &game);
void SortSaves();
void RefreshSaveImg(WGame &game, int Pos, uint8 Type);
diff --git a/engines/watchmaker/windows_hacks.cpp b/engines/watchmaker/windows_hacks.cpp
index 35e1ca2a8a7..fd11f562449 100644
--- a/engines/watchmaker/windows_hacks.cpp
+++ b/engines/watchmaker/windows_hacks.cpp
@@ -25,7 +25,7 @@
namespace Watchmaker {
-void ResetDIKbd(void) {
+void ResetDIKbd() {
warning("STUBBED ResetDIKbd");
}
Commit: d2bc3aea2f32009f5438a101c0cf863c508b71a4
https://github.com/scummvm/scummvm/commit/d2bc3aea2f32009f5438a101c0cf863c508b71a4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:27+03:00
Commit Message:
ULTIMA: NUVIE: Remove empty protected sections
Changed paths:
engines/ultima/nuvie/actors/md_actor.h
engines/ultima/nuvie/actors/se_actor.h
engines/ultima/nuvie/actors/wou_actor.h
engines/ultima/nuvie/core/effect.h
engines/ultima/nuvie/fonts/bmp_font.h
engines/ultima/nuvie/fonts/conv_font.h
engines/ultima/nuvie/gui/gui_console.h
engines/ultima/nuvie/gui/widgets/console.h
engines/ultima/nuvie/views/scroll_view_gump.h
engines/ultima/nuvie/views/scroll_widget_gump.h
engines/ultima/nuvie/views/sign_view_gump.h
diff --git a/engines/ultima/nuvie/actors/md_actor.h b/engines/ultima/nuvie/actors/md_actor.h
index 971adea181d..95a94254b1a 100644
--- a/engines/ultima/nuvie/actors/md_actor.h
+++ b/engines/ultima/nuvie/actors/md_actor.h
@@ -28,8 +28,6 @@ namespace Ultima {
namespace Nuvie {
class MDActor: public WOUActor {
-protected:
-
public:
MDActor(Map *m, ObjManager *om, GameClock *c);
diff --git a/engines/ultima/nuvie/actors/se_actor.h b/engines/ultima/nuvie/actors/se_actor.h
index 2ad0a884d04..f4f235dbfe4 100644
--- a/engines/ultima/nuvie/actors/se_actor.h
+++ b/engines/ultima/nuvie/actors/se_actor.h
@@ -29,8 +29,6 @@ namespace Ultima {
namespace Nuvie {
class SEActor: public WOUActor {
-protected:
-
public:
SEActor(Map *m, ObjManager *om, GameClock *c);
diff --git a/engines/ultima/nuvie/actors/wou_actor.h b/engines/ultima/nuvie/actors/wou_actor.h
index b64e8441301..4d93ea6042e 100644
--- a/engines/ultima/nuvie/actors/wou_actor.h
+++ b/engines/ultima/nuvie/actors/wou_actor.h
@@ -28,8 +28,6 @@ namespace Ultima {
namespace Nuvie {
class WOUActor: public Actor {
-protected:
-
public:
WOUActor(Map *m, ObjManager *om, GameClock *c) : Actor(m, om, c) { }
diff --git a/engines/ultima/nuvie/core/effect.h b/engines/ultima/nuvie/core/effect.h
index 0e6c6dd8e5c..ed1f0a35465 100644
--- a/engines/ultima/nuvie/core/effect.h
+++ b/engines/ultima/nuvie/core/effect.h
@@ -676,8 +676,6 @@ public:
};
class HailStormEffect : public Effect {
-protected:
-
public:
HailStormEffect(const MapCoord &target);
diff --git a/engines/ultima/nuvie/fonts/bmp_font.h b/engines/ultima/nuvie/fonts/bmp_font.h
index 68ab5d7ff1a..80832bc2a9f 100644
--- a/engines/ultima/nuvie/fonts/bmp_font.h
+++ b/engines/ultima/nuvie/fonts/bmp_font.h
@@ -53,8 +53,6 @@ public:
uint16 drawChar(Screen *screen, uint8 char_num, uint16 x, uint16 y,
uint8 color) override;
uint16 getStringWidth(const char *str, uint16 string_len) override;
-protected:
-
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/fonts/conv_font.h b/engines/ultima/nuvie/fonts/conv_font.h
index 9c0a2cf8291..56374d6e383 100644
--- a/engines/ultima/nuvie/fonts/conv_font.h
+++ b/engines/ultima/nuvie/fonts/conv_font.h
@@ -47,8 +47,6 @@ public:
}
uint16 drawChar(Screen *screen, uint8 char_num, uint16 x, uint16 y,
uint8 color) override;
-protected:
-
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/gui/gui_console.h b/engines/ultima/nuvie/gui/gui_console.h
index 8ba9d5afedc..8fbe1143952 100644
--- a/engines/ultima/nuvie/gui/gui_console.h
+++ b/engines/ultima/nuvie/gui/gui_console.h
@@ -56,9 +56,6 @@ public:
GUI_status MouseMotion(int x, int y, uint8 state) override;
virtual void AddLine(const Std::string &line);
-
-protected:
-
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/gui/widgets/console.h b/engines/ultima/nuvie/gui/widgets/console.h
index e5f8d880755..f49e5002104 100644
--- a/engines/ultima/nuvie/gui/widgets/console.h
+++ b/engines/ultima/nuvie/gui/widgets/console.h
@@ -43,9 +43,6 @@ public:
~Console() override;
void AddLine(const Std::string &line) override;
-
-protected:
-
};
void ConsoleInit(const Configuration *c, Screen *s, GUI *gui, uint16 w, uint16 h);
diff --git a/engines/ultima/nuvie/views/scroll_view_gump.h b/engines/ultima/nuvie/views/scroll_view_gump.h
index 07b5d513b6f..51bbe036ca2 100644
--- a/engines/ultima/nuvie/views/scroll_view_gump.h
+++ b/engines/ultima/nuvie/views/scroll_view_gump.h
@@ -52,9 +52,6 @@ public:
return GUI_YUM;
}
GUI_status KeyDown(const Common::KeyState &key) override;
-
-protected:
-
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/views/scroll_widget_gump.h b/engines/ultima/nuvie/views/scroll_widget_gump.h
index 8ff1ba393fd..534522d3c91 100644
--- a/engines/ultima/nuvie/views/scroll_widget_gump.h
+++ b/engines/ultima/nuvie/views/scroll_widget_gump.h
@@ -104,10 +104,6 @@ public:
scroll_movement_event(SCROLL_UP);
}
-protected:
-
-
-
private:
const Common::Rect arrow_up_rect;
diff --git a/engines/ultima/nuvie/views/sign_view_gump.h b/engines/ultima/nuvie/views/sign_view_gump.h
index 890c38e9c47..2ceabacfcc6 100644
--- a/engines/ultima/nuvie/views/sign_view_gump.h
+++ b/engines/ultima/nuvie/views/sign_view_gump.h
@@ -51,9 +51,6 @@ public:
GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
GUI_status KeyDown(const Common::KeyState &key) override;
-
-protected:
-
};
} // End of namespace Nuvie
Commit: 8bf89f10d63dcc38ec7618045ed041632ff94f05
https://github.com/scummvm/scummvm/commit/8bf89f10d63dcc38ec7618045ed041632ff94f05
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:28+03:00
Commit Message:
ULTIMA8: Remove superfluous protected section
Changed paths:
engines/ultima/ultima8/graphics/fonts/font.h
diff --git a/engines/ultima/ultima8/graphics/fonts/font.h b/engines/ultima/ultima8/graphics/fonts/font.h
index 3d4521938a8..82ed1f9ff5a 100644
--- a/engines/ultima/ultima8/graphics/fonts/font.h
+++ b/engines/ultima/ultima8/graphics/fonts/font.h
@@ -105,8 +105,6 @@ public:
protected:
bool _highRes;
-protected:
-
struct Traits {
static bool isSpace(Std::string::const_iterator &i, bool u8specials) {
char c = *i;
Commit: 40d62bd6bcd19e31d4ff06ab34aac70ae4a04747
https://github.com/scummvm/scummvm/commit/40d62bd6bcd19e31d4ff06ab34aac70ae4a04747
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:28+03:00
Commit Message:
AGOS: Use true/false keywords for boolean variables
Changed paths:
engines/agos/input.cpp
engines/agos/menus.cpp
engines/agos/string.cpp
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 0d8b45f370a..a3bf8dfc834 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -58,7 +58,7 @@ uint AGOSEngine::setVerbText(HitArea *ha) {
void AGOSEngine::setup_cond_c_helper() {
HitArea *last;
- _noRightClick = 1;
+ _noRightClick = true;
if (getGameType() == GType_WW)
clearMenuStrip();
diff --git a/engines/agos/menus.cpp b/engines/agos/menus.cpp
index 608a3333c42..008162ebd22 100644
--- a/engines/agos/menus.cpp
+++ b/engines/agos/menus.cpp
@@ -48,7 +48,7 @@ void AGOSEngine::loadMenuFile() {
// Personal Nightmare specific
void AGOSEngine::restoreMenu() {
- _wiped = 0;
+ _wiped = false;
_videoLockOut |= 0x80;
diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp
index 3d1c73b1f8f..1aa590b834c 100644
--- a/engines/agos/string.cpp
+++ b/engines/agos/string.cpp
@@ -33,7 +33,7 @@ namespace AGOS {
void AGOSEngine::uncompressText(byte *ptr) {
byte a;
- while (1) {
+ while (true) {
if (_awaitTwoByteToken != 0)
a = _awaitTwoByteToken;
else
Commit: 808f5c66c6c2381adc1811bc631c037a11c9e403
https://github.com/scummvm/scummvm/commit/808f5c66c6c2381adc1811bc631c037a11c9e403
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:28+03:00
Commit Message:
AVALANCE: Use true/false keywords for boolean variables
Changed paths:
engines/avalanche/nim.cpp
diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp
index 6f96aa54f51..1e6b32a947d 100644
--- a/engines/avalanche/nim.cpp
+++ b/engines/avalanche/nim.cpp
@@ -53,7 +53,7 @@ void Nim::resetVariables() {
for (int i = 0; i < 3; i++) {
_old[i] = 0;
_stones[i] = 0;
- _inAp[i] = 0;
+ _inAp[i] = false;
_r[i] = 0;
}
}
Commit: a2dad68dda02a6265dd0a5bc910588cdbffe23c6
https://github.com/scummvm/scummvm/commit/a2dad68dda02a6265dd0a5bc910588cdbffe23c6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:29+03:00
Commit Message:
BLADERUNNER: Use true/false keywords for boolean variables
Changed paths:
engines/bladerunner/script/ai/bullet_bob.cpp
engines/bladerunner/script/ai/maggie.cpp
engines/bladerunner/script/ai/moraji.cpp
engines/bladerunner/script/ai/transient.cpp
engines/bladerunner/script/scene/ar01.cpp
engines/bladerunner/script/scene/ct06.cpp
engines/bladerunner/script/scene/dr04.cpp
engines/bladerunner/script/scene/kp03.cpp
engines/bladerunner/script/scene/kp07.cpp
engines/bladerunner/script/scene/ma02.cpp
engines/bladerunner/script/scene/ps09.cpp
engines/bladerunner/script/scene/tb06.cpp
diff --git a/engines/bladerunner/script/ai/bullet_bob.cpp b/engines/bladerunner/script/ai/bullet_bob.cpp
index 50c5e4520a9..724e7c1edf8 100644
--- a/engines/bladerunner/script/ai/bullet_bob.cpp
+++ b/engines/bladerunner/script/ai/bullet_bob.cpp
@@ -194,7 +194,7 @@ bool AIScriptBulletBob::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Force_Stop_Walking(kActorMcCoy);
Ambient_Sounds_Play_Speech_Sound(kActorMcCoy, 9900, 100, 0, 0, 0);
Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
- Actor_Retired_Here(kActorMcCoy, 6, 6, 1, -1);
+ Actor_Retired_Here(kActorMcCoy, 6, 6, true, -1);
Scene_Exits_Enable();
return true;
}
diff --git a/engines/bladerunner/script/ai/maggie.cpp b/engines/bladerunner/script/ai/maggie.cpp
index 41c28be4a90..a3d24933146 100644
--- a/engines/bladerunner/script/ai/maggie.cpp
+++ b/engines/bladerunner/script/ai/maggie.cpp
@@ -623,7 +623,7 @@ bool AIScriptMaggie::GoalChanged(int currentGoalNumber, int newGoalNumber) {
if (Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorMaggie) < 144) {
Player_Loses_Control();
Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
- Actor_Retired_Here(kActorMcCoy, 6, 6, 1, -1);
+ Actor_Retired_Here(kActorMcCoy, 6, 6, true, -1);
} else {
Delay(3000);
Scene_Exits_Disable();
diff --git a/engines/bladerunner/script/ai/moraji.cpp b/engines/bladerunner/script/ai/moraji.cpp
index 0ee4977dc65..1c36c4f1d56 100644
--- a/engines/bladerunner/script/ai/moraji.cpp
+++ b/engines/bladerunner/script/ai/moraji.cpp
@@ -186,7 +186,7 @@ bool AIScriptMoraji::GoalChanged(int currentGoalNumber, int newGoalNumber) {
return true;
case kGoalMorajiLayDown:
- Actor_Retired_Here(kActorMoraji, 60, 16, 0, -1);
+ Actor_Retired_Here(kActorMoraji, 60, 16, false, -1);
Actor_Set_Targetable(kActorMoraji, true);
return true;
@@ -204,7 +204,7 @@ bool AIScriptMoraji::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case kGoalMorajiDead:
Actor_Set_Targetable(kActorMoraji, false);
_animationState = 14;
- Actor_Retired_Here(kActorMoraji, 60, 16, 1, -1);
+ Actor_Retired_Here(kActorMoraji, 60, 16, true, -1);
return true;
break;
diff --git a/engines/bladerunner/script/ai/transient.cpp b/engines/bladerunner/script/ai/transient.cpp
index 7e71986826e..8f143d9f979 100644
--- a/engines/bladerunner/script/ai/transient.cpp
+++ b/engines/bladerunner/script/ai/transient.cpp
@@ -357,7 +357,7 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
_animationState = 15;
_animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationTransientShotDeadCollapseInPlace) - 1;
Actor_Set_Targetable(kActorTransient, false);
- Actor_Retired_Here(kActorTransient, 120, 24, 1, -1);
+ Actor_Retired_Here(kActorTransient, 120, 24, true, -1);
}
break;
diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp
index e64be4bed37..2ad36b14661 100644
--- a/engines/bladerunner/script/scene/ar01.cpp
+++ b/engines/bladerunner/script/scene/ar01.cpp
@@ -309,7 +309,7 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) {
Actor_Says(kActorMcCoy, 1800, 21);
Actor_Change_Animation_Mode(kActorMcCoy, 48);
Player_Gains_Control();
- Actor_Retired_Here(kActorMcCoy, 12, 48, 1, kActorIzo);
+ Actor_Retired_Here(kActorMcCoy, 12, 48, true, kActorIzo);
} else if (!v1) {
if ( Game_Flag_Query(kFlagDNARowAvailable)
&& !Game_Flag_Query(kFlagDNARowAvailableTalk)
diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp
index 379cf521471..f65a6381898 100644
--- a/engines/bladerunner/script/scene/ct06.cpp
+++ b/engines/bladerunner/script/scene/ct06.cpp
@@ -37,7 +37,7 @@ void SceneScriptCT06::InitializeScene() {
if (Game_Flag_Query(kFlagZubenRetired) && Actor_Query_In_Set(kActorZuben, kSetCT07)) {
Actor_Put_In_Set(kActorZuben, kSetCT06);
Actor_Set_At_XYZ(kActorZuben, 58.41f, -58.23f, -24.97f, 240);
- Actor_Retired_Here(kActorZuben, 72, 36, 1, kActorMcCoy);
+ Actor_Retired_Here(kActorZuben, 72, 36, true, kActorMcCoy);
}
Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 20, 1, 1);
diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp
index 1953ab1d8f7..761ece9ba33 100644
--- a/engines/bladerunner/script/scene/dr04.cpp
+++ b/engines/bladerunner/script/scene/dr04.cpp
@@ -283,7 +283,7 @@ void SceneScriptDR04::PlayerWalkedIn() {
if (Game_Flag_Query(kFlagDR05ViewExplosion)) {
Player_Loses_Control();
Delay(4000);
- Actor_Retired_Here(kActorMcCoy, 6, 6, 1, -1);
+ Actor_Retired_Here(kActorMcCoy, 6, 6, true, -1);
} else {
if ( Game_Flag_Query(kFlagDR05BombActivated)
&& !Game_Flag_Query(kFlagDR05BombExploded)
diff --git a/engines/bladerunner/script/scene/kp03.cpp b/engines/bladerunner/script/scene/kp03.cpp
index 45b09089e76..23bc35f828a 100644
--- a/engines/bladerunner/script/scene/kp03.cpp
+++ b/engines/bladerunner/script/scene/kp03.cpp
@@ -94,7 +94,7 @@ bool SceneScriptKP03::ClickedOn3DObject(const char *objectName, bool combatMode)
Scene_Loop_Set_Default(kKP03MainLoopBombExploded);
Scene_Loop_Start_Special(kSceneLoopModeOnce, kKP03MainLoopBombExploding, true);
Actor_Change_Animation_Mode(kActorMcCoy, 39);
- Actor_Retired_Here(kActorMcCoy, 72, 18, 1, -1);
+ Actor_Retired_Here(kActorMcCoy, 72, 18, true, -1);
Game_Flag_Set(kFlagKP03BombExploded);
Game_Flag_Reset(kFlagKP03BombActive);
return false;
diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp
index c2a7b271f73..9e402c3053a 100644
--- a/engines/bladerunner/script/scene/kp07.cpp
+++ b/engines/bladerunner/script/scene/kp07.cpp
@@ -242,7 +242,7 @@ void SceneScriptKP07::PlayerWalkedIn() {
} else {
Actor_Face_Actor(kActorMcCoy, kActorClovis, true);
Actor_Says(kActorClovis, 160, 3);
- Actor_Retired_Here(kActorClovis, 72, 60, 0, -1);
+ Actor_Retired_Here(kActorClovis, 72, 60, false, -1);
}
Game_Flag_Set(kFlagKP07Entered);
}
diff --git a/engines/bladerunner/script/scene/ma02.cpp b/engines/bladerunner/script/scene/ma02.cpp
index 4c9fb968dec..2d0e5a1b3dc 100644
--- a/engines/bladerunner/script/scene/ma02.cpp
+++ b/engines/bladerunner/script/scene/ma02.cpp
@@ -48,7 +48,7 @@ void SceneScriptMA02::InitializeScene() {
Actor_Change_Animation_Mode(kActorMaggie, 88);
Actor_Put_In_Set(kActorMaggie, kSetMA02_MA04);
Actor_Set_At_XYZ(kActorMaggie, -35.51f, -144.12f, 428.0f, 0);
- Actor_Retired_Here(kActorMaggie, 24, 24, 1, -1);
+ Actor_Retired_Here(kActorMaggie, 24, 24, true, -1);
}
Ambient_Sounds_Add_Looping_Sound(kSfxAPRTAMB5, 12, 0, 1);
diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp
index 5cbf2a76c36..315f7d2b1b7 100644
--- a/engines/bladerunner/script/scene/ps09.cpp
+++ b/engines/bladerunner/script/scene/ps09.cpp
@@ -277,7 +277,7 @@ void SceneScriptPS09::PlayerWalkedIn() {
if (Game_Flag_Query(kFlagMcCoyArrested)) {
Player_Loses_Control();
Delay(2000);
- Actor_Retired_Here(kActorMcCoy, 6, 6, 1, -1);
+ Actor_Retired_Here(kActorMcCoy, 6, 6, true, -1);
//return true;
return;
}
diff --git a/engines/bladerunner/script/scene/tb06.cpp b/engines/bladerunner/script/scene/tb06.cpp
index 9ca69db8247..e1a99334208 100644
--- a/engines/bladerunner/script/scene/tb06.cpp
+++ b/engines/bladerunner/script/scene/tb06.cpp
@@ -32,7 +32,7 @@ void SceneScriptTB06::InitializeScene() {
if (!Game_Flag_Query(kFlagNotUsed103)) {
Actor_Put_In_Set(kActorMarcus, kSetTB06);
Actor_Set_At_XYZ(kActorMarcus, 135.0f, 151.0f, -671.0f, 800);
- Actor_Retired_Here(kActorMarcus, 60, 32, 1, -1);
+ Actor_Retired_Here(kActorMarcus, 60, 32, true, -1);
//return true;
return;
}
Commit: 6625df5ac46a343dfb27b346553de707ab5e09b5
https://github.com/scummvm/scummvm/commit/6625df5ac46a343dfb27b346553de707ab5e09b5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:29+03:00
Commit Message:
KYRA: Use true/false keywords for boolean variables
Changed paths:
engines/kyra/engine/timer_hof.cpp
engines/kyra/engine/timer_lok.cpp
engines/kyra/engine/timer_mr.cpp
engines/kyra/graphics/animator_hof.cpp
engines/kyra/sound/sound_towns_lok.cpp
diff --git a/engines/kyra/engine/timer_hof.cpp b/engines/kyra/engine/timer_hof.cpp
index 50a1849f465..a55dcbd7a79 100644
--- a/engines/kyra/engine/timer_hof.cpp
+++ b/engines/kyra/engine/timer_hof.cpp
@@ -27,17 +27,17 @@ namespace Kyra {
#define TimerV2(x) new Common::Functor1Mem<int, void, KyraEngine_HoF>(this, &KyraEngine_HoF::x)
void KyraEngine_HoF::setupTimers() {
- _timer->addTimer(0, nullptr, 5, 1);
- _timer->addTimer(1, TimerV2(timerFadeOutMessage), -1, 1);
- _timer->addTimer(2, TimerV2(timerCauldronAnimation), 1, 1);
- _timer->addTimer(3, TimerV2(timerFunc4), 1, 0);
- _timer->addTimer(4, TimerV2(timerFunc5), 1, 0);
- _timer->addTimer(5, TimerV2(timerBurnZanthia), 1, 0);
+ _timer->addTimer(0, nullptr, 5, true);
+ _timer->addTimer(1, TimerV2(timerFadeOutMessage), -1, true);
+ _timer->addTimer(2, TimerV2(timerCauldronAnimation), 1, true);
+ _timer->addTimer(3, TimerV2(timerFunc4), 1, false);
+ _timer->addTimer(4, TimerV2(timerFunc5), 1, false);
+ _timer->addTimer(5, TimerV2(timerBurnZanthia), 1, false);
}
void KyraEngine_HoF::timerFadeOutMessage(int arg) {
if (!_shownMessage.empty())
- _fadeMessagePalette = 1;
+ _fadeMessagePalette = true;
}
void KyraEngine_HoF::timerCauldronAnimation(int arg) {
diff --git a/engines/kyra/engine/timer_lok.cpp b/engines/kyra/engine/timer_lok.cpp
index b38cd28fbae..51824e1ae90 100644
--- a/engines/kyra/engine/timer_lok.cpp
+++ b/engines/kyra/engine/timer_lok.cpp
@@ -29,41 +29,41 @@ namespace Kyra {
void KyraEngine_LoK::setupTimers() {
for (int i = 0; i <= 4; ++i)
- _timer->addTimer(i, nullptr, -1, 1);
+ _timer->addTimer(i, nullptr, -1, true);
- _timer->addTimer(5, nullptr, 5, 1);
- _timer->addTimer(6, nullptr, 7, 1);
- _timer->addTimer(7, nullptr, 8, 1);
- _timer->addTimer(8, nullptr, 9, 1);
- _timer->addTimer(9, nullptr, 7, 1);
+ _timer->addTimer(5, nullptr, 5, true);
+ _timer->addTimer(6, nullptr, 7, true);
+ _timer->addTimer(7, nullptr, 8, true);
+ _timer->addTimer(8, nullptr, 9, true);
+ _timer->addTimer(9, nullptr, 7, true);
for (int i = 10; i <= 13; ++i)
- _timer->addTimer(i, nullptr, 420, 1);
-
- _timer->addTimer(14, TimerV1(timerAsWillowispTimeout), 600, 1);
- _timer->addTimer(15, TimerV1(timerUpdateHeadAnims), 11, 1);
- _timer->addTimer(16, TimerV1(timerTulipCreator), 7200, 1);
- _timer->addTimer(17, TimerV1(timerRubyCreator), 7200, 1);
- _timer->addTimer(18, TimerV1(timerAsInvisibleTimeout), 600, 1);
- _timer->addTimer(19, TimerV1(timerRedrawAmulet), 600, 1);
-
- _timer->addTimer(20, nullptr, 7200, 1);
- _timer->addTimer(21, TimerV1(timerLavenderRoseCreator), 18000, 1);
- _timer->addTimer(22, nullptr, 7200, 1);
-
- _timer->addTimer(23, nullptr, 10800, 1);
- _timer->addTimer(24, TimerV1(timerAcornCreator), 10800, 1);
- _timer->addTimer(25, nullptr, 10800, 1);
- _timer->addTimer(26, TimerV1(timerBlueberryCreator), 10800, 1);
- _timer->addTimer(27, nullptr, 10800, 1);
-
- _timer->addTimer(28, nullptr, 21600, 1);
- _timer->addTimer(29, nullptr, 7200, 1);
- _timer->addTimer(30, nullptr, 10800, 1);
-
- _timer->addTimer(31, TimerV1(timerFadeText), -1, 1);
- _timer->addTimer(32, TimerV1(timerWillowispFrameTimer), 9, 1);
- _timer->addTimer(33, TimerV1(timerInvisibleFrameTimer), 3, 1);
+ _timer->addTimer(i, nullptr, 420, true);
+
+ _timer->addTimer(14, TimerV1(timerAsWillowispTimeout), 600, true);
+ _timer->addTimer(15, TimerV1(timerUpdateHeadAnims), 11, true);
+ _timer->addTimer(16, TimerV1(timerTulipCreator), 7200, true);
+ _timer->addTimer(17, TimerV1(timerRubyCreator), 7200, true);
+ _timer->addTimer(18, TimerV1(timerAsInvisibleTimeout), 600, true);
+ _timer->addTimer(19, TimerV1(timerRedrawAmulet), 600, true);
+
+ _timer->addTimer(20, nullptr, 7200, true);
+ _timer->addTimer(21, TimerV1(timerLavenderRoseCreator), 18000, true);
+ _timer->addTimer(22, nullptr, 7200, true);
+
+ _timer->addTimer(23, nullptr, 10800, true);
+ _timer->addTimer(24, TimerV1(timerAcornCreator), 10800, true);
+ _timer->addTimer(25, nullptr, 10800, true);
+ _timer->addTimer(26, TimerV1(timerBlueberryCreator), 10800, true);
+ _timer->addTimer(27, nullptr, 10800, true);
+
+ _timer->addTimer(28, nullptr, 21600, true);
+ _timer->addTimer(29, nullptr, 7200, true);
+ _timer->addTimer(30, nullptr, 10800, true);
+
+ _timer->addTimer(31, TimerV1(timerFadeText), -1, true);
+ _timer->addTimer(32, TimerV1(timerWillowispFrameTimer), 9, true);
+ _timer->addTimer(33, TimerV1(timerInvisibleFrameTimer), 3, true);
}
void KyraEngine_LoK::timerUpdateHeadAnims(int timerNum) {
diff --git a/engines/kyra/engine/timer_mr.cpp b/engines/kyra/engine/timer_mr.cpp
index 2a12430d7cc..00e8ba256e9 100644
--- a/engines/kyra/engine/timer_mr.cpp
+++ b/engines/kyra/engine/timer_mr.cpp
@@ -29,14 +29,14 @@ namespace Kyra {
#define TimerV3(x) new Common::Functor1Mem<int, void, KyraEngine_MR>(this, &KyraEngine_MR::x)
void KyraEngine_MR::setupTimers() {
- _timer->addTimer(0, TimerV3(timerRestoreCommandLine), -1, 1);
+ _timer->addTimer(0, TimerV3(timerRestoreCommandLine), -1, true);
for (int i = 1; i <= 3; ++i)
- _timer->addTimer(i, TimerV3(timerRunSceneScript7), -1, 0);
- _timer->addTimer(4, TimerV3(timerFleaDeath), -1, 0);
+ _timer->addTimer(i, TimerV3(timerRunSceneScript7), -1, false);
+ _timer->addTimer(4, TimerV3(timerFleaDeath), -1, false);
for (int i = 5; i <= 11; ++i)
- _timer->addTimer(i, TimerV3(timerRunSceneScript7), -1, 0);
+ _timer->addTimer(i, TimerV3(timerRunSceneScript7), -1, false);
for (int i = 12; i <= 13; ++i)
- _timer->addTimer(i, TimerV3(timerRunSceneScript7), 0, 0);
+ _timer->addTimer(i, TimerV3(timerRunSceneScript7), 0, false);
}
void KyraEngine_MR::timerRestoreCommandLine(int arg) {
diff --git a/engines/kyra/graphics/animator_hof.cpp b/engines/kyra/graphics/animator_hof.cpp
index adce4256cfb..6724a22cee3 100644
--- a/engines/kyra/graphics/animator_hof.cpp
+++ b/engines/kyra/graphics/animator_hof.cpp
@@ -33,7 +33,7 @@ void KyraEngine_HoF::restorePage3() {
void KyraEngine_HoF::clearAnimObjects() {
_animObjects[0].index = 0;
_animObjects[0].type = 0;
- _animObjects[0].enabled = 1;
+ _animObjects[0].enabled = true;
_animObjects[0].flags = 0x800;
_animObjects[0].width = 32;
_animObjects[0].height = 49;
diff --git a/engines/kyra/sound/sound_towns_lok.cpp b/engines/kyra/sound/sound_towns_lok.cpp
index ed5c36278f4..3285f4cb200 100644
--- a/engines/kyra/sound/sound_towns_lok.cpp
+++ b/engines/kyra/sound/sound_towns_lok.cpp
@@ -31,7 +31,7 @@
namespace Kyra {
SoundTowns_LoK::SoundTowns_LoK(KyraEngine_v1 *vm, Audio::Mixer *mixer)
- : Sound(vm, mixer), _lastTrack(-1), _musicTrackData(nullptr), _sfxFileData(nullptr), _cdaPlaying(0),
+ : Sound(vm, mixer), _lastTrack(-1), _musicTrackData(nullptr), _sfxFileData(nullptr), _cdaPlaying(false),
_sfxFileIndex((uint)-1), _musicFadeTable(nullptr), _sfxWDTable(nullptr), _sfxBTTable(nullptr), _sfxChannel(0x46), _currentResourceSet(0) {
memset(&_resInfo, 0, sizeof(_resInfo));
_player = new EuphonyPlayer(_mixer);
Commit: 3bd3a29353786ac6f90543fc5bef2a3d57d6415f
https://github.com/scummvm/scummvm/commit/3bd3a29353786ac6f90543fc5bef2a3d57d6415f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:29+03:00
Commit Message:
MM: MM1: Use true/false keywords for boolean variables
Changed paths:
engines/mm/mm1/views/spells/fly.cpp
engines/mm/mm1/views/spells/teleport.cpp
engines/mm/mm1/views_enh/spells/fly.cpp
engines/mm/mm1/views_enh/spells/teleport.cpp
diff --git a/engines/mm/mm1/views/spells/fly.cpp b/engines/mm/mm1/views/spells/fly.cpp
index 549159a38db..f5b95a8931b 100644
--- a/engines/mm/mm1/views/spells/fly.cpp
+++ b/engines/mm/mm1/views/spells/fly.cpp
@@ -36,7 +36,7 @@ bool Fly::msgFocus(const FocusMessage &msg) {
_mode = SELECT_X;
_xIndex = _yIndex = 0;
- return 0;
+ return false;
}
void Fly::draw() {
diff --git a/engines/mm/mm1/views/spells/teleport.cpp b/engines/mm/mm1/views/spells/teleport.cpp
index 161386b3f1f..f7de86a28ec 100644
--- a/engines/mm/mm1/views/spells/teleport.cpp
+++ b/engines/mm/mm1/views/spells/teleport.cpp
@@ -35,7 +35,7 @@ bool Teleport::msgFocus(const FocusMessage &msg) {
SpellView::msgFocus(msg);
_mode = SELECT_DIRECTION;
- return 0;
+ return false;
}
void Teleport::draw() {
diff --git a/engines/mm/mm1/views_enh/spells/fly.cpp b/engines/mm/mm1/views_enh/spells/fly.cpp
index d10ce4e67ba..09991bab959 100644
--- a/engines/mm/mm1/views_enh/spells/fly.cpp
+++ b/engines/mm/mm1/views_enh/spells/fly.cpp
@@ -42,7 +42,7 @@ bool Fly::msgFocus(const FocusMessage &msg) {
_mode = SELECT_X;
_xIndex = _yIndex = 0;
- return 0;
+ return false;
}
void Fly::draw() {
diff --git a/engines/mm/mm1/views_enh/spells/teleport.cpp b/engines/mm/mm1/views_enh/spells/teleport.cpp
index 3bbb8f88fa6..28423249d9f 100644
--- a/engines/mm/mm1/views_enh/spells/teleport.cpp
+++ b/engines/mm/mm1/views_enh/spells/teleport.cpp
@@ -38,7 +38,7 @@ bool Teleport::msgFocus(const FocusMessage &msg) {
ScrollView::msgFocus(msg);
_mode = SELECT_DIRECTION;
- return 0;
+ return false;
}
void Teleport::draw() {
Commit: f4244cc7006b54d723f09c879a541117b7ca48ca
https://github.com/scummvm/scummvm/commit/f4244cc7006b54d723f09c879a541117b7ca48ca
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:29+03:00
Commit Message:
NGI: Use true/false keywords for boolean variables
Changed paths:
engines/ngi/behavior.cpp
engines/ngi/fullpipe/scene20.cpp
engines/ngi/fullpipe/sceneDbg.cpp
engines/ngi/fullpipe/sceneFinal.cpp
diff --git a/engines/ngi/behavior.cpp b/engines/ngi/behavior.cpp
index 313c7845d73..9a030d360f1 100644
--- a/engines/ngi/behavior.cpp
+++ b/engines/ngi/behavior.cpp
@@ -30,7 +30,7 @@ namespace NGI {
BehaviorManager::BehaviorManager() {
_scene = nullptr;
- _isActive = 1;
+ _isActive = true;
}
BehaviorManager::~BehaviorManager() {
diff --git a/engines/ngi/fullpipe/scene20.cpp b/engines/ngi/fullpipe/scene20.cpp
index ff082db64df..46eacd10dd8 100644
--- a/engines/ngi/fullpipe/scene20.cpp
+++ b/engines/ngi/fullpipe/scene20.cpp
@@ -43,9 +43,9 @@ void scene20_setExits(Scene *sc) {
thingpar = 1;
else if (g_nmi->getObjectState(sO_Grandma) == g_nmi->getObjectEnumState(sO_Grandma, sO_NearPipe)
|| g_nmi->getObjectState(sO_Grandma) == g_nmi->getObjectEnumState(sO_Grandma, sO_NearPipeWithStool)) {
- getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing, 1);
- getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing2, 1);
- getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing3, 0);
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing, true);
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing2, true);
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing3, false);
return;
} else {
@@ -53,8 +53,8 @@ void scene20_setExits(Scene *sc) {
}
getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing, thingpar);
- getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing2, 0);
- getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing3, 1);
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing2, false);
+ getSc2MctlCompoundBySceneId(sc->_sceneId)->enableLinks(sO_CloseThing3, true);
}
void scene20_initScene(Scene *sc) {
diff --git a/engines/ngi/fullpipe/sceneDbg.cpp b/engines/ngi/fullpipe/sceneDbg.cpp
index 7bb11bfd447..3c88742ba2d 100644
--- a/engines/ngi/fullpipe/sceneDbg.cpp
+++ b/engines/ngi/fullpipe/sceneDbg.cpp
@@ -36,7 +36,7 @@ namespace NGI {
void sceneDbgMenu_initScene(Scene *sc) {
g_vars->selector = sc->getPictureObjectById(PIC_SCD_SEL, 0);
getGameLoaderInteractionController()->disableFlag24();
- setInputDisabled(0);
+ setInputDisabled(false);
}
GameObject *sceneHandlerDbgMenu_getObjectAtXY(int x, int y) {
diff --git a/engines/ngi/fullpipe/sceneFinal.cpp b/engines/ngi/fullpipe/sceneFinal.cpp
index 7b55775f824..85901b8db49 100644
--- a/engines/ngi/fullpipe/sceneFinal.cpp
+++ b/engines/ngi/fullpipe/sceneFinal.cpp
@@ -46,11 +46,11 @@ void sceneFinal_initScene() {
g_nmi->_gameLoader->loadScene(SC_FINAL4);
g_nmi->accessScene(SC_FINAL4)->setPictureObjectsFlag4();
- getGameLoaderInventory()->setIsLocked(0);
+ getGameLoaderInventory()->setIsLocked(false);
getGameLoaderInventory()->slideIn();
- g_nmi->_updateFlag = 0;
- g_nmi->_flgCanOpenMap = 0;
+ g_nmi->_updateFlag = false;
+ g_nmi->_flgCanOpenMap = false;
g_vars->sceneFinal_var01 = 0;
g_vars->sceneFinal_var02 = 0;
Commit: 5883b013073e45d9752ae456780b4f742d480239
https://github.com/scummvm/scummvm/commit/5883b013073e45d9752ae456780b4f742d480239
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:30+03:00
Commit Message:
PINK: Use true/false keywords for boolean variables
Changed paths:
engines/pink/objects/actors/inventory_actor.h
engines/pink/objects/pages/page.cpp
engines/pink/objects/sequences/sequence.cpp
engines/pink/pda_mgr.h
diff --git a/engines/pink/objects/actors/inventory_actor.h b/engines/pink/objects/actors/inventory_actor.h
index b32d4477255..d3b2d91f7ae 100644
--- a/engines/pink/objects/actors/inventory_actor.h
+++ b/engines/pink/objects/actors/inventory_actor.h
@@ -41,7 +41,7 @@ public:
void pause(bool paused) override {}
void init(bool paused) override {
- Actor::init(0);
+ Actor::init(false);
}
};
diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp
index 134b8b84ca8..1adacc4b21b 100644
--- a/engines/pink/objects/pages/page.cpp
+++ b/engines/pink/objects/pages/page.cpp
@@ -56,7 +56,7 @@ void Page::toConsole() const {
void Page::init() {
initPalette();
for (uint i = 0; i < _actors.size(); ++i) {
- _actors[i]->init(0);
+ _actors[i]->init(false);
}
}
diff --git a/engines/pink/objects/sequences/sequence.cpp b/engines/pink/objects/sequences/sequence.cpp
index fb0202511e9..80779779efa 100644
--- a/engines/pink/objects/sequences/sequence.cpp
+++ b/engines/pink/objects/sequences/sequence.cpp
@@ -33,7 +33,7 @@
namespace Pink {
Sequence::Sequence()
- : _canBeSkipped(0), _context(nullptr),
+ : _canBeSkipped(false), _context(nullptr),
_sequencer(nullptr) {}
Sequence::~Sequence() {
diff --git a/engines/pink/pda_mgr.h b/engines/pink/pda_mgr.h
index 7a47b64234e..a7b31e3aad1 100644
--- a/engines/pink/pda_mgr.h
+++ b/engines/pink/pda_mgr.h
@@ -64,7 +64,7 @@ private:
void initPerilButtons();
- void updateWheels(bool playSfx = 0);
+ void updateWheels(bool playSfx = false);
void updateLocator();
void calculateIndexes();
Commit: 2f46b58ef5da9bd3a6f0a8d0fa0c55f254968ac9
https://github.com/scummvm/scummvm/commit/2f46b58ef5da9bd3a6f0a8d0fa0c55f254968ac9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:30+03:00
Commit Message:
TITANIC: Use true/false keywords for boolean variables
Changed paths:
engines/titanic/carry/head_piece.cpp
engines/titanic/game/hammer_dispensor_button.cpp
engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
engines/titanic/game/pet/pet_sentinal.cpp
engines/titanic/game/reserved_table.cpp
engines/titanic/game/seasonal_adjustment.h
engines/titanic/game/sgt/sgt_state_room.cpp
engines/titanic/game/up_lighter.cpp
engines/titanic/npcs/callbot.cpp
engines/titanic/npcs/summon_bots.cpp
engines/titanic/star_control/star_view.cpp
diff --git a/engines/titanic/carry/head_piece.cpp b/engines/titanic/carry/head_piece.cpp
index 470260fe3ec..bb44bc3ca42 100644
--- a/engines/titanic/carry/head_piece.cpp
+++ b/engines/titanic/carry/head_piece.cpp
@@ -30,7 +30,7 @@ BEGIN_MESSAGE_MAP(CHeadPiece, CCarry)
END_MESSAGE_MAP()
CHeadPiece::CHeadPiece() : CCarry(), _string6("Not Working"),
- _flag(0), _field13C(false) {
+ _flag(false), _field13C(false) {
}
void CHeadPiece::save(SimpleFile *file, int indent) {
diff --git a/engines/titanic/game/hammer_dispensor_button.cpp b/engines/titanic/game/hammer_dispensor_button.cpp
index 9e4b19eed01..7740ac08f0d 100644
--- a/engines/titanic/game/hammer_dispensor_button.cpp
+++ b/engines/titanic/game/hammer_dispensor_button.cpp
@@ -35,7 +35,7 @@ END_MESSAGE_MAP()
CHammerDispensorButton::CHammerDispensorButton() : CStartAction(),
_active(false), _open(false), _hitCounter(0), _btnPos(Point(56, 6)),
- _perch(nullptr), _hammerTaken(0) {
+ _perch(nullptr), _hammerTaken(false) {
}
void CHammerDispensorButton::save(SimpleFile *file, int indent) {
diff --git a/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp b/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
index 2ac3e21bb20..20bbfb0df56 100644
--- a/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
@@ -36,7 +36,7 @@ BEGIN_MESSAGE_MAP(CParrotNutBowlActor, CGameObject)
END_MESSAGE_MAP()
CParrotNutBowlActor::CParrotNutBowlActor() : CGameObject(),
- _puzzleDone(0), _state(0) {
+ _puzzleDone(false), _state(0) {
}
void CParrotNutBowlActor::save(SimpleFile *file, int indent) {
diff --git a/engines/titanic/game/pet/pet_sentinal.cpp b/engines/titanic/game/pet/pet_sentinal.cpp
index 82013215961..4eaffe2f751 100644
--- a/engines/titanic/game/pet/pet_sentinal.cpp
+++ b/engines/titanic/game/pet/pet_sentinal.cpp
@@ -29,7 +29,7 @@ BEGIN_MESSAGE_MAP(CPETSentinal, CGameObject)
END_MESSAGE_MAP()
CPETSentinal::CPETSentinal() : CGameObject(), _elevatorNum(0),
- _wellEntry(0), _resetHighlight(0) {
+ _wellEntry(0), _resetHighlight(false) {
}
void CPETSentinal::save(SimpleFile *file, int indent) {
diff --git a/engines/titanic/game/reserved_table.cpp b/engines/titanic/game/reserved_table.cpp
index b1a2928d924..fb1146fba4f 100644
--- a/engines/titanic/game/reserved_table.cpp
+++ b/engines/titanic/game/reserved_table.cpp
@@ -48,7 +48,7 @@ void CReservedTable::load(SimpleFile *file) {
bool CReservedTable::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
if (!_flag) {
- CPlayerTriesRestaurantTableMsg tryMsg(_tableId, 0);
+ CPlayerTriesRestaurantTableMsg tryMsg(_tableId, false);
tryMsg.execute(findRoom(), CReservedTable::_type, MSGFLAG_CLASS_DEF | MSGFLAG_SCAN);
}
diff --git a/engines/titanic/game/seasonal_adjustment.h b/engines/titanic/game/seasonal_adjustment.h
index ba2d0b6d88f..bc5f333b94a 100644
--- a/engines/titanic/game/seasonal_adjustment.h
+++ b/engines/titanic/game/seasonal_adjustment.h
@@ -40,7 +40,7 @@ private:
bool _enabled;
public:
CLASSDEF;
- CSeasonalAdjustment() : CBackground(), _switching(false), _enabled(0) {}
+ CSeasonalAdjustment() : CBackground(), _switching(false), _enabled(false) {}
/**
* Save the data for the class to file
diff --git a/engines/titanic/game/sgt/sgt_state_room.cpp b/engines/titanic/game/sgt/sgt_state_room.cpp
index 67bccabcb37..507c611e050 100644
--- a/engines/titanic/game/sgt/sgt_state_room.cpp
+++ b/engines/titanic/game/sgt/sgt_state_room.cpp
@@ -43,7 +43,7 @@ void CSGTStateRoom::deinit() {
delete _statics;
}
-CSGTStateRoom::CSGTStateRoom() : CBackground(), _isClosed(1),
+CSGTStateRoom::CSGTStateRoom() : CBackground(), _isClosed(true),
_displayFlag(true), _savedFrame(0), _savedIsClosed(true), _savedVisible(true) {
}
diff --git a/engines/titanic/game/up_lighter.cpp b/engines/titanic/game/up_lighter.cpp
index ec5ca933903..47a73229bd3 100644
--- a/engines/titanic/game/up_lighter.cpp
+++ b/engines/titanic/game/up_lighter.cpp
@@ -37,7 +37,7 @@ BEGIN_MESSAGE_MAP(CUpLighter, CDropTarget)
END_MESSAGE_MAP()
CUpLighter::CUpLighter() : CDropTarget(), _hosePumping(false),
- _inRoom(0), _isSpring(false), _noseDispensed(false) {
+ _inRoom(false), _isSpring(false), _noseDispensed(false) {
}
void CUpLighter::save(SimpleFile *file, int indent) {
diff --git a/engines/titanic/npcs/callbot.cpp b/engines/titanic/npcs/callbot.cpp
index 24da9f14b7a..b5872b9e2e4 100644
--- a/engines/titanic/npcs/callbot.cpp
+++ b/engines/titanic/npcs/callbot.cpp
@@ -31,7 +31,7 @@ BEGIN_MESSAGE_MAP(CCallBot, CGameObject)
ON_MESSAGE(EnterViewMsg)
END_MESSAGE_MAP()
-CCallBot::CCallBot() : CGameObject(), _enabled(0) {
+CCallBot::CCallBot() : CGameObject(), _enabled(false) {
}
void CCallBot::save(SimpleFile *file, int indent) {
diff --git a/engines/titanic/npcs/summon_bots.cpp b/engines/titanic/npcs/summon_bots.cpp
index 9845ae7b013..eeb6af2f14c 100644
--- a/engines/titanic/npcs/summon_bots.cpp
+++ b/engines/titanic/npcs/summon_bots.cpp
@@ -29,7 +29,7 @@ BEGIN_MESSAGE_MAP(CSummonBots, CRobotController)
END_MESSAGE_MAP()
CSummonBots::CSummonBots() : CRobotController(), _validSummonLocations("NULL"),
- _canSummonBellbot(0), _canSummonDoorbot(0) {
+ _canSummonBellbot(false), _canSummonDoorbot(false) {
}
void CSummonBots::save(SimpleFile *file, int indent) {
diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index 38b32d15a93..022a13c42b6 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -35,7 +35,7 @@
namespace Titanic {
CStarView::CStarView() : _camera((const CNavigationInfo *)nullptr), _owner(nullptr),
- _starField(nullptr), _videoSurface(nullptr), _lensValid(0),
+ _starField(nullptr), _videoSurface(nullptr), _lensValid(false),
_photoSurface(nullptr), _homePhotoMask(nullptr),
_stereoPair(false), _showingPhoto(false) {
CNavigationInfo data = { 0, 0, 100000.0, 0, 20.0, 1.0, 1.0, 1.0 };
Commit: 6e7f0157fcb5988b4db205335d218fd1009cd1b8
https://github.com/scummvm/scummvm/commit/6e7f0157fcb5988b4db205335d218fd1009cd1b8
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-05-13T09:47:30+03:00
Commit Message:
ULTIMA: NUVIE: Use true/false keywords for boolean variables
Changed paths:
engines/ultima/nuvie/gui/gui_callback.h
engines/ultima/nuvie/gui/gui_drag_manager.cpp
engines/ultima/nuvie/gui/gui_text_toggle_button.cpp
engines/ultima/nuvie/gui/gui_yes_no_dialog.cpp
engines/ultima/nuvie/sound/adplug/u6m.h
diff --git a/engines/ultima/nuvie/gui/gui_callback.h b/engines/ultima/nuvie/gui/gui_callback.h
index 641cd7c55b3..eecb3786ae1 100644
--- a/engines/ultima/nuvie/gui/gui_callback.h
+++ b/engines/ultima/nuvie/gui/gui_callback.h
@@ -39,7 +39,7 @@ public:
return;
}
virtual GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) {
- DEBUG(0, LEVEL_WARNING, "Unhandled callback. msg (%x)\n", msg);
+ DEBUG(false, LEVEL_WARNING, "Unhandled callback. msg (%x)\n", msg);
return GUI_PASS;
}
diff --git a/engines/ultima/nuvie/gui/gui_drag_manager.cpp b/engines/ultima/nuvie/gui/gui_drag_manager.cpp
index b03fd414c0c..de6191902ea 100644
--- a/engines/ultima/nuvie/gui/gui_drag_manager.cpp
+++ b/engines/ultima/nuvie/gui/gui_drag_manager.cpp
@@ -34,7 +34,7 @@ GUI_DragManager::GUI_DragManager(Screen *s): screen(s), message(0),
}
GUI_status GUI_DragManager::start_drag(GUI_DragArea *src, int msg, void *d, unsigned char *icon_buf, uint16 w, uint16 h, uint8 bpp, bool out_of_range) {
- DEBUG(0, LEVEL_DEBUGGING, "Start Drag\n");
+ DEBUG(false, LEVEL_DEBUGGING, "Start Drag\n");
drag_source = src;
message = msg;
diff --git a/engines/ultima/nuvie/gui/gui_text_toggle_button.cpp b/engines/ultima/nuvie/gui/gui_text_toggle_button.cpp
index 04674f9308a..738e9c166a0 100644
--- a/engines/ultima/nuvie/gui/gui_text_toggle_button.cpp
+++ b/engines/ultima/nuvie/gui/gui_text_toggle_button.cpp
@@ -29,7 +29,7 @@ GUI_TextToggleButton::GUI_TextToggleButton(void *data, int x, int y, int w, int
const char *const *texts_, int count_, int selection_,
GUI_Font *font, ButtonTextAlign alignment_,
GUI_CallBack *callback, int flat)
- : GUI_Button(data, x, y, w, h, "", font, alignment_, 0, callback, flat), count(count_),
+ : GUI_Button(data, x, y, w, h, "", font, alignment_, false, callback, flat), count(count_),
selection(selection_), alignment(alignment_) {
assert(count > 0);
assert(selection >= 0 && selection < count);
diff --git a/engines/ultima/nuvie/gui/gui_yes_no_dialog.cpp b/engines/ultima/nuvie/gui/gui_yes_no_dialog.cpp
index 1f11e624037..1d8028cbf21 100644
--- a/engines/ultima/nuvie/gui/gui_yes_no_dialog.cpp
+++ b/engines/ultima/nuvie/gui/gui_yes_no_dialog.cpp
@@ -39,11 +39,11 @@ GUI_YesNoDialog::GUI_YesNoDialog(GUI *gui, int x, int y, int w, int h, const cha
yes_callback_object(yesCallback), no_callback_object(noCallback) {
GUI_Widget *widget;
- yes_button = new GUI_Button(this, 100, 50, 40, 18, "Yes", gui->get_font(), BUTTON_TEXTALIGN_CENTER, 0, this, 0);
+ yes_button = new GUI_Button(this, 100, 50, 40, 18, "Yes", gui->get_font(), BUTTON_TEXTALIGN_CENTER, false, this, false);
AddWidget(yes_button);
button_index[0] = yes_button;
- no_button = new GUI_Button(this, 30, 50, 40, 18, "No", gui->get_font(), BUTTON_TEXTALIGN_CENTER, 0, this, 0);
+ no_button = new GUI_Button(this, 30, 50, 40, 18, "No", gui->get_font(), BUTTON_TEXTALIGN_CENTER, false, this, false);
AddWidget(no_button);
button_index[1] = no_button;
diff --git a/engines/ultima/nuvie/sound/adplug/u6m.h b/engines/ultima/nuvie/sound/adplug/u6m.h
index 9a3be0ff851..e789c08eecb 100644
--- a/engines/ultima/nuvie/sound/adplug/u6m.h
+++ b/engines/ultima/nuvie/sound/adplug/u6m.h
@@ -32,8 +32,8 @@ class Cu6mPlayer: public CPlayer {
public:
static CPlayer *factory(Copl *newopl);
- Cu6mPlayer(Copl *newopl) : CPlayer(newopl), song_data(0), driver_active(0),
- songend(0), song_pos(0), loop_position(0), read_delay(0), played_ticks(0) {
+ Cu6mPlayer(Copl *newopl) : CPlayer(newopl), song_data(0), driver_active(false),
+ songend(false), song_pos(0), loop_position(0), read_delay(0), played_ticks(0) {
ARRAYCLEAR(channel_freq);
}
More information about the Scummvm-git-logs
mailing list