From ec70392a02151b742cf274695bd7faf253ba0e31 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Sun, 18 Jun 2006 15:23:36 -0400 Subject: [PATCH] Changed Renamed class ControlSchemeClass to ControlScheme Changed Renamed CTRLS_* to ACTION_* Changed Moved anonymous enum containing ACTION_* into class ControlScheme ~g2k --- include/ctrls.h | 14 ++++----- include/player.h | 2 +- src/ctrls.cpp | 54 ++++++++++++++++---------------- src/level.cpp | 80 ++++++++++++++++++++++++------------------------ 4 files changed, 74 insertions(+), 76 deletions(-) diff --git a/include/ctrls.h b/include/ctrls.h index 2bbfcb0..10451c1 100644 --- a/include/ctrls.h +++ b/include/ctrls.h @@ -4,16 +4,14 @@ #include "list.h" namespace OpenArena{ - - enum {CTRLS_FORWARD, CTRLS_BACKWARD, CTRLS_LOOKLEFT, CTRLS_LOOKRIGHT, CTRLS_LOOKUP, - CTRLS_LOOKDOWN, CTRLS_MOVELEFT, CTRLS_MOVERIGHT, CTRLS_MOVEUP, CTRLS_MOVEDOWN, - CTRLS_ROLLLEFT, CTRLS_ROLLRIGHT, CTRLS_FIREPRIMARY, CTRLS_FIRESECONDARY, - CTRLS_WEAPONNEXT, CTRLS_WEAPONPREV, CTRLS_TOGGLE_LIGHTS, CTRLS_TOGGLE_FPS, - CTRLS_TOGGLE_CONSOLE, CTRLS_TOGGLE_MOUSELOOK, CTRLS_QUICKMOUSELOOK}; - - class ControlSchemeClass + class ControlScheme { public: + enum Action{ACTION_FORWARD, ACTION_BACKWARD, ACTION_LOOKLEFT, ACTION_LOOKRIGHT, ACTION_LOOKUP, + ACTION_LOOKDOWN, ACTION_MOVELEFT, ACTION_MOVERIGHT, ACTION_MOVEUP, ACTION_MOVEDOWN, + ACTION_ROLLLEFT, ACTION_ROLLRIGHT, ACTION_FIREPRIMARY, ACTION_FIRESECONDARY, + ACTION_WEAPONNEXT, ACTION_WEAPONPREV, ACTION_TOGGLE_LIGHTS, ACTION_TOGGLE_FPS, + ACTION_TOGGLE_CONSOLE, ACTION_TOGGLE_MOUSELOOK, ACTION_QUICKMOUSELOOK}; void LoadDefaultControlScheme(); void ClearControlScheme(); void Unbind(uint8); diff --git a/include/player.h b/include/player.h index dee04b8..306e113 100644 --- a/include/player.h +++ b/include/player.h @@ -17,7 +17,7 @@ namespace OpenArena void AddItem(unsigned int item); void RemoveItem(unsigned int item); - ControlSchemeClass controls; + ControlScheme controls; Camera camera; diff --git a/src/ctrls.cpp b/src/ctrls.cpp index a1dcced..a340e6d 100644 --- a/src/ctrls.cpp +++ b/src/ctrls.cpp @@ -10,7 +10,7 @@ // To implement a system for managing a bindable control scheme. // // Summary of Methods: -// ControlSchemeClass +// ControlScheme // void LoadDefaultControlScheme(); // -Loads the default control scheme // void ClearControlScheme(); @@ -19,7 +19,7 @@ // -Removes key from all control lists. // // Summary of Properties: -// ControlSchemeClass +// ControlScheme // -list forward; // A list of the VKeys associated with forward. // -list backward; @@ -68,7 +68,7 @@ #include "../include/ctrls.h" namespace OpenArena{ - void ControlSchemeClass::LoadDefaultControlScheme() + void ControlScheme::LoadDefaultControlScheme() { forward.Insert(OpenArena::KEY_LBUTTON); backward.Insert(OpenArena::KEY_RBUTTON); @@ -92,7 +92,7 @@ namespace OpenArena{ rollLeft.Insert(OpenArena::KEY_W); rollRight.Insert(OpenArena::KEY_E); } - void ControlSchemeClass::ClearControlScheme() + void ControlScheme::ClearControlScheme() { backward.Clear(); firePrimary.Clear(); @@ -115,7 +115,7 @@ namespace OpenArena{ weaponPrev.Clear(); } - void ControlSchemeClass::Unbind(uint8 key) + void ControlScheme::Unbind(uint8 key) { backward.Remove(key); firePrimary.Remove(key); @@ -137,131 +137,131 @@ namespace OpenArena{ weaponPrev.Remove(key); } - bool ControlSchemeClass::Bind(uint32 action, uint8 key) + bool ControlScheme::Bind(uint32 action, uint8 key) { switch(action) { - case CTRLS_FORWARD: + case ACTION_FORWARD: { Unbind(key); forward.Insert(key); return true; } - case CTRLS_BACKWARD: + case ACTION_BACKWARD: { Unbind(key); backward.Insert(key); return true; } - case CTRLS_LOOKLEFT: + case ACTION_LOOKLEFT: { Unbind(key); lookLeft.Insert(key); return true; } - case CTRLS_LOOKRIGHT: + case ACTION_LOOKRIGHT: { Unbind(key); lookRight.Insert(key); return true; } - case CTRLS_LOOKUP: + case ACTION_LOOKUP: { Unbind(key); lookUp.Insert(key); return true; } - case CTRLS_LOOKDOWN: + case ACTION_LOOKDOWN: { Unbind(key); lookDown.Insert(key); return true; } - case CTRLS_MOVELEFT: + case ACTION_MOVELEFT: { Unbind(key); moveLeft.Insert(key); return true; } - case CTRLS_MOVERIGHT: + case ACTION_MOVERIGHT: { Unbind(key); moveRight.Insert(key); return true; } - case CTRLS_MOVEUP: + case ACTION_MOVEUP: { Unbind(key); moveUp.Insert(key); return true; } - case CTRLS_MOVEDOWN: + case ACTION_MOVEDOWN: { Unbind(key); moveDown.Insert(key); return true; } - case CTRLS_ROLLLEFT: + case ACTION_ROLLLEFT: { Unbind(key); rollLeft.Insert(key); return true; } - case CTRLS_ROLLRIGHT: + case ACTION_ROLLRIGHT: { Unbind(key); rollRight.Insert(key); return true; } - case CTRLS_FIREPRIMARY: + case ACTION_FIREPRIMARY: { Unbind(key); firePrimary.Insert(key); return true; } - case CTRLS_FIRESECONDARY: + case ACTION_FIRESECONDARY: { Unbind(key); fireSecondary.Insert(key); return true; } - case CTRLS_WEAPONNEXT: + case ACTION_WEAPONNEXT: { Unbind(key); weaponNext.Insert(key); return true; } - case CTRLS_WEAPONPREV: + case ACTION_WEAPONPREV: { Unbind(key); weaponPrev.Insert(key); return true; } - case CTRLS_TOGGLE_LIGHTS: + case ACTION_TOGGLE_LIGHTS: { Unbind(key); toggleLights.Insert(key); return true; } - case CTRLS_TOGGLE_FPS: + case ACTION_TOGGLE_FPS: { Unbind(key); toggleFPS.Insert(key); return true; } - case CTRLS_TOGGLE_CONSOLE: + case ACTION_TOGGLE_CONSOLE: { Unbind(key); toggleConsole.Insert(key); return true; } - case CTRLS_TOGGLE_MOUSELOOK: + case ACTION_TOGGLE_MOUSELOOK: { Unbind(key); toggleMouseLook.Insert(key); return true; } - case CTRLS_QUICKMOUSELOOK: + case ACTION_QUICKMOUSELOOK: { Unbind(key); quickMouseLook.Insert(key); diff --git a/src/level.cpp b/src/level.cpp index 8267a6c..aaf6770 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -551,147 +551,147 @@ namespace OpenArena if(command == "forward") { - if(!defaultPlayer[0].controls.Bind(CTRLS_FORWARD, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_FORWARD, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action forward"); } } else if(command == "backward") { - if(!defaultPlayer[0].controls.Bind(CTRLS_BACKWARD, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_BACKWARD, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action backward"); } } else if(command == "lookleft") { - if(!defaultPlayer[0].controls.Bind(CTRLS_LOOKLEFT, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_LOOKLEFT, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action lookleft"); } } else if(command == "lookright") { - if(!defaultPlayer[0].controls.Bind(CTRLS_LOOKRIGHT, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_LOOKRIGHT, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action lookright"); } } else if(command == "lookup") { - if(!defaultPlayer[0].controls.Bind(CTRLS_LOOKUP, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_LOOKUP, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action lookup"); } } else if(command == "lookdown") { - if(!defaultPlayer[0].controls.Bind(CTRLS_LOOKDOWN, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_LOOKDOWN, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action lookdown"); } } else if(command == "moveup") { - if(!defaultPlayer[0].controls.Bind(CTRLS_MOVEUP, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_MOVEUP, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action moveup"); } } else if(command == "movedown") { - if(!defaultPlayer[0].controls.Bind(CTRLS_MOVEDOWN, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_MOVEDOWN, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action movedown"); } } else if(command == "moveleft") { - if(!defaultPlayer[0].controls.Bind(CTRLS_MOVELEFT, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_MOVELEFT, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action moveleft"); } } else if(command == "moveright") { - if(!defaultPlayer[0].controls.Bind(CTRLS_MOVERIGHT, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_MOVERIGHT, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action moveright"); } } else if(command == "fireprimary") { - if(!defaultPlayer[0].controls.Bind(CTRLS_FIREPRIMARY, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_FIREPRIMARY, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action fireprimary"); } } else if(command == "firesecondary") { - if(!defaultPlayer[0].controls.Bind(CTRLS_FIRESECONDARY, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_FIRESECONDARY, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action firesecondary"); } } else if(command == "weapnext") { - if(!defaultPlayer[0].controls.Bind(CTRLS_WEAPONNEXT, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_WEAPONNEXT, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action weapnext"); } } else if(command == "weapprev") { - if(!defaultPlayer[0].controls.Bind(CTRLS_WEAPONPREV, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_WEAPONPREV, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action weapprev"); } } else if(command == "togglelights" || command == "togglelighting") { - if(!defaultPlayer[0].controls.Bind(CTRLS_TOGGLE_LIGHTS, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_TOGGLE_LIGHTS, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action togglelights"); } } else if(command == "togglefps") { - if(!defaultPlayer[0].controls.Bind(CTRLS_TOGGLE_FPS, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_TOGGLE_FPS, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action togglefps"); } } else if(command == "toggleconsole") { - if(!defaultPlayer[0].controls.Bind(CTRLS_TOGGLE_CONSOLE, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_TOGGLE_CONSOLE, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action toggleconsole"); } } else if(command == "togglemouselook") { - if(!defaultPlayer[0].controls.Bind(CTRLS_TOGGLE_MOUSELOOK, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_TOGGLE_MOUSELOOK, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action togglemouselook"); } } else if(command == "quickmouselook") { - if(!defaultPlayer[0].controls.Bind(CTRLS_QUICKMOUSELOOK, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_QUICKMOUSELOOK, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action quickmouselook"); } } else if(command == "rollleft") { - if(!defaultPlayer[0].controls.Bind(CTRLS_ROLLLEFT, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_ROLLLEFT, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action rollleft"); } } else if(command == "rollright") { - if(!defaultPlayer[0].controls.Bind(CTRLS_ROLLRIGHT, KeyName(word(cmd, ++i)))) + if(!defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_ROLLRIGHT, KeyName(word(cmd, ++i)))) { ConsolePrint("Couldn't bind " + word(cmd, i) + " to action rollright"); } @@ -828,79 +828,79 @@ namespace OpenArena if(command == "forward") { - defaultPlayer[0].controls.Bind(CTRLS_FORWARD, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_FORWARD, KeyName(word(cmd, ++i))); } else if(command == "backward") { - defaultPlayer[0].controls.Bind(CTRLS_BACKWARD, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_BACKWARD, KeyName(word(cmd, ++i))); } else if(command == "lookleft") { - defaultPlayer[0].controls.Bind(CTRLS_LOOKLEFT, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_LOOKLEFT, KeyName(word(cmd, ++i))); } else if(command == "lookright") { - defaultPlayer[0].controls.Bind(CTRLS_LOOKRIGHT, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_LOOKRIGHT, KeyName(word(cmd, ++i))); } else if(command == "lookup") { - defaultPlayer[0].controls.Bind(CTRLS_LOOKUP, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_LOOKUP, KeyName(word(cmd, ++i))); } else if(command == "lookdown") { - defaultPlayer[0].controls.Bind(CTRLS_LOOKDOWN, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_LOOKDOWN, KeyName(word(cmd, ++i))); } else if(command == "moveup") { - defaultPlayer[0].controls.Bind(CTRLS_MOVEUP, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_MOVEUP, KeyName(word(cmd, ++i))); } else if(command == "movedown") { - defaultPlayer[0].controls.Bind(CTRLS_MOVEDOWN, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_MOVEDOWN, KeyName(word(cmd, ++i))); } else if(command == "moveleft") { - defaultPlayer[0].controls.Bind(CTRLS_MOVELEFT, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_MOVELEFT, KeyName(word(cmd, ++i))); } else if(command == "moveright") { - defaultPlayer[0].controls.Bind(CTRLS_MOVERIGHT, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_MOVERIGHT, KeyName(word(cmd, ++i))); } else if(command == "fireprimary") { - defaultPlayer[0].controls.Bind(CTRLS_FIREPRIMARY, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_FIREPRIMARY, KeyName(word(cmd, ++i))); } else if(command == "firesecondary") { - defaultPlayer[0].controls.Bind(CTRLS_FIRESECONDARY, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_FIRESECONDARY, KeyName(word(cmd, ++i))); } else if(command == "weapnext") { - defaultPlayer[0].controls.Bind(CTRLS_WEAPONNEXT, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_WEAPONNEXT, KeyName(word(cmd, ++i))); } else if(command == "weapprev") { - defaultPlayer[0].controls.Bind(CTRLS_WEAPONPREV, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_WEAPONPREV, KeyName(word(cmd, ++i))); } else if(command == "togglelights" || command == "togglelighting") { - defaultPlayer[0].controls.Bind(CTRLS_TOGGLE_LIGHTS, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_TOGGLE_LIGHTS, KeyName(word(cmd, ++i))); } else if(command == "togglefps") { - defaultPlayer[0].controls.Bind(CTRLS_TOGGLE_FPS, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_TOGGLE_FPS, KeyName(word(cmd, ++i))); } else if(command == "toggleconsole") { - defaultPlayer[0].controls.Bind(CTRLS_TOGGLE_CONSOLE, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_TOGGLE_CONSOLE, KeyName(word(cmd, ++i))); } else if(command == "togglemouselook") { - defaultPlayer[0].controls.Bind(CTRLS_TOGGLE_MOUSELOOK, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_TOGGLE_MOUSELOOK, KeyName(word(cmd, ++i))); } else if(command == "quickmouselook") { - defaultPlayer[0].controls.Bind(CTRLS_QUICKMOUSELOOK, KeyName(word(cmd, ++i))); + defaultPlayer[0].controls.Bind(OpenArena::ControlScheme::ACTION_QUICKMOUSELOOK, KeyName(word(cmd, ++i))); } } else if(command == "+map" || command == "+map_load")