aboutsummaryrefslogtreecommitdiff
path: root/engines/touche
diff options
context:
space:
mode:
authorGregory Montoir2007-09-26 19:26:12 +0000
committerGregory Montoir2007-09-26 19:26:12 +0000
commit3d2485ca9722f88a2a3ee8b971e59989633991d8 (patch)
tree50e2e3aa030abfd4ab73eb3bf818077fa911e2dc /engines/touche
parent72d0be841f3b671fa6379034e4d3c597170f7f62 (diff)
downloadscummvm-rg350-3d2485ca9722f88a2a3ee8b971e59989633991d8.tar.gz
scummvm-rg350-3d2485ca9722f88a2a3ee8b971e59989633991d8.tar.bz2
scummvm-rg350-3d2485ca9722f88a2a3ee8b971e59989633991d8.zip
rename ui.cpp to menu.cpp for consistency with other engines
svn-id: r29108
Diffstat (limited to 'engines/touche')
-rw-r--r--engines/touche/menu.cpp (renamed from engines/touche/ui.cpp)4
-rw-r--r--engines/touche/module.mk4
-rw-r--r--engines/touche/touche.cpp2
-rw-r--r--engines/touche/touche.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/touche/ui.cpp b/engines/touche/menu.cpp
index 11e8ddeb4d..48f49f7d7b 100644
--- a/engines/touche/ui.cpp
+++ b/engines/touche/menu.cpp
@@ -566,7 +566,7 @@ void ToucheEngine::clearStatusString() {
}
int ToucheEngine::displayQuitDialog() {
- debug(kDebugUserIntf, "ToucheEngine::displayQuitDialog()");
+ debug(kDebugMenu, "ToucheEngine::displayQuitDialog()");
printStatusString(getString(-85));
int ret = 0;
bool quitLoop = false;
@@ -622,7 +622,7 @@ int ToucheEngine::displayQuitDialog() {
}
void ToucheEngine::displayTextMode(int str) {
- debug(kDebugUserIntf, "ToucheEngine::displayTextMode(%d)", str);
+ debug(kDebugMenu, "ToucheEngine::displayTextMode(%d)", str);
printStatusString(getString(str));
_system->delayMillis(1000);
clearStatusString();
diff --git a/engines/touche/module.mk b/engines/touche/module.mk
index c1bc0b5719..1cfd2d2929 100644
--- a/engines/touche/module.mk
+++ b/engines/touche/module.mk
@@ -3,13 +3,13 @@ MODULE := engines/touche
MODULE_OBJS := \
detection.o \
graphics.o \
+ menu.o \
midi.o \
opcodes.o \
resource.o \
saveload.o \
staticres.o \
- touche.o \
- ui.o
+ touche.o
# This module can be built as a plugin
ifdef BUILD_PLUGINS
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index ce1a26c788..c91a2db2f1 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -72,7 +72,7 @@ ToucheEngine::ToucheEngine(OSystem *system)
Common::addSpecialDebugLevel(kDebugGraphics, "Graphics", "Graphics debug level");
Common::addSpecialDebugLevel(kDebugResource, "Resource", "Resource debug level");
Common::addSpecialDebugLevel(kDebugOpcodes, "Opcodes", "Opcodes debug level");
- Common::addSpecialDebugLevel(kDebugUserIntf, "UserIntf", "UserInterface debug level");
+ Common::addSpecialDebugLevel(kDebugMenu, "Menu", "Menu debug level");
system->getEventManager()->registerRandomSource(_rnd, "touche");
}
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index 5aef0ef613..f1f8d3bd6e 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -269,7 +269,7 @@ enum {
kDebugGraphics = 1 << 1,
kDebugResource = 1 << 2,
kDebugOpcodes = 1 << 3,
- kDebugUserIntf = 1 << 4
+ kDebugMenu = 1 << 4
};
enum ResourceType {