[Scummvm-git-logs] scummvm master -> 673232ae8eb76360b514791e6ef1eb08e8535e2a
aquadran
noreply at scummvm.org
Wed Sep 3 10:32:04 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:
673232ae8e WINTERMUTE: Format portion of code to match alignment with original code
Commit: 673232ae8eb76360b514791e6ef1eb08e8535e2a
https://github.com/scummvm/scummvm/commit/673232ae8eb76360b514791e6ef1eb08e8535e2a
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-03T12:31:59+02:00
Commit Message:
WINTERMUTE: Format portion of code to match alignment with original code
Changed paths:
engines/wintermute/ad/ad_actor_3dx.cpp
engines/wintermute/ad/ad_game.cpp
engines/wintermute/ad/ad_object.cpp
engines/wintermute/ad/ad_object_3d.cpp
engines/wintermute/ad/ad_scene.cpp
engines/wintermute/ad/ad_scene_geometry.cpp
engines/wintermute/base/base_script_holder.cpp
engines/wintermute/base/base_string_table.cpp
engines/wintermute/base/base_sub_frame.cpp
engines/wintermute/base/font/base_font_storage.cpp
engines/wintermute/base/gfx/xmodel.cpp
engines/wintermute/base/scriptables/script.cpp
engines/wintermute/base/scriptables/script_ext_file.cpp
engines/wintermute/base/sound/base_sound.cpp
diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index f7e3ff02c45..365ca9f84c0 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -288,8 +288,7 @@ bool AdActor3DX::update() {
_tempSkelAnim = _sentence->_currentSkelAnim;
}
- bool timeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) ||
- (!_sentence->_sound && _sentence->_duration <= _gameRef->getTimer()->getTime() - _sentence->_startTime);
+ bool timeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= _gameRef->getTimer()->getTime() - _sentence->_startTime);
if (_tempSkelAnim == nullptr || !_xmodel->isAnimPending(0, _tempSkelAnim) || timeIsUp) {
if (timeIsUp) {
_sentence->finish();
@@ -727,9 +726,7 @@ void AdActor3DX::getNextStep2D() {
newPos._z += -cosf(degToRad(_targetAngle)) * _velocity * _scale3D * (float)_gameRef->_deltaTime / 1000.f;
DXVector3 currentPoint;
- adGame->_scene->_geom->convert2Dto3DTolerant(_path2D->getCurrent()->x,
- _path2D->getCurrent()->y,
- ¤tPoint);
+ adGame->_scene->_geom->convert2Dto3DTolerant(_path2D->getCurrent()->x, _path2D->getCurrent()->y, ¤tPoint);
DXVector3 origVec, newVec;
@@ -749,9 +746,7 @@ void AdActor3DX::getNextStep2D() {
_nextState = STATE_READY;
}
} else {
- adGame->_scene->_geom->convert2Dto3DTolerant(_path2D->getCurrent()->x,
- _path2D->getCurrent()->y,
- ¤tPoint);
+ adGame->_scene->_geom->convert2Dto3DTolerant(_path2D->getCurrent()->x, _path2D->getCurrent()->y, ¤tPoint);
initLine3D(_posVector, currentPoint, false);
}
} else
@@ -778,9 +773,7 @@ void AdActor3DX::followPath2D() {
_state = STATE_FOLLOWING_PATH;
DXVector3 currentPoint;
- adGameRef->_scene->_geom->convert2Dto3DTolerant(_path2D->getCurrent()->x,
- _path2D->getCurrent()->y,
- ¤tPoint);
+ adGameRef->_scene->_geom->convert2Dto3DTolerant(_path2D->getCurrent()->x, _path2D->getCurrent()->y, ¤tPoint);
initLine3D(_posVector, currentPoint, true);
} else {
@@ -1673,14 +1666,10 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
dir = val->getInt();
angle = dirToAngle((TDirection)dir);
}
-
- if (_path2D) {
+ if (_path2D)
_path2D->reset();
- }
-
- if (_path3D) {
+ if (_path3D)
_path3D->reset();
- }
turnTo(angle);
if (strcmp(name, "TurnToAsync") != 0) {
@@ -2021,11 +2010,10 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
float offsetZ = stack->pop()->getFloat();
PartEmitter *emitter = createParticleEmitter(boneName, DXVector3(offsetX, offsetY, offsetZ));
- if (emitter) {
+ if (emitter)
stack->pushNative(_partEmitter, true);
- } else {
+ else
stack->pushNULL();
- }
return true;
} else {
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 5a8b57d7f6e..59052eabc9a 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -2102,12 +2102,10 @@ 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();
- }
_renderer->displayIndicator();
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index 7a7b39f6e82..c60803ec6bc 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -323,7 +323,6 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
break;
}
}
-
}
if (!regFound) {
@@ -990,9 +989,8 @@ 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_object_3d.cpp b/engines/wintermute/ad/ad_object_3d.cpp
index b33767c5085..6d6a7690e35 100644
--- a/engines/wintermute/ad/ad_object_3d.cpp
+++ b/engines/wintermute/ad/ad_object_3d.cpp
@@ -75,7 +75,6 @@ void AdObject3D::clearIgnoredLights() {
for (int32 i = 0; i < _ignoredLights.getSize(); ++i) {
delete _ignoredLights[i];
}
-
_ignoredLights.removeAll();
}
@@ -216,7 +215,6 @@ bool AdObject3D::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
getBonePosition3D(boneName, &pos);
ScValue *val = stack->getPushValue();
-
if (val) {
val->setProperty("X", pos._x);
val->setProperty("Y", pos._y);
@@ -471,7 +469,6 @@ bool AdObject3D::scSetProperty(const char *name, ScValue *value) {
if (_shadowType < 0) {
_shadowType = SHADOW_NONE;
}
-
if (_shadowType > SHADOW_STENCIL) {
_shadowType = SHADOW_STENCIL;
}
@@ -586,10 +583,8 @@ bool AdObject3D::skipTo(int x, int y, bool tolerant) {
//////////////////////////////////////////////////////////////////////////
ShadowVolume *AdObject3D::getShadowVolume() {
- if (_shadowVolume == nullptr) {
+ if (_shadowVolume == nullptr)
_shadowVolume = _gameRef->_renderer3D->createShadowVolume();
- }
-
return _shadowVolume;
}
@@ -631,8 +626,8 @@ bool AdObject3D::getBonePosition3D(const char *boneName, DXVector3 *pos, DXVecto
return false;
}
- DXVector3 vz(0, 0, 0);
if (!offset) {
+ DXVector3 vz(0, 0, 0);
offset = &vz;
}
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 3ed2395f9fc..fa71f91e4a1 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -1092,11 +1092,13 @@ bool AdScene::traverseNodes(bool doUpdate) {
if (_autoScroll) {
// adjust horizontal scroll
if (_gameRef->getTimer()->getTime() - _lastTimeH >= _scrollTimeH) {
- int timesMissed = (_gameRef->getTimer()->getTime() - _lastTimeH) / _scrollTimeH;
+
// Cap the amount of catch-up to avoid jittery characters.
+ int timesMissed = (_gameRef->getTimer()->getTime() - _lastTimeH) / _scrollTimeH;
if (timesMissed > 2) {
timesMissed = 2;
}
+
_lastTimeH = _gameRef->getTimer()->getTime();
if (_offsetLeft < _targetOffsetLeft) {
_offsetLeft += _scrollPixelsH * timesMissed;
@@ -1109,11 +1111,13 @@ bool AdScene::traverseNodes(bool doUpdate) {
// adjust vertical scroll
if (_gameRef->getTimer()->getTime() - _lastTimeV >= _scrollTimeV) {
- int timesMissed = (_gameRef->getTimer()->getTime() - _lastTimeV) / _scrollTimeV;
+
// Cap the amount of catch-up to avoid jittery characters.
+ int timesMissed = (_gameRef->getTimer()->getTime() - _lastTimeV) / _scrollTimeV;
if (timesMissed > 2) {
timesMissed = 2;
}
+
_lastTimeV = _gameRef->getTimer()->getTime();
if (_offsetTop < _targetOffsetTop) {
_offsetTop += _scrollPixelsV * timesMissed;
@@ -2361,7 +2365,6 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
}
}
-
//////////////////////////////////////////////////////////////////////////
ScValue *AdScene::scGetProperty(const Common::String &name) {
_scValue->setNULL();
@@ -2483,7 +2486,6 @@ ScValue *AdScene::scGetProperty(const Common::String &name) {
return _scValue;
}
-
//////////////////////////////////////////////////////////////////////////
// ScrollSpeedX
//////////////////////////////////////////////////////////////////////////
@@ -2526,7 +2528,6 @@ ScValue *AdScene::scGetProperty(const Common::String &name) {
} else {
_scValue->setNULL();
}
-
return _scValue;
}
@@ -2539,7 +2540,6 @@ ScValue *AdScene::scGetProperty(const Common::String &name) {
} else {
_scValue->setFloat(0.0f);
}
-
return _scValue;
}
#endif
@@ -2594,7 +2594,6 @@ ScValue *AdScene::scGetProperty(const Common::String &name) {
} else {
_scValue->setInt(_geom->_lights.getSize());
}
-
return _scValue;
}
#endif
@@ -2604,7 +2603,6 @@ ScValue *AdScene::scGetProperty(const Common::String &name) {
}
}
-
//////////////////////////////////////////////////////////////////////////
bool AdScene::scSetProperty(const char *name, ScValue *value) {
//////////////////////////////////////////////////////////////////////////
@@ -2730,7 +2728,6 @@ bool AdScene::scSetProperty(const char *name, ScValue *value) {
_geom->_waypointHeight = value->getFloat();
_geom->dropWaypoints();
}
-
return STATUS_OK;
}
@@ -2854,8 +2851,6 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent + 2, "VIEWPORT { %d, %d, %d, %d }\n", rc->left, rc->top, rc->right, rc->bottom);
}
-
-
// editor settings
buffer->putTextIndent(indent + 2, "; ----- editor settings\n");
buffer->putTextIndent(indent + 2, "EDITOR_MARGIN_H=%d\n", _editorMarginH);
@@ -2909,7 +2904,6 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
_rotLevels[i]->saveAsText(buffer, indent + 2);
}
-
buffer->putTextIndent(indent + 2, "\n");
// free entities
@@ -2917,7 +2911,6 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
for (int32 i = 0; i < _objects.getSize(); i++) {
if (_objects[i]->_type == OBJECT_ENTITY) {
_objects[i]->saveAsText(buffer, indent + 2);
-
}
}
@@ -2928,9 +2921,11 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
//////////////////////////////////////////////////////////////////////////
bool AdScene::sortScaleLevels() {
+
if (_scaleLevels.getSize() == 0) {
return STATUS_OK;
}
+
bool changed;
do {
changed = false;
@@ -2952,9 +2947,11 @@ bool AdScene::sortScaleLevels() {
//////////////////////////////////////////////////////////////////////////
bool AdScene::sortRotLevels() {
+
if (_rotLevels.getSize() == 0) {
return STATUS_OK;
}
+
bool changed;
do {
changed = false;
@@ -3078,13 +3075,18 @@ bool AdScene::persist(BasePersistenceManager *persistMgr) {
if (BaseEngine::instance().getFlags() & GF_3D) {
persistMgr->transferSint32(TMEMBER(_editorResolutionWidth));
persistMgr->transferSint32(TMEMBER(_editorResolutionHeight));
+
persistMgr->transferFloat(TMEMBER(_fov));
persistMgr->transferFloat(TMEMBER(_nearClipPlane));
persistMgr->transferFloat(TMEMBER(_farClipPlane));
+
persistMgr->transferBool(TMEMBER(_2DPathfinding));
persistMgr->transferSint32(TMEMBER_INT(_maxShadowType));
+
persistMgr->transferBool(TMEMBER(_scroll3DCompatibility));
+
persistMgr->transferUint32(TMEMBER(_ambientLightColor));
+
persistMgr->transferBool(TMEMBER(_fogEnabled));
persistMgr->transferUint32(TMEMBER(_fogColor));
persistMgr->transferFloat(TMEMBER(_fogStart));
@@ -3127,7 +3129,6 @@ bool AdScene::correctTargetPoint2(int32 startX, int32 startY, int32 *targetX, in
x2 = startX;
y2 = startY;
-
xLength = abs(x2 - x1);
yLength = abs(y2 - y1);
diff --git a/engines/wintermute/ad/ad_scene_geometry.cpp b/engines/wintermute/ad/ad_scene_geometry.cpp
index 0334df03bf5..dd478ce1a49 100644
--- a/engines/wintermute/ad/ad_scene_geometry.cpp
+++ b/engines/wintermute/ad/ad_scene_geometry.cpp
@@ -480,7 +480,8 @@ float AdSceneGeometry::getHeightAt(DXVector3 pos, float tolerance, bool *intFoun
for (int32 i = 0; i < _planes.getSize(); i++) {
for (uint32 j = 0; j < _planes[i]->_mesh->_numFaces; j++) {
- if (C3DUtils::intersectTriangle(pos, dir,
+ if (C3DUtils::intersectTriangle(
+ pos, dir,
_planes[i]->_mesh->_vertices[_planes[i]->_mesh->_faces[j]._vertices[0]]._pos,
_planes[i]->_mesh->_vertices[_planes[i]->_mesh->_faces[j]._vertices[1]]._pos,
_planes[i]->_mesh->_vertices[_planes[i]->_mesh->_faces[j]._vertices[2]]._pos,
@@ -546,13 +547,11 @@ bool AdSceneGeometry::directPathExists(DXVector3 *p1, DXVector3 *p2) {
float dist;
if (C3DUtils::pickGetIntersect(*p1, *p2, v0, v1, v2, &intersection, &dist)) {
- if (C3DUtils::intersectTriangle(*p1, *p1 - *p2, v0, v1, v2,
- &intersection._x, &intersection._y, &intersection._z)) {
+ if (C3DUtils::intersectTriangle(*p1, *p1 - *p2, v0, v1, v2, &intersection._x, &intersection._y, &intersection._z)) {
return false;
}
- if (C3DUtils::intersectTriangle(*p2, *p2 - *p1, v0, v1, v2,
- &intersection._x, &intersection._y, &intersection._z)) {
+ if (C3DUtils::intersectTriangle(*p2, *p2 - *p1, v0, v1, v2, &intersection._x, &intersection._y, &intersection._z)) {
return false;
}
}
@@ -703,7 +702,6 @@ bool AdSceneGeometry::convert2Dto3D(int x, int y, DXVector3 *pos) {
x -= (mleft + mright) / 2 + modWidth;
y -= (mtop + mbottom) / 2 + modHeight;
-
DXVector3 vPickRayDir;
DXVector3 vPickRayOrig;
@@ -731,7 +729,8 @@ bool AdSceneGeometry::convert2Dto3D(int x, int y, DXVector3 *pos) {
DXVector3 intersection, ray;
for (int32 i = 0; i < _planes.getSize(); i++) {
for (int32 j = 0; j < _planes[i]->_mesh->_numFaces; j++) {
- if (C3DUtils::intersectTriangle(vPickRayOrig, vPickRayDir,
+ if (C3DUtils::intersectTriangle(
+ vPickRayOrig, vPickRayDir,
_planes[i]->_mesh->_vertices[_planes[i]->_mesh->_faces[j]._vertices[0]]._pos,
_planes[i]->_mesh->_vertices[_planes[i]->_mesh->_faces[j]._vertices[1]]._pos,
_planes[i]->_mesh->_vertices[_planes[i]->_mesh->_faces[j]._vertices[2]]._pos,
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index 75cecbe5a7b..16c62a05bae 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -311,9 +311,9 @@ bool BaseScriptHolder::addScript(const char *filename) {
if (_gameRef->_editorForceScripts) {
// editor hack
#if EXTENDED_DEBUGGER_ENABLED
- scr = new DebuggableScript(_gameRef, _gameRef->_scEngine);
+ scr = new DebuggableScript(_gameRef, _gameRef->_scEngine);
#else
- scr = new ScScript(_gameRef, _gameRef->_scEngine);
+ scr = new ScScript(_gameRef, _gameRef->_scEngine);
#endif
size_t filenameSize = strlen(filename) + 1;
scr->_filename = new char[filenameSize];
diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp
index ad03695872e..c8918c87562 100644
--- a/engines/wintermute/base/base_string_table.cpp
+++ b/engines/wintermute/base/base_string_table.cpp
@@ -36,7 +36,6 @@ namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseStringTable::BaseStringTable(BaseGame *inGame) : BaseClass(inGame) {
-
}
@@ -44,7 +43,6 @@ BaseStringTable::BaseStringTable(BaseGame *inGame) : BaseClass(inGame) {
BaseStringTable::~BaseStringTable() {
// delete strings
_strings.clear();
-
}
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index b91eec967c5..ca4b33156e6 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -286,7 +286,8 @@ bool BaseSubFrame::getBoundingRect(Common::Rect32 *rect, int x, int y, float sca
float ratioX = scaleX / 100.0f;
float ratioY = scaleY / 100.0f;
- BasePlatform::setRect(rect, (int)(x - _hotspotX * ratioX),
+ BasePlatform::setRect(rect,
+ (int)(x - _hotspotX * ratioX),
(int)(y - _hotspotY * ratioY),
(int)(x - _hotspotX * ratioX + (getRect().right - getRect().left) * ratioX),
(int)(y - _hotspotY * ratioY + (getRect().bottom - getRect().top) * ratioY));
diff --git a/engines/wintermute/base/font/base_font_storage.cpp b/engines/wintermute/base/font/base_font_storage.cpp
index daf3272d8a9..ebd89e56257 100644
--- a/engines/wintermute/base/font/base_font_storage.cpp
+++ b/engines/wintermute/base/font/base_font_storage.cpp
@@ -50,9 +50,8 @@ BaseFontStorage::~BaseFontStorage() {
//////////////////////////////////////////////////////////////////////////
bool BaseFontStorage::cleanup(bool warn) {
for (int32 i = 0; i < _fonts.getSize(); i++) {
- if (warn) {
+ if (warn)
_gameRef->LOG(0, "Removing orphan font '%s'", _fonts[i]->getFilename());
- }
delete _fonts[i];
}
_fonts.removeAll();
diff --git a/engines/wintermute/base/gfx/xmodel.cpp b/engines/wintermute/base/gfx/xmodel.cpp
index 4d12508d8d6..4860a9a6788 100644
--- a/engines/wintermute/base/gfx/xmodel.cpp
+++ b/engines/wintermute/base/gfx/xmodel.cpp
@@ -313,9 +313,8 @@ bool XModel::loadAnimation(const Common::String &filename, XFileData *xobj, Anim
}
parentAnimSet->addAnimation(anim);
- if (newAnimSet) {
+ if (newAnimSet)
_animationSets.add(parentAnimSet);
- }
return true;
}
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 3f532d4f389..6c12375ea49 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -1450,9 +1450,8 @@ bool ScScript::pause() {
return STATUS_FAILED;
}
- if (!_freezable || _state == SCRIPT_PERSISTENT) {
+ if (!_freezable || _state == SCRIPT_PERSISTENT)
return STATUS_OK;
- }
_origState = _state;
_state = SCRIPT_PAUSED;
@@ -1463,9 +1462,8 @@ 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_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp
index 0a9611d1fdb..9d089514a7a 100644
--- a/engines/wintermute/base/scriptables/script_ext_file.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_file.cpp
@@ -746,12 +746,12 @@ uint32 SXFile::getLength() {
} else if ((_mode == 2 || _mode == 3) && _writeFile) {
error("SXFile - reading length for WriteFile not supported");
return 0;
- /*
- uint32 currentPos = ftell((FILE *)_writeFile);
- fseek((FILE *)_writeFile, 0, SEEK_END);
- int ret = ftell((FILE *)_writeFile);
- fseek((FILE *)_writeFile, CurrentPos, SEEK_SET);
- return Ret;*/
+/*
+ uint32 currentPos = ftell((FILE *)_writeFile);
+ fseek((FILE *)_writeFile, 0, SEEK_END);
+ int ret = ftell((FILE *)_writeFile);
+ fseek((FILE *)_writeFile, CurrentPos, SEEK_SET);
+ return Ret;*/
} else {
return 0;
}
diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp
index 89c65f7ce5e..c4b866efbf2 100644
--- a/engines/wintermute/base/sound/base_sound.cpp
+++ b/engines/wintermute/base/sound/base_sound.cpp
@@ -34,6 +34,7 @@ namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseSound, false)
+//////////////////////////////////////////////////////////////////////////
BaseSound::BaseSound(BaseGame *inGame) : BaseClass(inGame) {
_sound = nullptr;
_soundFilename = "";
@@ -52,6 +53,7 @@ BaseSound::BaseSound(BaseGame *inGame) : BaseClass(inGame) {
_sFXParam1 = _sFXParam2 = _sFXParam3 = _sFXParam4 = 0;
}
+//////////////////////////////////////////////////////////////////////////
BaseSound::~BaseSound() {
if (_sound) {
_gameRef->_soundMgr->removeSound(_sound);
@@ -59,6 +61,7 @@ BaseSound::~BaseSound() {
_sound = nullptr;
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::setSound(const Common::String &filename, Audio::Mixer::SoundType type, bool streamed) {
if (_sound) {
_gameRef->_soundMgr->removeSound(_sound);
@@ -79,6 +82,7 @@ bool BaseSound::setSound(const Common::String &filename, Audio::Mixer::SoundType
}
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::setSoundSimple() {
_sound = _gameRef->_soundMgr->addSound(_soundFilename, _soundType, _soundStreamed);
if (_sound) {
@@ -99,6 +103,7 @@ bool BaseSound::setSoundSimple() {
}
}
+//////////////////////////////////////////////////////////////////////////
uint32 BaseSound::getLength() {
if (_sound) {
return _sound->getLength();
@@ -107,6 +112,7 @@ uint32 BaseSound::getLength() {
}
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::play(bool looping) {
if (_sound) {
_soundPaused = false;
@@ -116,6 +122,7 @@ bool BaseSound::play(bool looping) {
}
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::stop() {
if (_sound) {
_soundPaused = false;
@@ -125,6 +132,7 @@ bool BaseSound::stop() {
}
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::pause(bool freezePaused) {
if (_sound) {
_soundPaused = true;
@@ -137,6 +145,7 @@ bool BaseSound::pause(bool freezePaused) {
}
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::resume() {
if (_sound && _soundPaused) {
_soundPaused = false;
@@ -146,6 +155,7 @@ bool BaseSound::resume() {
}
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::persist(BasePersistenceManager *persistMgr) {
if (persistMgr->getIsSaving() && _sound) {
_soundPlaying = _sound->isPlaying();
@@ -179,14 +189,17 @@ bool BaseSound::persist(BasePersistenceManager *persistMgr) {
return STATUS_OK;
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::isPlaying() {
return _sound && _sound->isPlaying();
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::isPaused() {
return _sound && _soundPaused;
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::setPositionTime(uint32 time) {
if (!_sound) {
return STATUS_FAILED;
@@ -199,6 +212,7 @@ bool BaseSound::setPositionTime(uint32 time) {
return ret;
}
+//////////////////////////////////////////////////////////////////////////
uint32 BaseSound::getPositionTime() {
if (!_sound) {
return 0;
@@ -211,6 +225,7 @@ uint32 BaseSound::getPositionTime() {
}
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::setVolumePercent(int percent) {
if (!_sound) {
return STATUS_FAILED;
@@ -219,6 +234,7 @@ bool BaseSound::setVolumePercent(int percent) {
}
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::setVolume(int volume) {
if (!_sound) {
return STATUS_FAILED;
@@ -274,6 +290,7 @@ bool BaseSound::setPan(float pan) {
}
}
+//////////////////////////////////////////////////////////////////////////
bool BaseSound::applyFX(TSFXType type, float param1, float param2, float param3, float param4) {
if (!_sound) {
return STATUS_OK;
More information about the Scummvm-git-logs
mailing list