miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed more in-game keys

Browse Source
This commit is contained in:
pelya
2010-07-09 17:36:50 +03:00
parent 362c83b759
commit e901c4971e
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alienblaster/project/jni/application/src/game.cpp
View File

@@ -402,7 +402,8 @@ void Game::handleEventsPlayOn() {
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
switch(event.type) { switch(event.type) {
case SDL_JOYBUTTONDOWN: case SDL_JOYBUTTONDOWN:
case SDL_KEYDOWN: { case SDL_KEYDOWN:
case SDL_MOUSEBUTTONDOWN: {
if (paused) pause(); if (paused) pause();
racers->handleEvent(input.translate(event), input.isPressed(event)); racers->handleEvent(input.translate(event), input.isPressed(event));
break; break;
@@ -448,6 +449,7 @@ void Game::handleEventsPlayOn() {
} }
case SDL_JOYAXISMOTION: case SDL_JOYAXISMOTION:
case SDL_JOYBUTTONUP: case SDL_JOYBUTTONUP:
case SDL_MOUSEBUTTONUP:
racers->handleEvent(input.translate(event), input.isPressed(event)); racers->handleEvent(input.translate(event), input.isPressed(event));
break; break;
case SDL_QUIT: { case SDL_QUIT: {

7
alienblaster/project/jni/application/src/input.cpp
View File

@@ -22,6 +22,7 @@ using namespace std;
#include <vector> #include <vector>
#include "input.h" #include "input.h"
#include "SDL.h" #include "SDL.h"
#include "settings.h"
Input input; Input input;
@@ -101,12 +102,14 @@ const SDLKey Input::translate(const SDL_Event& event) {
if (event.type == SDL_JOYBUTTONDOWN || event.type == SDL_JOYBUTTONUP) { if (event.type == SDL_JOYBUTTONDOWN || event.type == SDL_JOYBUTTONUP) {
return (SDLKey) (1040 + event.jbutton.button); return (SDLKey) (1040 + event.jbutton.button);
} }
if (event.type == SDL_MOUSEBUTTONDOWN || event.type == SDL_MOUSEBUTTONUP) {
return SDLK_LCTRL; // settings->getPlayerEventKeys(0).find(PE_FIRE_WEAPONS)->second;
}
return (SDLKey) 0; return (SDLKey) 0;
} }
const bool Input::isPressed(const SDL_Event& event) { const bool Input::isPressed(const SDL_Event& event) {
/* || event.type == SDL_MOUSEBUTTONDOWN*/ if (event.type == SDL_JOYBUTTONDOWN || event.type == SDL_KEYDOWN || event.type == SDL_MOUSEBUTTONDOWN) return true;
if (event.type == SDL_JOYBUTTONDOWN || event.type == SDL_KEYDOWN) return true;
if (event.type == SDL_JOYAXISMOTION) return event.jaxis.value / initialSensitivity; if (event.type == SDL_JOYAXISMOTION) return event.jaxis.value / initialSensitivity;
return false; return false;
} }

10
alienblaster/project/jni/application/src/setDifficulty.cpp
View File

@@ -105,7 +105,7 @@ void SetDifficulty::draw() {
r.h = heavyFighterIcon1->h; r.h = heavyFighterIcon1->h;
SDL_BlitSurface( heavyFighterIcon1, 0, screen, &r ); SDL_BlitSurface( heavyFighterIcon1, 0, screen, &r );
} }
fontHighlighted->drawStr( screen, 100, 400, "Press \"1\"", FONT_ALIGN_CENTERED ); fontHighlighted->drawStr( screen, 100, 400, "Press \"Volume Up\"", FONT_ALIGN_CENTERED );
fontHighlighted->drawStr( screen, 100, 430, "To Change", FONT_ALIGN_CENTERED ); fontHighlighted->drawStr( screen, 100, 430, "To Change", FONT_ALIGN_CENTERED );
} }
else { else {
@@ -124,7 +124,7 @@ void SetDifficulty::draw() {
r.h = heavyFighterIcon1->h; r.h = heavyFighterIcon1->h;
SDL_BlitSurface( heavyFighterIcon1, 0, screen, &r ); SDL_BlitSurface( heavyFighterIcon1, 0, screen, &r );
} }
fontHighlighted->drawStr( screen, 100, 400, "Press \"1\"", FONT_ALIGN_CENTERED ); fontHighlighted->drawStr( screen, 100, 400, "Press \"Volume Up\"", FONT_ALIGN_CENTERED );
fontHighlighted->drawStr( screen, 100, 430, "To Change", FONT_ALIGN_CENTERED ); fontHighlighted->drawStr( screen, 100, 430, "To Change", FONT_ALIGN_CENTERED );
font->drawStr( screen, 560, 270, "Player 2", FONT_ALIGN_CENTERED ); font->drawStr( screen, 560, 270, "Player 2", FONT_ALIGN_CENTERED );
if ( playerTwoLightFighter ) { if ( playerTwoLightFighter ) {
@@ -140,7 +140,7 @@ void SetDifficulty::draw() {
r.h = heavyFighterIcon2->h; r.h = heavyFighterIcon2->h;
SDL_BlitSurface( heavyFighterIcon2, 0, screen, &r ); SDL_BlitSurface( heavyFighterIcon2, 0, screen, &r );
} }
fontHighlighted->drawStr( screen, 560, 400, "Press \"2\"", FONT_ALIGN_CENTERED ); fontHighlighted->drawStr( screen, 560, 400, "Press \"Volume Down\"", FONT_ALIGN_CENTERED );
fontHighlighted->drawStr( screen, 560, 430, "To Change", FONT_ALIGN_CENTERED ); fontHighlighted->drawStr( screen, 560, 430, "To Change", FONT_ALIGN_CENTERED );
} }
} }
@@ -154,11 +154,11 @@ void SetDifficulty::handleEvents( GameStates &gameState ) {
switch(event.type) { switch(event.type) {
case SDL_KEYDOWN: { case SDL_KEYDOWN: {
switch ( event.key.keysym.sym ) { switch ( event.key.keysym.sym ) {
case SDLK_1: { case SDLK_PAGEUP: {
playerOneLightFighter = !playerOneLightFighter; playerOneLightFighter = !playerOneLightFighter;
break; break;
} }
case SDLK_2: { case SDLK_PAGEDOWN: {
playerTwoLightFighter = !playerTwoLightFighter; playerTwoLightFighter = !playerTwoLightFighter;
break; break;
} }

4
alienblaster/project/jni/application/src/settings.cpp
View File

@@ -421,6 +421,10 @@ const PlayerKeys Settings::getPlayerKeys(unsigned int player) const {
return pk; return pk;
} }
const PlayerEventKeys & Settings::getPlayerEventKeys(unsigned int player) const {
return playerKeys[player];
}
void Settings::setKeyNames() { void Settings::setKeyNames() {
/* /*
keyName[ (SDLKey)0 ] = "UNKNOWN"; keyName[ (SDLKey)0 ] = "UNKNOWN";

1
alienblaster/project/jni/application/src/settings.h
View File

@@ -64,6 +64,7 @@ class Settings {
void settingsDialog(SdlCompat_AcceleratedSurface *screen); void settingsDialog(SdlCompat_AcceleratedSurface *screen);
const PlayerKeys getPlayerKeys(unsigned int player) const; const PlayerKeys getPlayerKeys(unsigned int player) const;
const PlayerEventKeys & getPlayerEventKeys(unsigned int player) const;
private: private: