aboutsummaryrefslogtreecommitdiff
path: root/sword2/sword2.h
diff options
context:
space:
mode:
authorMax Horn2003-10-04 01:09:29 +0000
committerMax Horn2003-10-04 01:09:29 +0000
commit2162df92fc5efbe64bce31c91d880c47e1daa44d (patch)
tree3fba0152ccea9440f760e53031023210e0d6e8f0 /sword2/sword2.h
parent3ef5a410a3337b323b40fc6828df7d11aa4016ae (diff)
downloadscummvm-rg350-2162df92fc5efbe64bce31c91d880c47e1daa44d.tar.gz
scummvm-rg350-2162df92fc5efbe64bce31c91d880c47e1daa44d.tar.bz2
scummvm-rg350-2162df92fc5efbe64bce31c91d880c47e1daa44d.zip
removed Sword2 prefixes of most classes (made obsolete by our namespace usage); renamed Sword2State to Sword2Engine
svn-id: r10583
Diffstat (limited to 'sword2/sword2.h')
-rw-r--r--sword2/sword2.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/sword2/sword2.h b/sword2/sword2.h
index 2bf3c0476a..7a9f9dfcf6 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -52,9 +52,9 @@ extern uint8 unencoded_name[];
// TODO move stuff into class
-class Sword2State : public Engine {
+class Sword2Engine : public Engine {
public:
- Sword2State(GameDetector *detector, OSystem *syst);
+ Sword2Engine(GameDetector *detector, OSystem *syst);
void go(void);
void parseEvents(void);
void Start_game(void);
@@ -63,7 +63,7 @@ public:
uint32 _features;
byte _gameId;
char *_game_name; // target name for saves
- Sword2Sound *_sound;
+ Sound *_sound;
private:
bool _quit;
@@ -74,8 +74,8 @@ public:
void errorString(const char *buf_input, char *buf_output);
};
-extern Sword2State *g_sword2;
-extern Sword2Sound *g_sound;
+extern Sword2Engine *g_sword2;
+extern Sound *g_sound;
} // End of namespace Sword2