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

sev- noreply at scummvm.org
Sun Jan 22 21:58:16 UTC 2023 

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

Summary:
2a390d87c7 MM: Rename meta_engine.* -> metaengine.* for consistency
d988cd7398 ULTIMA: Rename meta_engine.* -> metaengine.* for consistency


Commit: 2a390d87c720a5183707178ea247a681f653807a
    https://github.com/scummvm/scummvm/commit/2a390d87c720a5183707178ea247a681f653807a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-22T22:43:44+01:00

Commit Message:
MM: Rename meta_engine.* -> metaengine.* for consistency

Changed paths:
  A engines/mm/metaengine.cpp
  A engines/mm/mm1/metaengine.cpp
  A engines/mm/mm1/metaengine.h
  A engines/mm/xeen/metaengine.cpp
  A engines/mm/xeen/metaengine.h
  R engines/mm/meta_engine.cpp
  R engines/mm/mm1/meta_engine.cpp
  R engines/mm/mm1/meta_engine.h
  R engines/mm/xeen/meta_engine.cpp
  R engines/mm/xeen/meta_engine.h
    engines/mm/POTFILES
    engines/mm/mm1/messages.h
    engines/mm/mm1/views/game.cpp
    engines/mm/mm1/views_enh/button_container.h
    engines/mm/mm1/views_enh/game.cpp
    engines/mm/module.mk


diff --git a/engines/mm/POTFILES b/engines/mm/POTFILES
index 39eb38a79d4..6831fe13fe9 100644
--- a/engines/mm/POTFILES
+++ b/engines/mm/POTFILES
@@ -1,4 +1,4 @@
 engines/mm/detection.cpp
-engines/mm/meta_engine.cpp
+engines/mm/metaengine.cpp
 engines/mm/utils/engine_data.cpp
 engines/mm/xeen/saves.cpp
diff --git a/engines/mm/meta_engine.cpp b/engines/mm/metaengine.cpp
similarity index 99%
rename from engines/mm/meta_engine.cpp
rename to engines/mm/metaengine.cpp
index ede88e048cd..125b1ea47f3 100644
--- a/engines/mm/meta_engine.cpp
+++ b/engines/mm/metaengine.cpp
@@ -31,7 +31,7 @@
 #include "mm/detection.h"
 #include "mm/mm1/mm1.h"
 #include "mm/xeen/xeen.h"
-#include "mm/xeen/meta_engine.h"
+#include "mm/xeen/metaengine.h"
 #include "mm/xeen/worldofxeen/worldofxeen.h"
 #include "mm/xeen/swordsofxeen/swordsofxeen.h"
 
diff --git a/engines/mm/mm1/messages.h b/engines/mm/mm1/messages.h
index f5a5a42fa40..2b9c7706c0a 100644
--- a/engines/mm/mm1/messages.h
+++ b/engines/mm/mm1/messages.h
@@ -25,7 +25,7 @@
 #include "common/array.h"
 #include "common/events.h"
 #include "common/str.h"
-#include "mm/mm1/meta_engine.h"
+#include "mm/mm1/metaengine.h"
 
 namespace MM {
 namespace MM1 {
diff --git a/engines/mm/mm1/meta_engine.cpp b/engines/mm/mm1/metaengine.cpp
similarity index 99%
rename from engines/mm/mm1/meta_engine.cpp
rename to engines/mm/mm1/metaengine.cpp
index bdf1b9fa430..afcaece8f9b 100644
--- a/engines/mm/mm1/meta_engine.cpp
+++ b/engines/mm/mm1/metaengine.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mm/mm1/meta_engine.h"
+#include "mm/mm1/metaengine.h"
 #include "mm/mm1/mm1.h"
 #include "common/translation.h"
 #include "backends/keymapper/action.h"
diff --git a/engines/mm/mm1/meta_engine.h b/engines/mm/mm1/metaengine.h
similarity index 100%
rename from engines/mm/mm1/meta_engine.h
rename to engines/mm/mm1/metaengine.h
diff --git a/engines/mm/mm1/views/game.cpp b/engines/mm/mm1/views/game.cpp
index 9be40cd7cd5..9f0accdf56e 100644
--- a/engines/mm/mm1/views/game.cpp
+++ b/engines/mm/mm1/views/game.cpp
@@ -21,7 +21,7 @@
 
 #include "mm/mm1/views/game.h"
 #include "mm/mm1/globals.h"
-#include "mm/mm1/meta_engine.h"
+#include "mm/mm1/metaengine.h"
 
 namespace MM {
 namespace MM1 {
diff --git a/engines/mm/mm1/views_enh/button_container.h b/engines/mm/mm1/views_enh/button_container.h
index dec50cd0ced..f451a37a049 100644
--- a/engines/mm/mm1/views_enh/button_container.h
+++ b/engines/mm/mm1/views_enh/button_container.h
@@ -28,7 +28,7 @@
 #include "mm/xeen/sprites.h"
 #include "mm/mm1/views/text_view.h"
 #include "mm/mm1/events.h"
-#include "mm/mm1/meta_engine.h"
+#include "mm/mm1/metaengine.h"
 
 namespace MM {
 namespace MM1 {
diff --git a/engines/mm/mm1/views_enh/game.cpp b/engines/mm/mm1/views_enh/game.cpp
index 15753389c50..c3c27ec7ce3 100644
--- a/engines/mm/mm1/views_enh/game.cpp
+++ b/engines/mm/mm1/views_enh/game.cpp
@@ -22,7 +22,7 @@
 #include "common/file.h"
 #include "mm/mm1/views_enh/game.h"
 #include "mm/mm1/globals.h"
-#include "mm/mm1/meta_engine.h"
+#include "mm/mm1/metaengine.h"
 
 namespace MM {
 namespace MM1 {
diff --git a/engines/mm/module.mk b/engines/mm/module.mk
index 6bbd5a972f4..110fe69181b 100644
--- a/engines/mm/module.mk
+++ b/engines/mm/module.mk
@@ -1,7 +1,7 @@
 MODULE := engines/mm
 
 MODULE_OBJS := \
-	meta_engine.o \
+	metaengine.o \
 	utils/bitmap_font.o \
 	utils/engine_data.o \
 	utils/strings.o \
@@ -11,7 +11,7 @@ MODULE_OBJS := \
 	mm1/events.o \
 	mm1/globals.o \
 	mm1/messages.o \
-	mm1/meta_engine.o \
+	mm1/metaengine.o \
 	mm1/mm1.o \
 	mm1/sound.o \
 	mm1/data/active_spells.o \
@@ -214,7 +214,7 @@ MODULE_OBJS := \
 	xeen/dialogs/dialogs_spells.o \
 	xeen/dialogs/dialogs_whowill.o \
 	xeen/dialogs/please_wait.o \
-	xeen/meta_engine.o \
+	xeen/metaengine.o \
 	xeen/character.o \
 	xeen/combat.o \
 	xeen/cutscenes.o \
diff --git a/engines/mm/xeen/meta_engine.cpp b/engines/mm/xeen/metaengine.cpp
similarity index 98%
rename from engines/mm/xeen/meta_engine.cpp
rename to engines/mm/xeen/metaengine.cpp
index 62115f3094d..a849581efa7 100644
--- a/engines/mm/xeen/meta_engine.cpp
+++ b/engines/mm/xeen/metaengine.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "common/system.h"
-#include "mm/xeen/meta_engine.h"
+#include "mm/xeen/metaengine.h"
 #include "mm/xeen/events.h"
 #include "mm/xeen/saves.h"
 
diff --git a/engines/mm/xeen/meta_engine.h b/engines/mm/xeen/metaengine.h
similarity index 100%
rename from engines/mm/xeen/meta_engine.h
rename to engines/mm/xeen/metaengine.h


Commit: d988cd7398e3f6121da6ffbabf52b4e8544db4de
    https://github.com/scummvm/scummvm/commit/d988cd7398e3f6121da6ffbabf52b4e8544db4de
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-22T22:57:29+01:00

Commit Message:
ULTIMA: Rename meta_engine.* -> metaengine.* for consistency

Changed paths:
  A engines/ultima/nuvie/metaengine.cpp
  A engines/ultima/nuvie/metaengine.h
  A engines/ultima/ultima4/metaengine.cpp
  A engines/ultima/ultima4/metaengine.h
  A engines/ultima/ultima8/metaengine.cpp
  A engines/ultima/ultima8/metaengine.h
  R engines/ultima/nuvie/meta_engine.cpp
  R engines/ultima/nuvie/meta_engine.h
  R engines/ultima/ultima4/meta_engine.cpp
  R engines/ultima/ultima4/meta_engine.h
  R engines/ultima/ultima8/meta_engine.cpp
  R engines/ultima/ultima8/meta_engine.h
    engines/ultima/POTFILES
    engines/ultima/metaengine.cpp
    engines/ultima/module.mk
    engines/ultima/nuvie/nuvie.cpp
    engines/ultima/ultima4/controllers/controller.h
    engines/ultima/ultima4/controllers/read_dir_controller.cpp
    engines/ultima/ultima4/game/game.cpp
    engines/ultima/ultima8/gumps/cru_menu_gump.cpp
    engines/ultima/ultima8/gumps/menu_gump.cpp
    engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
    engines/ultima/ultima8/ultima8.cpp


diff --git a/engines/ultima/POTFILES b/engines/ultima/POTFILES
index 5303a44834d..f86ac9346d2 100644
--- a/engines/ultima/POTFILES
+++ b/engines/ultima/POTFILES
@@ -2,10 +2,10 @@ engines/ultima/metaengine.cpp
 engines/ultima/shared/early/ultima_early.cpp
 engines/ultima/shared/engine/ultima.cpp
 engines/ultima/shared/engine/data_archive.cpp
-engines/ultima/ultima4/meta_engine.cpp
+engines/ultima/ultima4/metaengine.cpp
 engines/ultima/nuvie/nuvie.cpp
-engines/ultima/nuvie/meta_engine.cpp
+engines/ultima/nuvie/metaengine.cpp
 engines/ultima/nuvie/save/save_game.cpp
-engines/ultima/ultima8/meta_engine.cpp
+engines/ultima/ultima8/metaengine.cpp
 engines/ultima/ultima8/ultima8.cpp
 engines/ultima/ultima8/gumps/u8_save_gump.cpp
diff --git a/engines/ultima/metaengine.cpp b/engines/ultima/metaengine.cpp
index c3e0f7ee746..a4bb371a8f3 100644
--- a/engines/ultima/metaengine.cpp
+++ b/engines/ultima/metaengine.cpp
@@ -29,11 +29,11 @@
 #include "common/translation.h"
 #include "ultima/shared/early/ultima_early.h"
 #include "ultima/ultima4/ultima4.h"
-#include "ultima/ultima4/meta_engine.h"
-#include "ultima/nuvie/meta_engine.h"
+#include "ultima/ultima4/metaengine.h"
+#include "ultima/nuvie/metaengine.h"
 #include "ultima/nuvie/nuvie.h"
 #include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/meta_engine.h"
+#include "ultima/ultima8/metaengine.h"
 
 #include "ultima/metaengine.h"
 
diff --git a/engines/ultima/module.mk b/engines/ultima/module.mk
index 3a5fc5ed3a6..47633060c58 100644
--- a/engines/ultima/module.mk
+++ b/engines/ultima/module.mk
@@ -218,9 +218,9 @@ MODULE_OBJS := \
 	ultima4/views/textview.o \
 	ultima4/views/tileview.o \
 	ultima4/views/view.o \
-	ultima4/meta_engine.o \
+	ultima4/metaengine.o \
 	ultima4/ultima4.o \
-	nuvie/meta_engine.o \
+	nuvie/metaengine.o \
 	nuvie/nuvie.o \
 	nuvie/actors/actor.o \
 	nuvie/actors/actor_manager.o \
@@ -377,7 +377,7 @@ MODULE_OBJS := \
 	nuvie/views/sun_moon_strip_widget.o \
 	nuvie/views/view.o \
 	nuvie/views/view_manager.o \
-	ultima8/meta_engine.o \
+	ultima8/metaengine.o \
 	ultima8/ultima8.o \
 	ultima8/audio/audio_channel.o \
 	ultima8/audio/audio_mixer.o \
diff --git a/engines/ultima/nuvie/meta_engine.cpp b/engines/ultima/nuvie/metaengine.cpp
similarity index 97%
rename from engines/ultima/nuvie/meta_engine.cpp
rename to engines/ultima/nuvie/metaengine.cpp
index 7f43a221597..3712ef200e6 100644
--- a/engines/ultima/nuvie/meta_engine.cpp
+++ b/engines/ultima/nuvie/metaengine.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "ultima/nuvie/meta_engine.h"
+#include "ultima/nuvie/metaengine.h"
 #include "common/translation.h"
 
 namespace Ultima {
diff --git a/engines/ultima/nuvie/meta_engine.h b/engines/ultima/nuvie/metaengine.h
similarity index 100%
rename from engines/ultima/nuvie/meta_engine.h
rename to engines/ultima/nuvie/metaengine.h
diff --git a/engines/ultima/nuvie/nuvie.cpp b/engines/ultima/nuvie/nuvie.cpp
index 7966a1f6f2c..5a4b9754808 100644
--- a/engines/ultima/nuvie/nuvie.cpp
+++ b/engines/ultima/nuvie/nuvie.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ultima/nuvie/nuvie.h"
-#include "ultima/nuvie/meta_engine.h"
+#include "ultima/nuvie/metaengine.h"
 #include "ultima/nuvie/core/events.h"
 #include "ultima/nuvie/actors/actor.h"
 #include "ultima/nuvie/core/nuvie_defs.h"
diff --git a/engines/ultima/ultima4/controllers/controller.h b/engines/ultima/ultima4/controllers/controller.h
index 57d4467e50a..7a5cf0ee466 100644
--- a/engines/ultima/ultima4/controllers/controller.h
+++ b/engines/ultima/ultima4/controllers/controller.h
@@ -22,7 +22,7 @@
 #ifndef ULTIMA4_CONTROLLERS_CONTROLLER_H
 #define ULTIMA4_CONTROLLERS_CONTROLLER_H
 
-#include "ultima/ultima4/meta_engine.h"
+#include "ultima/ultima4/metaengine.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/controllers/read_dir_controller.cpp b/engines/ultima/ultima4/controllers/read_dir_controller.cpp
index bd0f53ef8d2..825e0afc6ca 100644
--- a/engines/ultima/ultima4/controllers/read_dir_controller.cpp
+++ b/engines/ultima/ultima4/controllers/read_dir_controller.cpp
@@ -21,7 +21,7 @@
 
 #include "ultima/ultima4/controllers/read_dir_controller.h"
 #include "ultima/ultima4/map/direction.h"
-#include "ultima/ultima4/meta_engine.h"
+#include "ultima/ultima4/metaengine.h"
 
 namespace Ultima {
 namespace Ultima4 {
diff --git a/engines/ultima/ultima4/game/game.cpp b/engines/ultima/ultima4/game/game.cpp
index 563cc1faab4..f4efccd5257 100644
--- a/engines/ultima/ultima4/game/game.cpp
+++ b/engines/ultima/ultima4/game/game.cpp
@@ -66,7 +66,7 @@
 #include "ultima/ultima4/sound/music.h"
 #include "ultima/ultima4/sound/sound.h"
 #include "ultima/ultima4/views/dungeonview.h"
-#include "ultima/ultima4/meta_engine.h"
+#include "ultima/ultima4/metaengine.h"
 #include "common/savefile.h"
 #include "common/system.h"
 
diff --git a/engines/ultima/ultima4/meta_engine.cpp b/engines/ultima/ultima4/metaengine.cpp
similarity index 99%
rename from engines/ultima/ultima4/meta_engine.cpp
rename to engines/ultima/ultima4/metaengine.cpp
index ab0a64b3b87..93143699e21 100644
--- a/engines/ultima/ultima4/meta_engine.cpp
+++ b/engines/ultima/ultima4/metaengine.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "ultima/ultima4/meta_engine.h"
+#include "ultima/ultima4/metaengine.h"
 #include "ultima/ultima4/core/debugger.h"
 #include "ultima/ultima4/ultima4.h"
 #include "common/translation.h"
diff --git a/engines/ultima/ultima4/meta_engine.h b/engines/ultima/ultima4/metaengine.h
similarity index 100%
rename from engines/ultima/ultima4/meta_engine.h
rename to engines/ultima/ultima4/metaengine.h
diff --git a/engines/ultima/ultima8/gumps/cru_menu_gump.cpp b/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
index 6c0b22ccca8..d6c5a561030 100644
--- a/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_menu_gump.cpp
@@ -35,7 +35,7 @@
 #include "ultima/ultima8/graphics/palette_manager.h"
 #include "ultima/ultima8/audio/music_process.h"
 #include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/meta_engine.h"
+#include "ultima/ultima8/metaengine.h"
 
 #include "engines/dialogs.h"
 #include "common/translation.h"
diff --git a/engines/ultima/ultima8/gumps/menu_gump.cpp b/engines/ultima/ultima8/gumps/menu_gump.cpp
index f916e33ae93..4125734fab7 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/menu_gump.cpp
@@ -39,7 +39,7 @@
 #include "ultima/ultima8/gumps/widgets/edit_widget.h"
 #include "ultima/ultima8/gumps/u8_save_gump.h"
 #include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/meta_engine.h"
+#include "ultima/ultima8/metaengine.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
index 25593279e4a..9fdf723a4e4 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.cpp
@@ -43,7 +43,7 @@
 #include "ultima/ultima8/graphics/palette_manager.h"
 #include "ultima/ultima8/usecode/usecode.h"
 
-#include "ultima/ultima8/meta_engine.h"
+#include "ultima/ultima8/metaengine.h"
 
 namespace Ultima {
 namespace Ultima8 {
diff --git a/engines/ultima/ultima8/meta_engine.cpp b/engines/ultima/ultima8/metaengine.cpp
similarity index 99%
rename from engines/ultima/ultima8/meta_engine.cpp
rename to engines/ultima/ultima8/metaengine.cpp
index 7aa3710f140..a5f213117d2 100644
--- a/engines/ultima/ultima8/meta_engine.cpp
+++ b/engines/ultima/ultima8/metaengine.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "ultima/ultima8/meta_engine.h"
+#include "ultima/ultima8/metaengine.h"
 #include "ultima/ultima8/misc/debugger.h"
 #include "ultima/ultima8/ultima8.h"
 #include "common/translation.h"
diff --git a/engines/ultima/ultima8/meta_engine.h b/engines/ultima/ultima8/metaengine.h
similarity index 100%
rename from engines/ultima/ultima8/meta_engine.h
rename to engines/ultima/ultima8/metaengine.h
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 78a87c2cf0f..424544b12ad 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -93,7 +93,7 @@
 #include "ultima/ultima8/audio/cru_music_process.h"
 #include "ultima/ultima8/audio/midi_player.h"
 #include "ultima/ultima8/gumps/shape_viewer_gump.h"
-#include "ultima/ultima8/meta_engine.h"
+#include "ultima/ultima8/metaengine.h"
 
 #include "ultima/shared/engine/data_archive.h"

More information about the Scummvm-git-logs mailing list