diff options
| author | Littleboy | 2011-06-22 23:32:14 -0400 |
|---|---|---|
| committer | Littleboy | 2011-06-23 06:58:21 -0400 |
| commit | f0cf72f4313c146dcec25fa004312a4319b89b91 (patch) | |
| tree | 26d161641f433c575425fd752cfea41149d64b6b | |
| parent | 97137e6b27a6d64fc2ba45c0c6d1a07d027ee27c (diff) | |
| download | scummvm-rg350-f0cf72f4313c146dcec25fa004312a4319b89b91.tar.gz scummvm-rg350-f0cf72f4313c146dcec25fa004312a4319b89b91.tar.bz2 scummvm-rg350-f0cf72f4313c146dcec25fa004312a4319b89b91.zip | |
LASTEXPRESS: Move Menu class to a separate folder
| -rw-r--r-- | engines/lastexpress/entities/chapters.cpp | 3 | ||||
| -rw-r--r-- | engines/lastexpress/game/inventory.cpp | 3 | ||||
| -rw-r--r-- | engines/lastexpress/game/logic.cpp | 3 | ||||
| -rw-r--r-- | engines/lastexpress/game/savegame.cpp | 3 | ||||
| -rw-r--r-- | engines/lastexpress/lastexpress.cpp | 3 | ||||
| -rw-r--r-- | engines/lastexpress/menu/menu.cpp (renamed from engines/lastexpress/game/menu.cpp) | 2 | ||||
| -rw-r--r-- | engines/lastexpress/menu/menu.h (renamed from engines/lastexpress/game/menu.h) | 0 | ||||
| -rw-r--r-- | engines/lastexpress/module.mk | 2 |
8 files changed, 12 insertions, 7 deletions
diff --git a/engines/lastexpress/entities/chapters.cpp b/engines/lastexpress/entities/chapters.cpp index 1252a62d8d..6a41590f64 100644 --- a/engines/lastexpress/entities/chapters.cpp +++ b/engines/lastexpress/entities/chapters.cpp @@ -57,13 +57,14 @@ #include "lastexpress/game/entities.h" #include "lastexpress/game/inventory.h" #include "lastexpress/game/logic.h" -#include "lastexpress/game/menu.h" #include "lastexpress/game/object.h" #include "lastexpress/game/savepoint.h" #include "lastexpress/game/scenes.h" #include "lastexpress/game/sound.h" #include "lastexpress/game/state.h" +#include "lastexpress/menu/menu.h" + #include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp index adf6ff772e..07ad8d936b 100644 --- a/engines/lastexpress/game/inventory.cpp +++ b/engines/lastexpress/game/inventory.cpp @@ -27,11 +27,12 @@ #include "lastexpress/data/snd.h" #include "lastexpress/game/logic.h" -#include "lastexpress/game/menu.h" #include "lastexpress/game/scenes.h" #include "lastexpress/game/sound.h" #include "lastexpress/game/state.h" +#include "lastexpress/menu/menu.h" + #include "lastexpress/graphics.h" #include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp index a8a2ce87b1..3bd7d6da68 100644 --- a/engines/lastexpress/game/logic.cpp +++ b/engines/lastexpress/game/logic.cpp @@ -38,7 +38,6 @@ #include "lastexpress/game/beetle.h" #include "lastexpress/game/entities.h" #include "lastexpress/game/inventory.h" -#include "lastexpress/game/menu.h" #include "lastexpress/game/object.h" #include "lastexpress/game/savegame.h" #include "lastexpress/game/savepoint.h" @@ -46,6 +45,8 @@ #include "lastexpress/game/sound.h" #include "lastexpress/game/state.h" +#include "lastexpress/menu/menu.h" + #include "lastexpress/graphics.h" #include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" diff --git a/engines/lastexpress/game/savegame.cpp b/engines/lastexpress/game/savegame.cpp index 5d06ecab13..594cd1276b 100644 --- a/engines/lastexpress/game/savegame.cpp +++ b/engines/lastexpress/game/savegame.cpp @@ -24,11 +24,12 @@ #include "lastexpress/game/inventory.h" #include "lastexpress/game/logic.h" -#include "lastexpress/game/menu.h" #include "lastexpress/game/object.h" #include "lastexpress/game/savepoint.h" #include "lastexpress/game/state.h" +#include "lastexpress/menu/menu.h" + #include "lastexpress/debug.h" #include "lastexpress/lastexpress.h" #include "lastexpress/helpers.h" diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp index 120e6eb28b..73893c9982 100644 --- a/engines/lastexpress/lastexpress.cpp +++ b/engines/lastexpress/lastexpress.cpp @@ -26,11 +26,12 @@ #include "lastexpress/data/font.h" #include "lastexpress/game/logic.h" -#include "lastexpress/game/menu.h" #include "lastexpress/game/scenes.h" #include "lastexpress/game/state.h" #include "lastexpress/game/sound.h" +#include "lastexpress/menu/menu.h" + #include "lastexpress/graphics.h" #include "lastexpress/helpers.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/game/menu.cpp b/engines/lastexpress/menu/menu.cpp index 27a43d8f61..b7e6a1430a 100644 --- a/engines/lastexpress/game/menu.cpp +++ b/engines/lastexpress/menu/menu.cpp @@ -20,7 +20,7 @@ * */ -#include "lastexpress/game/menu.h" +#include "lastexpress/menu/menu.h" // Data #include "lastexpress/data/animation.h" diff --git a/engines/lastexpress/game/menu.h b/engines/lastexpress/menu/menu.h index 4b84c065cb..4b84c065cb 100644 --- a/engines/lastexpress/game/menu.h +++ b/engines/lastexpress/menu/menu.h diff --git a/engines/lastexpress/module.mk b/engines/lastexpress/module.mk index e81151910b..e38772ad30 100644 --- a/engines/lastexpress/module.mk +++ b/engines/lastexpress/module.mk @@ -57,13 +57,13 @@ MODULE_OBJS := \ game/entities.o \ game/inventory.o \ game/logic.o \ - game/menu.o \ game/object.o \ game/savegame.o \ game/savepoint.o \ game/scenes.o \ game/sound.o \ game/state.o \ + menu/menu.o \ debug.o \ detection.o \ graphics.o \ |