diff --git a/alienblaster/AppSettings.cfg b/alienblaster/AppSettings.cfg index cbbcde781..d7bfabb71 100644 --- a/alienblaster/AppSettings.cfg +++ b/alienblaster/AppSettings.cfg @@ -1,4 +1,4 @@ -LibSdlVersion=1.2 +LibSdlVersion=1.3 AppName="Alien Blaster" AppFullName=de.schwardtnet.alienblaster ScreenOrientation=h @@ -9,8 +9,8 @@ AppUsesMouse=n AppNeedsArrowKeys=y AppUsesJoystick=n MultiABI=n -AppVersionCode=110003 -AppVersionName="1.1.0.p3" +AppVersionCode=110004 +AppVersionName="1.1.0.4" CompiledLibraries="sdl_mixer sdl_image" AppCflags='-finline-functions -O2' ReadmeText='^You can press "Home" now - the data will be downloaded in background^In game press "Menu" for secondary fire, "Volume Up/Down" to cycle weapons^If your phone doesnt have joystick or trackball the accelerometer will be used' diff --git a/alienblaster/project/AndroidManifest.xml b/alienblaster/project/AndroidManifest.xml index d9f1df30a..d0e2f53ed 100644 --- a/alienblaster/project/AndroidManifest.xml +++ b/alienblaster/project/AndroidManifest.xml @@ -1,8 +1,8 @@ getPlayerEventKeys(0).find(PE_FIRE_WEAPONS)->second; - } return (SDLKey) 0; } diff --git a/alienblaster/project/jni/application/alienblaster/racer.cpp b/alienblaster/project/jni/application/alienblaster/racer.cpp index 18ef749af..15e2680ce 100644 --- a/alienblaster/project/jni/application/alienblaster/racer.cpp +++ b/alienblaster/project/jni/application/alienblaster/racer.cpp @@ -1101,7 +1101,8 @@ void Racer::handlePlayerEvent( PlayerEvent pEvent, bool keyDown ) { case PE_DOWN: if ( keyDown ) backwards = true; else backwards = false; break; case PE_LEFT: if ( keyDown ) left = true; else left = false; break; case PE_RIGHT: if ( keyDown ) right = true; else right = false; break; - case PE_FIRE_WEAPONS: if ( keyDown ) fireWeapons = true; else fireWeapons = false; break; + case PE_FIRE_SPECIALS:// PE_FIRE_WEAPONS: + if ( keyDown ) fireWeapons = true; else fireWeapons = false; break; case PE_CHOOSE_WEAPON_SECONDARY: { if ( !keyDown ) { @@ -1116,7 +1117,7 @@ void Racer::handlePlayerEvent( PlayerEvent pEvent, bool keyDown ) { } break; } - case PE_FIRE_SPECIALS: + case PE_FIRE_WEAPONS: // PE_FIRE_SPECIALS: { if ( keyDown ) { useSpecial = true; diff --git a/alienblaster/project/jni/application/alienblaster/surfaceDB.cpp b/alienblaster/project/jni/application/alienblaster/surfaceDB.cpp index e66f3f4ce..8d4fba0cc 100644 --- a/alienblaster/project/jni/application/alienblaster/surfaceDB.cpp +++ b/alienblaster/project/jni/application/alienblaster/surfaceDB.cpp @@ -83,6 +83,9 @@ SdlCompat_AcceleratedSurface *SurfaceDB::loadSurface( string fn, bool alpha ) { exit(1); } + SDL_SetColorKey( newSurface, SDL_SRCCOLORKEY, + SDL_MapRGB(newSurface->format, transR, transG, transB) ); + SDL_Surface * hwSurface = SDL_DisplayFormat(newSurface); if( hwSurface ) { @@ -90,9 +93,6 @@ SdlCompat_AcceleratedSurface *SurfaceDB::loadSurface( string fn, bool alpha ) { newSurface = hwSurface; } - SDL_SetColorKey( newSurface, SDL_SRCCOLORKEY, - SDL_MapRGB(newSurface->format, transR, transG, transB) ); - surfaceDB[ fn ] = SdlCompat_CreateAcceleratedSurface( newSurface ); SDL_FreeSurface(newSurface); diff --git a/alienblaster/project/jni/sdl b/alienblaster/project/jni/sdl index 73bcf85be..d92c7931b 120000 --- a/alienblaster/project/jni/sdl +++ b/alienblaster/project/jni/sdl @@ -1 +1 @@ -../sdl/sdl-1.2 \ No newline at end of file +../sdl/sdl-1.3 \ No newline at end of file