[Scummvm-git-logs] scummvm master -> 0b61492a198e8042b8969941e7190669bb82fd35

dreammaster noreply at scummvm.org
Sat May 2 11:43:17 UTC 2026 

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:
84ae6b0ab0 MADS: PHANTOM: Further gcc warning fixes
0b61492a19 MADS: DRAGONSPHERE: Temporarily comment out unimplemented rooms' scratch area


Commit: 84ae6b0ab0d77fdb5196ac9aed3759c56047dfd5
    https://github.com/scummvm/scummvm/commit/84ae6b0ab0d77fdb5196ac9aed3759c56047dfd5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-02T21:41:01+10:00

Commit Message:
MADS: PHANTOM: Further gcc warning fixes

Changed paths:
    engines/mads/madsv2/core/sprite_0.cpp
    engines/mads/madsv2/core/tile.h


diff --git a/engines/mads/madsv2/core/sprite_0.cpp b/engines/mads/madsv2/core/sprite_0.cpp
index 74140ed7440..953394611f4 100644
--- a/engines/mads/madsv2/core/sprite_0.cpp
+++ b/engines/mads/madsv2/core/sprite_0.cpp
@@ -658,7 +658,7 @@ pixel_RLE:
 
 						/* pixel_RLE_run_yesdraw */
 						if (run_value != SS_SKIP) {
-#if !attribute
+#ifndef attribute
 							byte out_byte = run_value;
 #endif
 #if three_d
diff --git a/engines/mads/madsv2/core/tile.h b/engines/mads/madsv2/core/tile.h
index ecf315ceeda..d9d2730777b 100644
--- a/engines/mads/madsv2/core/tile.h
+++ b/engines/mads/madsv2/core/tile.h
@@ -51,7 +51,7 @@ struct TileResource {
 	uint32 chunk_size;              /* Tile size in bytes (x*y)         */
 	int16 color_handle;             /* Color handle for loaded resource */
 
-	byte *tile_data = nullptr;      /* Flat tile store allocated by tile_load (not serialised) */
+	byte *tile_data;      /* Flat tile store allocated by tile_load (not serialised) */
 
 	static constexpr int SIZE = 2 + 2 + 2 + 2 + 2 + 2 + 2 + 4 + 2;
 	void load(Common::SeekableReadStream *src);


Commit: 0b61492a198e8042b8969941e7190669bb82fd35
    https://github.com/scummvm/scummvm/commit/0b61492a198e8042b8969941e7190669bb82fd35
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-02T21:43:05+10:00

Commit Message:
MADS: DRAGONSPHERE: Temporarily comment out unimplemented rooms' scratch area

Changed paths:
    engines/mads/madsv2/dragonsphere/rooms/room102.cpp
    engines/mads/madsv2/dragonsphere/rooms/room103.cpp
    engines/mads/madsv2/dragonsphere/rooms/room104.cpp
    engines/mads/madsv2/dragonsphere/rooms/room105.cpp
    engines/mads/madsv2/dragonsphere/rooms/room106.cpp
    engines/mads/madsv2/dragonsphere/rooms/room107.cpp
    engines/mads/madsv2/dragonsphere/rooms/room108.cpp
    engines/mads/madsv2/dragonsphere/rooms/room109.cpp
    engines/mads/madsv2/dragonsphere/rooms/room110.cpp
    engines/mads/madsv2/dragonsphere/rooms/room111.cpp
    engines/mads/madsv2/dragonsphere/rooms/room112.cpp
    engines/mads/madsv2/dragonsphere/rooms/room113.cpp
    engines/mads/madsv2/dragonsphere/rooms/room114.cpp
    engines/mads/madsv2/dragonsphere/rooms/room115.cpp
    engines/mads/madsv2/dragonsphere/rooms/room116.cpp
    engines/mads/madsv2/dragonsphere/rooms/room117.cpp
    engines/mads/madsv2/dragonsphere/rooms/room118.cpp
    engines/mads/madsv2/dragonsphere/rooms/room119.cpp
    engines/mads/madsv2/dragonsphere/rooms/room201.cpp
    engines/mads/madsv2/dragonsphere/rooms/room203.cpp
    engines/mads/madsv2/dragonsphere/rooms/room204.cpp
    engines/mads/madsv2/dragonsphere/rooms/room205.cpp
    engines/mads/madsv2/dragonsphere/rooms/room206.cpp
    engines/mads/madsv2/dragonsphere/rooms/room301.cpp
    engines/mads/madsv2/dragonsphere/rooms/room302.cpp
    engines/mads/madsv2/dragonsphere/rooms/room303.cpp
    engines/mads/madsv2/dragonsphere/rooms/room401.cpp
    engines/mads/madsv2/dragonsphere/rooms/room402.cpp
    engines/mads/madsv2/dragonsphere/rooms/room403.cpp
    engines/mads/madsv2/dragonsphere/rooms/room404.cpp
    engines/mads/madsv2/dragonsphere/rooms/room405.cpp
    engines/mads/madsv2/dragonsphere/rooms/room406.cpp
    engines/mads/madsv2/dragonsphere/rooms/room407.cpp
    engines/mads/madsv2/dragonsphere/rooms/room408.cpp
    engines/mads/madsv2/dragonsphere/rooms/room409.cpp
    engines/mads/madsv2/dragonsphere/rooms/room410.cpp
    engines/mads/madsv2/dragonsphere/rooms/room411.cpp
    engines/mads/madsv2/dragonsphere/rooms/room412.cpp
    engines/mads/madsv2/dragonsphere/rooms/room454.cpp
    engines/mads/madsv2/dragonsphere/rooms/room501.cpp
    engines/mads/madsv2/dragonsphere/rooms/room502.cpp
    engines/mads/madsv2/dragonsphere/rooms/room503.cpp
    engines/mads/madsv2/dragonsphere/rooms/room504.cpp
    engines/mads/madsv2/dragonsphere/rooms/room505.cpp
    engines/mads/madsv2/dragonsphere/rooms/room506.cpp
    engines/mads/madsv2/dragonsphere/rooms/room507.cpp
    engines/mads/madsv2/dragonsphere/rooms/room508.cpp
    engines/mads/madsv2/dragonsphere/rooms/room509.cpp
    engines/mads/madsv2/dragonsphere/rooms/room510.cpp
    engines/mads/madsv2/dragonsphere/rooms/room511.cpp
    engines/mads/madsv2/dragonsphere/rooms/room512.cpp
    engines/mads/madsv2/dragonsphere/rooms/room557.cpp
    engines/mads/madsv2/dragonsphere/rooms/room601.cpp
    engines/mads/madsv2/dragonsphere/rooms/room602.cpp
    engines/mads/madsv2/dragonsphere/rooms/room603.cpp
    engines/mads/madsv2/dragonsphere/rooms/room604.cpp
    engines/mads/madsv2/dragonsphere/rooms/room605.cpp
    engines/mads/madsv2/dragonsphere/rooms/room606.cpp
    engines/mads/madsv2/dragonsphere/rooms/room607.cpp
    engines/mads/madsv2/dragonsphere/rooms/room608.cpp
    engines/mads/madsv2/dragonsphere/rooms/room609.cpp
    engines/mads/madsv2/dragonsphere/rooms/room610.cpp
    engines/mads/madsv2/dragonsphere/rooms/room611.cpp
    engines/mads/madsv2/dragonsphere/rooms/room612.cpp
    engines/mads/madsv2/dragonsphere/rooms/room613.cpp
    engines/mads/madsv2/dragonsphere/rooms/room614.cpp
    engines/mads/madsv2/dragonsphere/rooms/room909.cpp


diff --git a/engines/mads/madsv2/dragonsphere/rooms/room102.cpp b/engines/mads/madsv2/dragonsphere/rooms/room102.cpp
index 134c3220928..8296012b218 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room102.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room102.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_102_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room103.cpp b/engines/mads/madsv2/dragonsphere/rooms/room103.cpp
index 6d3b73cc383..52747619258 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room103.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room103.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_103_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room104.cpp b/engines/mads/madsv2/dragonsphere/rooms/room104.cpp
index 7b73f6fd062..3f3d73026d2 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room104.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room104.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_104_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room105.cpp b/engines/mads/madsv2/dragonsphere/rooms/room105.cpp
index 1aaf2782ece..2d0cc8b37eb 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room105.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room105.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_105_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room106.cpp b/engines/mads/madsv2/dragonsphere/rooms/room106.cpp
index fb19f07ca6b..968bbddbd1b 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room106.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room106.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_106_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room107.cpp b/engines/mads/madsv2/dragonsphere/rooms/room107.cpp
index 8510a1eeb1e..8262f2ded3d 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room107.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room107.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_107_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room108.cpp b/engines/mads/madsv2/dragonsphere/rooms/room108.cpp
index f745ea965a2..d36e90bbff4 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room108.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room108.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_108_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room109.cpp b/engines/mads/madsv2/dragonsphere/rooms/room109.cpp
index a1f425e8980..1002a868335 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room109.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room109.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_109_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room110.cpp b/engines/mads/madsv2/dragonsphere/rooms/room110.cpp
index 3d3ecb1e838..a1063e2d084 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room110.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room110.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_110_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room111.cpp b/engines/mads/madsv2/dragonsphere/rooms/room111.cpp
index 78ee5aa603e..00221423d7a 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room111.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room111.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_111_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room112.cpp b/engines/mads/madsv2/dragonsphere/rooms/room112.cpp
index 230d5a73c61..9861f8ce466 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room112.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room112.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_112_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room113.cpp b/engines/mads/madsv2/dragonsphere/rooms/room113.cpp
index 64f4fce2081..1710e0e8ab6 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room113.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room113.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_113_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room114.cpp b/engines/mads/madsv2/dragonsphere/rooms/room114.cpp
index 2a2365408bd..fd26def7153 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room114.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room114.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_114_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room115.cpp b/engines/mads/madsv2/dragonsphere/rooms/room115.cpp
index cf8ce71cee9..4f95b76b695 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room115.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room115.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_115_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room116.cpp b/engines/mads/madsv2/dragonsphere/rooms/room116.cpp
index 1e4bb0fe13e..f6aab0d98e5 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room116.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room116.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_116_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room117.cpp b/engines/mads/madsv2/dragonsphere/rooms/room117.cpp
index 6d05ce8afce..8bacdb0e8ab 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room117.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room117.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_117_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room118.cpp b/engines/mads/madsv2/dragonsphere/rooms/room118.cpp
index 6bb9c92033d..bc77b26088b 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room118.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room118.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_118_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room119.cpp b/engines/mads/madsv2/dragonsphere/rooms/room119.cpp
index 33a4c2ccc30..13c30241b8f 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room119.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room119.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_119_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room201.cpp b/engines/mads/madsv2/dragonsphere/rooms/room201.cpp
index 72a93a83d89..331772fc4d4 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room201.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room201.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_201_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room203.cpp b/engines/mads/madsv2/dragonsphere/rooms/room203.cpp
index 411b488bd8e..808ee507bef 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room203.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room203.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_203_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room204.cpp b/engines/mads/madsv2/dragonsphere/rooms/room204.cpp
index 1b1c4ebbfa9..81bfc265ad8 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room204.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room204.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_204_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room205.cpp b/engines/mads/madsv2/dragonsphere/rooms/room205.cpp
index b8cb313f0f5..6b1c888ee41 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room205.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room205.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_205_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room206.cpp b/engines/mads/madsv2/dragonsphere/rooms/room206.cpp
index 11722264335..3dc78d2fdd9 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room206.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room206.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_206_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room301.cpp b/engines/mads/madsv2/dragonsphere/rooms/room301.cpp
index baba0a86587..b16fa84b918 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room301.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room301.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_301_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room302.cpp b/engines/mads/madsv2/dragonsphere/rooms/room302.cpp
index bce20f7ac60..4840935beb1 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room302.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room302.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_302_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room303.cpp b/engines/mads/madsv2/dragonsphere/rooms/room303.cpp
index 55e4ad94217..57918a222e2 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room303.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room303.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_303_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room401.cpp b/engines/mads/madsv2/dragonsphere/rooms/room401.cpp
index d01bf609cca..10790d87e0e 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room401.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room401.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_401_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room402.cpp b/engines/mads/madsv2/dragonsphere/rooms/room402.cpp
index e70f80d9805..a72c830959a 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room402.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room402.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_402_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room403.cpp b/engines/mads/madsv2/dragonsphere/rooms/room403.cpp
index 377ff0fc2dd..0ff3bcc1fdc 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room403.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room403.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_403_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room404.cpp b/engines/mads/madsv2/dragonsphere/rooms/room404.cpp
index d82c0672163..448fbe1c6f4 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room404.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room404.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_404_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room405.cpp b/engines/mads/madsv2/dragonsphere/rooms/room405.cpp
index 342d8d1e8f8..ef8d0b623d6 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room405.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room405.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_405_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room406.cpp b/engines/mads/madsv2/dragonsphere/rooms/room406.cpp
index 33c25d54c06..abf4ee46b0c 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room406.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room406.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_406_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room407.cpp b/engines/mads/madsv2/dragonsphere/rooms/room407.cpp
index b26f24d4ecb..dc59a85ffc5 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room407.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room407.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_407_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room408.cpp b/engines/mads/madsv2/dragonsphere/rooms/room408.cpp
index f6b2a195259..a5a5eee3133 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room408.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room408.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_408_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room409.cpp b/engines/mads/madsv2/dragonsphere/rooms/room409.cpp
index 754fb3b6cb2..d7b3317fd89 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room409.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room409.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_409_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room410.cpp b/engines/mads/madsv2/dragonsphere/rooms/room410.cpp
index ec1cbcf878e..f69697c8282 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room410.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room410.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_410_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room411.cpp b/engines/mads/madsv2/dragonsphere/rooms/room411.cpp
index db5a1a59f96..ecd824f958e 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room411.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room411.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_411_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room412.cpp b/engines/mads/madsv2/dragonsphere/rooms/room412.cpp
index 8bd6a9e8450..ea57fa7f9f0 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room412.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room412.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_412_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room454.cpp b/engines/mads/madsv2/dragonsphere/rooms/room454.cpp
index 2a5eb74e819..a3d8f4384bb 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room454.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room454.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_454_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room501.cpp b/engines/mads/madsv2/dragonsphere/rooms/room501.cpp
index 97fe5a17a1a..e16ecdec82c 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room501.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room501.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_501_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room502.cpp b/engines/mads/madsv2/dragonsphere/rooms/room502.cpp
index 24be6da4620..4865dfb4b2f 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room502.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room502.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_502_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room503.cpp b/engines/mads/madsv2/dragonsphere/rooms/room503.cpp
index b3d8a921786..34c9c2d7f93 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room503.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room503.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_503_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room504.cpp b/engines/mads/madsv2/dragonsphere/rooms/room504.cpp
index 2b0c835a7c8..f56ee7acab0 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room504.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room504.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_504_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room505.cpp b/engines/mads/madsv2/dragonsphere/rooms/room505.cpp
index f2c85174b00..799ce8ddfe2 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room505.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room505.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_505_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room506.cpp b/engines/mads/madsv2/dragonsphere/rooms/room506.cpp
index a56c649284f..27e7fb5c2eb 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room506.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room506.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_506_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room507.cpp b/engines/mads/madsv2/dragonsphere/rooms/room507.cpp
index 1b3fe07d092..eb168f4033a 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room507.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room507.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_507_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room508.cpp b/engines/mads/madsv2/dragonsphere/rooms/room508.cpp
index e67bc931ae0..d8e1dd1ac5a 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room508.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room508.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_508_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room509.cpp b/engines/mads/madsv2/dragonsphere/rooms/room509.cpp
index 6503aa7dce3..e54fb5d6e5a 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room509.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room509.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_509_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room510.cpp b/engines/mads/madsv2/dragonsphere/rooms/room510.cpp
index e2e18c9c62f..a2ca4824576 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room510.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room510.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_510_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room511.cpp b/engines/mads/madsv2/dragonsphere/rooms/room511.cpp
index 3c8418bf0ba..7b73e578495 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room511.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room511.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_511_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room512.cpp b/engines/mads/madsv2/dragonsphere/rooms/room512.cpp
index dbd84597739..911ab71b5c8 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room512.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room512.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_512_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room557.cpp b/engines/mads/madsv2/dragonsphere/rooms/room557.cpp
index ca3208d4b7f..2c957f69f95 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room557.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room557.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_557_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room601.cpp b/engines/mads/madsv2/dragonsphere/rooms/room601.cpp
index 31cf14df137..b1917bc8a2c 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room601.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room601.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_601_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room602.cpp b/engines/mads/madsv2/dragonsphere/rooms/room602.cpp
index 9ee5be8cc91..f4937912aa3 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room602.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room602.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_602_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room603.cpp b/engines/mads/madsv2/dragonsphere/rooms/room603.cpp
index 7873d9b468c..aade6e73eea 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room603.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room603.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_603_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room604.cpp b/engines/mads/madsv2/dragonsphere/rooms/room604.cpp
index 46086e1bdd3..8d081577d1b 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room604.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room604.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_604_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room605.cpp b/engines/mads/madsv2/dragonsphere/rooms/room605.cpp
index 1add792cfc8..c429c7aba78 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room605.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room605.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_605_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room606.cpp b/engines/mads/madsv2/dragonsphere/rooms/room606.cpp
index a596a2f6c86..e32b4739d22 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room606.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room606.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_606_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room607.cpp b/engines/mads/madsv2/dragonsphere/rooms/room607.cpp
index cc154dad631..a31b1bce9d6 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room607.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room607.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_607_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room608.cpp b/engines/mads/madsv2/dragonsphere/rooms/room608.cpp
index 9185a788238..711c8e914e6 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room608.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room608.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_608_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room609.cpp b/engines/mads/madsv2/dragonsphere/rooms/room609.cpp
index c5175ed0483..16f7aa5b2bb 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room609.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room609.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_609_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room610.cpp b/engines/mads/madsv2/dragonsphere/rooms/room610.cpp
index 15d0d0c7822..9be3e746a46 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room610.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room610.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_610_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room611.cpp b/engines/mads/madsv2/dragonsphere/rooms/room611.cpp
index ad5bb260c00..4c9dfc6c402 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room611.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room611.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_611_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room612.cpp b/engines/mads/madsv2/dragonsphere/rooms/room612.cpp
index 8c36e76ea92..209e168f87a 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room612.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room612.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_612_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room613.cpp b/engines/mads/madsv2/dragonsphere/rooms/room613.cpp
index 12476b4bf2b..d1b3cfcc285 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room613.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room613.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_613_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room614.cpp b/engines/mads/madsv2/dragonsphere/rooms/room614.cpp
index 29f09548b06..ec63f0a2221 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room614.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room614.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_614_init() {
 
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room909.cpp b/engines/mads/madsv2/dragonsphere/rooms/room909.cpp
index 651d59f2cf2..115d623a184 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room909.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room909.cpp
@@ -34,7 +34,7 @@ namespace MADSV2 {
 namespace Dragonsphere {
 namespace Rooms {
 
-static Scratch scratch;
+//static Scratch scratch;
 
 void room_909_init() {

More information about the Scummvm-git-logs mailing list