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

Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

Browse Source
This commit is contained in:
Sergii Pylypenko
2015-02-20 17:41:59 +02:00
parent 78c649a4cc f4f314f397
commit e058734273
155 changed files with 1213 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/jni/glshim/src/gl/gl.c
View File

@@ -222,13 +222,13 @@ void glGetIntegerv(GLenum pname, GLint *params) {
*params=MAX_STACK_TEXTURE;
break;
case GL_MODELVIEW_STACK_DEPTH:
*params=(state.modelview_matrix)?1:(state.modelview_matrix->top+1);
*params=(state.modelview_matrix)?(state.modelview_matrix->top+1):1;
break;
case GL_PROJECTION_STACK_DEPTH:
*params=(state.projection_matrix)?1:(state.projection_matrix->top+1);
*params=(state.projection_matrix)?(state.projection_matrix->top+1):1;
break;
case GL_TEXTURE_STACK_DEPTH:
*params=(state.texture_matrix)?1:(state.texture_matrix[state.texture.active]->top+1);
*params=(state.texture_matrix)?(state.texture_matrix[state.texture.active]->top+1):1;
break;
case GL_MAX_LIST_NESTING:
*params=64; // fake, no limit in fact

8
project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c
View File

@@ -907,7 +907,11 @@ static int setupScreenKeyboardButtonSun( int buttonID, Uint8 * charBuf )
data = &(buttonImages[4+(buttonID-5)*2]);
if( buttonID == 9 )
data = &mousePointer;
else if( buttonID > 9 ) // Error, array too big
if( buttonID == 10 )
data = &(arrowImages[10]);
if( buttonID == 11 )
data = &(arrowImages[11]);
else if( buttonID > 11 ) // Error, array too big
return 12; // Return value bigger than zero to iterate it
ret = setupScreenKeyboardButtonTexture(data, charBuf);
@@ -934,7 +938,7 @@ static int setupScreenKeyboardButton( int buttonID, Uint8 * charBuf, int count )
sunTheme = 0;
return setupScreenKeyboardButtonLegacy(buttonID, charBuf);
}
else if( count == 10 )
else if( count == 10 || count == 12)
{
sunTheme = 1;
return setupScreenKeyboardButtonSun(buttonID, charBuf);