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

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
382abaf53d MADS: DRAGONSPHERE: Fix Visual Studio compilation
f41520283d MADS: PHANTOM: Added missing buffer setup to animview animation


Commit: 382abaf53d85e281ac3de1c0f0e6867aa66d9d32
    https://github.com/scummvm/scummvm/commit/382abaf53d85e281ac3de1c0f0e6867aa66d9d32
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-09T19:41:00+10:00

Commit Message:
MADS: DRAGONSPHERE: Fix Visual Studio compilation

Changed paths:
  A engines/mads/madsv2/dragonsphere/mads/dragon_mads.cpp
  A engines/mads/madsv2/dragonsphere/mads/dragon_mads.h
  R engines/mads/madsv2/dragonsphere/mads/mads.cpp
  R engines/mads/madsv2/dragonsphere/mads/mads.h
    engines/mads/madsv2/dragonsphere/rooms/room104.cpp
    engines/mads/module.mk


diff --git a/engines/mads/madsv2/dragonsphere/mads/mads.cpp b/engines/mads/madsv2/dragonsphere/mads/dragon_mads.cpp
similarity index 94%
rename from engines/mads/madsv2/dragonsphere/mads/mads.cpp
rename to engines/mads/madsv2/dragonsphere/mads/dragon_mads.cpp
index 086912802ba..ad07d4079eb 100644
--- a/engines/mads/madsv2/dragonsphere/mads/mads.cpp
+++ b/engines/mads/madsv2/dragonsphere/mads/dragon_mads.cpp
@@ -19,4 +19,4 @@
  *
  */
 
-#include "mads/madsv2/dragonsphere/mads/mads.h"
+#include "mads/madsv2/dragonsphere/mads/dragon_mads.h"
diff --git a/engines/mads/madsv2/dragonsphere/mads/mads.h b/engines/mads/madsv2/dragonsphere/mads/dragon_mads.h
similarity index 100%
rename from engines/mads/madsv2/dragonsphere/mads/mads.h
rename to engines/mads/madsv2/dragonsphere/mads/dragon_mads.h
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room104.cpp b/engines/mads/madsv2/dragonsphere/rooms/room104.cpp
index 30cd2bc8237..7afcc1f6571 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room104.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room104.cpp
@@ -33,7 +33,7 @@
 #include "mads/madsv2/core/text.h"
 #include "mads/madsv2/core/vocab.h"
 #include "mads/madsv2/dragonsphere/global.h"
-#include "mads/madsv2/dragonsphere/mads/mads.h"
+#include "mads/madsv2/dragonsphere/mads/dragon_mads.h"
 #include "mads/madsv2/dragonsphere/rooms/section1.h"
 #include "mads/madsv2/dragonsphere/rooms/room104.h"
 
diff --git a/engines/mads/module.mk b/engines/mads/module.mk
index fa0d8485ad7..19f157b18f2 100644
--- a/engines/mads/module.mk
+++ b/engines/mads/module.mk
@@ -180,7 +180,7 @@ MODULE_OBJS += \
 	madsv2/phantom/sound_phantom.o \
 	madsv2/dragonsphere/dragonsphere.o \
 	madsv2/dragonsphere/global.o \
-	madsv2/dragonsphere/mads/mads.o \
+	madsv2/dragonsphere/mads/dragon_mads.o \
 	madsv2/dragonsphere/rooms/section1.o \
 	madsv2/dragonsphere/rooms/room101.o \
 	madsv2/dragonsphere/rooms/section2.o \


Commit: f41520283d344d260b12c0bc0c43babfdcb110da
    https://github.com/scummvm/scummvm/commit/f41520283d344d260b12c0bc0c43babfdcb110da
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-09T19:41:00+10:00

Commit Message:
MADS: PHANTOM: Added missing buffer setup to animview animation

Changed paths:
    engines/mads/madsv2/animview/animview.cpp


diff --git a/engines/mads/madsv2/animview/animview.cpp b/engines/mads/madsv2/animview/animview.cpp
index 30c2bb71a49..202746161d5 100644
--- a/engines/mads/madsv2/animview/animview.cpp
+++ b/engines/mads/madsv2/animview/animview.cpp
@@ -81,6 +81,9 @@ static void *anim_buffer;
 static bool foundSeries;
 static int imageFlags, imageFlags2, imageFlags3;
 static int imageSpriteId;
+static int largeBufferSize;
+static byte *largeBuffer, *largeBufferEnd;
+static byte *largeBuffer1, *largeBuffer2;
 
 /**
  * Initializes animview global variables
@@ -116,6 +119,9 @@ static void init_globals() {
 	foundSeries = false;
 	imageFlags = imageFlags2 = imageFlags3 = 0;
 	imageSpriteId = 0;
+	largeBufferSize = 0;
+	largeBuffer = largeBufferEnd = nullptr;
+	largeBuffer1 = largeBuffer2 = nullptr;
 }
 
 /**
@@ -390,21 +396,28 @@ static void animate() {
 			}
 		}
 
-		foundSeries = false;
-		imageIndex = -1;
-		for (ctr = 0; ctr < current_anim->num_images; ++ctr) {
-			int seriesId = current_anim->series_id[packIndex];
-			if (current_anim->image[ctr].series_id == seriesId) {
-				imageIndex = ctr;
-				foundSeries = true;
+		if (current_anim->misc_any_packed) {
+			largeBufferSize = 0xffff;
+			largeBuffer = (byte *)mem_get(largeBufferSize);
+			largeBufferEnd = largeBuffer + largeBufferSize - 1;
+			largeBuffer1 = largeBuffer2 = largeBuffer;
+
+			foundSeries = false;
+			imageIndex = -1;
+			for (ctr = 0; ctr < current_anim->num_images; ++ctr) {
+				int seriesId = current_anim->series_id[packIndex];
+				if (current_anim->image[ctr].series_id == seriesId) {
+					imageIndex = ctr;
+					foundSeries = true;
+				}
 			}
-		}
 
-		if (foundSeries) {
-			Image &img = current_anim->image[imageIndex];
-			imageFlags = imageFlags2 = img.flags;
-			imageFlags3 = imageFlags - 1;
-			imageSpriteId = img.sprite_id;
+			if (foundSeries) {
+				Image &img = current_anim->image[imageIndex];
+				imageFlags = imageFlags2 = img.flags;
+				imageFlags3 = imageFlags - 1;
+				imageSpriteId = img.sprite_id;
+			}
 		}
 
 		// Run the animation