aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'scumm')
-rw-r--r--scumm/dialogs.cpp6
-rw-r--r--scumm/dialogs.h8
-rw-r--r--scumm/scumm.h5
3 files changed, 9 insertions, 10 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index 85e5f9016c..9003732324 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -136,12 +136,6 @@ static ResString string_map_table_v5[] = {
#pragma mark -
-void ScummDialog::addResText(int x, int y, int w, int h, int resID) {
- // Get the string
- new StaticTextWidget(this, x, y, w, h, queryResString(resID), kTextAlignCenter);
-}
-
-
const Common::String ScummDialog::queryResString(int stringno) {
byte *result;
diff --git a/scumm/dialogs.h b/scumm/dialogs.h
index ab6999d38d..f7d22bbc55 100644
--- a/scumm/dialogs.h
+++ b/scumm/dialogs.h
@@ -30,7 +30,11 @@
#include "scumm/help.h"
#endif
-class ListWidget;
+namespace GUI {
+ class ListWidget;
+}
+using namespace GUI; // FIXME: Bad style to use a using directive in a header
+
namespace Scumm {
@@ -46,8 +50,6 @@ protected:
ScummEngine *_scumm;
- void addResText(int x, int y, int w, int h, int resID);
-
// Query a string from the resources
const String queryResString(int stringno);
};
diff --git a/scumm/scumm.h b/scumm/scumm.h
index f80d99c244..7ce022db8d 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -32,7 +32,10 @@
#include "scumm/gfx.h"
#include "scumm/script.h"
-class Dialog;
+namespace GUI {
+ class Dialog;
+}
+using GUI::Dialog;
class GameDetector;
namespace Scumm {