[Scummvm-git-logs] scummvm master -> 23ff1f4023fa9863154681d4d8740a314335d3d5
aquadran
noreply at scummvm.org
Sat Sep 13 14:00:28 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
23ff1f4023 WINTERMUTE: Formatting code
Commit: 23ff1f4023fa9863154681d4d8740a314335d3d5
https://github.com/scummvm/scummvm/commit/23ff1f4023fa9863154681d4d8740a314335d3d5
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-13T16:00:21+02:00
Commit Message:
WINTERMUTE: Formatting code
Changed paths:
engines/wintermute/ad/ad_actor.cpp
engines/wintermute/ad/ad_entity.cpp
engines/wintermute/ad/ad_game.cpp
engines/wintermute/ad/ad_item.cpp
engines/wintermute/ad/ad_node_state.cpp
engines/wintermute/ad/ad_object.cpp
engines/wintermute/ad/ad_response.cpp
engines/wintermute/ad/ad_response.h
engines/wintermute/ad/ad_response_box.cpp
engines/wintermute/ad/ad_rot_level.cpp
engines/wintermute/ad/ad_scene.cpp
engines/wintermute/ad/ad_scene.h
engines/wintermute/ad/ad_sentence.h
engines/wintermute/ad/ad_sprite_set.cpp
engines/wintermute/ad/ad_talk_def.cpp
engines/wintermute/ad/ad_types.h
engines/wintermute/ad/ad_waypoint_group.cpp
engines/wintermute/base/base.cpp
engines/wintermute/base/base_active_rect.h
engines/wintermute/base/base_fader.cpp
engines/wintermute/base/base_frame.h
engines/wintermute/base/base_game.cpp
engines/wintermute/base/base_game.h
engines/wintermute/base/base_object.cpp
engines/wintermute/base/base_object.h
engines/wintermute/base/base_parser.cpp
engines/wintermute/base/base_point.h
engines/wintermute/base/base_sprite.h
engines/wintermute/base/base_surface_storage.cpp
engines/wintermute/base/base_surface_storage.h
engines/wintermute/base/font/base_font.h
engines/wintermute/base/font/base_font_bitmap.cpp
engines/wintermute/base/font/base_font_truetype.cpp
engines/wintermute/base/gfx/3dutils.h
engines/wintermute/base/gfx/base_renderer.cpp
engines/wintermute/base/gfx/base_surface.h
engines/wintermute/base/particles/part_emitter.cpp
engines/wintermute/base/particles/part_emitter.h
engines/wintermute/base/scriptables/script.cpp
engines/wintermute/base/scriptables/script_engine.cpp
engines/wintermute/base/scriptables/script_ext_date.cpp
engines/wintermute/base/scriptables/script_ext_file.cpp
engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
engines/wintermute/base/scriptables/script_ext_mem_buffer.h
engines/wintermute/base/scriptables/script_ext_string.h
engines/wintermute/base/scriptables/script_stack.cpp
engines/wintermute/base/scriptables/script_stack.h
engines/wintermute/base/scriptables/script_value.cpp
engines/wintermute/system/sys_class.cpp
engines/wintermute/system/sys_class_registry.cpp
engines/wintermute/system/sys_class_registry.h
engines/wintermute/ui/ui_button.cpp
engines/wintermute/ui/ui_edit.cpp
engines/wintermute/ui/ui_text.cpp
engines/wintermute/ui/ui_tiled_image.cpp
engines/wintermute/ui/ui_window.cpp
diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index 3fc36ae79bd..0336c939a89 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -848,7 +848,7 @@ bool AdActor::update() {
}
}
- //_game->QuickMessageForm("%s", _currentSprite->_filename);
+ //_game->quickMessageForm("%s", _currentSprite->_filename);
updateBlockRegion();
_ready = (_state == STATE_READY);
@@ -1485,8 +1485,9 @@ int32 AdActor::getHeight() {
//////////////////////////////////////////////////////////////////////////
AdSpriteSet *AdActor::getAnimByName(const char *animName) {
- if (!animName)
+ if (!animName) {
return nullptr;
+ }
for (int32 i = 0; i < _anims.getSize(); i++) {
if (scumm_stricmp(_anims[i]->_name, animName) == 0)
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index fb23abf2793..946fdd99c3a 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -101,7 +101,7 @@ int32 AdEntity::getHintY() const {
bool AdEntity::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "AdEntity::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "AdEntity::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
@@ -494,7 +494,6 @@ bool AdEntity::loadBuffer(char *buffer, bool complete) {
break;
#endif
}
- break;
default:
break;
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index ec931be87d3..aa916107d95 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -568,7 +568,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
if (_responseBox) {
AdResponse *res = new AdResponse(_game);
if (res) {
- res->_iD = id;
+ res->_id = id;
res->setText(text);
_stringTable->expand(&res->_text);
@@ -640,7 +640,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
if (_responseBox->_responses.getSize() == 1 && autoSelectLast) {
- stack->pushInt(_responseBox->_responses[0]->_iD);
+ stack->pushInt(_responseBox->_responses[0]->_id);
_responseBox->handleResponse(_responseBox->_responses[0]);
_responseBox->clearResponses();
return STATUS_OK;
@@ -1325,7 +1325,7 @@ bool AdGame::showCursor() {
bool AdGame::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "AdGame::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "AdGame::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
@@ -1435,12 +1435,13 @@ bool AdGame::loadBuffer(char *buffer, bool complete) {
break;
case TOKEN_VIDEO_SKIP_BUTTON:
- if (scumm_stricmp(params2, "right") == 0)
+ if (scumm_stricmp(params2, "right") == 0) {
_videoSkipButton = VIDEO_SKIP_RIGHT;
- else if (scumm_stricmp(params2, "both") == 0)
+ } else if (scumm_stricmp(params2, "both") == 0) {
_videoSkipButton = VIDEO_SKIP_BOTH;
- else
+ } else {
_videoSkipButton = VIDEO_SKIP_LEFT;
+ }
break;
case TOKEN_SCENE_VIEWPORT: {
@@ -1991,10 +1992,12 @@ bool AdGame::displayContent(bool doUpdate, bool displayAll) {
// display in-game windows
displayWindows(true);
- if (_inventoryBox)
+ if (_inventoryBox) {
_inventoryBox->display();
- if (_stateEx == GAME_WAITING_RESPONSE)
+ }
+ if (_stateEx == GAME_WAITING_RESPONSE) {
_responseBox->display();
+ }
#ifdef ENABLE_FOXTAIL
if (BaseEngine::instance().isFoxTail())
displayIndicatorFoxTail();
@@ -2323,8 +2326,9 @@ bool AdGame::onMouseLeftDown() {
//////////////////////////////////////////////////////////////////////////
bool AdGame::onMouseLeftUp() {
- if (isVideoPlaying())
+ if (isVideoPlaying()) {
return STATUS_OK;
+ }
if (_activeObject) {
_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT);
@@ -2417,8 +2421,9 @@ bool AdGame::onMouseRightDown() {
//////////////////////////////////////////////////////////////////////////
bool AdGame::onMouseRightUp() {
- if (isVideoPlaying())
+ if (isVideoPlaying()) {
return STATUS_OK;
+ }
if (_activeObject) {
_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT);
diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index ffa75006832..f9b040da64f 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -779,10 +779,11 @@ bool AdItem::scSetProperty(const char *name, ScValue *value) {
// AmountString
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "AmountString") == 0) {
- if (value->isNULL())
+ if (value->isNULL()) {
SAFE_DELETE_ARRAY(_amountString);
- else
+ } else {
BaseUtils::setString(&_amountString, value->getString());
+ }
return STATUS_OK;
}
diff --git a/engines/wintermute/ad/ad_node_state.cpp b/engines/wintermute/ad/ad_node_state.cpp
index ec4a9c297f2..1bbbdab0116 100644
--- a/engines/wintermute/ad/ad_node_state.cpp
+++ b/engines/wintermute/ad/ad_node_state.cpp
@@ -104,10 +104,12 @@ bool AdNodeState::persist(BasePersistenceManager *persistMgr) {
//////////////////////////////////////////////////////////////////////////
void AdNodeState::setCaption(const char *caption, int caseVal) {
- if (caseVal == 0)
+ if (caseVal == 0) {
caseVal = 1;
- if (caseVal < 1 || caseVal > 7)
+ }
+ if (caseVal < 1 || caseVal > 7) {
return;
+ }
SAFE_DELETE_ARRAY(_caption[caseVal - 1]);
size_t captionSize = strlen(caption) + 1;
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index 9b06e783d74..e038e64b879 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -988,8 +988,9 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
_state = STATE_TALKING;
- if (deleteSound)
+ if (deleteSound) {
delete[] sound;
+ }
//if (!m_Sentence->m_Sound)
// Game->m_AccessMgr->Speak(m_Sentence->m_Text, TTS_TALK);
diff --git a/engines/wintermute/ad/ad_response.cpp b/engines/wintermute/ad/ad_response.cpp
index 731616e46fe..505bc83aab5 100644
--- a/engines/wintermute/ad/ad_response.cpp
+++ b/engines/wintermute/ad/ad_response.cpp
@@ -42,7 +42,7 @@ AdResponse::AdResponse(BaseGame *inGame) : BaseObject(inGame) {
_textOrig = nullptr;
_icon = _iconHover = _iconPressed = nullptr;
_font = nullptr;
- _iD = 0;
+ _id = 0;
_responseType = RESPONSE_ALWAYS;
}
@@ -126,7 +126,7 @@ bool AdResponse::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferPtr(TMEMBER_PTR(_icon));
persistMgr->transferPtr(TMEMBER_PTR(_iconHover));
persistMgr->transferPtr(TMEMBER_PTR(_iconPressed));
- persistMgr->transferSint32(TMEMBER(_iD));
+ persistMgr->transferSint32(TMEMBER(_id));
persistMgr->transferCharPtr(TMEMBER(_text));
persistMgr->transferCharPtr(TMEMBER(_textOrig));
persistMgr->transferSint32(TMEMBER_INT(_responseType));
diff --git a/engines/wintermute/ad/ad_response.h b/engines/wintermute/ad/ad_response.h
index d4c182371c1..9df4c0913e4 100644
--- a/engines/wintermute/ad/ad_response.h
+++ b/engines/wintermute/ad/ad_response.h
@@ -42,7 +42,7 @@ public:
bool setIconHover(const char *filename);
bool setIconPressed(const char *filename);
void setText(const char *text);
- int32 _iD;
+ int32 _id;
BaseSprite *_icon;
BaseSprite *_iconHover;
BaseSprite *_iconPressed;
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index e0e7afaeb67..bdad0e44c2c 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -184,7 +184,7 @@ bool AdResponseBox::createButtons() {
btn->setName("response");
btn->correctSize();
- //btn->SetListener(this, btn, _responses[i]->_iD);
+ //btn->setListener(this, btn, _responses[i]->_id);
btn->setListener(this, btn, i);
btn->_visible = false;
_respButtons.add(btn);
@@ -205,7 +205,7 @@ bool AdResponseBox::createButtons() {
bool AdResponseBox::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "AdResponseBox::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "AdResponseBox::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
@@ -560,7 +560,7 @@ bool AdResponseBox::listen(BaseScriptHolder *param1, uint32 param2) {
_scrollOffset++;
} else if (scumm_stricmp(obj->_name, "response") == 0) {
if (_waitingScript) {
- _waitingScript->_stack->pushInt(_responses[param2]->_iD);
+ _waitingScript->_stack->pushInt(_responses[param2]->_id);
}
handleResponse(_responses[param2]);
_waitingScript = nullptr;
@@ -613,7 +613,7 @@ bool AdResponseBox::weedResponses() {
for (int32 i = 0; i < _responses.getSize(); i++) {
switch (_responses[i]->_responseType) {
case RESPONSE_ONCE:
- if (adGame->branchResponseUsed(_responses[i]->_iD)) {
+ if (adGame->branchResponseUsed(_responses[i]->_id)) {
delete _responses[i];
_responses.removeAt(i);
i--;
@@ -621,7 +621,7 @@ bool AdResponseBox::weedResponses() {
break;
case RESPONSE_ONCE_GAME:
- if (adGame->gameResponseUsed(_responses[i]->_iD)) {
+ if (adGame->gameResponseUsed(_responses[i]->_id)) {
delete _responses[i];
_responses.removeAt(i);
i--;
@@ -650,11 +650,11 @@ bool AdResponseBox::handleResponse(const AdResponse *response) {
switch (response->_responseType) {
case RESPONSE_ONCE:
- adGame->addBranchResponse(response->_iD);
+ adGame->addBranchResponse(response->_id);
break;
case RESPONSE_ONCE_GAME:
- adGame->addGameResponse(response->_iD);
+ adGame->addGameResponse(response->_id);
break;
default:
debugC(kWintermuteDebugGeneral, "AdResponseBox::HandleResponse - Unhandled enum");
diff --git a/engines/wintermute/ad/ad_rot_level.cpp b/engines/wintermute/ad/ad_rot_level.cpp
index 59162e8107e..d4726d96d3c 100644
--- a/engines/wintermute/ad/ad_rot_level.cpp
+++ b/engines/wintermute/ad/ad_rot_level.cpp
@@ -54,7 +54,7 @@ AdRotLevel::~AdRotLevel() {
bool AdRotLevel::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "AdRotLevel::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "AdRotLevel::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 34dc358f412..7462e0678bf 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -556,14 +556,14 @@ void AdScene::pathFinderStep() {
//////////////////////////////////////////////////////////////////////////
bool AdScene::initLoop() {
#ifdef _DEBUGxxxx
- int nu_steps = 0;
+ int numSteps = 0;
uint32 start = _game->_currentTime;
while (!_pfReady && g_system->getMillis() - start <= _pfMaxTime) {
pathFinderStep();
- nu_steps++;
+ numSteps++;
}
- if (nu_steps > 0) {
- _game->LOG(0, "STAT: PathFinder iterations in one loop: %d (%s) _pfMaxTime=%d", nu_steps, _pfReady ? "finished" : "not yet done", _pfMaxTime);
+ if (numSteps > 0) {
+ _game->LOG(0, "STAT: PathFinder iterations in one loop: %d (%s) _pfMaxTime=%d", numSteps, _pfReady ? "finished" : "not yet done", _pfMaxTime);
}
#else
uint32 start = _game->_currentTime;
diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h
index f129750fd56..7dd8d4d0c7e 100644
--- a/engines/wintermute/ad/ad_scene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -200,7 +200,7 @@ public:
private:
bool persistState(bool saving = true);
- void pfAddWaypointGroup(AdWaypointGroup *Wpt, BaseObject *requester = nullptr);
+ void pfAddWaypointGroup(AdWaypointGroup *wpt, BaseObject *requester = nullptr);
bool _pfReady;
BasePoint *_pfTarget;
AdPath *_pfTargetPath;
diff --git a/engines/wintermute/ad/ad_sentence.h b/engines/wintermute/ad/ad_sentence.h
index 94a498a9a43..5c7286b2575 100644
--- a/engines/wintermute/ad/ad_sentence.h
+++ b/engines/wintermute/ad/ad_sentence.h
@@ -49,7 +49,7 @@ public:
bool setupTalkFile(const char *soundFilename);
DECLARE_PERSISTENT(AdSentence, BaseClass)
bool finish();
- void setSound(BaseSound *Sound);
+ void setSound(BaseSound *sound);
bool _soundStarted;
BaseSound *_sound;
TTextAlign _align;
diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
index c97d653361f..78c6381bd18 100644
--- a/engines/wintermute/ad/ad_sprite_set.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -61,7 +61,7 @@ AdSpriteSet::~AdSpriteSet() {
bool AdSpriteSet::loadFile(const char *filename, int lifeTime, TSpriteCacheType cacheType) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "AdSpriteSet::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "AdSpriteSet::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
@@ -135,7 +135,7 @@ bool AdSpriteSet::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteC
case TOKEN_LEFT:
SAFE_DELETE(_sprites[DI_LEFT]);
- spr = new BaseSprite(_game, _owner);
+ spr = new BaseSprite(_game, _owner);
if (!spr || DID_FAIL(spr->loadFile(params, lifeTime, cacheType))) {
cmd = PARSERR_GENERIC;
} else {
@@ -145,7 +145,7 @@ bool AdSpriteSet::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteC
case TOKEN_RIGHT:
SAFE_DELETE(_sprites[DI_RIGHT]);
- spr = new BaseSprite(_game, _owner);
+ spr = new BaseSprite(_game, _owner);
if (!spr || DID_FAIL(spr->loadFile(params, lifeTime, cacheType))) {
cmd = PARSERR_GENERIC;
} else {
@@ -155,7 +155,7 @@ bool AdSpriteSet::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteC
case TOKEN_UP:
SAFE_DELETE(_sprites[DI_UP]);
- spr = new BaseSprite(_game, _owner);
+ spr = new BaseSprite(_game, _owner);
if (!spr || DID_FAIL(spr->loadFile(params, lifeTime, cacheType))) {
cmd = PARSERR_GENERIC;
} else {
@@ -165,7 +165,7 @@ bool AdSpriteSet::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteC
case TOKEN_DOWN:
SAFE_DELETE(_sprites[DI_DOWN]);
- spr = new BaseSprite(_game, _owner);
+ spr = new BaseSprite(_game, _owner);
if (!spr || DID_FAIL(spr->loadFile(params, lifeTime, cacheType))) {
cmd = PARSERR_GENERIC;
} else {
@@ -175,7 +175,7 @@ bool AdSpriteSet::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteC
case TOKEN_UP_LEFT:
SAFE_DELETE(_sprites[DI_UPLEFT]);
- spr = new BaseSprite(_game, _owner);
+ spr = new BaseSprite(_game, _owner);
if (!spr || DID_FAIL(spr->loadFile(params, lifeTime, cacheType))) {
cmd = PARSERR_GENERIC;
} else {
@@ -185,7 +185,7 @@ bool AdSpriteSet::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteC
case TOKEN_UP_RIGHT:
SAFE_DELETE(_sprites[DI_UPRIGHT]);
- spr = new BaseSprite(_game, _owner);
+ spr = new BaseSprite(_game, _owner);
if (!spr || DID_FAIL(spr->loadFile(params, lifeTime, cacheType))) {
cmd = PARSERR_GENERIC;
} else {
@@ -195,7 +195,7 @@ bool AdSpriteSet::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteC
case TOKEN_DOWN_LEFT:
SAFE_DELETE(_sprites[DI_DOWNLEFT]);
- spr = new BaseSprite(_game, _owner);
+ spr = new BaseSprite(_game, _owner);
if (!spr || DID_FAIL(spr->loadFile(params, lifeTime, cacheType))) {
cmd = PARSERR_GENERIC;
} else {
@@ -205,7 +205,7 @@ bool AdSpriteSet::loadBuffer(char *buffer, bool complete, int lifeTime, TSpriteC
case TOKEN_DOWN_RIGHT:
SAFE_DELETE(_sprites[DI_DOWNRIGHT]);
- spr = new BaseSprite(_game, _owner);
+ spr = new BaseSprite(_game, _owner);
if (!spr || DID_FAIL(spr->loadFile(params, lifeTime, cacheType))) {
cmd = PARSERR_GENERIC;
} else {
diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp
index 1d3338b2466..5b75ca7a8ba 100644
--- a/engines/wintermute/ad/ad_talk_def.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -69,7 +69,7 @@ AdTalkDef::~AdTalkDef() {
bool AdTalkDef::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "AdTalkDef::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "AdTalkDef::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
diff --git a/engines/wintermute/ad/ad_types.h b/engines/wintermute/ad/ad_types.h
index 7e84ad68c23..0ae40b34198 100644
--- a/engines/wintermute/ad/ad_types.h
+++ b/engines/wintermute/ad/ad_types.h
@@ -86,7 +86,6 @@ typedef enum {
RESPONSE_ONCE_GAME
} TResponseType;
-
typedef enum {
TALK_SKIP_LEFT = 0,
TALK_SKIP_RIGHT = 1,
@@ -94,8 +93,7 @@ typedef enum {
TALK_SKIP_NONE = 3
} TTalkSkipButton;
-typedef enum
-{
+typedef enum {
VIDEO_SKIP_LEFT = 0,
VIDEO_SKIP_RIGHT = 1,
VIDEO_SKIP_BOTH = 2,
diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index a92b6b395d9..a5558bd3eac 100644
--- a/engines/wintermute/ad/ad_waypoint_group.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -67,7 +67,7 @@ void AdWaypointGroup::cleanup() {
bool AdWaypointGroup::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "AdWaypointGroup::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "AdWaypointGroup::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp
index a620fbd1254..b882b14a7d9 100644
--- a/engines/wintermute/base/base.cpp
+++ b/engines/wintermute/base/base.cpp
@@ -60,7 +60,7 @@ Common::String BaseClass::getEditorProp(const Common::String &propName, const Co
if (_editorPropsIter != _editorProps.end()) {
return _editorPropsIter->_value.c_str();
} else {
- return initVal; // Used to be NULL
+ return initVal;
}
}
diff --git a/engines/wintermute/base/base_active_rect.h b/engines/wintermute/base/base_active_rect.h
index 2d7f912598a..0041156ec7a 100644
--- a/engines/wintermute/base/base_active_rect.h
+++ b/engines/wintermute/base/base_active_rect.h
@@ -38,7 +38,7 @@ class BaseObject;
#ifdef ENABLE_WME3D
class XModel;
#endif
-class BaseActiveRect: BaseClass {
+class BaseActiveRect : BaseClass {
public:
void clipRect();
bool _precise{};
diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp
index 0601b1998da..bd45180b7aa 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -102,7 +102,6 @@ bool BaseFader::display() {
return STATUS_OK;
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseFader::deactivate() {
_active = false;
diff --git a/engines/wintermute/base/base_frame.h b/engines/wintermute/base/base_frame.h
index bfa3cb108dc..2e49fd36a5a 100644
--- a/engines/wintermute/base/base_frame.h
+++ b/engines/wintermute/base/base_frame.h
@@ -38,7 +38,7 @@ class BaseSubFrame;
class BaseObject;
class ScScript;
class ScStack;
-class BaseFrame: public BaseScriptable {
+class BaseFrame : public BaseScriptable {
public:
bool _killSound;
bool _keyframe;
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index e5664a9af59..c4e0469d817 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -645,10 +645,12 @@ bool BaseGame::initialize3() { // renderer is initialized
if (_indicatorY == -1)
_indicatorY = _renderer->getHeight() - _indicatorHeight;
- if (_indicatorX == -1)
+ if (_indicatorX == -1) {
_indicatorX = 0;
- if (_indicatorWidth == -1)
+ }
+ if (_indicatorWidth == -1) {
_indicatorWidth = _renderer->getWidth();
+ }
//if (m_AccessMgr)
// Game->m_AccessMgr->Initialize();
@@ -714,7 +716,7 @@ void BaseGame::LOG(bool res, const char *fmt, ...) {
//fprintf((FILE *)_debugLogFile, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
//fflush((FILE *)_debugLogFile);
- //QuickMessage(buff);
+ //quickMessage(buff);
}
//////////////////////////////////////////////////////////////////////////
@@ -816,7 +818,7 @@ void BaseGame::getOffset(int *offsetX, int *offsetY) const {
bool BaseGame::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "BaseGame::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "BaseGame::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
@@ -1204,7 +1206,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
else if (strcmp(name, "ValidObject") == 0) {
stack->correctParams(1);
BaseScriptable *obj = stack->pop()->getNative();
- if (validObject((BaseObject *) obj)) {
+ if (validObject((BaseObject *)obj)) {
stack->pushBool(true);
} else {
stack->pushBool(false);
@@ -2644,8 +2646,9 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
if (DID_FAIL(_cachedThumbnail->storeThumbnail())) {
SAFE_DELETE(_cachedThumbnail);
stack->pushBool(false);
- } else
+ } else {
stack->pushBool(true);
+ }
return STATUS_OK;
}
@@ -2911,10 +2914,11 @@ ScValue *BaseGame::scGetProperty(const char *name) {
// Keyboard (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Keyboard") == 0) {
- if (_keyboardState)
+ if (_keyboardState) {
_scValue->setNative(_keyboardState, true);
- else
+ } else {
_scValue->setNULL();
+ }
return _scValue;
}
@@ -3688,6 +3692,7 @@ bool BaseGame::unregisterObject(BaseObject *object) {
if (_mainObject == object) {
_mainObject = nullptr;
}
+
// is it active accessibility object?
//if (m_AccessMgr && m_AccessMgr->GetActiveObject() == Object)
// m_AccessMgr->SetActiveObject(NULL);
@@ -4128,7 +4133,6 @@ bool BaseGame::externalCall(ScScript *script, ScStack *stack, ScStack *thisStack
//////////////////////////////////////////////////////////////////////////
bool BaseGame::showCursor() {
- // FoxTail:
if (_cursorHidden) {
return STATUS_OK;
}
@@ -4934,9 +4938,10 @@ bool BaseGame::getSaveSlotDescription(int slot, Common::String &description) {
Common::String filename;
getSaveSlotFilename(slot, filename);
BasePersistenceManager *pm = new BasePersistenceManager();
- if (!pm)
+ if (!pm) {
return STATUS_FAILED;
-
+ }
+
if (DID_FAIL(pm->initLoad(filename))) {
delete pm;
return STATUS_FAILED;
@@ -5029,9 +5034,9 @@ bool BaseGame::popViewport() {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::getCurrentViewportRect(Common::Rect32 *rect, bool *custom) const {
- if (rect == nullptr)
+ if (rect == nullptr) {
return STATUS_FAILED;
- else {
+ } else {
if (_viewportSP >= 0) {
BasePlatform::copyRect(rect, _viewportStack[_viewportSP]->getRect());
if (custom) {
@@ -5043,8 +5048,9 @@ bool BaseGame::getCurrentViewportRect(Common::Rect32 *rect, bool *custom) const
_renderer->_drawOffsetY,
_renderer->getWidth() + _renderer->_drawOffsetX,
_renderer->getHeight() + _renderer->_drawOffsetY);
- if (custom)
+ if (custom) {
*custom = false;
+ }
}
return STATUS_OK;
@@ -5129,10 +5135,11 @@ bool BaseGame::displayIndicator() {
if (_saveLoadImage && !_hasDrawnSaveLoadImage) {
Common::Rect32 rc;
BasePlatform::setRect(&rc, 0, 0, _saveLoadImage->getWidth(), _saveLoadImage->getHeight());
- if (_loadInProgress)
+ if (_loadInProgress) {
_saveLoadImage->displayTrans(_loadImageX, _loadImageY, rc);
- else
+ } else {
_saveLoadImage->displayTrans(_saveImageX, _saveImageY, rc);
+ }
_renderer->flip();
_hasDrawnSaveLoadImage = true;
}
@@ -5195,7 +5202,7 @@ bool BaseGame::updateMusicCrossfade() {
}
if (_musicCrossfadeSwap) {
- // swap channels
+ // Swap channels
BaseSound *dummy = _music[_musicCrossfadeChannel1];
int dummyInt = _musicStartTime[_musicCrossfadeChannel1];
@@ -5284,8 +5291,9 @@ bool BaseGame::isVideoPlaying() {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::stopVideo() {
- if (_videoPlayer->isPlaying())
+ if (_videoPlayer->isPlaying()) {
_videoPlayer->stop();
+ }
if (_theoraPlayer && _theoraPlayer->isPlaying()) {
_theoraPlayer->stop();
SAFE_DELETE(_theoraPlayer);
@@ -5310,7 +5318,6 @@ bool BaseGame::renderShadowGeometry() {
return STATUS_OK;
}
-//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
bool BaseGame::onActivate(bool activate, bool refreshMouse) {
if (_shuttingDown || !_renderer) {
@@ -5337,7 +5344,7 @@ bool BaseGame::onActivate(bool activate, bool refreshMouse) {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::onMouseLeftDown() {
if (isVideoPlaying()) {
- stopVideo ();
+ stopVideo();
return STATUS_OK;
}
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index c2575b38711..44265d752b7 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -74,7 +74,7 @@ struct FogParameters;
#define NUM_MUSIC_CHANNELS 5
-class BaseGame: public BaseObject {
+class BaseGame : public BaseObject {
public:
@@ -150,8 +150,8 @@ public:
int32 _indicatorWidth;
int32 _indicatorHeight;
- char *_savedGameExt;
bool _richSavedGames;
+ char *_savedGameExt;
#ifdef ENABLE_WME3D
int32 _editorResolutionWidth;
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index 3d06dea8438..3c03dc740b4 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -173,10 +173,12 @@ bool BaseObject::cleanup() {
//////////////////////////////////////////////////////////////////////////
void BaseObject::setCaption(const char *caption, int caseVal) {
- if (caseVal == 0)
+ if (caseVal == 0) {
caseVal = 1;
- if (caseVal < 1 || caseVal > 7)
+ }
+ if (caseVal < 1 || caseVal > 7) {
return;
+ }
SAFE_DELETE_ARRAY(_caption[caseVal - 1]);
size_t captionSize = strlen(caption) + 1;
@@ -360,7 +362,7 @@ bool BaseObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
loopStart = val3->getInt();
}
- if (DID_FAIL(playSFX(filename, looping, true, NULL, loopStart))) {
+ if (DID_FAIL(playSFX(filename, looping, true, nullptr, loopStart))) {
stack->pushBool(false);
} else {
stack->pushBool(true);
@@ -1334,7 +1336,7 @@ bool BaseObject::updateOneSound(BaseSound *sound) {
if (sound) {
if (_autoSoundPanning) {
- ret = sound->setPan(_game->_soundMgr->posToPan(_posX - _game->_offsetX, _posY - _game->_offsetY));
+ ret = sound->setPan(_game->_soundMgr->posToPan(_posX - _game->_offsetX, _posY - _game->_offsetY));
}
ret = sound->applyFX(_sFXType, _sFXParam1, _sFXParam2, _sFXParam3, _sFXParam4);
diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h
index 0b199b90525..ae59cf01d73 100644
--- a/engines/wintermute/base/base_object.h
+++ b/engines/wintermute/base/base_object.h
@@ -125,16 +125,16 @@ public:
bool _saveState;
// base
- virtual bool update() {
+ virtual bool update() {
return STATUS_FAILED;
};
virtual bool display() {
return STATUS_FAILED;
};
- virtual bool invalidateDeviceObjects() {
+ virtual bool invalidateDeviceObjects() {
return STATUS_OK;
};
- virtual bool restoreDeviceObjects() {
+ virtual bool restoreDeviceObjects() {
return STATUS_OK;
};
bool _nonIntMouseEvents;
diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp
index de6efc283f9..b62998eb80e 100644
--- a/engines/wintermute/base/base_parser.cpp
+++ b/engines/wintermute/base/base_parser.cpp
@@ -70,14 +70,14 @@ int32 BaseParser::getObject(char **buf, const TokenDesc *tokens, char **name, ch
// skip comment lines.
while (**buf == ';') {
*buf = strchr(*buf, '\n');
- if (! *buf) {
+ if (!*buf) {
return PARSERR_EOF;
}
_parserLine++;
skipCharacters(buf, _whiteSpace);
}
- if (! **buf) { // at end of file
+ if (!**buf) { // at end of file
return PARSERR_EOF;
}
@@ -107,7 +107,7 @@ int32 BaseParser::getObject(char **buf, const TokenDesc *tokens, char **name, ch
skipCharacters(buf, _whiteSpace);
// get optional name
- *name = getSubText(buf, '\'', '\''); // single quotes
+ *name = getSubText(buf, '\'', '\''); // single quotes
skipCharacters(buf, _whiteSpace);
// get optional data
@@ -142,7 +142,7 @@ void BaseParser::skipCharacters(char **buf, const char *toSkip) {
if (strchr(toSkip, ch) == nullptr) {
return;
}
- ++*buf; // skip this character
+ ++*buf; // skip this character
}
// we must be at the end of the buffer if we get here
}
@@ -153,14 +153,14 @@ char *BaseParser::getSubText(char **buf, char open, char close) {
if (**buf == 0 || **buf != open) {
return 0;
}
- ++*buf; // skip opening delimiter
+ ++*buf; // skip opening delimiter
char *result = *buf;
// now find the closing delimiter
char theChar;
long skip = 1;
- if (open == close) { // we can't nest identical delimiters
+ if (open == close) { // we cant nest identical delimiters
open = 0;
}
while ((theChar = **buf) != 0) {
@@ -169,12 +169,12 @@ char *BaseParser::getSubText(char **buf, char open, char close) {
}
if (theChar == close) {
if (--skip == 0) {
- **buf = 0; // null terminate the result string
- ++*buf; // move past the closing delimiter
+ **buf = 0; // null terminate the result string
+ ++*buf; // move past the closing delimiter
break;
}
}
- ++*buf; // try next character
+ ++*buf; // try next character
}
return result;
}
@@ -182,11 +182,10 @@ char *BaseParser::getSubText(char **buf, char open, char close) {
//////////////////////////////////////////////////////////////////////
char *BaseParser::getAssignmentText(char **buf) {
- ++*buf; // skip the '='
+ ++*buf; // skip the '='
skipCharacters(buf, _whiteSpace);
char *result = *buf;
-
if (*result == '"') {
result = getSubText(buf, '"', '"');
} else {
@@ -194,13 +193,13 @@ char *BaseParser::getAssignmentText(char **buf) {
char theChar;
while ((theChar = **buf) != 0) {
- if (theChar <= 0x20) { // space and control chars
+ if (theChar <= 0x20) { // space and control chars
break;
}
++*buf;
}
- **buf = 0; // null terminate it
- if (theChar) { // skip the terminator
+ **buf = 0; // null terminate it
+ if (theChar) { // skip the terminator
++*buf;
}
}
@@ -292,7 +291,7 @@ int32 BaseParser::getTokenInt(char **buf) {
void BaseParser::skipToken(char **buf, char *tok, char * /*msg*/) {
const char *t = getToken(buf);
if (strcmp(t, tok)) {
- return; // Error
+ return; // Error
}
}
diff --git a/engines/wintermute/base/base_point.h b/engines/wintermute/base/base_point.h
index 19638e2d022..2117e41de84 100644
--- a/engines/wintermute/base/base_point.h
+++ b/engines/wintermute/base/base_point.h
@@ -33,7 +33,7 @@
namespace Wintermute {
-class BasePoint: public BaseClass {
+class BasePoint : public BaseClass {
public:
DECLARE_PERSISTENT(BasePoint, BaseClass)
BasePoint();
diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h
index 6d5e1d28e57..44c0e51119c 100644
--- a/engines/wintermute/base/base_sprite.h
+++ b/engines/wintermute/base/base_sprite.h
@@ -37,7 +37,7 @@ namespace Wintermute {
class BaseFrame;
class BaseSurface;
class BaseObject;
-class BaseSprite: public BaseScriptHolder {
+class BaseSprite : public BaseScriptHolder {
public:
bool killAllSounds();
BaseSurface *getSurface();
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp
index cec7388bf47..69aa5a87ae6 100644
--- a/engines/wintermute/base/base_surface_storage.cpp
+++ b/engines/wintermute/base/base_surface_storage.cpp
@@ -37,7 +37,7 @@
namespace Wintermute {
-//IMPLEMENT_PERSISTENT(BaseSurfaceStorage, true);
+//IMPLEMENT_PERSISTENT(BaseSurfaceStorage, true)
//////////////////////////////////////////////////////////////////////
BaseSurfaceStorage::BaseSurfaceStorage(BaseGame *inGame) : BaseClass(inGame) {
@@ -75,7 +75,7 @@ bool BaseSurfaceStorage::initLoop() {
break;
}
- if (_surfaces[i]->_lifeTime > 0 && _surfaces[i]->_valid && (int)(_game->_liveTimer - _surfaces[i]->_lastUsedTime) >= _surfaces[i]->_lifeTime) {
+ if (_surfaces[i]->_lifeTime > 0 && _surfaces[i]->_valid && (int32)(_game->_liveTimer - _surfaces[i]->_lastUsedTime) >= _surfaces[i]->_lifeTime) {
//_game->quickMessageForm("Invalidating: %s", _surfaces[i]->_filename);
_surfaces[i]->invalidate();
}
diff --git a/engines/wintermute/base/base_surface_storage.h b/engines/wintermute/base/base_surface_storage.h
index 9b6e34db7e2..1384c98d499 100644
--- a/engines/wintermute/base/base_surface_storage.h
+++ b/engines/wintermute/base/base_surface_storage.h
@@ -40,7 +40,7 @@ public:
bool sortSurfaces();
static int surfaceSortCB(const void *arg1, const void *arg2);
bool cleanup(bool warn = false);
- //DECLARE_PERSISTENT(BaseSurfaceStorage, BaseClass);
+ //DECLARE_PERSISTENT(BaseSurfaceStorage, BaseClass)
bool restoreAll();
BaseSurface *addSurface(const char *filename, bool defaultCK = true, byte ckRed = 0, byte ckGreen = 0, byte ckBlue = 0, int lifeTime = -1, bool keepLoaded = false);
diff --git a/engines/wintermute/base/font/base_font.h b/engines/wintermute/base/font/base_font.h
index 92cb4938e36..ca79824ddc0 100644
--- a/engines/wintermute/base/font/base_font.h
+++ b/engines/wintermute/base/font/base_font.h
@@ -34,7 +34,7 @@
namespace Wintermute {
-class BaseFont: public BaseObject {
+class BaseFont : public BaseObject {
public:
DECLARE_PERSISTENT(BaseFont, BaseObject)
virtual int getTextWidth(const byte *text, int maxLength = -1);
@@ -50,7 +50,7 @@ public:
static BaseFont *createFromFile(BaseGame *game, const char *filename);
private:
- //bool loadBuffer(byte * Buffer);
+ //bool loadBuffer(char *buffer);
//bool loadFile(const char* Filename);
static bool isTrueType(BaseGame *game, const char *filename);
};
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index f38f1ebcf9c..727ae6cd0f4 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -281,7 +281,7 @@ void BaseFontBitmap::drawChar(byte c, int x, int y) {
bool BaseFontBitmap::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "BaseFontBitmap::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "BaseFontBitmap::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 54f583b4397..bec47b3abff 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -293,7 +293,7 @@ int BaseFontTT::getLetterHeight() {
bool BaseFontTT::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "BaseFontTT::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "BaseFontTT::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
diff --git a/engines/wintermute/base/gfx/3dutils.h b/engines/wintermute/base/gfx/3dutils.h
index 9f9d9134096..0bcad5e6c0d 100644
--- a/engines/wintermute/base/gfx/3dutils.h
+++ b/engines/wintermute/base/gfx/3dutils.h
@@ -34,7 +34,7 @@
namespace Wintermute {
-#define DX_PI ((float)3.141592654)
+#define DX_PI ((float)3.141592654f)
#define degToRad(_val) (_val * DX_PI * (1.0f / 180.0f))
#define radToDeg(_val) (_val * (180.0f / DX_PI))
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 399007638b0..61e81ccc92a 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -143,7 +143,7 @@ bool BaseRenderer::windowedBlt() {
}
//////////////////////////////////////////////////////////////////////////
-bool BaseRenderer::setup2D(bool Force) {
+bool BaseRenderer::setup2D(bool force) {
return STATUS_FAILED;
}
diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h
index a7c27aa3fde..5d31e46927d 100644
--- a/engines/wintermute/base/gfx/base_surface.h
+++ b/engines/wintermute/base/gfx/base_surface.h
@@ -34,7 +34,7 @@
namespace Wintermute {
-class BaseSurface: public BaseClass {
+class BaseSurface : public BaseClass {
public:
virtual bool invalidate();
virtual bool prepareToDraw();
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 3bde2090c57..2f61e86b740 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -377,12 +377,13 @@ int PartEmitter::compareZ(const void *obj1, const void *obj2) {
PartParticle *p1 = *(PartParticle **)o1;
PartParticle *p2 = *(PartParticle **)o2;
- if (p1->_posZ < p2->_posZ)
+ if (p1->_posZ < p2->_posZ) {
return -1;
- else if (p1->_posZ > p2->_posZ)
+ } else if (p1->_posZ > p2->_posZ) {
return 1;
- else
+ } else {
return 0;
+ }
}
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h
index 14e5845e467..cd6d1addf06 100644
--- a/engines/wintermute/base/particles/part_emitter.h
+++ b/engines/wintermute/base/particles/part_emitter.h
@@ -39,7 +39,7 @@ class PartEmitter : public BaseObject {
public:
DECLARE_PERSISTENT(PartEmitter, BaseObject)
- PartEmitter(BaseGame *inGame, BaseScriptHolder *Owner);
+ PartEmitter(BaseGame *inGame, BaseScriptHolder *owner);
~PartEmitter() override;
int32 _width;
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 7ee8991cb57..fa06107ef7e 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -1198,7 +1198,7 @@ ScValue *ScScript::getVar(char *name) {
}
if (ret == nullptr) {
- //RuntimeError("Variable '%s' is inaccessible in the current block. Consider changing the script.", name);
+ //runtimeError("Variable '%s' is inaccessible in the current block. Consider changing the script.", name);
_game->LOG(0, "Warning: variable '%s' is inaccessible in the current block. Consider changing the script (script:%s, line:%d)", name, _filename, _currentLine);
ScValue *val = new ScValue(_game);
ScValue *scope = _scopeStack->getTop();
@@ -1346,7 +1346,7 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferBool(TMEMBER(_waitFrozen));
persistMgr->transferBool(TMEMBER(_methodThread));
- persistMgr->transferBool(TMEMBER(_methodThread)); // TODO-SAVE: Deduplicate.
+ persistMgr->transferBool(TMEMBER(_methodThread));
persistMgr->transferBool(TMEMBER(_unbreakable));
persistMgr->transferPtr(TMEMBER_PTR(_parentScript));
@@ -1401,9 +1401,9 @@ ScScript *ScScript::invokeEventHandler(const char *eventName, bool unbreakable)
DebuggableScEngine* debuggableEngine;
debuggableEngine = dynamic_cast<DebuggableScEngine*>(_engine);
assert(debuggableEngine);
- ScScript *thread = new DebuggableScript(_game, debuggableEngine);
+ ScScript *thread = new DebuggableScript(_game, debuggableEngine);
#else
- ScScript *thread = new ScScript(_game, _engine);
+ ScScript *thread = new ScScript(_game, _engine);
#endif
if (thread) {
bool ret = thread->createThread(this, pos, eventName);
@@ -1452,8 +1452,9 @@ bool ScScript::pause() {
return STATUS_FAILED;
}
- if (!_freezable || _state == SCRIPT_PERSISTENT)
+ if (!_freezable || _state == SCRIPT_PERSISTENT) {
return STATUS_OK;
+ }
_origState = _state;
_state = SCRIPT_PAUSED;
@@ -1464,8 +1465,9 @@ bool ScScript::pause() {
//////////////////////////////////////////////////////////////////////////
bool ScScript::resume() {
- if (_state != SCRIPT_PAUSED)
+ if (_state != SCRIPT_PAUSED) {
return STATUS_OK;
+ }
_state = _origState;
return STATUS_OK;
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index d105be10c0b..f653ea0c2df 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -84,7 +84,7 @@ ScEngine::ScEngine(BaseGame *inGame) : BaseClass(inGame) {
_isProfiling = false;
_profilingStartTime = 0;
- //EnableProfiling();
+ //enableProfiling();
}
@@ -215,7 +215,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig
byte *buffer = BaseEngine::instance().getFileManager()->readWholeFile(filename, &size);
if (!buffer) {
- _game->LOG(0, "ScEngine::GetCompiledScript - error opening script '%s'", filename);
+ _game->LOG(0, "ScEngine::getCompiledScript - error opening script '%s'", filename);
return nullptr;
}
@@ -225,7 +225,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig
compSize = size;
} else {
if (!_compilerAvailable) {
- _game->LOG(0, "ScEngine::GetCompiledScript - script '%s' needs to be compiled but compiler is not available", filename);
+ _game->LOG(0, "ScEngine::getCompiledScript - script '%s' needs to be compiled but compiler is not available", filename);
delete[] buffer;
return nullptr;
}
@@ -489,10 +489,10 @@ bool ScEngine::emptyScriptCache() {
//////////////////////////////////////////////////////////////////////////
-bool ScEngine::resetObject(BaseObject *Object) {
+bool ScEngine::resetObject(BaseObject *object) {
// terminate all scripts waiting for this object
for (int32 i = 0; i < _scripts.getSize(); i++) {
- if (_scripts[i]->_state == SCRIPT_WAITING && _scripts[i]->_waitObject == Object) {
+ if (_scripts[i]->_state == SCRIPT_WAITING && _scripts[i]->_waitObject == object) {
if (!_game->_compatKillMethodThreads) {
resetScript(_scripts[i]);
}
diff --git a/engines/wintermute/base/scriptables/script_ext_date.cpp b/engines/wintermute/base/scriptables/script_ext_date.cpp
index 2f6f63e82b9..db58ea294bf 100644
--- a/engines/wintermute/base/scriptables/script_ext_date.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_date.cpp
@@ -274,9 +274,9 @@ bool SXDate::persist(BasePersistenceManager *persistMgr) {
}
//////////////////////////////////////////////////////////////////////////
-int SXDate::scCompare(BaseScriptable *Value) {
+int SXDate::scCompare(BaseScriptable *value) {
TimeDate time1 = _tm;
- TimeDate time2 = ((SXDate *)Value)->_tm;
+ TimeDate time2 = ((SXDate *)value)->_tm;
if (time1.tm_year < time2.tm_year) {
return -1;
diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp
index 7f549dc2a87..c80bf59724c 100644
--- a/engines/wintermute/base/scriptables/script_ext_file.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_file.cpp
@@ -129,7 +129,7 @@ bool SXFile::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
if (_mode == 1) {
_readFile = BaseFileManager::getEngineInstance()->openFile(_filename);
if (!_readFile) {
- //script->runtimeError("File.%s: Error opening file '%s' for reading.", Name, _filename);
+ //script->runtimeError("File.%s: Error opening file '%s' for reading.", name, _filename);
close();
} else {
_textMode = strcmp(name, "OpenAsText") == 0;
@@ -150,7 +150,7 @@ bool SXFile::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
}
if (!_writeFile) {
- //script->runtimeError("File.%s: Error opening file '%s' for writing.", Name, _filename);
+ //script->runtimeError("File.%s: Error opening file '%s' for writing.", name, _filename);
close();
} else {
_textMode = strcmp(name, "OpenAsText") == 0;
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
index 5205650e8ab..6e8a1bc0f39 100644
--- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
@@ -278,7 +278,7 @@ bool SXMemBuffer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSt
stack->pushNULL();
} else {
void *pointer = *(void **)((byte *)_buffer + start);
- SXMemBuffer *buf = new SXMemBuffer(_game, pointer);
+ SXMemBuffer *buf = new SXMemBuffer(_game, pointer);
stack->pushNative(buf, false);
}
return STATUS_OK;
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
index 73460d5085f..0a7a11afa67 100644
--- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
+++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
@@ -35,7 +35,7 @@ namespace Wintermute {
class SXMemBuffer : public BaseScriptable {
public:
- int scCompare(BaseScriptable *Val) override;
+ int scCompare(BaseScriptable *val) override;
DECLARE_PERSISTENT(SXMemBuffer, BaseScriptable)
ScValue *scGetProperty(const char *name) override;
bool scSetProperty(const char *name, ScValue *value) override;
diff --git a/engines/wintermute/base/scriptables/script_ext_string.h b/engines/wintermute/base/scriptables/script_ext_string.h
index 9bfd3375b58..1d948f23774 100644
--- a/engines/wintermute/base/scriptables/script_ext_string.h
+++ b/engines/wintermute/base/scriptables/script_ext_string.h
@@ -35,7 +35,7 @@ namespace Wintermute {
class SXString : public BaseScriptable {
public:
- int scCompare(BaseScriptable *Val) override;
+ int scCompare(BaseScriptable *val) override;
DECLARE_PERSISTENT(SXString, BaseScriptable)
ScValue *scGetProperty(const char *name) override;
bool scSetProperty(const char *name, ScValue *value) override;
diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp
index e62cc916e5d..90c06c1e5e2 100644
--- a/engines/wintermute/base/scriptables/script_stack.cpp
+++ b/engines/wintermute/base/scriptables/script_stack.cpp
@@ -41,7 +41,7 @@ ScStack::ScStack(BaseGame *inGame) : BaseClass(inGame) {
//////////////////////////////////////////////////////////////////////////
ScStack::~ScStack() {
- //_game->LOG(0, "STAT: Stack size: %d, SP=%d", _values.size(), _sP);
+ //_game->LOG(0, "STAT: Stack size: %d, SP=%d", _values.getSize(), _sP);
for (int32 i = 0; i < _values.getSize(); i++) {
delete _values[i];
diff --git a/engines/wintermute/base/scriptables/script_stack.h b/engines/wintermute/base/scriptables/script_stack.h
index 7e4881dad51..c24c4c33cac 100644
--- a/engines/wintermute/base/scriptables/script_stack.h
+++ b/engines/wintermute/base/scriptables/script_stack.h
@@ -40,7 +40,7 @@ class BaseScriptable;
class ScStack : public BaseClass {
public:
- ScValue *getAt(int Index);
+ ScValue *getAt(int index);
ScValue *getPushValue();
DECLARE_PERSISTENT(ScStack, BaseClass)
void pushNative(BaseScriptable *val, bool persistent);
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp
index f27fc7931a4..132324e8ae1 100644
--- a/engines/wintermute/base/scriptables/script_value.cpp
+++ b/engines/wintermute/base/scriptables/script_value.cpp
@@ -244,8 +244,8 @@ bool ScValue::setProp(const char *name, ScValue *val, bool copyWhole, bool setAs
_valIter->_value = nullptr;
}
ScValue* val = new ScValue(_game);
- val->Copy(Val, CopyWhole);
- val->_isConstVar = SetAsConst;
+ val->copy(Val, copyWhole);
+ val->_isConstVar = setAsConst;
_valObject[Name] = val;
if (_type!=VAL_NATIVE) _type = VAL_OBJECT;
@@ -830,8 +830,8 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) {
_valString[0] = '\0';
}
}
-
- /* // TODO: Convert to Debug-statements.
+ /*
+ // TODO: Convert to Debug-statements.
FILE* f = fopen("c:\\val.log", "a+");
switch(_type)
{
@@ -976,7 +976,7 @@ int ScValue::compareStrict(ScValue *val1, ScValue *val2, bool enableFloatCompare
//////////////////////////////////////////////////////////////////////////
bool ScValue::setProperty(const char *propName, int32 value) {
- ScValue *val = new ScValue(_game, value);
+ ScValue *val = new ScValue(_game, value);
bool ret = DID_SUCCEED(setProp(propName, val));
delete val;
return ret;
@@ -984,7 +984,7 @@ bool ScValue::setProperty(const char *propName, int32 value) {
//////////////////////////////////////////////////////////////////////////
bool ScValue::setProperty(const char *propName, const char *value) {
- ScValue *val = new ScValue(_game, value);
+ ScValue *val = new ScValue(_game, value);
bool ret = DID_SUCCEED(setProp(propName, val));
delete val;
return ret;
@@ -992,7 +992,7 @@ bool ScValue::setProperty(const char *propName, const char *value) {
//////////////////////////////////////////////////////////////////////////
bool ScValue::setProperty(const char *propName, double value) {
- ScValue *val = new ScValue(_game, value);
+ ScValue *val = new ScValue(_game, value);
bool ret = DID_SUCCEED(setProp(propName, val));
delete val;
return ret;
@@ -1001,7 +1001,7 @@ bool ScValue::setProperty(const char *propName, double value) {
//////////////////////////////////////////////////////////////////////////
bool ScValue::setProperty(const char *propName, bool value) {
- ScValue *val = new ScValue(_game, value);
+ ScValue *val = new ScValue(_game, value);
bool ret = DID_SUCCEED(setProp(propName, val));
delete val;
return ret;
diff --git a/engines/wintermute/system/sys_class.cpp b/engines/wintermute/system/sys_class.cpp
index f9fb39d99a2..a5eafdf72e4 100644
--- a/engines/wintermute/system/sys_class.cpp
+++ b/engines/wintermute/system/sys_class.cpp
@@ -174,7 +174,7 @@ void SystemClass::loadTable(BaseGame *game, BasePersistenceManager *persistMgr)
warning("HALT");
}
- addInstance(emptyObject, SystemClassRegistry::getInstance()->getNextID(), instId);
+ addInstance(emptyObject, SystemClassRegistry::getInstance()->getNextId(), instId);
}
}
diff --git a/engines/wintermute/system/sys_class_registry.cpp b/engines/wintermute/system/sys_class_registry.cpp
index 96b36cf5ba5..19917eef2e8 100644
--- a/engines/wintermute/system/sys_class_registry.cpp
+++ b/engines/wintermute/system/sys_class_registry.cpp
@@ -127,7 +127,7 @@ void SystemClassRegistry::addInstanceToTable(SystemInstance *instance, void *poi
}
//////////////////////////////////////////////////////////////////////////
-int SystemClassRegistry::getNextID() {
+int SystemClassRegistry::getNextId() {
return _count++;
}
diff --git a/engines/wintermute/system/sys_class_registry.h b/engines/wintermute/system/sys_class_registry.h
index 75a33d2ae68..ae44c7e875f 100644
--- a/engines/wintermute/system/sys_class_registry.h
+++ b/engines/wintermute/system/sys_class_registry.h
@@ -70,14 +70,14 @@ public:
bool saveTable(BaseGame *game, BasePersistenceManager *persistMgr, bool quickSave);
bool loadInstances(BaseGame *game, BasePersistenceManager *persistMgr);
bool saveInstances(BaseGame *game, BasePersistenceManager *persistMgr, bool quickSave);
- void *idToPointer(int classID, int instanceID);
- bool getPointerID(void *pointer, int *classID, int *instanceID);
+ void *idToPointer(int classID, int instanceId);
+ bool getPointerID(void *pointer, int *classId, int *instanceId);
bool registerClass(SystemClass *classObj);
bool unregisterClass(SystemClass *classObj);
bool registerInstance(const char *className, void *instance);
bool unregisterInstance(const char *className, void *instance);
void dumpClasses(Common::WriteStream *stream);
- int getNextID();
+ int getNextId();
void addInstanceToTable(SystemInstance *instance, void *pointer);
SystemClassRegistry();
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 2492bc47eb5..a2d81fdf562 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -105,7 +105,7 @@ UIButton::~UIButton() {
bool UIButton::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "UIButton::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "UIButton::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
@@ -615,10 +615,11 @@ void UIButton::correctSize() {
if (_text) {
int textHeight;
- if (_font)
+ if (_font) {
textHeight = _font->getTextHeight((byte *)_text, _width);
- else
+ } else {
textHeight = _game->_systemFont->getTextHeight((byte *)_text, _width);
+ }
if (textHeight > _height) {
_height = textHeight;
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp
index fa3588422de..d623e569387 100644
--- a/engines/wintermute/ui/ui_edit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -96,7 +96,7 @@ UIEdit::~UIEdit() {
bool UIEdit::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "UIEdit::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "UIEdit::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
@@ -724,7 +724,7 @@ bool UIEdit::display(int offsetX, int offsetY) {
}
- _game->_renderer->_rectList.add(new BaseActiveRect(_game, this, nullptr, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false));
+ _game->_renderer->_rectList.add(new BaseActiveRect(_game, this, nullptr, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false));
/* if (Game->m_AccessMgr->GetActiveObject() == this) {
RECT rc;
diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp
index a2b1205e213..c07482f2c36 100644
--- a/engines/wintermute/ui/ui_text.cpp
+++ b/engines/wintermute/ui/ui_text.cpp
@@ -94,7 +94,7 @@ bool UIText::display(int offsetX, int offsetY) {
font->drawText((byte *)_text, offsetX + _posX, offsetY + _posY + textOffset, _width, _textAlign, _height);
}
- //_game->_renderer->_rectList.add(new BaseActiveRect(_game, this, NULL, OffsetX + _posX, OffsetY + _posY, _width, _height, 100, 100, false));
+ //_game->_renderer->_rectList.add(new BaseActiveRect(_game, this, nullptr, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false));
return STATUS_OK;
}
@@ -105,7 +105,7 @@ bool UIText::display(int offsetX, int offsetY) {
bool UIText::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "UIText::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "UIText::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp
index b91b33416e9..1884818e50e 100644
--- a/engines/wintermute/ui/ui_tiled_image.cpp
+++ b/engines/wintermute/ui/ui_tiled_image.cpp
@@ -115,7 +115,7 @@ bool UITiledImage::display(int x, int y, int width, int height) {
bool UITiledImage::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "UITiledImage::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "UITiledImage::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 2d2c54a2a28..0576f9464e4 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -213,7 +213,7 @@ bool UIWindow::display(int offsetX, int offsetY) {
}
if (!_transparent && !image) {
- _game->_renderer->_rectList.add(new BaseActiveRect(_game, this, nullptr, _posX + offsetX, _posY + offsetY, _width, _height, 100, 100, false));
+ _game->_renderer->_rectList.add(new BaseActiveRect(_game, this, nullptr, _posX + offsetX, _posY + offsetY, _width, _height, 100, 100, false));
}
for (int32 i = 0; i < _widgets.getSize(); i++) {
@@ -995,9 +995,7 @@ bool UIWindow::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
return STATUS_OK;
} else if DID_SUCCEED(_game->windowScriptMethodHook(this, script, stack, name)) {
return STATUS_OK;
- }
-
- else {
+ } else {
return UIObject::scCallMethod(script, stack, thisStack, name);
}
}
More information about the Scummvm-git-logs
mailing list