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

bluegr noreply at scummvm.org
Sun Mar 9 14:32:08 UTC 2025 

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:
d3230461ea SCI: Rename graphics/palette*.* to graphics/scipalette*.*


Commit: d3230461eaa4c534d1960148bb919643afcecf4c
    https://github.com/scummvm/scummvm/commit/d3230461eaa4c534d1960148bb919643afcecf4c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-09T16:31:35+02:00

Commit Message:
SCI: Rename graphics/palette*.* to graphics/scipalette*.*

This is to avoid file name inclusion clashes with graphics/palette.h
placed in common code, as uncovered by PR #6471

Changed paths:
  A engines/sci/graphics/scipalette.cpp
  A engines/sci/graphics/scipalette.h
  A engines/sci/graphics/scipalette32.cpp
  A engines/sci/graphics/scipalette32.h
  R engines/sci/graphics/palette.cpp
  R engines/sci/graphics/palette.h
  R engines/sci/graphics/palette32.cpp
  R engines/sci/graphics/palette32.h
    engines/sci/console.cpp
    engines/sci/engine/kgraphics.cpp
    engines/sci/engine/kgraphics32.cpp
    engines/sci/engine/kmisc.cpp
    engines/sci/engine/kpathing.cpp
    engines/sci/engine/kvideo.cpp
    engines/sci/engine/savegame.cpp
    engines/sci/engine/segment.h
    engines/sci/graphics/animate.cpp
    engines/sci/graphics/celobj32.cpp
    engines/sci/graphics/cursor.cpp
    engines/sci/graphics/frameout.cpp
    engines/sci/graphics/maciconbar.cpp
    engines/sci/graphics/paint16.cpp
    engines/sci/graphics/picture.cpp
    engines/sci/graphics/portrait.cpp
    engines/sci/graphics/remap.cpp
    engines/sci/graphics/remap32.cpp
    engines/sci/graphics/screen.cpp
    engines/sci/graphics/transitions.cpp
    engines/sci/graphics/transitions32.cpp
    engines/sci/graphics/video32.cpp
    engines/sci/graphics/view.cpp
    engines/sci/module.mk
    engines/sci/sci.cpp


diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 89d43ffc2a6..fabb318055e 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -44,7 +44,7 @@
 #include "sci/graphics/cursor.h"
 #include "sci/graphics/screen.h"
 #include "sci/graphics/paint16.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/ports.h"
 #include "sci/graphics/view.h"
 
@@ -56,7 +56,7 @@
 #include "common/memstream.h"
 #include "sci/graphics/frameout.h"
 #include "sci/graphics/paint32.h"
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #include "sci/sound/decoders/sol.h"
 #include "video/coktel_decoder.h"
 #endif
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 538a562f7f9..42cb0dd5d18 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -44,7 +44,7 @@
 #include "sci/graphics/controls16.h"
 #include "sci/graphics/cursor.h"
 #include "sci/graphics/drivers/gfxdriver.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/paint16.h"
 #include "sci/graphics/picture.h"
 #include "sci/graphics/ports.h"
diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index c157aba0060..7da724229bd 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -38,7 +38,7 @@
 #include "sci/graphics/cache.h"
 #include "sci/graphics/compare.h"
 #include "sci/graphics/controls16.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/paint16.h"
 #include "sci/graphics/picture.h"
 #include "sci/graphics/ports.h"
@@ -53,7 +53,7 @@
 #include "sci/graphics/scifont.h"	// TODO: remove once kBitmap is moved in a separate class
 #include "sci/graphics/frameout.h"
 #include "sci/graphics/paint32.h"
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #include "sci/graphics/remap32.h"
 #include "sci/graphics/text32.h"
 #include "sci/graphics/transitions32.h"
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 5f3d20ce429..6855340c01d 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -36,7 +36,7 @@
 #include "sci/engine/savegame.h"
 #include "sci/graphics/cursor.h"
 #include "sci/graphics/drivers/gfxdriver.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/screen.h"
 #ifdef ENABLE_SCI32
 #include "sci/graphics/cursor32.h"
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 243fc031bdd..e47c180602b 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -24,11 +24,11 @@
 #include "sci/engine/selector.h"
 #include "sci/engine/kernel.h"
 #include "sci/graphics/paint16.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/screen.h"
 #ifdef ENABLE_SCI32
 #include "sci/graphics/paint32.h"
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #include "sci/graphics/plane32.h"
 #include "sci/graphics/frameout.h"
 #endif
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
index c427ed446d3..a9fbbe8f9a0 100644
--- a/engines/sci/engine/kvideo.cpp
+++ b/engines/sci/engine/kvideo.cpp
@@ -24,7 +24,7 @@
 #include "sci/graphics/helpers.h"
 #include "sci/graphics/cursor.h"
 #include "sci/graphics/drivers/gfxdriver.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/screen.h"
 #include "sci/util.h"
 #include "common/events.h"
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 76ff2c82cdc..6463287eaf1 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -40,7 +40,7 @@
 #include "sci/engine/script.h"	// for SCI_OBJ_EXPORTS and SCI_OBJ_SYNONYMS
 #include "sci/graphics/helpers.h"
 #include "sci/graphics/menu.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/ports.h"
 #include "sci/graphics/screen.h"
 #include "sci/parser/vocabulary.h"
@@ -53,7 +53,7 @@
 #include "sci/engine/guest_additions.h"
 #include "sci/graphics/cursor32.h"
 #include "sci/graphics/frameout.h"
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #include "sci/graphics/remap32.h"
 #include "sci/graphics/video32.h"
 #endif
diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h
index 1ca13f38153..2783f2cdc12 100644
--- a/engines/sci/engine/segment.h
+++ b/engines/sci/engine/segment.h
@@ -29,7 +29,7 @@
 #include "sci/engine/vm_types.h"	// for reg_t
 #include "sci/util.h"
 #ifdef ENABLE_SCI32
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #endif
 
 namespace Sci {
diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp
index c8463f72603..a65e3b21867 100644
--- a/engines/sci/graphics/animate.cpp
+++ b/engines/sci/graphics/animate.cpp
@@ -36,7 +36,7 @@
 #include "sci/graphics/cursor.h"
 #include "sci/graphics/ports.h"
 #include "sci/graphics/paint16.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/view.h"
 #include "sci/graphics/screen.h"
 #include "sci/graphics/transitions.h"
diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index 23350bf328d..201d799d096 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -25,7 +25,7 @@
 #include "sci/engine/state.h"
 #include "sci/graphics/celobj32.h"
 #include "sci/graphics/frameout.h"
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #include "sci/graphics/remap32.h"
 #include "sci/graphics/text32.h"
 #include "sci/engine/workarounds.h"
diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index 36bc7892693..13d5e5c6b9a 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -31,7 +31,7 @@
 #include "sci/event.h"
 #include "sci/engine/state.h"
 #include "sci/graphics/drivers/gfxdriver.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/screen.h"
 #include "sci/graphics/coordadjuster.h"
 #include "sci/graphics/view.h"
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 95e71968021..5fb65eb134a 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -47,7 +47,7 @@
 #include "sci/graphics/frameout.h"
 #include "sci/graphics/helpers.h"
 #include "sci/graphics/paint32.h"
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #include "sci/graphics/plane32.h"
 #include "sci/graphics/remap32.h"
 #include "sci/graphics/screen.h"
diff --git a/engines/sci/graphics/maciconbar.cpp b/engines/sci/graphics/maciconbar.cpp
index c384958607c..b6530e07ac2 100644
--- a/engines/sci/graphics/maciconbar.cpp
+++ b/engines/sci/graphics/maciconbar.cpp
@@ -25,7 +25,7 @@
 #include "sci/engine/state.h"
 #include "sci/graphics/drivers/gfxdriver.h"
 #include "sci/graphics/maciconbar.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/screen.h"
 
 #include "common/memstream.h"
diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index c57b2d5ce6f..4a088dd3b1c 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -34,7 +34,7 @@
 #include "sci/graphics/view.h"
 #include "sci/graphics/screen.h"
 #include "sci/graphics/drivers/gfxdriver.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/portrait.h"
 #include "sci/graphics/text16.h"
 #include "sci/graphics/transitions.h"
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index fe96b96b58c..9653f569c06 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -26,7 +26,7 @@
 #include "sci/sci.h"
 #include "sci/engine/state.h"
 #include "sci/graphics/screen.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/coordadjuster.h"
 #include "sci/graphics/ports.h"
 #include "sci/graphics/picture.h"
diff --git a/engines/sci/graphics/portrait.cpp b/engines/sci/graphics/portrait.cpp
index 62af1c70b2b..d4cb5c2941e 100644
--- a/engines/sci/graphics/portrait.cpp
+++ b/engines/sci/graphics/portrait.cpp
@@ -28,7 +28,7 @@
 #include "sci/engine/state.h"
 #include "sci/graphics/drivers/gfxdriver.h"
 #include "sci/graphics/screen.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/portrait.h"
 #include "sci/sound/audio.h"
 
diff --git a/engines/sci/graphics/remap.cpp b/engines/sci/graphics/remap.cpp
index 29ef9995790..eeabc5cd7f0 100644
--- a/engines/sci/graphics/remap.cpp
+++ b/engines/sci/graphics/remap.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "sci/sci.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/remap.h"
 #include "sci/graphics/screen.h"
 
diff --git a/engines/sci/graphics/remap32.cpp b/engines/sci/graphics/remap32.cpp
index ee159fa3b2c..cb95e91839b 100644
--- a/engines/sci/graphics/remap32.cpp
+++ b/engines/sci/graphics/remap32.cpp
@@ -21,7 +21,7 @@
 
 #include "sci/sci.h"
 #include "sci/engine/features.h"
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #include "sci/graphics/remap32.h"
 
 namespace Sci {
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/scipalette.cpp
similarity index 99%
rename from engines/sci/graphics/palette.cpp
rename to engines/sci/graphics/scipalette.cpp
index ad75722e27f..2defe864c5d 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/scipalette.cpp
@@ -29,7 +29,7 @@
 #include "sci/graphics/cache.h"
 #include "sci/graphics/drivers/gfxdriver.h"
 #include "sci/graphics/maciconbar.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/remap.h"
 #include "sci/graphics/screen.h"
 #include "sci/graphics/view.h"
diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/scipalette.h
similarity index 97%
rename from engines/sci/graphics/palette.h
rename to engines/sci/graphics/scipalette.h
index c1147fa3860..92c9f674ce4 100644
--- a/engines/sci/graphics/palette.h
+++ b/engines/sci/graphics/scipalette.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef SCI_GRAPHICS_PALETTE_H
-#define SCI_GRAPHICS_PALETTE_H
+#ifndef SCI_GRAPHICS_SCIPALETTE_H
+#define SCI_GRAPHICS_SCIPALETTE_H
 
 #include "common/array.h"
 #include "sci/graphics/helpers.h"
@@ -132,4 +132,4 @@ protected:
 
 } // End of namespace Sci
 
-#endif // SCI_GRAPHICS_PALETTE_H
+#endif // SCI_GRAPHICS_SCIPALETTE_H
diff --git a/engines/sci/graphics/palette32.cpp b/engines/sci/graphics/scipalette32.cpp
similarity index 99%
rename from engines/sci/graphics/palette32.cpp
rename to engines/sci/graphics/scipalette32.cpp
index a9fa2ebd891..238c1b11394 100644
--- a/engines/sci/graphics/palette32.cpp
+++ b/engines/sci/graphics/scipalette32.cpp
@@ -28,7 +28,7 @@
 #include "sci/resource/resource.h"
 #include "sci/util.h"
 #include "sci/engine/features.h"
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #include "sci/graphics/remap32.h"
 #include "sci/graphics/screen.h"
 
diff --git a/engines/sci/graphics/palette32.h b/engines/sci/graphics/scipalette32.h
similarity index 99%
rename from engines/sci/graphics/palette32.h
rename to engines/sci/graphics/scipalette32.h
index 21b58c43f19..0577b5a5fcc 100644
--- a/engines/sci/graphics/palette32.h
+++ b/engines/sci/graphics/scipalette32.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef SCI_GRAPHICS_PALETTE32_H
-#define SCI_GRAPHICS_PALETTE32_H
+#ifndef SCI_GRAPHICS_SCIPALETTE32_H
+#define SCI_GRAPHICS_SCIPALETTE32_H
 
 #include "common/ptr.h"
 
@@ -673,4 +673,4 @@ private:
 
 } // End of namespace Sci
 
-#endif // SCI_GRAPHICS_PALETTE32_H
+#endif // SCI_GRAPHICS_SCIPALETTE32_H
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 0ac7f3947f2..ccd745a3701 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -32,7 +32,7 @@
 #include "sci/engine/state.h"
 #include "sci/graphics/screen.h"
 #include "sci/graphics/view.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/scifx.h"
 #include "sci/graphics/drivers/gfxdriver.h"
 
diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index 58b935e462d..83d33e6d8e0 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -27,7 +27,7 @@
 #include "sci/engine/state.h"
 #include "sci/graphics/drivers/gfxdriver.h"
 #include "sci/graphics/screen.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/transitions.h"
 
 namespace Sci {
diff --git a/engines/sci/graphics/transitions32.cpp b/engines/sci/graphics/transitions32.cpp
index daa1e168949..44db05b8313 100644
--- a/engines/sci/graphics/transitions32.cpp
+++ b/engines/sci/graphics/transitions32.cpp
@@ -24,7 +24,7 @@
 #include "sci/engine/seg_manager.h"
 #include "sci/engine/state.h"
 #include "sci/graphics/frameout.h"
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #include "sci/graphics/text32.h"
 #include "sci/graphics/transitions32.h"
 #include "sci/sci.h"
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index 290f225c9c8..34ec6cd1806 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -38,7 +38,7 @@
 #include "sci/graphics/cursor32.h"       // for GfxCursor32
 #include "sci/graphics/frameout.h"       // for GfxFrameout
 #include "sci/graphics/helpers.h"        // for Color, Palette
-#include "sci/graphics/palette32.h"      // for GfxPalette32
+#include "sci/graphics/scipalette32.h"   // for GfxPalette32
 #include "sci/graphics/plane32.h"        // for Plane, PlanePictureCodes::kP...
 #include "sci/graphics/screen_item32.h"  // for ScaleInfo, ScreenItem, Scale...
 #include "sci/resource/resource.h"       // for ResourceManager, ResourceId,...
diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index dd87ed973b1..6f46ed013cb 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -23,7 +23,7 @@
 #include "sci/engine/state.h"
 #include "sci/graphics/drivers/gfxdriver.h"
 #include "sci/graphics/screen.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/remap.h"
 #include "sci/graphics/coordadjuster.h"
 #include "sci/graphics/view.h"
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 8801ea412e3..e78b4f9ba80 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -54,13 +54,13 @@ MODULE_OBJS := \
 	graphics/maciconbar.o \
 	graphics/menu.o \
 	graphics/paint16.o \
-	graphics/palette.o \
 	graphics/picture.o \
 	graphics/portrait.o \
 	graphics/ports.o \
 	graphics/remap.o \
 	graphics/scifont.o \
 	graphics/scifx.o \
+	graphics/scipalette.o \
 	graphics/screen.o \
 	graphics/text16.o \
 	graphics/transitions.o \
@@ -113,8 +113,8 @@ MODULE_OBJS += \
 	graphics/frameout.o \
 	graphics/paint32.o \
 	graphics/plane32.o \
-	graphics/palette32.o \
 	graphics/remap32.o \
+	graphics/scipalette32.o \
 	graphics/screen_item32.o \
 	graphics/text32.o \
 	graphics/transitions32.o \
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 41007473fe9..66c740e9738 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -62,7 +62,7 @@
 #include "sci/graphics/paint32.h"
 #include "sci/graphics/picture.h"
 #include "sci/graphics/ports.h"
-#include "sci/graphics/palette.h"
+#include "sci/graphics/scipalette.h"
 #include "sci/graphics/remap.h"
 #include "sci/graphics/screen.h"
 #include "sci/graphics/text16.h"
@@ -73,7 +73,7 @@
 #include "sci/graphics/cursor32.h"
 #include "sci/graphics/frameout.h"
 #include "sci/graphics/maccursor32.h"
-#include "sci/graphics/palette32.h"
+#include "sci/graphics/scipalette32.h"
 #include "sci/graphics/remap32.h"
 #include "sci/graphics/text32.h"
 #include "sci/graphics/transitions32.h"

More information about the Scummvm-git-logs mailing list