maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed Renamed class ControlSchemeClass to ControlScheme

Browse Source 
Changed Renamed CTRLS_* to ACTION_*
Changed Moved anonymous enum containing ACTION_* into class ControlScheme
~g2k
This commit is contained in:
Tom Hicks
2006-06-18 15:23:36 -04:00
parent 7e4b388fee
commit ec70392a02
4 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/ctrls.h
View File

@@ -4,16 +4,14 @@
#include "list.h" #include "list.h"
namespace OpenArena{ namespace OpenArena{
class ControlScheme
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
{ {
public: 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 LoadDefaultControlScheme();
void ClearControlScheme(); void ClearControlScheme();
void Unbind(uint8); void Unbind(uint8);

2
include/player.h
View File

@@ -17,7 +17,7 @@ namespace OpenArena
void AddItem(unsigned int item); void AddItem(unsigned int item);
void RemoveItem(unsigned int item); void RemoveItem(unsigned int item);
ControlSchemeClass controls; ControlScheme controls;
Camera camera; Camera camera;

54
src/ctrls.cpp
View File

@@ -10,7 +10,7 @@
// To implement a system for managing a bindable control scheme. // To implement a system for managing a bindable control scheme.
// //
// Summary of Methods: // Summary of Methods:
// ControlSchemeClass // ControlScheme
// void LoadDefaultControlScheme(); // void LoadDefaultControlScheme();
// -Loads the default control scheme // -Loads the default control scheme
// void ClearControlScheme(); // void ClearControlScheme();
@@ -19,7 +19,7 @@
// -Removes key from all control lists. // -Removes key from all control lists.
// //
// Summary of Properties: // Summary of Properties:
// ControlSchemeClass // ControlScheme
// -list<uint8> forward; // -list<uint8> forward;
// A list of the VKeys associated with forward. // A list of the VKeys associated with forward.
// -list<uint8> backward; // -list<uint8> backward;
@@ -68,7 +68,7 @@
#include "../include/ctrls.h" #include "../include/ctrls.h"
namespace OpenArena{ namespace OpenArena{
void ControlSchemeClass::LoadDefaultControlScheme() void ControlScheme::LoadDefaultControlScheme()
{ {
forward.Insert(OpenArena::KEY_LBUTTON); forward.Insert(OpenArena::KEY_LBUTTON);
backward.Insert(OpenArena::KEY_RBUTTON); backward.Insert(OpenArena::KEY_RBUTTON);
@@ -92,7 +92,7 @@ namespace OpenArena{
rollLeft.Insert(OpenArena::KEY_W); rollLeft.Insert(OpenArena::KEY_W);
rollRight.Insert(OpenArena::KEY_E); rollRight.Insert(OpenArena::KEY_E);
} }
void ControlSchemeClass::ClearControlScheme() void ControlScheme::ClearControlScheme()
{ {
backward.Clear(); backward.Clear();
firePrimary.Clear(); firePrimary.Clear();
@@ -115,7 +115,7 @@ namespace OpenArena{
weaponPrev.Clear(); weaponPrev.Clear();
} }
void ControlSchemeClass::Unbind(uint8 key) void ControlScheme::Unbind(uint8 key)
{ {
backward.Remove(key); backward.Remove(key);
firePrimary.Remove(key); firePrimary.Remove(key);
@@ -137,131 +137,131 @@ namespace OpenArena{
weaponPrev.Remove(key); weaponPrev.Remove(key);
} }
bool ControlSchemeClass::Bind(uint32 action, uint8 key) bool ControlScheme::Bind(uint32 action, uint8 key)
{ {
switch(action) switch(action)
{ {
case CTRLS_FORWARD: case ACTION_FORWARD:
{ {
Unbind(key); Unbind(key);
forward.Insert(key); forward.Insert(key);
return true; return true;
} }
case CTRLS_BACKWARD: case ACTION_BACKWARD:
{ {
Unbind(key); Unbind(key);
backward.Insert(key); backward.Insert(key);
return true; return true;
} }
case CTRLS_LOOKLEFT: case ACTION_LOOKLEFT:
{ {
Unbind(key); Unbind(key);
lookLeft.Insert(key); lookLeft.Insert(key);
return true; return true;
} }
case CTRLS_LOOKRIGHT: case ACTION_LOOKRIGHT:
{ {
Unbind(key); Unbind(key);
lookRight.Insert(key); lookRight.Insert(key);
return true; return true;
} }
case CTRLS_LOOKUP: case ACTION_LOOKUP:
{ {
Unbind(key); Unbind(key);
lookUp.Insert(key); lookUp.Insert(key);
return true; return true;
} }
case CTRLS_LOOKDOWN: case ACTION_LOOKDOWN:
{ {
Unbind(key); Unbind(key);
lookDown.Insert(key); lookDown.Insert(key);
return true; return true;
} }
case CTRLS_MOVELEFT: case ACTION_MOVELEFT:
{ {
Unbind(key); Unbind(key);
moveLeft.Insert(key); moveLeft.Insert(key);
return true; return true;
} }
case CTRLS_MOVERIGHT: case ACTION_MOVERIGHT:
{ {
Unbind(key); Unbind(key);
moveRight.Insert(key); moveRight.Insert(key);
return true; return true;
} }
case CTRLS_MOVEUP: case ACTION_MOVEUP:
{ {
Unbind(key); Unbind(key);
moveUp.Insert(key); moveUp.Insert(key);
return true; return true;
} }
case CTRLS_MOVEDOWN: case ACTION_MOVEDOWN:
{ {
Unbind(key); Unbind(key);
moveDown.Insert(key); moveDown.Insert(key);
return true; return true;
} }
case CTRLS_ROLLLEFT: case ACTION_ROLLLEFT:
{ {
Unbind(key); Unbind(key);
rollLeft.Insert(key); rollLeft.Insert(key);
return true; return true;
} }
case CTRLS_ROLLRIGHT: case ACTION_ROLLRIGHT:
{ {
Unbind(key); Unbind(key);
rollRight.Insert(key); rollRight.Insert(key);
return true; return true;
} }
case CTRLS_FIREPRIMARY: case ACTION_FIREPRIMARY:
{ {
Unbind(key); Unbind(key);
firePrimary.Insert(key); firePrimary.Insert(key);
return true; return true;
} }
case CTRLS_FIRESECONDARY: case ACTION_FIRESECONDARY:
{ {
Unbind(key); Unbind(key);
fireSecondary.Insert(key); fireSecondary.Insert(key);
return true; return true;
} }
case CTRLS_WEAPONNEXT: case ACTION_WEAPONNEXT:
{ {
Unbind(key); Unbind(key);
weaponNext.Insert(key); weaponNext.Insert(key);
return true; return true;
} }
case CTRLS_WEAPONPREV: case ACTION_WEAPONPREV:
{ {
Unbind(key); Unbind(key);
weaponPrev.Insert(key); weaponPrev.Insert(key);
return true; return true;
} }
case CTRLS_TOGGLE_LIGHTS: case ACTION_TOGGLE_LIGHTS:
{ {
Unbind(key); Unbind(key);
toggleLights.Insert(key); toggleLights.Insert(key);
return true; return true;
} }
case CTRLS_TOGGLE_FPS: case ACTION_TOGGLE_FPS:
{ {
Unbind(key); Unbind(key);
toggleFPS.Insert(key); toggleFPS.Insert(key);
return true; return true;
} }
case CTRLS_TOGGLE_CONSOLE: case ACTION_TOGGLE_CONSOLE:
{ {
Unbind(key); Unbind(key);
toggleConsole.Insert(key); toggleConsole.Insert(key);
return true; return true;
} }
case CTRLS_TOGGLE_MOUSELOOK: case ACTION_TOGGLE_MOUSELOOK:
{ {
Unbind(key); Unbind(key);
toggleMouseLook.Insert(key); toggleMouseLook.Insert(key);
return true; return true;
} }
case CTRLS_QUICKMOUSELOOK: case ACTION_QUICKMOUSELOOK:
{ {
Unbind(key); Unbind(key);
quickMouseLook.Insert(key); quickMouseLook.Insert(key);

80
src/level.cpp
View File

@@ -551,147 +551,147 @@ namespace OpenArena
if(command == "forward") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action forward");
} }
} }
else if(command == "backward") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action backward");
} }
} }
else if(command == "lookleft") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action lookleft");
} }
} }
else if(command == "lookright") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action lookright");
} }
} }
else if(command == "lookup") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action lookup");
} }
} }
else if(command == "lookdown") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action lookdown");
} }
} }
else if(command == "moveup") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action moveup");
} }
} }
else if(command == "movedown") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action movedown");
} }
} }
else if(command == "moveleft") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action moveleft");
} }
} }
else if(command == "moveright") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action moveright");
} }
} }
else if(command == "fireprimary") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action fireprimary");
} }
} }
else if(command == "firesecondary") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action firesecondary");
} }
} }
else if(command == "weapnext") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action weapnext");
} }
} }
else if(command == "weapprev") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action weapprev");
} }
} }
else if(command == "togglelights" || command == "togglelighting") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action togglelights");
} }
} }
else if(command == "togglefps") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action togglefps");
} }
} }
else if(command == "toggleconsole") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action toggleconsole");
} }
} }
else if(command == "togglemouselook") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action togglemouselook");
} }
} }
else if(command == "quickmouselook") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action quickmouselook");
} }
} }
else if(command == "rollleft") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action rollleft");
} }
} }
else if(command == "rollright") 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"); ConsolePrint("Couldn't bind " + word(cmd, i) + " to action rollright");
} }
@@ -828,79 +828,79 @@ namespace OpenArena
if(command == "forward") 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") 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") 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") 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") 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") 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") 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") 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") 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") 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") 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") 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") 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") 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") 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") 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") 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") 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") 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") else if(command == "+map" || command == "+map_load")