[Scummvm-git-logs] scummvm master -> bf64eb8a3e04f869d7ce9442ada4cb37a36de895

[aquadran]

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:
bf64eb8a3e WINTERMUTE: Silence rewind in theora video, but error for seek


Commit: bf64eb8a3e04f869d7ce9442ada4cb37a36de895
    https://github.com/scummvm/scummvm/commit/bf64eb8a3e04f869d7ce9442ada4cb37a36de895
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-05-24T07:45:31+02:00

Commit Message:
WINTERMUTE: Silence rewind in theora video, but error for seek

Changed paths:
    engines/wintermute/base/gfx/xframe_node.cpp
    engines/wintermute/base/gfx/xmath.cpp
    engines/wintermute/video/video_theora_player.cpp


diff --git a/engines/wintermute/base/gfx/xframe_node.cpp b/engines/wintermute/base/gfx/xframe_node.cpp
index 857b3f57411..9fb3fa626b9 100644
--- a/engines/wintermute/base/gfx/xframe_node.cpp
+++ b/engines/wintermute/base/gfx/xframe_node.cpp
@@ -40,7 +40,7 @@ namespace Wintermute {
 //////////////////////////////////////////////////////////////////////////
 FrameNode::FrameNode(BaseGame *inGame) : BaseNamedObject(inGame) {
 	DXMatrixIdentity(&_transformationMatrix);
-   	DXMatrixIdentity(&_originalMatrix);
+	DXMatrixIdentity(&_originalMatrix);
 	DXMatrixIdentity(&_combinedMatrix);
 
 	for (int i = 0; i < 2; i++) {
diff --git a/engines/wintermute/base/gfx/xmath.cpp b/engines/wintermute/base/gfx/xmath.cpp
index 769a7013086..78db54ec3db 100644
--- a/engines/wintermute/base/gfx/xmath.cpp
+++ b/engines/wintermute/base/gfx/xmath.cpp
@@ -178,7 +178,7 @@ DXQuaternion::DXQuaternion(float fx, float fy, float fz, float fw) {
 	_z = fz;
 	_w = fw;
 }
-					  
+
 DXQuaternion::operator float* () {
 	return (float *)&_x;
 }
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index ea1e9ca30f4..a1ebba08b02 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -153,7 +153,6 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common:
 
 //////////////////////////////////////////////////////////////////////////
 bool VideoTheoraPlayer::resetStream() {
-	warning("VidTheoraPlayer::resetStream - hacked");
 	// HACK: Just reopen the same file again.
 	if (_theoraDecoder) {
 		_theoraDecoder->close();
@@ -304,9 +303,8 @@ bool VideoTheoraPlayer::update() {
 		}
 
 		if (_theoraDecoder->endOfVideo() && _looping) {
-			warning("Should loop movie %s, hacked for now", _filename.c_str());
 			_theoraDecoder->rewind();
-			//HACK: Just reinitialize the same video again:
+			// HACK: Just reinitialize the same video again
 			return resetStream();
 		} else if (_theoraDecoder->endOfVideo() && !_looping) {
 			debugC(kWintermuteDebugLog, "Finished movie %s", _filename.c_str());
@@ -475,7 +473,7 @@ inline int intlog(int num) {
 
 //////////////////////////////////////////////////////////////////////////
 bool VideoTheoraPlayer::seekToTime(uint32 time) {
-	warning("VideoTheoraPlayer::SeekToTime(%d) - not supported", time);
+	error("VideoTheoraPlayer::SeekToTime(%d) - not supported", time);
 	return STATUS_OK;
 }