diff --git a/project/jni/application/sc2/src/config_unix.h b/project/jni/application/sc2/src/config_unix.h index b1c90d26d..f9aa7e9a1 100644 --- a/project/jni/application/sc2/src/config_unix.h +++ b/project/jni/application/sc2/src/config_unix.h @@ -11,19 +11,19 @@ #define _CONFIG_UNIX_H /* Directory where the UQM game data is located */ -#define CONTENTDIR "./" +#define CONTENTDIR "" /* Directory where game data will be stored */ -#define USERDIR "./config/" +#define USERDIR "config/" /* Directory where config files will be stored */ #define CONFIGDIR USERDIR /* Directory where supermelee teams will be stored */ -#define MELEEDIR "./teams/" +#define MELEEDIR "teams/" /* Directory where save games will be stored */ -#define SAVEDIR "./save/" +#define SAVEDIR "save/" /* Defined if words are stored with the most significant byte first */ #ifdef __ARMEL__ diff --git a/project/jni/application/src b/project/jni/application/src index 706424f94..018e1c87b 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -sc2 \ No newline at end of file +REminiscence \ No newline at end of file diff --git a/project/jni/application/teeworlds/src/engine/client/ec_gfx.cpp b/project/jni/application/teeworlds/src/engine/client/ec_gfx.cpp index b2af71346..209f6263f 100644 --- a/project/jni/application/teeworlds/src/engine/client/ec_gfx.cpp +++ b/project/jni/application/teeworlds/src/engine/client/ec_gfx.cpp @@ -314,7 +314,7 @@ static int try_init() pos.x = screen_width - screen_width / 16; pos.y = screen_height - screen_height / 8; - pos.w = screen_width / (SDL_ANDROID_GetScreenKeyboardSize() + 2) / 4; + pos.w = screen_width / 2 /*(SDL_ANDROID_GetScreenKeyboardSize() + 2)*/ / 4; pos.h = pos.w; pos.x -= pos.w/2; pos.y -= pos.h/2; @@ -334,8 +334,11 @@ static int try_init() SDL_ANDROID_SetScreenKeyboardButtonPos(SDL_ANDRIOD_SCREENKEYBOARD_BUTTON_3, &pos); - pos.y = screen_height - screen_height / 8 - screen_height / 4; - pos.y -= pos.h/2; + //pos.y = screen_height - screen_height / 8 - screen_height / 4; + //pos.y -= pos.h/2; + + pos.y -= pos.h; + pos.x = screen_width / 16; pos.x -= pos.w/2;