diff --git a/.gitignore b/.gitignore index ec143a5..45af8f8 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ DerivedData/ xcuserdata/ xcshareddata/ xcworkspace/ +project.xcworkspace/ ## Other *.moved-aside *.xcuserstate diff --git a/game/main_code.cpp b/game/main_code.cpp index 0540ccb..498fe34 100644 --- a/game/main_code.cpp +++ b/game/main_code.cpp @@ -260,12 +260,12 @@ void TAndroidApplication::LoadResources() TextureNamesToLoad.push_back(std::pair(CONST_TAP_TO_CONTINUE_BTN_TEXTURE + ".png", CONST_TAP_TO_CONTINUE_BTN_TEXTURE)); TextureNamesToLoad.push_back(std::pair(CONST_CREDITS_TEXTURE + ".png", CONST_CREDITS_TEXTURE)); -/*#ifdef TARGET_IOS +#ifdef TARGET_IOS ResourceManager->SoundManager.LoadMusicLooped("level1ogg.ogg"); #else - ResourceManager->SoundManager.LoadMusic("level1ogg.ogg"); -#endif*/ - + //ResourceManager->SoundManager.LoadMusic("level1ogg.ogg"); +#endif + ResourceManager->FontManager.AddFont("droid_sans14", "droid_sans14_font_bitmap.png", "droid_sans14_font_charmap.txt"); ResourceManager->FontManager.PushFont("droid_sans14"); @@ -414,7 +414,7 @@ void TAndroidApplication::InnerUpdate(cardinal dt) void TAndroidApplication::GoFromMenuToGame(int level) { //#ifndef TARGET_IOS - //ResourceManager->SoundManager.PlayMusicLooped("level1ogg.ogg"); + ResourceManager->SoundManager.PlayMusicLooped("level1ogg.ogg"); //#endif GameLevel.FillWithFile(ST::PathToResources + "level"+tostr(level+1)+".txt"); @@ -429,7 +429,7 @@ void TAndroidApplication::GoFromMenuToGame(int level) void TAndroidApplication::GoFromGameToMenu() { //#ifndef TARGET_IOS - //ResourceManager->SoundManager.StopMusic("level1ogg.ogg"); + ResourceManager->SoundManager.StopMusic("level1ogg.ogg"); //#endif TrySaveGame(); DisapplySignalsToGame();