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

Fixed Alien Blaster textures out of place

Browse Source
This commit is contained in:
pelya
2010-07-09 16:24:05 +03:00
parent edd162e109
commit 362c83b759
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,7 @@ void Settings::showSettings( SdlCompat_AcceleratedSurface *screen, bool getNewKe
r.x = 175;
r.y = i-1;
SDL_BlitSurface(bluePlain, &srcKey, screen, &r );
fontNormal->drawStr( screen, 270, i, keyName[ pkiter->second ], FONT_ALIGN_RIGHT );
fontNormal->drawStr( screen, 270, i, SDL_GetKeyName( pkiter->second ), FONT_ALIGN_RIGHT );
}
if ( !(playerOfActiveItem == 1 && pkiter->first == activePlayerEvent) ) {
r.x = screen->w/2 + 5;
@@ -206,7 +206,7 @@ void Settings::showSettings( SdlCompat_AcceleratedSurface *screen, bool getNewKe
r.y = i-1;
SDL_BlitSurface(bluePlain, &srcKey, screen, &r );
fontNormal->drawStr( screen, screen->w/2 + 260, i,
keyName[ playerKeys[1][pkiter->first] ], FONT_ALIGN_RIGHT );
SDL_GetKeyName( playerKeys[1][pkiter->first] ), FONT_ALIGN_RIGHT );
}
if ( playerOfActiveItem == 0 && pkiter->first == activePlayerEvent ) {
@@ -219,7 +219,7 @@ void Settings::showSettings( SdlCompat_AcceleratedSurface *screen, bool getNewKe
r.y = i-1;
SDL_BlitSurface(whitePlain, &srcKey, screen, &r );
if (!getNewKey) {
fontHighlighted->drawStr( screen, 270, i, keyName[ pkiter->second ], FONT_ALIGN_RIGHT );
fontHighlighted->drawStr( screen, 270, i, SDL_GetKeyName( pkiter->second ), FONT_ALIGN_RIGHT );
}
}
if ( playerOfActiveItem == 1 && pkiter->first == activePlayerEvent ) {
@@ -234,7 +234,7 @@ void Settings::showSettings( SdlCompat_AcceleratedSurface *screen, bool getNewKe
SDL_BlitSurface(whitePlain, &srcKey, screen, &r );
if (!getNewKey) {
fontHighlighted->drawStr( screen, screen->w/2 + 260, i,
keyName[ playerKeys[1][pkiter->first] ], FONT_ALIGN_RIGHT );
SDL_GetKeyName( playerKeys[1][pkiter->first] ), FONT_ALIGN_RIGHT );
}
}
@@ -409,9 +409,11 @@ void Settings::getNewKeyFromUser() {
const PlayerKeys Settings::getPlayerKeys(unsigned int player) const {
assert( player < playerKeys.size() );
PlayerKeys pk;
/*
for( std::map< SDLKey, std::string > :: const_iterator i = keyName.begin(); i != keyName.end(); ++i ) {
pk[ i->first ] = PE_UNKNOWN;
}
*/
std::map< PlayerEvent, SDLKey >::const_iterator pkiter;
for(pkiter = playerKeys[player].begin(); pkiter != playerKeys[player].end(); ++pkiter) {
pk[ pkiter->second ] = pkiter->first;
@@ -420,6 +422,7 @@ const PlayerKeys Settings::getPlayerKeys(unsigned int player) const {
}
void Settings::setKeyNames() {
/*
keyName[ (SDLKey)0 ] = "UNKNOWN";
keyName[ (SDLKey)8 ] = "BACKSPACE";
keyName[ (SDLKey)9 ] = "TAB";
@@ -685,4 +688,5 @@ void Settings::setKeyNames() {
keyName[ (SDLKey)1053 ] = "GPB_13";
keyName[ (SDLKey)1054 ] = "GPB_14";
keyName[ (SDLKey)1055 ] = "GPB_15";
*/
}

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

@@ -80,7 +80,7 @@ class Settings {
Font *fontKey;
Font *fontHighlighted;
std::vector< PlayerEventKeys > playerKeys;
std::map< SDLKey, std::string > keyName;
//std::map< SDLKey, std::string > keyName;
PlayerEventName playerEventNames;
DefaultSettings defaultSettings;
void getNewKeyFromUser();

2
alienblaster/project/jni/application/src/video.cpp
View File

@@ -58,6 +58,8 @@ SdlCompat_AcceleratedSurface *Video::init(){
SDL_Surface * screen3 = SDL_DisplayFormat( screen2 );
SDL_FreeSurface(screen2);
screen = SdlCompat_CreateAcceleratedSurface(screen3);
screen->w = SCREEN_WIDTH;
screen->h = SCREEN_HEIGHT;
SDL_FreeSurface(screen3);
SDL_WM_SetCaption("AlienBlaster", "AlienBlaster");