diff options
author | Torbjörn Andersson | 2004-01-11 15:47:41 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2004-01-11 15:47:41 +0000 |
commit | cf0a73f913174599c7c28d910ecd87229fd62afd (patch) | |
tree | 7eabb5c16878d42f35d811ed13af5ed20b763f92 /sword1/mouse.h | |
parent | 563d95c576c817a63ec64302e67b2ee5daa97c6e (diff) | |
download | scummvm-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/mouse.h')
-rw-r--r-- | sword1/mouse.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/sword1/mouse.h b/sword1/mouse.h index 3683dfdce3..443698473e 100644 --- a/sword1/mouse.h +++ b/sword1/mouse.h @@ -26,6 +26,10 @@ #include "sworddefs.h" #include "object.h" +class OSystem; + +namespace Sword1 { + #define MAX_MOUSE 30 #define BS1L_BUTTON_DOWN 2 @@ -38,7 +42,7 @@ struct MouseObj { int id; - BsObject *compact; + Object *compact; }; #if !defined(__GNUC__) @@ -58,18 +62,17 @@ struct MousePtr { #pragma END_PACK_STRUCTS #endif -class SwordLogic; -class SwordMenu; +class Logic; +class Menu; class ResMan; class ObjectMan; -class OSystem; -class SwordMouse { +class Mouse { public: - SwordMouse(OSystem *system, ResMan *pResMan, ObjectMan *pObjMan); + Mouse(OSystem *system, ResMan *pResMan, ObjectMan *pObjMan); void initialize(void); - void addToList(int id, BsObject *compact); - void useLogicAndMenu(SwordLogic *pLogic, SwordMenu *pMenu); + void addToList(int id, Object *compact); + void useLogicAndMenu(Logic *pLogic, Menu *pMenu); void setLuggage(uint32 resID, uint32 rate); void setPointer(uint32 resID, uint32 rate); void animate(void); @@ -86,8 +89,8 @@ public: private: void createPointer(uint32 ptrId, uint32 luggageId); OSystem *_system; - SwordLogic *_logic; - SwordMenu *_menu; + Logic *_logic; + Menu *_menu; MouseObj _objList[MAX_MOUSE]; ResMan *_resMan; ObjectMan *_objMan; @@ -101,4 +104,6 @@ private: bool _inTopMenu, _mouseOverride; }; +} // End of namespace Sword1 + #endif //BSMOUSE_H |