[Scummvm-git-logs] scummvm master -> 12175266af404471cc45a585ed9424ec36e66541

[aquadran]

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:
12175266af WINTERMUTE: Fixes for CID: 1497100, 1497101, 1497102


Commit: 12175266af404471cc45a585ed9424ec36e66541
    https://github.com/scummvm/scummvm/commit/12175266af404471cc45a585ed9424ec36e66541
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-28T11:13:11+01:00

Commit Message:
WINTERMUTE: Fixes for CID: 1497100, 1497101, 1497102

Changed paths:
    engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
    engines/wintermute/base/gfx/xmodel.h


diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
index 65db86230dd..9892baf7180 100644
--- a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
@@ -46,6 +46,7 @@ struct ShadowVertexShader {
 ShadowVolumeOpenGLShader::ShadowVolumeOpenGLShader(BaseGame *inGame, OpenGL::Shader *volumeShader, OpenGL::Shader *maskShader)
 	: ShadowVolume(inGame), _color(0x7f000000), _volumeShader(volumeShader), _maskShader(maskShader) {
 	ShadowVertexShader shadowMask[4];
+	_shadowVolumeVertexBuffer = 0;
 	DXViewport viewport = _gameRef->_renderer3D->getViewPort();
 
 	shadowMask[0].x = viewport._x;
diff --git a/engines/wintermute/base/gfx/xmodel.h b/engines/wintermute/base/gfx/xmodel.h
index bfc6031b28b..365f97640f9 100644
--- a/engines/wintermute/base/gfx/xmodel.h
+++ b/engines/wintermute/base/gfx/xmodel.h
@@ -122,7 +122,7 @@ public:
 	XModel(BaseGame *inGame, BaseObject *owner);
 	virtual ~XModel();
 
-	XModel *_parentModel;
+	XModel *_parentModel{};
 
 	bool loadFromFile(const Common::String &filename, XModel *parentModel = nullptr);
 	bool mergeFromFile(const Common::String &filename);
@@ -147,7 +147,7 @@ public:
 	static bool loadName(Common::String &targetStr, XFileData *data);
 
 	Rect32 _boundingRect;
-	BaseObject *_owner;
+	BaseObject *_owner{};
 
 	bool parseAnim(byte *buffer);
 	bool parseEvent(AnimationSet *anim, byte *buffer);
@@ -168,7 +168,7 @@ public:
 
 	bool unloadAnimation(const char *animName);
 
-	uint32 _ticksPerSecond;
+	uint32 _ticksPerSecond{};
 
 	BaseArray<AnimationSet *> _animationSets;
 
@@ -178,21 +178,21 @@ private:
 
 	void updateBoundingRect();
 	void static inline updateRect(Rect32 *rc, DXVector3 *vec);
-	DXViewport _drawingViewport;
+	DXViewport _drawingViewport{};
 	DXMatrix _lastWorldMat;
 	DXMatrix _lastViewMat;
 	DXMatrix _lastProjMat;
-	int32 _lastOffsetX;
-	int32 _lastOffsetY;
+	int32 _lastOffsetX{};
+	int32 _lastOffsetY{};
 
 	DXVector3 _BBoxStart;
 	DXVector3 _BBoxEnd;
 
 protected:
 	BaseArray<const char*> _mergedModels;
-	AnimationChannel *_channels[X_NUM_ANIMATION_CHANNELS];
+	AnimationChannel *_channels[X_NUM_ANIMATION_CHANNELS]{};
 
-	FrameNode *_rootFrame;
+	FrameNode *_rootFrame{};
 
 	BaseArray<XModelMatSprite *> _matSprites;
 };