Changed Moved class ControlSchemeClass into namespace OpenArena

~g2k

src/ctrls.cpp

@@ -67,206 +67,208 @@
 
 #include "../include/ctrls.h"
 
-void ControlSchemeClass::LoadDefaultControlScheme()
+namespace OpenArena{
-{
+	void ControlSchemeClass::LoadDefaultControlScheme()
-	forward.Insert(OpenArena::KEY_LBUTTON);
-	backward.Insert(OpenArena::KEY_RBUTTON);
-	lookLeft.Insert(OpenArena::KEY_LEFT);
-	lookRight.Insert(OpenArena::KEY_RIGHT);
-	lookUp.Insert(OpenArena::KEY_UP);
-	lookDown.Insert(OpenArena::KEY_DOWN);
-	moveLeft.Insert(OpenArena::KEY_S);
-	moveRight.Insert(OpenArena::KEY_D);
-	moveUp.Insert(OpenArena::KEY_SPACE);
-	moveDown.Insert(OpenArena::KEY_A);
-	firePrimary.Insert(OpenArena::KEY_F);
-	fireSecondary.Insert(OpenArena::KEY_G);
-	weaponNext.Insert(OpenArena::KEY_T);
-	weaponPrev.Insert(OpenArena::KEY_R);
-	toggleLights.Insert(OpenArena::KEY_L);
-	toggleFPS.Insert(OpenArena::KEY_P);
-	toggleConsole.Insert(OpenArena::KEY_OEM_3);
-	toggleMouseLook.Insert(OpenArena::KEY_M);
-	quickMouseLook.Insert(OpenArena::KEY_Q);
-	rollLeft.Insert(OpenArena::KEY_W);
-	rollRight.Insert(OpenArena::KEY_E);
-}
-void ControlSchemeClass::ClearControlScheme()
-{
-	backward.Clear();
-	firePrimary.Clear();
-	fireSecondary.Clear();
-	forward.Clear();
-	lookDown.Clear();
-	lookUp.Clear();
-	lookRight.Clear();
-	lookLeft.Clear();
-	moveDown.Clear();
-	moveUp.Clear();
-	moveLeft.Clear();
-	moveRight.Clear();
-	quickMouseLook.Clear();
-	toggleConsole.Clear();
-	toggleFPS.Clear();
-	toggleLights.Clear();
-	toggleMouseLook.Clear();
-	weaponNext.Clear();
-	weaponPrev.Clear();
-}
-
-void ControlSchemeClass::Unbind(uint8 key)
-{
-	backward.Remove(key);
-	firePrimary.Remove(key);
-	fireSecondary.Remove(key);
-	forward.Remove(key);
-	lookDown.Remove(key);
-	lookUp.Remove(key);
-	lookRight.Remove(key);
-	lookLeft.Remove(key);
-	moveDown.Remove(key);
-	moveUp.Remove(key);
-	moveRight.Remove(key);
-	quickMouseLook.Remove(key);
-	toggleConsole.Remove(key);
-	toggleFPS.Remove(key);
-	toggleLights.Remove(key);
-	toggleMouseLook.Remove(key);
-	weaponNext.Remove(key);
-	weaponPrev.Remove(key);
-}
-
-bool ControlSchemeClass::Bind(uint32 action, uint8 key)
-{
-	switch(action)
 	{
-	case CTRLS_FORWARD:
+		forward.Insert(OpenArena::KEY_LBUTTON);
-		{
+		backward.Insert(OpenArena::KEY_RBUTTON);
-			Unbind(key);
+		lookLeft.Insert(OpenArena::KEY_LEFT);
-			forward.Insert(key);
+		lookRight.Insert(OpenArena::KEY_RIGHT);
-			return true;
+		lookUp.Insert(OpenArena::KEY_UP);
-		}
+		lookDown.Insert(OpenArena::KEY_DOWN);
-	case CTRLS_BACKWARD:
+		moveLeft.Insert(OpenArena::KEY_S);
-		{
+		moveRight.Insert(OpenArena::KEY_D);
-            Unbind(key);
+		moveUp.Insert(OpenArena::KEY_SPACE);
-			backward.Insert(key);
+		moveDown.Insert(OpenArena::KEY_A);
-			return true;
+		firePrimary.Insert(OpenArena::KEY_F);
-		}
+		fireSecondary.Insert(OpenArena::KEY_G);
-	case CTRLS_LOOKLEFT:
+		weaponNext.Insert(OpenArena::KEY_T);
-		{
+		weaponPrev.Insert(OpenArena::KEY_R);
-			Unbind(key);
+		toggleLights.Insert(OpenArena::KEY_L);
-			lookLeft.Insert(key);
+		toggleFPS.Insert(OpenArena::KEY_P);
-			return true;
+		toggleConsole.Insert(OpenArena::KEY_OEM_3);
-		}
+		toggleMouseLook.Insert(OpenArena::KEY_M);
-	case CTRLS_LOOKRIGHT:
+		quickMouseLook.Insert(OpenArena::KEY_Q);
-		{
+		rollLeft.Insert(OpenArena::KEY_W);
-			Unbind(key);
+		rollRight.Insert(OpenArena::KEY_E);
-			lookRight.Insert(key);
-			return true;
-		}
-	case CTRLS_LOOKUP:
-		{
-			Unbind(key);
-			lookUp.Insert(key);
-			return true;
-		}
-	case CTRLS_LOOKDOWN:
-		{
-			Unbind(key);
-			lookDown.Insert(key);
-			return true;
-		}
-	case CTRLS_MOVELEFT:
-		{
-			Unbind(key);
-			moveLeft.Insert(key);
-			return true;
-		}
-	case CTRLS_MOVERIGHT:
-		{
-			Unbind(key);
-			moveRight.Insert(key);
-			return true;
-		}
-	case CTRLS_MOVEUP:
-		{
-			Unbind(key);
-			moveUp.Insert(key);
-			return true;
-		}
-	case CTRLS_MOVEDOWN:
-		{
-			Unbind(key);
-			moveDown.Insert(key);
-			return true;
-		}
-	case CTRLS_ROLLLEFT:
-		{
-			Unbind(key);
-			rollLeft.Insert(key);
-			return true;
-		}
-	case CTRLS_ROLLRIGHT:
-		{
-			Unbind(key);
-			rollRight.Insert(key);
-			return true;
-		}
-	case CTRLS_FIREPRIMARY:
-		{
-			Unbind(key);
-			firePrimary.Insert(key);
-			return true;
-		}
-	case CTRLS_FIRESECONDARY:
-		{
-			Unbind(key);
-			fireSecondary.Insert(key);
-			return true;
-		}
-	case CTRLS_WEAPONNEXT:
-		{
-			Unbind(key);
-			weaponNext.Insert(key);
-			return true;
-		}
-	case CTRLS_WEAPONPREV:
-		{
-			Unbind(key);
-			weaponPrev.Insert(key);
-			return true;
-		}
-	case CTRLS_TOGGLE_LIGHTS:
-		{
-			Unbind(key);
-			toggleLights.Insert(key);
-			return true;
-		}
-	case CTRLS_TOGGLE_FPS:
-		{
-			Unbind(key);
-			toggleFPS.Insert(key);
-			return true;
-		}
-	case CTRLS_TOGGLE_CONSOLE:
-		{
-			Unbind(key);
-			toggleConsole.Insert(key);
-			return true;
-		}
-	case CTRLS_TOGGLE_MOUSELOOK:
-		{
-			Unbind(key);
-			toggleMouseLook.Insert(key);
-			return true;
-		}
-	case CTRLS_QUICKMOUSELOOK:
-		{
-			Unbind(key);
-			quickMouseLook.Insert(key);
-			return true;
-		}
-	default:
-		return false;
 	}
-}
+	void ControlSchemeClass::ClearControlScheme()
+	{
+		backward.Clear();
+		firePrimary.Clear();
+		fireSecondary.Clear();
+		forward.Clear();
+		lookDown.Clear();
+		lookUp.Clear();
+		lookRight.Clear();
+		lookLeft.Clear();
+		moveDown.Clear();
+		moveUp.Clear();
+		moveLeft.Clear();
+		moveRight.Clear();
+		quickMouseLook.Clear();
+		toggleConsole.Clear();
+		toggleFPS.Clear();
+		toggleLights.Clear();
+		toggleMouseLook.Clear();
+		weaponNext.Clear();
+		weaponPrev.Clear();
+	}
+
+	void ControlSchemeClass::Unbind(uint8 key)
+	{
+		backward.Remove(key);
+		firePrimary.Remove(key);
+		fireSecondary.Remove(key);
+		forward.Remove(key);
+		lookDown.Remove(key);
+		lookUp.Remove(key);
+		lookRight.Remove(key);
+		lookLeft.Remove(key);
+		moveDown.Remove(key);
+		moveUp.Remove(key);
+		moveRight.Remove(key);
+		quickMouseLook.Remove(key);
+		toggleConsole.Remove(key);
+		toggleFPS.Remove(key);
+		toggleLights.Remove(key);
+		toggleMouseLook.Remove(key);
+		weaponNext.Remove(key);
+		weaponPrev.Remove(key);
+	}
+
+	bool ControlSchemeClass::Bind(uint32 action, uint8 key)
+	{
+		switch(action)
+		{
+		case CTRLS_FORWARD:
+			{
+				Unbind(key);
+				forward.Insert(key);
+				return true;
+			}
+		case CTRLS_BACKWARD:
+			{
+				Unbind(key);
+				backward.Insert(key);
+				return true;
+			}
+		case CTRLS_LOOKLEFT:
+			{
+				Unbind(key);
+				lookLeft.Insert(key);
+				return true;
+			}
+		case CTRLS_LOOKRIGHT:
+			{
+				Unbind(key);
+				lookRight.Insert(key);
+				return true;
+			}
+		case CTRLS_LOOKUP:
+			{
+				Unbind(key);
+				lookUp.Insert(key);
+				return true;
+			}
+		case CTRLS_LOOKDOWN:
+			{
+				Unbind(key);
+				lookDown.Insert(key);
+				return true;
+			}
+		case CTRLS_MOVELEFT:
+			{
+				Unbind(key);
+				moveLeft.Insert(key);
+				return true;
+			}
+		case CTRLS_MOVERIGHT:
+			{
+				Unbind(key);
+				moveRight.Insert(key);
+				return true;
+			}
+		case CTRLS_MOVEUP:
+			{
+				Unbind(key);
+				moveUp.Insert(key);
+				return true;
+			}
+		case CTRLS_MOVEDOWN:
+			{
+				Unbind(key);
+				moveDown.Insert(key);
+				return true;
+			}
+		case CTRLS_ROLLLEFT:
+			{
+				Unbind(key);
+				rollLeft.Insert(key);
+				return true;
+			}
+		case CTRLS_ROLLRIGHT:
+			{
+				Unbind(key);
+				rollRight.Insert(key);
+				return true;
+			}
+		case CTRLS_FIREPRIMARY:
+			{
+				Unbind(key);
+				firePrimary.Insert(key);
+				return true;
+			}
+		case CTRLS_FIRESECONDARY:
+			{
+				Unbind(key);
+				fireSecondary.Insert(key);
+				return true;
+			}
+		case CTRLS_WEAPONNEXT:
+			{
+				Unbind(key);
+				weaponNext.Insert(key);
+				return true;
+			}
+		case CTRLS_WEAPONPREV:
+			{
+				Unbind(key);
+				weaponPrev.Insert(key);
+				return true;
+			}
+		case CTRLS_TOGGLE_LIGHTS:
+			{
+				Unbind(key);
+				toggleLights.Insert(key);
+				return true;
+			}
+		case CTRLS_TOGGLE_FPS:
+			{
+				Unbind(key);
+				toggleFPS.Insert(key);
+				return true;
+			}
+		case CTRLS_TOGGLE_CONSOLE:
+			{
+				Unbind(key);
+				toggleConsole.Insert(key);
+				return true;
+			}
+		case CTRLS_TOGGLE_MOUSELOOK:
+			{
+				Unbind(key);
+				toggleMouseLook.Insert(key);
+				return true;
+			}
+		case CTRLS_QUICKMOUSELOOK:
+			{
+				Unbind(key);
+				quickMouseLook.Insert(key);
+				return true;
+			}
+		default:
+			return false;
+		}
+	}
+};