diff options
| author | Filippos Karapetis | 2014-12-25 22:00:55 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-12-25 22:00:55 +0200 |
| commit | 6368a6ea91364f90bcb0d5d9d88826d856181a52 (patch) | |
| tree | bb8dd8b1c70f44faafd300e139bd26421312ec9d | |
| parent | 6c451c9cf481dcaa6261c34773b79689386ded42 (diff) | |
| download | scummvm-rg350-6368a6ea91364f90bcb0d5d9d88826d856181a52.tar.gz scummvm-rg350-6368a6ea91364f90bcb0d5d9d88826d856181a52.tar.bz2 scummvm-rg350-6368a6ea91364f90bcb0d5d9d88826d856181a52.zip | |
ZVISION: Move the menu code together with the other scripting code
| -rw-r--r-- | engines/zvision/core/events.cpp | 2 | ||||
| -rw-r--r-- | engines/zvision/module.mk | 2 | ||||
| -rw-r--r-- | engines/zvision/scripting/menu.cpp (renamed from engines/zvision/core/menu.cpp) | 5 | ||||
| -rw-r--r-- | engines/zvision/scripting/menu.h (renamed from engines/zvision/core/menu.h) | 0 | ||||
| -rw-r--r-- | engines/zvision/zvision.cpp | 2 |
5 files changed, 4 insertions, 7 deletions
diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp index 1920ffd769..89f1595460 100644 --- a/engines/zvision/core/events.cpp +++ b/engines/zvision/core/events.cpp @@ -28,7 +28,7 @@ #include "zvision/graphics/cursors/cursor_manager.h" #include "zvision/graphics/render_manager.h" #include "zvision/scripting/script_manager.h" -#include "zvision/core/menu.h" +#include "zvision/scripting/menu.h" #include "zvision/sound/zork_raw.h" #include "common/events.h" diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk index 3ea31abe1b..6955d62534 100644 --- a/engines/zvision/module.mk +++ b/engines/zvision/module.mk @@ -4,7 +4,6 @@ MODULE_OBJS := \ core/console.o \ core/clock.o \ core/events.o \ - core/menu.o \ core/save_manager.o \ detection.o \ file/lzss_read_stream.o \ @@ -30,6 +29,7 @@ MODULE_OBJS := \ scripting/controls/slot_control.o \ scripting/controls/titler_control.o \ scripting/inventory.o \ + scripting/menu.o \ scripting/scr_file_handling.o \ scripting/script_manager.o \ scripting/sidefx/animation_node.o \ diff --git a/engines/zvision/core/menu.cpp b/engines/zvision/scripting/menu.cpp index 31e0d71370..fa5e24f39f 100644 --- a/engines/zvision/core/menu.cpp +++ b/engines/zvision/scripting/menu.cpp @@ -20,11 +20,8 @@ * */ -#include "common/scummsys.h" - -#include "zvision/core/menu.h" - #include "zvision/graphics/render_manager.h" +#include "zvision/scripting/menu.h" namespace ZVision { diff --git a/engines/zvision/core/menu.h b/engines/zvision/scripting/menu.h index ebe0bb50ac..ebe0bb50ac 100644 --- a/engines/zvision/core/menu.h +++ b/engines/zvision/scripting/menu.h diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index db96884103..f692969942 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -30,7 +30,7 @@ #include "zvision/core/save_manager.h" #include "zvision/text/string_manager.h" #include "zvision/detection.h" -#include "zvision/core/menu.h" +#include "zvision/scripting/menu.h" #include "zvision/file/search_manager.h" #include "zvision/text/text.h" #include "zvision/text/truetype_font.h" |