diff --git a/JGE/src/main.cpp b/JGE/src/main.cpp index 4afe4bba6..357f7151d 100644 --- a/JGE/src/main.cpp +++ b/JGE/src/main.cpp @@ -10,6 +10,10 @@ #include #include +//Profiling +//#include + + #include #include #include @@ -299,7 +303,7 @@ int main(int argc, char *argv[]) pspDebugScreenSetTextColor(0xFFFFFFFF); pspDebugScreenClear(); - pspDebugScreenPrintf("Wagic:Loading core..."); + pspDebugScreenPrintf("JGE:Loading application..."); JLOG("SetupCallbacks()"); SetupCallbacks(); @@ -343,6 +347,8 @@ int main(int argc, char *argv[]) JGE::Destroy(); g_engine = NULL; + //Profiling + //gprof_cleanup(); sceKernelExitGame(); return 0; diff --git a/projects/mtg/Android/AndroidManifest.xml b/projects/mtg/Android/AndroidManifest.xml index 537020358..331b0a54f 100644 --- a/projects/mtg/Android/AndroidManifest.xml +++ b/projects/mtg/Android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="171" + android:versionName="0.17.1"> diff --git a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java index 58289a4fd..84f82447b 100644 --- a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java +++ b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java @@ -72,7 +72,7 @@ public class SDLActivity extends Activity { public String mErrorMessage = ""; public Boolean mErrorHappened = false; public final static String RES_FOLDER = "/sdcard/Wagic/Res/"; - public static final String RES_FILENAME = "core_017.zip"; + public static final String RES_FILENAME = "core_0171.zip"; public static final String RES_URL = "http://wagic.googlecode.com/files/"; private void startDownload() { diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp index d61582ac7..4a4920622 100644 --- a/projects/mtg/src/GameStateDuel.cpp +++ b/projects/mtg/src/GameStateDuel.cpp @@ -512,7 +512,7 @@ void GameStateDuel::Update(float dt) } //END almosthumane - mulligan menu->Add(MENUITEM_MAIN_MENU, "Back to main menu"); - menu->Add(MENUITEM_UNDO, "Undo"); + //menu->Add(MENUITEM_UNDO, "Undo"); #ifdef TESTSUITE menu->Add(MENUITEM_LOAD, "Load"); #endif diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index b59e39bff..264c8a975 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -27,7 +27,7 @@ #include #endif//NETWORK_SUPPORT -static const char* GAME_VERSION = "WTH?! 0.17.0 - wololo.net"; +static const char* GAME_VERSION = "WTH?! 0.17.1 - wololo.net"; enum ENUM_MENU_STATE_MAJOR {