aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.h
diff options
context:
space:
mode:
authorChristopher Page2008-07-07 06:05:48 +0000
committerChristopher Page2008-07-07 06:05:48 +0000
commitb50df858eb52520b529597d98fcd0d9b29619930 (patch)
tree682ef79468d1c134a1d99e14ab0ec91eac1b92f8 /engines/scumm/scumm.h
parent0bffc3cb7b812e43ad58fe5e8d53eebea13063f9 (diff)
downloadscummvm-rg350-b50df858eb52520b529597d98fcd0d9b29619930.tar.gz
scummvm-rg350-b50df858eb52520b529597d98fcd0d9b29619930.tar.bz2
scummvm-rg350-b50df858eb52520b529597d98fcd0d9b29619930.zip
Changed the name of the Scumm menu dialog class MainMenuDialog to ScummMenuDialog, to avoid confusion and conflict with the Global Main Menu class
svn-id: r32937
Diffstat (limited to 'engines/scumm/scumm.h')
-rw-r--r--engines/scumm/scumm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 76aedee3f3..fb7f3e6845 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -501,14 +501,14 @@ public:
protected:
Dialog *_pauseDialog;
Dialog *_versionDialog;
- Dialog *_mainMenuDialog;
+ Dialog *_scummMenuDialog;
virtual int runDialog(Dialog &dialog);
void confirmExitDialog();
void confirmRestartDialog();
void pauseDialog();
void versionDialog();
- void mainMenuDialog();
+ void scummMenuDialog();
char displayMessage(const char *altButton, const char *message, ...);