Nasty bug fixed inside SDL_image - the colorkey was not set in SDL 1.2 because of SDL 1.3 changes

Also updated Biniax2
This commit is contained in:
pelya
2012-09-18 20:15:28 +03:00
parent f342ad315c
commit 72b5f3c86a
10 changed files with 37 additions and 11 deletions

View File

@@ -16,22 +16,22 @@ SdlVideoResizeKeepAspect=n
CompatibilityHacks=n
CompatibilityHacksStaticInit=n
CompatibilityHacksTextInputEmulatesHwKeyboard=n
AppUsesMouse=n
AppUsesMouse=y
AppNeedsTwoButtonMouse=n
ShowMouseCursor=n
ForceRelativeMouseMode=n
AppNeedsArrowKeys=y
AppNeedsArrowKeys=n
AppNeedsTextInput=n
AppUsesJoystick=n
AppUsesAccelerometer=n
AppUsesMultitouch=n
NonBlockingSwapBuffers=n
RedefinedKeys="RETURN"
AppTouchscreenKeyboardKeysAmount=2
AppTouchscreenKeyboardKeysAmount=0
AppTouchscreenKeyboardKeysAmountAutoFire=0
RedefinedKeysScreenKb="RETURN SPACE"
StartupMenuButtonTimeout=0
HiddenMenuOptions=''
HiddenMenuOptions='DisplaySizeConfig'
FirstStartMenuOptions=''
MultiABI=n
AppVersionCode=1301

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

View File

@@ -56,8 +56,8 @@ BNX_BOOL cfgInit()
_Cfg.sound = BNX_TRUE;
_Cfg.music = BNX_TRUE;
_Cfg.fullscreen = BNX_FALSE;
_Cfg.touch = BNX_FALSE;
_Cfg.fullscreen = BNX_TRUE;
_Cfg.touch = BNX_TRUE;
f = fopen( sysGetFullFileName( csConfigName ), "rt" );
if ( f == 0 )

View File

@@ -30,6 +30,7 @@ INCLUDES
#include <stdlib.h>
#include <stdio.h>
#include <android/log.h>
#include "inc.h"
#include "txt.h"

View File

@@ -28,6 +28,7 @@ For complete product license refer to LICENSE.TXT file
INCLUDES
******************************************************************************/
#include <string.h>
#include <SDL_screenkeyboard.h>
#include "inc.h"
@@ -95,10 +96,10 @@ BNX_BOOL hofInit()
for ( i = 0; i < cHofEntries; ++i )
{
strcpy( Hof.arcade[ i ].name, "JORDAN " );
Hof.arcade[ i ].score = (cHofEntries - i) * cHofInitScore;
Hof.arcade[ i ].score = (cHofEntries - i - 1) * cHofInitScore;
strcpy( Hof.tactic[ i ].name, "JORDAN " );
Hof.tactic[ i ].score = (cHofEntries - i) * cHofInitScore;
Hof.tactic[ i ].score = (cHofEntries - i - 1) * cHofInitScore;
}
if ( sysGetFileLen( sysGetFullFileName( csHOFName ) ) != cHOFFileSize )
@@ -221,11 +222,14 @@ BNX_BOOL hofEnter( BNX_GAME *game )
strcpy( recEntry->name, " " );
recEntry->score = game->score[ cPlayer1 ];
#ifdef __ANDROID__
//strcpy( recEntry->name, "Player" );
//SDL_ANDROID_GetScreenKeyboardTextInput(recEntry->name, 30);
#endif
inpInit();
do
{
startTime = sysGetTime();
gfxGetVirtualChar( game, inpDirect() );
cChar = inpGetChar();
if ( cChar > 0 )
@@ -286,7 +290,7 @@ void hofView()
sysUpdate();
}
}
while ( inpKeyA() == BNX_FALSE );
while ( inpKeyA() == BNX_FALSE && inpKeyB() == BNX_FALSE );
}
BNX_HALL *hofGet()