[Scummvm-git-logs] scummvm master -> 1ca112b6accd243d2028c461c19cc54306f75eb4
aquadran
noreply at scummvm.org
Sat Jul 2 20:27:03 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1ca112b6ac WINTERMUTE: Janitorial
Commit: 1ca112b6accd243d2028c461c19cc54306f75eb4
https://github.com/scummvm/scummvm/commit/1ca112b6accd243d2028c461c19cc54306f75eb4
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-02T22:26:58+02:00
Commit Message:
WINTERMUTE: Janitorial
Changed paths:
engines/wintermute/ad/ad_actor_3dx.cpp
engines/wintermute/ad/ad_block.cpp
engines/wintermute/ad/ad_scene.cpp
engines/wintermute/ad/ad_waypoint_group3d.cpp
engines/wintermute/base/base_animation_transition_time.cpp
engines/wintermute/base/base_fader.cpp
engines/wintermute/base/base_scriptable.cpp
engines/wintermute/base/gfx/x/modelx.cpp
engines/wintermute/base/scriptables/script.cpp
engines/wintermute/debugger.cpp
engines/wintermute/ui/ui_window.cpp
engines/wintermute/video/video_theora_player.cpp
diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index 4af0315dab7..3abd89522fe 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -475,6 +475,7 @@ bool AdActor3DX::displayShadowVolume() {
lightVector.normalize();
getShadowVolume()->setColor(_shadowColor);
+
getShadowVolume()->reset();
ModelX *shadowModel;
@@ -798,7 +799,6 @@ bool AdActor3DX::turnToStep(float velocity) {
}
// done turning?
- // comparison between floating point numbers?
if (_angle == _targetAngle) {
_angle.normalize(0.0f);
_targetAngle = _angle;
@@ -923,8 +923,8 @@ bool AdActor3DX::loadBuffer(byte *buffer, bool complete) {
}
delete _modelX;
- delete _shadowModel;
_modelX = nullptr;
+ delete _shadowModel;
_shadowModel = nullptr;
while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)¶ms)) > 0) {
@@ -1055,7 +1055,6 @@ bool AdActor3DX::loadBuffer(byte *buffer, bool complete) {
_shadowType = SHADOW_STENCIL;
}
}
-
break;
}
@@ -1078,7 +1077,6 @@ bool AdActor3DX::loadBuffer(byte *buffer, bool complete) {
case TOKEN_SHADOW_MODEL:
if (_modelX) {
delete _shadowModel;
- _shadowModel = nullptr;
_shadowModel = new ModelX(_gameRef, this);
if (!_shadowModel || !_shadowModel->loadFromFile((char *)params, _modelX)) {
@@ -1152,7 +1150,6 @@ bool AdActor3DX::loadBuffer(byte *buffer, bool complete) {
_currentBlockRegion = crgn;
_currentBlockRegion->mimic(_blockRegion);
}
-
break;
}
@@ -1174,9 +1171,9 @@ bool AdActor3DX::loadBuffer(byte *buffer, bool complete) {
_currentWptGroup = cwpt;
_currentWptGroup->mimic(_wptGroup);
}
-
break;
}
+
}
}
@@ -1291,7 +1288,7 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
if (strcmp(name, "PlayAnim") == 0 || strcmp(name, "PlayAnimAsync") == 0) {
bool async = strcmp(name, "PlayAnimAsync") == 0;
stack->correctParams(1);
- if (!playAnim3DX(stack->pop()->getString(), true /*!Async*/)) {
+ if (!playAnim3DX(stack->pop()->getString(), true)) {
stack->pushBool(false);
} else {
if (!async)
diff --git a/engines/wintermute/ad/ad_block.cpp b/engines/wintermute/ad/ad_block.cpp
index 7982089fd43..03922b16254 100644
--- a/engines/wintermute/ad/ad_block.cpp
+++ b/engines/wintermute/ad/ad_block.cpp
@@ -41,6 +41,7 @@ AdBlock::AdBlock(BaseGame *inGame) : BaseScriptable(inGame, false, false) {
//////////////////////////////////////////////////////////////////////////
AdBlock::~AdBlock() {
delete _mesh;
+ _mesh = nullptr;
}
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 7979ff20908..2a8efa3599d 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -1289,7 +1289,7 @@ bool AdScene::updateFreeObjects() {
#ifdef ENABLE_WME3D
if (adGame->_objects[i]->_is3D && _sceneGeometry) {
- Camera3D* activeCamera = _sceneGeometry->getActiveCamera();
+ Camera3D *activeCamera = _sceneGeometry->getActiveCamera();
if (activeCamera != nullptr) {
_gameRef->_renderer->setup3D(activeCamera, !is3DSet);
is3DSet = true;
@@ -1307,7 +1307,7 @@ bool AdScene::updateFreeObjects() {
}
#ifdef ENABLE_WME3D
if (_objects[i]->_is3D && _sceneGeometry) {
- Camera3D* activeCamera = _sceneGeometry->getActiveCamera();
+ Camera3D *activeCamera = _sceneGeometry->getActiveCamera();
if (activeCamera != nullptr) {
_gameRef->_renderer->setup3D(activeCamera, !is3DSet);
is3DSet = true;
@@ -1366,8 +1366,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) {
_gameRef->_renderer->setup2D();
#else
if (objects[i]->_is3D && _sceneGeometry) {
- Camera3D* activeCamera = _sceneGeometry->getActiveCamera();
-
+ Camera3D *activeCamera = _sceneGeometry->getActiveCamera();
if (activeCamera != nullptr) {
_gameRef->_renderer->setup3D(activeCamera);
}
@@ -2920,12 +2919,6 @@ float AdScene::getScaleAt(int Y) {
//////////////////////////////////////////////////////////////////////////
bool AdScene::persist(BasePersistenceManager *persistMgr) {
- // TODO: Persist scene geometry as well.
- // Keep in mind that this might create incompabilities
- // between savegames from ScummVM and ResidualVM
- // Suggestions of potential fixes by somaen:
- // 1) Give ResidualVM savegames a special tag
- // 2) Don't serialize 3d stuff (which might mean more work than just ignoring them here)
BaseObject::persist(persistMgr);
persistMgr->transferBool(TMEMBER(_autoScroll));
@@ -3665,4 +3658,5 @@ void Wintermute::AdScene::setMaxShadowType(Wintermute::TShadowType shadowType) {
Common::String AdScene::debuggerToString() const {
return Common::String::format("%p: Scene \"%s\", paralax: %d, autoscroll: %d", (const void *)this, getName(), _paralaxScrolling, _autoScroll);
}
+
} // End of namespace Wintermute
diff --git a/engines/wintermute/ad/ad_waypoint_group3d.cpp b/engines/wintermute/ad/ad_waypoint_group3d.cpp
index 8dafcf26dff..a509c96b0ad 100644
--- a/engines/wintermute/ad/ad_waypoint_group3d.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group3d.cpp
@@ -54,7 +54,7 @@ bool AdWaypointGroup3D::addFromMesh(Mesh3DS *mesh) {
min = max = mesh->getVertexPosition(0);
}
- for (int i = 0; i < mesh->vertexCount(); i++){
+ for (int i = 0; i < mesh->vertexCount(); i++) {
min.x() = MIN(min.x(), mesh->getVertexPosition(i)[0]);
min.y() = MIN(min.y(), mesh->getVertexPosition(i)[1]);
min.z() = MIN(min.z(), mesh->getVertexPosition(i)[2]);
diff --git a/engines/wintermute/base/base_animation_transition_time.cpp b/engines/wintermute/base/base_animation_transition_time.cpp
index 0dec5ad6c81..b91d93eb79d 100644
--- a/engines/wintermute/base/base_animation_transition_time.cpp
+++ b/engines/wintermute/base/base_animation_transition_time.cpp
@@ -31,9 +31,10 @@
namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
-BaseAnimationTransitionTime::BaseAnimationTransitionTime(const Common::String &from, const Common::String &to, uint32 time) :
- _animFrom(from), _animTo(to), _time(time) {
-
+BaseAnimationTransitionTime::BaseAnimationTransitionTime(const Common::String &from, const Common::String &to, uint32 time) {
+ _animFrom = from;
+ _animTo = to;
+ _time = time;
}
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp
index 89b3666ffb2..92b51a7492e 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -79,7 +79,7 @@ bool BaseFader::update() {
} else {
_currentAlpha = (byte)(_sourceAlpha + (float)time / (float)_duration * alphaDelta);
}
- _currentAlpha = MIN((unsigned char)255, MAX(_currentAlpha, (byte)0)); // TODO: clean
+ _currentAlpha = MIN((byte)255, MAX(_currentAlpha, (byte)0));
_ready = time >= _duration;
if (_ready && _currentAlpha == 0x00) {
diff --git a/engines/wintermute/base/base_scriptable.cpp b/engines/wintermute/base/base_scriptable.cpp
index 0bc078275ad..3d0ac927a75 100644
--- a/engines/wintermute/base/base_scriptable.cpp
+++ b/engines/wintermute/base/base_scriptable.cpp
@@ -107,7 +107,7 @@ const char *BaseScriptable::scToString() {
//////////////////////////////////////////////////////////////////////////
void *BaseScriptable::scToMemBuffer() {
- return (void *)NULL;
+ return (void *)nullptr;
}
diff --git a/engines/wintermute/base/gfx/x/modelx.cpp b/engines/wintermute/base/gfx/x/modelx.cpp
index 3afb61105f4..2bf701581bd 100644
--- a/engines/wintermute/base/gfx/x/modelx.cpp
+++ b/engines/wintermute/base/gfx/x/modelx.cpp
@@ -824,6 +824,7 @@ bool ModelX::initializeSimple() {
_rootFrame->setMaterialSprite(_matSprites[i]->_matName, _matSprites[i]->_sprite);
}
}
+ // TODO: Effects
if (_parentModel) {
findBones(false, _parentModel);
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 45f22a0027d..5b8b71fffa8 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -755,12 +755,13 @@ bool ScScript::executeInstruction() {
case II_PUSH_VAR: {
ScValue *var = getVar(_symbols[getDWORD()]);
- if (false && /*var->_type==VAL_OBJECT ||*/ var->_type == VAL_NATIVE) {
+ // Disabled in original code
+ /*if (false && var->_type==VAL_OBJECT || var->_type == VAL_NATIVE) {
_operand->setReference(var);
_stack->push(_operand);
- } else {
+ } else {*/
_stack->push(var);
- }
+ //}
break;
}
@@ -806,10 +807,8 @@ bool ScScript::executeInstruction() {
_stack->pushFloat(getFloat());
break;
-
case II_PUSH_BOOL:
_stack->pushBool(getDWORD() != 0);
-
break;
case II_PUSH_STRING:
@@ -1372,6 +1371,27 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) {
}
+//////////////////////////////////////////////////////////////////////////
+void ScScript::afterLoad() {
+ if (_buffer == nullptr) {
+ byte *buffer = _engine->getCompiledScript(_filename, &_bufferSize);
+ if (!buffer) {
+ _gameRef->LOG(0, "Error reinitializing script '%s' after load. Script will be terminated.", _filename);
+ _state = SCRIPT_ERROR;
+ return;
+ }
+
+ _buffer = new byte [_bufferSize];
+ memcpy(_buffer, buffer, _bufferSize);
+
+ delete _scriptStream;
+ _scriptStream = new Common::MemoryReadStream(_buffer, _bufferSize);
+
+ initTables();
+ }
+}
+
+
//////////////////////////////////////////////////////////////////////////
ScScript *ScScript::invokeEventHandler(const Common::String &eventName, bool unbreakable) {
//if (_state!=SCRIPT_PERSISTENT) return nullptr;
@@ -1512,25 +1532,6 @@ bool ScScript::finishThreads() {
return STATUS_OK;
}
-//////////////////////////////////////////////////////////////////////////
-void ScScript::afterLoad() {
- if (_buffer == nullptr) {
- byte *buffer = _engine->getCompiledScript(_filename, &_bufferSize);
- if (!buffer) {
- _gameRef->LOG(0, "Error reinitializing script '%s' after load. Script will be terminated.", _filename);
- _state = SCRIPT_ERROR;
- return;
- }
-
- _buffer = new byte [_bufferSize];
- memcpy(_buffer, buffer, _bufferSize);
-
- delete _scriptStream;
- _scriptStream = new Common::MemoryReadStream(_buffer, _bufferSize);
-
- initTables();
- }
-}
void ScScript::preInstHook(uint32 inst) {}
diff --git a/engines/wintermute/debugger.cpp b/engines/wintermute/debugger.cpp
index 5f452640545..a38c3682050 100644
--- a/engines/wintermute/debugger.cpp
+++ b/engines/wintermute/debugger.cpp
@@ -275,7 +275,6 @@ bool Console::Cmd_Print(int argc, const char **argv) {
}
}
-
bool Console::Cmd_Set(int argc, const char **argv) {
if (argc == 4 && !strncmp("=", argv[2], 1)) {
ScValue *val = nullptr;
@@ -340,7 +339,6 @@ bool Console::Cmd_DumpFile(int argc, const char **argv) {
return true;
}
-
bool Console::Cmd_SourcePath(int argc, const char **argv) {
if (argc != 2) {
debugPrintf("Usage: %s <source path>\n", argv[0]);
@@ -377,7 +375,6 @@ void Console::notifyWatch(const char *filename, const char *symbol, const char *
}
Error Console::printSource(int n) {
-
Error* error = nullptr;
Listing *listing = CONTROLLER->getListing(error);
Error err(*error);
@@ -416,4 +413,5 @@ bool Console::Cmd_Top(int argc, const char **argv) {
void Console::printError(const Common::String &command, Error error) {
debugPrintf("%s: %s\n", command.c_str(), error.getErrorDisplayStr().c_str());
}
+
} // End of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 2ba7c8f6c92..58ebf692c55 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -152,6 +152,7 @@ bool UIWindow::display(int offsetX, int offsetY) {
}
if (_fadeBackground) {
+ // TODO: This should be handled on renderer side
Graphics::PixelFormat format = _gameRef->_renderer->getPixelFormat();
byte fadeR, fadeG, fadeB, fadeA;
// First convert from the internal format to the screen-format
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index a8de0c03798..e1e6f1cbf1f 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -445,7 +445,8 @@ bool VideoTheoraPlayer::setAlphaImage(const Common::String &filename) {
if (_alphaFilename != filename) {
_alphaFilename = filename;
}
- //TODO: Conversion.
+ // TODO: Conversion.
+ //_alphaImage->convert(IMG_TRUECOLOR);
return STATUS_OK;
}
More information about the Scummvm-git-logs
mailing list