diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-26 16:10:21 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-26 16:10:21 (GMT) |
| commit | e2c9882692fabcd22a7d022ebd21fd3b36ad84b0 (patch) | |
| tree | 0afb6c4c35985625484d87adcdda40004910a3ff /src/interface.c | |
| parent | 4742c1bcd9103e93751b67a831403a66dc411804 (diff) | |
| parent | 60de1cf5754d8132a7bf5b6868df34babe66397b (diff) | |
| download | powder-e2c9882692fabcd22a7d022ebd21fd3b36ad84b0.zip powder-e2c9882692fabcd22a7d022ebd21fd3b36ad84b0.tar.gz | |
Merge latest FIGH additions
Diffstat (limited to 'src/interface.c')
| -rw-r--r-- | src/interface.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/interface.c b/src/interface.c index 0073a6e..8311dd9 100644 --- a/src/interface.c +++ b/src/interface.c @@ -2495,36 +2495,36 @@ int sdl_poll(void) //1 8 2 if (event.key.keysym.sym == SDLK_RIGHT) { - player[0] = (int)(player[0])|0x02; //Go right command + player.comm = (int)(player.comm)|0x02; //Go right command } if (event.key.keysym.sym == SDLK_LEFT) { - player[0] = (int)(player[0])|0x01; //Go left command + player.comm = (int)(player.comm)|0x01; //Go left command } - if (event.key.keysym.sym == SDLK_DOWN && ((int)(player[0])&0x08)!=0x08) + if (event.key.keysym.sym == SDLK_DOWN && ((int)(player.comm)&0x08)!=0x08) { - player[0] = (int)(player[0])|0x08; //Go left command + player.comm = (int)(player.comm)|0x08; //Go left command } - if (event.key.keysym.sym == SDLK_UP && ((int)(player[0])&0x04)!=0x04) + if (event.key.keysym.sym == SDLK_UP && ((int)(player.comm)&0x04)!=0x04) { - player[0] = (int)(player[0])|0x04; //Jump command + player.comm = (int)(player.comm)|0x04; //Jump command } if (event.key.keysym.sym == SDLK_d) { - player2[0] = (int)(player2[0])|0x02; //Go right command + player2.comm = (int)(player2.comm)|0x02; //Go right command } if (event.key.keysym.sym == SDLK_a) { - player2[0] = (int)(player2[0])|0x01; //Go left command + player2.comm = (int)(player2.comm)|0x01; //Go left command } - if (event.key.keysym.sym == SDLK_s && ((int)(player2[0])&0x08)!=0x08) + if (event.key.keysym.sym == SDLK_s && ((int)(player2.comm)&0x08)!=0x08) { - player2[0] = (int)(player2[0])|0x08; //Go left command + player2.comm = (int)(player2.comm)|0x08; //Go left command } - if (event.key.keysym.sym == SDLK_w && ((int)(player2[0])&0x04)!=0x04) + if (event.key.keysym.sym == SDLK_w && ((int)(player2.comm)&0x04)!=0x04) { - player2[0] = (int)(player2[0])|0x04; //Jump command + player2.comm = (int)(player2.comm)|0x04; //Jump command } break; @@ -2536,30 +2536,30 @@ int sdl_poll(void) sdl_zoom_trig = 0; if (event.key.keysym.sym == SDLK_RIGHT || event.key.keysym.sym == SDLK_LEFT) { - player[1] = player[0]; //Saving last movement - player[0] = (int)(player[0])&12; //Stop command + player.pcomm = player.comm; //Saving last movement + player.comm = (int)(player.comm)&12; //Stop command } if (event.key.keysym.sym == SDLK_UP) { - player[0] = (int)(player[0])&11; + player.comm = (int)(player.comm)&11; } if (event.key.keysym.sym == SDLK_DOWN) { - player[0] = (int)(player[0])&7; + player.comm = (int)(player.comm)&7; } if (event.key.keysym.sym == SDLK_d || event.key.keysym.sym == SDLK_a) { - player2[1] = player2[0]; //Saving last movement - player2[0] = (int)(player2[0])&12; //Stop command + player2.pcomm = player2.comm; //Saving last movement + player2.comm = (int)(player2.comm)&12; //Stop command } if (event.key.keysym.sym == SDLK_w) { - player2[0] = (int)(player2[0])&11; + player2.comm = (int)(player2.comm)&11; } if (event.key.keysym.sym == SDLK_s) { - player2[0] = (int)(player2[0])&7; + player2.comm = (int)(player2.comm)&7; } break; case SDL_MOUSEBUTTONDOWN: |
