Changed Moved class ControlSchemeClass into namespace OpenArena

~g2k
This commit is contained in:
2006-06-18 14:33:57 -04:00
parent fd2f7364d5
commit a975fe58ed

View File

@@ -67,8 +67,9 @@
#include "../include/ctrls.h" #include "../include/ctrls.h"
void ControlSchemeClass::LoadDefaultControlScheme() namespace OpenArena{
{ void ControlSchemeClass::LoadDefaultControlScheme()
{
forward.Insert(OpenArena::KEY_LBUTTON); forward.Insert(OpenArena::KEY_LBUTTON);
backward.Insert(OpenArena::KEY_RBUTTON); backward.Insert(OpenArena::KEY_RBUTTON);
lookLeft.Insert(OpenArena::KEY_LEFT); lookLeft.Insert(OpenArena::KEY_LEFT);
@@ -90,9 +91,9 @@ void ControlSchemeClass::LoadDefaultControlScheme()
quickMouseLook.Insert(OpenArena::KEY_Q); quickMouseLook.Insert(OpenArena::KEY_Q);
rollLeft.Insert(OpenArena::KEY_W); rollLeft.Insert(OpenArena::KEY_W);
rollRight.Insert(OpenArena::KEY_E); rollRight.Insert(OpenArena::KEY_E);
} }
void ControlSchemeClass::ClearControlScheme() void ControlSchemeClass::ClearControlScheme()
{ {
backward.Clear(); backward.Clear();
firePrimary.Clear(); firePrimary.Clear();
fireSecondary.Clear(); fireSecondary.Clear();
@@ -112,10 +113,10 @@ void ControlSchemeClass::ClearControlScheme()
toggleMouseLook.Clear(); toggleMouseLook.Clear();
weaponNext.Clear(); weaponNext.Clear();
weaponPrev.Clear(); weaponPrev.Clear();
} }
void ControlSchemeClass::Unbind(uint8 key) void ControlSchemeClass::Unbind(uint8 key)
{ {
backward.Remove(key); backward.Remove(key);
firePrimary.Remove(key); firePrimary.Remove(key);
fireSecondary.Remove(key); fireSecondary.Remove(key);
@@ -134,10 +135,10 @@ void ControlSchemeClass::Unbind(uint8 key)
toggleMouseLook.Remove(key); toggleMouseLook.Remove(key);
weaponNext.Remove(key); weaponNext.Remove(key);
weaponPrev.Remove(key); weaponPrev.Remove(key);
} }
bool ControlSchemeClass::Bind(uint32 action, uint8 key) bool ControlSchemeClass::Bind(uint32 action, uint8 key)
{ {
switch(action) switch(action)
{ {
case CTRLS_FORWARD: case CTRLS_FORWARD:
@@ -269,4 +270,5 @@ bool ControlSchemeClass::Bind(uint32 action, uint8 key)
default: default:
return false; return false;
} }
} }
};