aboutsummaryrefslogtreecommitdiff
path: root/sword1/control.h
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-01-11 15:47:41 +0000
committerTorbjörn Andersson2004-01-11 15:47:41 +0000
commitcf0a73f913174599c7c28d910ecd87229fd62afd (patch)
tree7eabb5c16878d42f35d811ed13af5ed20b763f92 /sword1/control.h
parent563d95c576c817a63ec64302e67b2ee5daa97c6e (diff)
downloadscummvm-rg350-cf0a73f913174599c7c28d910ecd87229fd62afd.tar.gz
scummvm-rg350-cf0a73f913174599c7c28d910ecd87229fd62afd.tar.bz2
scummvm-rg350-cf0a73f913174599c7c28d910ecd87229fd62afd.zip
Introduced new namespace, Sword1, removing the "Sword" and "Bs" prefixes in
the process, except for SwordEngine. Some minor cleanups along the wa, e.g. stdafx.h already includes <stdio.h>, <stdlib.h> and <math.h> so there shouldn't be any need to do it elsewhere. svn-id: r12320
Diffstat (limited to 'sword1/control.h')
-rw-r--r--sword1/control.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/sword1/control.h b/sword1/control.h
index e83b0a6982..50697fc224 100644
--- a/sword1/control.h
+++ b/sword1/control.h
@@ -25,12 +25,15 @@
#include "scummsys.h"
#include "sworddefs.h"
+class OSystem;
+
+namespace Sword1 {
+
class ObjectMan;
class ResMan;
-class OSystem;
-class SwordMouse;
-class SwordMusic;
-class SwordSound;
+class Mouse;
+class Music;
+class Sound;
#define MAX_BUTTONS 16
@@ -62,10 +65,10 @@ struct ButtonInfo {
uint32 resId, id;
};
-class SwordControl {
+class Control {
public:
- SwordControl(ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, SwordMouse *pMouse, SwordSound *pSound, SwordMusic *pMusic, const char *savePath);
- ~SwordControl(void);
+ Control(ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic, const char *savePath);
+ ~Control(void);
uint8 runPanel(void);
void doRestore(void);
void askForCd(void);
@@ -115,9 +118,9 @@ private:
ObjectMan *_objMan;
ResMan *_resMan;
OSystem *_system;
- SwordMouse *_mouse;
- SwordMusic *_music;
- SwordSound *_sound;
+ Mouse *_mouse;
+ Music *_music;
+ Sound *_sound;
char _savePath[256];
uint8 *_font, *_redFont;
uint8 *_screenBuf;
@@ -127,6 +130,7 @@ private:
bool _mouseDown;
};
-
+} // End of namespace Sword1
+
#endif //BSCONTROL_H