commit f204c851

sago007 · 2016-04-16 14:42
f204c851addfeca714b8d4afa721b2bf74531344 patch · browse files
parent 75ea368bbe48bb58ff95099dce4574b048487126

Remove the old joypad and mouseplay config entries

Changed files

M	source/code/main.cpp before
M	source/code/mainVars.inc before

diff --git a/source/code/main.cpp b/source/code/main.cpp index 372fba2..e9163fb 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -1275,22 +1275,19 @@ int main(int argc, char* argv[]) {

}

- keySettings[0].up= SDLK_UP;

- keySettings[0].down = SDLK_DOWN;

- keySettings[0].left = SDLK_LEFT;

- keySettings[0].right = SDLK_RIGHT;

- keySettings[0].change = SDLK_RCTRL;

- keySettings[0].push = SDLK_RSHIFT;

- keySettings[2].up= SDLK_w;

- keySettings[2].down = SDLK_s;

- keySettings[2].left = SDLK_a;

- keySettings[2].right = SDLK_d;

- keySettings[2].change = SDLK_LCTRL;

- keySettings[2].push = SDLK_LSHIFT;

- player1keys=0;

- player2keys=2;

+ keySettings[player1keys].up= SDLK_UP;

+ keySettings[player1keys].down = SDLK_DOWN;

+ keySettings[player1keys].left = SDLK_LEFT;

+ keySettings[player1keys].right = SDLK_RIGHT;

+ keySettings[player1keys].change = SDLK_RCTRL;

+ keySettings[player1keys].push = SDLK_RSHIFT;

+ keySettings[player2keys].up= SDLK_w;

+ keySettings[player2keys].down = SDLK_s;

+ keySettings[player2keys].left = SDLK_a;

+ keySettings[player2keys].right = SDLK_d;

+ keySettings[player2keys].change = SDLK_LCTRL;

+ keySettings[player2keys].push = SDLK_LSHIFT;

player1name = _("Player 1");

player2name = _("Player 2");

@@ -1302,8 +1299,6 @@ int main(int argc, char* argv[]) {

bFullscreen = (bool)configSettings->getInt("fullscreen");

MusicEnabled = (bool)configSettings->getInt("musicenabled");

SoundEnabled = (bool)configSettings->getInt("soundenabled");

- mouseplay1 = (bool)configSettings->getInt("mouseplay1");

- mouseplay2 = (bool)configSettings->getInt("mouseplay2");

if (configSettings->exists("sdl2_player1keyup")) {

keySettings[0].up = (SDL_Keycode)configSettings->getInt("sdl2_player1keyup");

@@ -1426,10 +1421,6 @@ int main(int argc, char* argv[]) {

configSettings->setInt("fullscreen",(int)bFullscreen);

configSettings->setInt("musicenabled",(int)MusicEnabled);

configSettings->setInt("soundenabled",(int)SoundEnabled);

- configSettings->setInt("mouseplay1",(int)mouseplay1);

- configSettings->setInt("mouseplay2",(int)mouseplay2);

- configSettings->setInt("joypad1",(int)joyplay1);

- configSettings->setInt("joypad2",(int)joyplay2);

configSettings->setInt("sdl2_player1keyup",(int)keySettings[0].up);

configSettings->setInt("sdl2_player1keydown",(int)keySettings[0].down);

diff --git a/source/code/mainVars.inc b/source/code/mainVars.inc index adc5cb4..ae3a018 100644 --- a/source/code/mainVars.inc +++ b/source/code/mainVars.inc

@@ -186,11 +186,8 @@ char FPS[10];

int verboseLevel = 0;

//keySetup

-int player1keys, player2keys;

-bool mouseplay1=false; //The mouse works on the play field

-bool mouseplay2=false; //Same for player2

-bool joyplay1=false; //Player one uses the joypad

-bool joyplay2=false; //Player two uses the joypad

+const int player1keys = 0;

+const int player2keys = 2;

//Stores the controls

struct control