diff options
| author | Paul Gilbert | 2010-08-01 09:31:36 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:18:35 +0000 |
| commit | 2006e564a1287ff31c2c6acedecf90034e784fd2 (patch) | |
| tree | 4e1ebb10fedbd39f053691c3cd59b6157c545d37 /engines/sword25/input | |
| parent | 53a9d2d0a1dab1119dc1cc12886321fa72743061 (diff) | |
| download | scummvm-rg350-2006e564a1287ff31c2c6acedecf90034e784fd2.tar.gz scummvm-rg350-2006e564a1287ff31c2c6acedecf90034e784fd2.tar.bz2 scummvm-rg350-2006e564a1287ff31c2c6acedecf90034e784fd2.zip | |
SWORD25: Moved the Lua library into it's own namespace
Previously with some of the files I was leaving the #include references to the library inside the global namespace. However, since the engine itself is now inside a namespace, I had to do a lot of changes, such as lua_State to ::lua_State. This way is cleaner, and I just need to add a 'using namespace Lua' where needed.
svn-id: r53198
Diffstat (limited to 'engines/sword25/input')
| -rw-r--r-- | engines/sword25/input/stdwininput.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/engines/sword25/input/stdwininput.h b/engines/sword25/input/stdwininput.h index 8d0f0c8180..11ed63be49 100644 --- a/engines/sword25/input/stdwininput.h +++ b/engines/sword25/input/stdwininput.h @@ -36,23 +36,20 @@ #define SWORD25_STDWININPUT_H /// Includes -#include "sword25/kernel/memlog_off.h" -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include <list> -#include "sword25/kernel/memlog_on.h" - +#include "common/scummsys.h" +#include "common/list.h" #include "sword25/kernel/common.h" #include "sword25/input/inputengine.h" -/// Klassendefinitionen +namespace Sword25 { + +/// Forward class definitions class BS_Kernel; -/// Klassendefinition -class BS_StdWinInput : public BS_InputEngine -{ +/// Class definitions +class BS_StdWinInput : public BS_InputEngine { public: - BS_StdWinInput(BS_Kernel* pKernel); + BS_StdWinInput(BS_Kernel *pKernel); virtual ~BS_StdWinInput(); virtual bool Init(); @@ -75,13 +72,13 @@ public: virtual void ReportCharacter(unsigned char Character); virtual void ReportCommand(KEY_COMMANDS Command); - bool Persist(BS_OutputPersistenceBlock & Writer); - bool Unpersist(BS_InputPersistenceBlock & Reader); + bool Persist(BS_OutputPersistenceBlock &Writer); + bool Unpersist(BS_InputPersistenceBlock &Reader); private: void TestForLeftDoubleClick(); - BYTE m_KeyboardState[2][256]; + byte m_KeyboardState[2][256]; bool m_LeftMouseState[2]; bool m_RightMouseState[2]; unsigned int m_CurrentState; @@ -96,8 +93,10 @@ private: unsigned int m_LastLeftClickTime; int m_LastLeftClickMouseX; int m_LastLeftClickMouseY; - std::list<CommandCallback> m_CommandCallbacks; - std::list<CharacterCallback> m_CharacterCallbacks; + Common::List<CommandCallback> m_CommandCallbacks; + Common::List<CharacterCallback> m_CharacterCallbacks; }; +} // End of namespace Sword25 + #endif |