aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/action.h
diff options
context:
space:
mode:
authorPaul Gilbert2014-03-02 20:06:21 -0500
committerPaul Gilbert2014-03-02 20:06:21 -0500
commit72163a233f980a385c432fbf66fd6bb21f6acdf2 (patch)
treecafcc533c1162425f8741bef6ccf38ebf6275c07 /engines/mads/action.h
parentb816b9990d98633794f42ba49aeb971d6f9d930b (diff)
downloadscummvm-rg350-72163a233f980a385c432fbf66fd6bb21f6acdf2.tar.gz
scummvm-rg350-72163a233f980a385c432fbf66fd6bb21f6acdf2.tar.bz2
scummvm-rg350-72163a233f980a385c432fbf66fd6bb21f6acdf2.zip
MADS: Moved Player class into it's own file
Diffstat (limited to 'engines/mads/action.h')
-rw-r--r--engines/mads/action.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/engines/mads/action.h b/engines/mads/action.h
index a29d43baa0..c38b842992 100644
--- a/engines/mads/action.h
+++ b/engines/mads/action.h
@@ -24,6 +24,7 @@
#define MADS_ACTION_H
#include "common/scummsys.h"
+#include "common/str.h"
namespace MADS {
@@ -46,7 +47,7 @@ enum {
VERB_WALKTO = 13
};
-class Scene;
+class MADSEngine;
struct ActionDetails {
int verbId;
@@ -54,7 +55,7 @@ struct ActionDetails {
int indirectObjectId;
};
-struct MadsActionSavedFields {
+struct MADSActionSavedFields {
int articleNumber;
int actionMode;
int actionMode2;
@@ -62,11 +63,11 @@ struct MadsActionSavedFields {
int selectedRow;
};
-class MadsAction {
+class MADSAction {
private:
- Scene *_scene;
- char _statusText[100];
- char _dialogTitle[100];
+ MADSEngine *_vm;
+ Common::String _statusText;
+ Common::String _dialogTitle;
void appendVocab(int vocabId, bool capitalise = false);
public:
@@ -83,7 +84,7 @@ public:
bool _startWalkFlag;
int _statusTextIndex;
int _hotspotId;
- MadsActionSavedFields _savedFields;
+ MADSActionSavedFields _savedFields;
bool _walkFlag;
// Unknown fields
@@ -97,11 +98,11 @@ public:
AbortTimerMode _v8453A;
public:
- MadsAction(Scene *scene);
+ MADSAction(MADSEngine *vm);
void clear();
void set();
- const char *statusText() const { return _statusText; }
+ const Common::String &statusText() const { return _statusText; }
void refresh();
void startAction();
void checkAction();