matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stickman keys working, fixes first half of issue #50

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-04 14:34:43 +01:00
parent ae5d099b81
commit 18e1890590
2 changed files with 77 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/game/GameController.cpp
View File

@ -386,12 +386,82 @@ bool GameController::MouseWheel(int x, int y, int d)
bool GameController::KeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{
return commandInterface->OnKeyPress(key, character, shift, ctrl, alt);
bool ret = commandInterface->OnKeyPress(key, character, shift, ctrl, alt);
if(ret)
{
Simulation * sim = gameModel->GetSimulation();
if (key == KEY_RIGHT)
{
sim->player.comm = (int)(sim->player.comm)|0x02; //Go right command
}
if (key == KEY_LEFT)
{
sim->player.comm = (int)(sim->player.comm)|0x01; //Go left command
}
if (key == KEY_DOWN && ((int)(sim->player.comm)&0x08)!=0x08)
{
sim->player.comm = (int)(sim->player.comm)|0x08; //Use element command
}
if (key == KEY_UP && ((int)(sim->player.comm)&0x04)!=0x04)
{
sim->player.comm = (int)(sim->player.comm)|0x04; //Jump command
}
if (key == KEY_d)
{
sim->player2.comm = (int)(sim->player2.comm)|0x02; //Go right command
}
if (key == KEY_a)
{
sim->player2.comm = (int)(sim->player2.comm)|0x01; //Go left command
}
if (key == KEY_s && ((int)(sim->player2.comm)&0x08)!=0x08)
{
sim->player2.comm = (int)(sim->player2.comm)|0x08; //Use element command
}
if (key == KEY_w && ((int)(sim->player2.comm)&0x04)!=0x04)
{
sim->player2.comm = (int)(sim->player2.comm)|0x04; //Jump command
}
}
return ret;
}
bool GameController::KeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{
return commandInterface->OnKeyRelease(key, character, shift, ctrl, alt);
bool ret = commandInterface->OnKeyRelease(key, character, shift, ctrl, alt);
if(ret)
{
Simulation * sim = gameModel->GetSimulation();
if (key == SDLK_RIGHT || key == SDLK_LEFT)
{
sim->player.pcomm = sim->player.comm; //Saving last movement
sim->player.comm = (int)(sim->player.comm)&12; //Stop command
}
if (key == SDLK_UP)
{
sim->player.comm = (int)(sim->player.comm)&11;
}
if (key == SDLK_DOWN)
{
sim->player.comm = (int)(sim->player.comm)&7;
}
if (key == SDLK_d || key == SDLK_a)
{
sim->player2.pcomm = sim->player2.comm; //Saving last movement
sim->player2.comm = (int)(sim->player2.comm)&12; //Stop command
}
if (key == SDLK_w)
{
sim->player2.comm = (int)(sim->player2.comm)&11;
}
if (key == SDLK_s)
{
sim->player2.comm = (int)(sim->player2.comm)&7;
}
}
return ret;
}
void GameController::Tick()

5
src/interface/Keys.h
View File

@ -22,6 +22,11 @@
#define KEY_MOD_ALT KMOD_ALT
#define KEY_MOD_SHIFT KMOD_SHIFT
#define KEY_a SDLK_a
#define KEY_d SDLK_d
#define KEY_s SDLK_s
#define KEY_w SDLK_w
#define BUTTON_LEFT SDL_BUTTON_LEFT
#define BUTTON_MIDDLE SDL_BUTTON_MIDDLE
#define BUTTON_RIGHT SDL_BUTTON_RIGHT