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/sword1.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/sword1.h')
-rw-r--r-- | sword1/sword1.h | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/sword1/sword1.h b/sword1/sword1.h index ff4a822239..29cab3bf9d 100644 --- a/sword1/sword1.h +++ b/sword1/sword1.h @@ -19,22 +19,26 @@ * */ -#include <stdio.h> +#ifndef BSSWORD1_H +#define BSSWORD1_H + #include "base/engine.h" #include "common/util.h" #include "base/gameDetector.h" #include "sworddefs.h" -class SwordScreen; -class SwordSound; -class SwordLogic; -class SwordMouse; +namespace Sword1 { + +class Screen; +class Sound; +class Logic; +class Mouse; class ResMan; class MemMan; class ObjectMan; -class SwordMenu; -class SwordMusic; -class SwordControl; +class Menu; +class Music; +class Control; struct SystemVars { bool runningFromCd; @@ -46,8 +50,8 @@ struct SystemVars { bool forceRestart; bool wantFade; // when true => fade during scene change, else cut. uint8 playSpeech; - uint8 showText; - uint8 language; + uint8 showText; + uint8 language; }; class SwordEngine : public Engine { @@ -74,12 +78,16 @@ private: MemMan *_memMan; ResMan *_resMan; ObjectMan *_objectMan; - SwordScreen *_screen; - SwordMouse *_mouse; - SwordLogic *_logic; - SwordSound *_sound; - SwordMenu *_menu; - SwordMusic *_music; - SwordControl *_control; + Screen *_screen; + Mouse *_mouse; + Logic *_logic; + Sound *_sound; + Menu *_menu; + Music *_music; + Control *_control; static const uint8 _cdList[TOTAL_SECTIONS]; }; + +} // End of namespace Sword1 + +#endif //BSSWORD1_H |