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

Don't control STKM when placing stamps, fixes #320

Browse Source
This commit is contained in:
jacob1 2016-10-13 20:29:10 -04:00
parent 4aa58d6c0c
commit 5370f07bf0
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/gui/game/GameController.cpp
View File

@ -645,38 +645,49 @@ bool GameController::KeyPress(int key, Uint16 character, bool shift, bool ctrl,
if (ret) if (ret)
{ {
Simulation * sim = gameModel->GetSimulation(); Simulation * sim = gameModel->GetSimulation();
if (key == SDLK_RIGHT) if (!gameView->GetPlacingSave())
{ {
sim->player.comm = (int)(sim->player.comm)|0x02; //Go right command // Go right command
} if (key == SDLK_RIGHT)
if (key == SDLK_LEFT) {
{ sim->player.comm = (int)(sim->player.comm)|0x02;
sim->player.comm = (int)(sim->player.comm)|0x01; //Go left command }
} // Go left command
if (key == SDLK_DOWN && ((int)(sim->player.comm)&0x08)!=0x08) if (key == SDLK_LEFT)
{ {
sim->player.comm = (int)(sim->player.comm)|0x08; //Use element command sim->player.comm = (int)(sim->player.comm)|0x01;
} }
if (key == SDLK_UP && ((int)(sim->player.comm)&0x04)!=0x04) // Use element command
{ if (key == SDLK_DOWN && ((int)(sim->player.comm)&0x08)!=0x08)
sim->player.comm = (int)(sim->player.comm)|0x04; //Jump command {
sim->player.comm = (int)(sim->player.comm)|0x08;
}
// Jump command
if (key == SDLK_UP && ((int)(sim->player.comm)&0x04)!=0x04)
{
sim->player.comm = (int)(sim->player.comm)|0x04;
}
} }
// Go right command
if (key == SDLK_d) if (key == SDLK_d)
{ {
sim->player2.comm = (int)(sim->player2.comm)|0x02; //Go right command sim->player2.comm = (int)(sim->player2.comm)|0x02;
} }
// Go left command
if (key == SDLK_a) if (key == SDLK_a)
{ {
sim->player2.comm = (int)(sim->player2.comm)|0x01; //Go left command sim->player2.comm = (int)(sim->player2.comm)|0x01;
} }
// Use element command
if (key == SDLK_s && ((int)(sim->player2.comm)&0x08)!=0x08) if (key == SDLK_s && ((int)(sim->player2.comm)&0x08)!=0x08)
{ {
sim->player2.comm = (int)(sim->player2.comm)|0x08; //Use element command sim->player2.comm = (int)(sim->player2.comm)|0x08;
} }
// Jump command
if (key == SDLK_w && ((int)(sim->player2.comm)&0x04)!=0x04) if (key == SDLK_w && ((int)(sim->player2.comm)&0x04)!=0x04)
{ {
sim->player2.comm = (int)(sim->player2.comm)|0x04; //Jump command sim->player2.comm = (int)(sim->player2.comm)|0x04;
} }
if (!sim->elementCount[PT_STKM2] || ctrl) if (!sim->elementCount[PT_STKM2] || ctrl)