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

dreammaster noreply at scummvm.org
Mon Feb 13 04:45:13 UTC 2023 

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:
c3d9c4f896 MM: Move utils/ folder into shared/


Commit: c3d9c4f8961249d3367248dd4d97fbd1ccb065c9
    https://github.com/scummvm/scummvm/commit/c3d9c4f8961249d3367248dd4d97fbd1ccb065c9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-12T20:44:50-08:00

Commit Message:
MM: Move utils/ folder into shared/

Changed paths:
  A engines/mm/shared/utils/bitmap_font.cpp
  A engines/mm/shared/utils/bitmap_font.h
  A engines/mm/shared/utils/engine_data.cpp
  A engines/mm/shared/utils/engine_data.h
  A engines/mm/shared/utils/strings.cpp
  A engines/mm/shared/utils/strings.h
  A engines/mm/shared/utils/strings_data.cpp
  A engines/mm/shared/utils/strings_data.h
  A engines/mm/shared/utils/xeen_font.cpp
  A engines/mm/shared/utils/xeen_font.h
  R engines/mm/utils/bitmap_font.cpp
  R engines/mm/utils/bitmap_font.h
  R engines/mm/utils/engine_data.cpp
  R engines/mm/utils/engine_data.h
  R engines/mm/utils/strings.cpp
  R engines/mm/utils/strings.h
  R engines/mm/utils/strings_data.cpp
  R engines/mm/utils/strings_data.h
  R engines/mm/utils/xeen_font.cpp
  R engines/mm/utils/xeen_font.h
    engines/mm/mm1/console.cpp
    engines/mm/mm1/data/character.cpp
    engines/mm/mm1/gfx/bitmap_font.h
    engines/mm/mm1/globals.cpp
    engines/mm/mm1/globals.h
    engines/mm/mm1/views_enh/character_info.cpp
    engines/mm/mm1/views_enh/game_messages.cpp
    engines/mm/mm1/views_enh/locations/location.cpp
    engines/mm/mm1/views_enh/locations/market.cpp
    engines/mm/mm1/views_enh/locations/temple.cpp
    engines/mm/mm1/views_enh/scroll_text.cpp
    engines/mm/mm1/views_enh/text_view.cpp
    engines/mm/module.mk
    engines/mm/xeen/debugger.cpp
    engines/mm/xeen/files.cpp


diff --git a/engines/mm/mm1/console.cpp b/engines/mm/mm1/console.cpp
index 5b2578ac5f6..5cad5e68476 100644
--- a/engines/mm/mm1/console.cpp
+++ b/engines/mm/mm1/console.cpp
@@ -22,7 +22,7 @@
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/system.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 #include "mm/mm1/console.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/events.h"
diff --git a/engines/mm/mm1/data/character.cpp b/engines/mm/mm1/data/character.cpp
index a30084e3594..9662ce22830 100644
--- a/engines/mm/mm1/data/character.cpp
+++ b/engines/mm/mm1/data/character.cpp
@@ -21,7 +21,7 @@
 
 #include "common/algorithm.h"
 #include "mm/mm1/data/character.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 #include "mm/mm1/mm1.h"
 
 namespace MM {
diff --git a/engines/mm/mm1/gfx/bitmap_font.h b/engines/mm/mm1/gfx/bitmap_font.h
index 3a9904a71e5..13457a08a13 100644
--- a/engines/mm/mm1/gfx/bitmap_font.h
+++ b/engines/mm/mm1/gfx/bitmap_font.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/utils/bitmap_font.h"
+#include "mm/shared/utils/bitmap_font.h"
 
 namespace MM {
 namespace MM1 {
diff --git a/engines/mm/mm1/globals.cpp b/engines/mm/mm1/globals.cpp
index 01e5abbda1f..83899db9198 100644
--- a/engines/mm/mm1/globals.cpp
+++ b/engines/mm/mm1/globals.cpp
@@ -22,7 +22,7 @@
 #include "engines/engine.h"
 #include "graphics/fonts/ttf.h"
 #include "mm/mm1/globals.h"
-#include "mm/utils/engine_data.h"
+#include "mm/shared/utils/engine_data.h"
 #include "graphics/fontman.h"
 
 namespace MM {
diff --git a/engines/mm/mm1/globals.h b/engines/mm/mm1/globals.h
index e8ec9e20665..fd6e46bb922 100644
--- a/engines/mm/mm1/globals.h
+++ b/engines/mm/mm1/globals.h
@@ -24,8 +24,8 @@
 
 #include "common/serializer.h"
 #include "graphics/font.h"
-#include "mm/utils/strings_data.h"
-#include "mm/utils/xeen_font.h"
+#include "mm/shared/utils/strings_data.h"
+#include "mm/shared/utils/xeen_font.h"
 #include "mm/xeen/sprites.h"
 #include "mm/mm1/data/game_state.h"
 #include "mm/mm1/data/items.h"
diff --git a/engines/mm/mm1/views_enh/character_info.cpp b/engines/mm/mm1/views_enh/character_info.cpp
index 0daf45a15fa..70391fad70c 100644
--- a/engines/mm/mm1/views_enh/character_info.cpp
+++ b/engines/mm/mm1/views_enh/character_info.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "mm/mm1/views_enh/character_info.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 #include "mm/mm1/globals.h"
 
 namespace MM {
diff --git a/engines/mm/mm1/views_enh/game_messages.cpp b/engines/mm/mm1/views_enh/game_messages.cpp
index 6f01c5a5cb7..238af78b5b9 100644
--- a/engines/mm/mm1/views_enh/game_messages.cpp
+++ b/engines/mm/mm1/views_enh/game_messages.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "common/util.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 #include "mm/mm1/views_enh/game_messages.h"
 #include "mm/mm1/events.h"
 #include "mm/mm1/globals.h"
diff --git a/engines/mm/mm1/views_enh/locations/location.cpp b/engines/mm/mm1/views_enh/locations/location.cpp
index 34052c734a7..43cd2914505 100644
--- a/engines/mm/mm1/views_enh/locations/location.cpp
+++ b/engines/mm/mm1/views_enh/locations/location.cpp
@@ -22,7 +22,7 @@
 #include "mm/mm1/views_enh/locations/location.h"
 #include "mm/mm1/globals.h"
 #include "mm/mm1/sound.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 
 namespace MM {
 namespace MM1 {
diff --git a/engines/mm/mm1/views_enh/locations/market.cpp b/engines/mm/mm1/views_enh/locations/market.cpp
index 15818feb1d8..65556925226 100644
--- a/engines/mm/mm1/views_enh/locations/market.cpp
+++ b/engines/mm/mm1/views_enh/locations/market.cpp
@@ -21,7 +21,7 @@
 
 #include "mm/mm1/views_enh/locations/market.h"
 #include "mm/mm1/globals.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 
 namespace MM {
 namespace MM1 {
diff --git a/engines/mm/mm1/views_enh/locations/temple.cpp b/engines/mm/mm1/views_enh/locations/temple.cpp
index 19a29e47984..6fd824fb970 100644
--- a/engines/mm/mm1/views_enh/locations/temple.cpp
+++ b/engines/mm/mm1/views_enh/locations/temple.cpp
@@ -23,7 +23,7 @@
 #include "mm/mm1/globals.h"
 #include "mm/mm1/mm1.h"
 #include "mm/mm1/sound.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 
 namespace MM {
 namespace MM1 {
diff --git a/engines/mm/mm1/views_enh/scroll_text.cpp b/engines/mm/mm1/views_enh/scroll_text.cpp
index 92c92b4fa19..921305503ce 100644
--- a/engines/mm/mm1/views_enh/scroll_text.cpp
+++ b/engines/mm/mm1/views_enh/scroll_text.cpp
@@ -21,7 +21,7 @@
 
 #include "mm/mm1/views_enh/scroll_text.h"
 #include "mm/mm1/globals.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 
 namespace MM {
 namespace MM1 {
diff --git a/engines/mm/mm1/views_enh/text_view.cpp b/engines/mm/mm1/views_enh/text_view.cpp
index 61e2705d91f..6a642ed4103 100644
--- a/engines/mm/mm1/views_enh/text_view.cpp
+++ b/engines/mm/mm1/views_enh/text_view.cpp
@@ -23,7 +23,7 @@
 #include "mm/mm1/gfx/gfx.h"
 #include "mm/mm1/views_enh/text_view.h"
 #include "mm/mm1/mm1.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 
 namespace MM {
 namespace MM1 {
diff --git a/engines/mm/module.mk b/engines/mm/module.mk
index 0f052310a0a..58596e9ebe8 100644
--- a/engines/mm/module.mk
+++ b/engines/mm/module.mk
@@ -3,11 +3,11 @@ MODULE := engines/mm
 MODULE_OBJS := \
 	metaengine.o \
 	mm.o \
-	utils/bitmap_font.o \
-	utils/engine_data.o \
-	utils/strings.o \
-	utils/strings_data.o \
-	utils/xeen_font.o \
+	shared/utils/bitmap_font.o \
+	shared/utils/engine_data.o \
+	shared/utils/strings.o \
+	shared/utils/strings_data.o \
+	shared/utils/xeen_font.o \
 	shared/xeen/cc_archive.o \
 	shared/xeen/file.o \
 	shared/xeen/sprites.o \
diff --git a/engines/mm/utils/bitmap_font.cpp b/engines/mm/shared/utils/bitmap_font.cpp
similarity index 98%
rename from engines/mm/utils/bitmap_font.cpp
rename to engines/mm/shared/utils/bitmap_font.cpp
index 8a2a90b70b9..9eb530e9fd9 100644
--- a/engines/mm/utils/bitmap_font.cpp
+++ b/engines/mm/shared/utils/bitmap_font.cpp
@@ -21,7 +21,7 @@
 
 #include "common/file.h"
 #include "image/bmp.h"
-#include "mm/utils/bitmap_font.h"
+#include "mm/shared/utils/bitmap_font.h"
 
 namespace MM {
 
diff --git a/engines/mm/utils/bitmap_font.h b/engines/mm/shared/utils/bitmap_font.h
similarity index 100%
rename from engines/mm/utils/bitmap_font.h
rename to engines/mm/shared/utils/bitmap_font.h
diff --git a/engines/mm/utils/engine_data.cpp b/engines/mm/shared/utils/engine_data.cpp
similarity index 99%
rename from engines/mm/utils/engine_data.cpp
rename to engines/mm/shared/utils/engine_data.cpp
index 5c9bdc6ea3c..dae0ba11621 100644
--- a/engines/mm/utils/engine_data.cpp
+++ b/engines/mm/shared/utils/engine_data.cpp
@@ -24,7 +24,7 @@
 #include "common/file.h"
 #include "common/translation.h"
 #include "common/compression/unzip.h"
-#include "mm/utils/engine_data.h"
+#include "mm/shared/utils/engine_data.h"
 
 #define DATA_FILENAME "mm.dat"
 
diff --git a/engines/mm/utils/engine_data.h b/engines/mm/shared/utils/engine_data.h
similarity index 100%
rename from engines/mm/utils/engine_data.h
rename to engines/mm/shared/utils/engine_data.h
diff --git a/engines/mm/utils/strings.cpp b/engines/mm/shared/utils/strings.cpp
similarity index 98%
rename from engines/mm/utils/strings.cpp
rename to engines/mm/shared/utils/strings.cpp
index f839965e106..ddfc7420e72 100644
--- a/engines/mm/utils/strings.cpp
+++ b/engines/mm/shared/utils/strings.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "common/textconsole.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 
 namespace MM {
 
diff --git a/engines/mm/utils/strings.h b/engines/mm/shared/utils/strings.h
similarity index 100%
rename from engines/mm/utils/strings.h
rename to engines/mm/shared/utils/strings.h
diff --git a/engines/mm/utils/strings_data.cpp b/engines/mm/shared/utils/strings_data.cpp
similarity index 97%
rename from engines/mm/utils/strings_data.cpp
rename to engines/mm/shared/utils/strings_data.cpp
index 1aa979e4e7d..efd6473d5f0 100644
--- a/engines/mm/utils/strings_data.cpp
+++ b/engines/mm/shared/utils/strings_data.cpp
@@ -21,8 +21,8 @@
 
 #include "common/array.h"
 #include "common/file.h"
-#include "mm/utils/strings_data.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings_data.h"
+#include "mm/shared/utils/strings.h"
 
 namespace MM {
 
diff --git a/engines/mm/utils/strings_data.h b/engines/mm/shared/utils/strings_data.h
similarity index 100%
rename from engines/mm/utils/strings_data.h
rename to engines/mm/shared/utils/strings_data.h
diff --git a/engines/mm/utils/xeen_font.cpp b/engines/mm/shared/utils/xeen_font.cpp
similarity index 98%
rename from engines/mm/utils/xeen_font.cpp
rename to engines/mm/shared/utils/xeen_font.cpp
index 7cccdd1d71a..fe0453cc6dd 100644
--- a/engines/mm/utils/xeen_font.cpp
+++ b/engines/mm/shared/utils/xeen_font.cpp
@@ -21,7 +21,7 @@
 
 #include "common/file.h"
 #include "image/bmp.h"
-#include "mm/utils/xeen_font.h"
+#include "mm/shared/utils/xeen_font.h"
 
 namespace MM {
 
diff --git a/engines/mm/utils/xeen_font.h b/engines/mm/shared/utils/xeen_font.h
similarity index 100%
rename from engines/mm/utils/xeen_font.h
rename to engines/mm/shared/utils/xeen_font.h
diff --git a/engines/mm/xeen/debugger.cpp b/engines/mm/xeen/debugger.cpp
index ec19c21ae91..1b9c853cfb5 100644
--- a/engines/mm/xeen/debugger.cpp
+++ b/engines/mm/xeen/debugger.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "common/file.h"
-#include "mm/utils/strings.h"
+#include "mm/shared/utils/strings.h"
 #include "mm/xeen/xeen.h"
 #include "mm/xeen/debugger.h"
 #include "mm/xeen/files.h"
diff --git a/engines/mm/xeen/files.cpp b/engines/mm/xeen/files.cpp
index 05c1e7ea775..d661918f063 100644
--- a/engines/mm/xeen/files.cpp
+++ b/engines/mm/xeen/files.cpp
@@ -27,7 +27,7 @@
 #include "mm/xeen/xeen.h"
 #include "mm/xeen/files.h"
 #include "mm/xeen/saves.h"
-#include "mm/utils/engine_data.h"
+#include "mm/shared/utils/engine_data.h"
 
 namespace MM {
 namespace Xeen {

More information about the Scummvm-git-logs mailing list