salmon-engine-projects/double-hit-balls
9
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Added musix

Browse Source
This commit is contained in:
Vladislav Khorev 2017-02-27 02:23:22 +03:00
parent 792d9bb356
commit 05bf7ada9c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -20,6 +20,7 @@ DerivedData/
xcuserdata/ xcuserdata/
xcshareddata/ xcshareddata/
xcworkspace/ xcworkspace/
project.xcworkspace/
## Other ## Other
*.moved-aside *.moved-aside
*.xcuserstate *.xcuserstate

10
game/main_code.cpp
View File

@ -260,11 +260,11 @@ void TAndroidApplication::LoadResources()
TextureNamesToLoad.push_back(std::pair<std::string, std::string>(CONST_TAP_TO_CONTINUE_BTN_TEXTURE + ".png", CONST_TAP_TO_CONTINUE_BTN_TEXTURE)); TextureNamesToLoad.push_back(std::pair<std::string, std::string>(CONST_TAP_TO_CONTINUE_BTN_TEXTURE + ".png", CONST_TAP_TO_CONTINUE_BTN_TEXTURE));
TextureNamesToLoad.push_back(std::pair<std::string, std::string>(CONST_CREDITS_TEXTURE + ".png", CONST_CREDITS_TEXTURE)); TextureNamesToLoad.push_back(std::pair<std::string, std::string>(CONST_CREDITS_TEXTURE + ".png", CONST_CREDITS_TEXTURE));
/*#ifdef TARGET_IOS #ifdef TARGET_IOS
ResourceManager->SoundManager.LoadMusicLooped("level1ogg.ogg"); ResourceManager->SoundManager.LoadMusicLooped("level1ogg.ogg");
#else #else
ResourceManager->SoundManager.LoadMusic("level1ogg.ogg"); //ResourceManager->SoundManager.LoadMusic("level1ogg.ogg");
#endif*/ #endif
ResourceManager->FontManager.AddFont("droid_sans14", "droid_sans14_font_bitmap.png", "droid_sans14_font_charmap.txt"); ResourceManager->FontManager.AddFont("droid_sans14", "droid_sans14_font_bitmap.png", "droid_sans14_font_charmap.txt");
ResourceManager->FontManager.PushFont("droid_sans14"); ResourceManager->FontManager.PushFont("droid_sans14");
@ -414,7 +414,7 @@ void TAndroidApplication::InnerUpdate(cardinal dt)
void TAndroidApplication::GoFromMenuToGame(int level) void TAndroidApplication::GoFromMenuToGame(int level)
{ {
//#ifndef TARGET_IOS //#ifndef TARGET_IOS
//ResourceManager->SoundManager.PlayMusicLooped("level1ogg.ogg"); ResourceManager->SoundManager.PlayMusicLooped("level1ogg.ogg");
//#endif //#endif
GameLevel.FillWithFile(ST::PathToResources + "level"+tostr(level+1)+".txt"); GameLevel.FillWithFile(ST::PathToResources + "level"+tostr(level+1)+".txt");
@ -429,7 +429,7 @@ void TAndroidApplication::GoFromMenuToGame(int level)
void TAndroidApplication::GoFromGameToMenu() void TAndroidApplication::GoFromGameToMenu()
{ {
//#ifndef TARGET_IOS //#ifndef TARGET_IOS
//ResourceManager->SoundManager.StopMusic("level1ogg.ogg"); ResourceManager->SoundManager.StopMusic("level1ogg.ogg");
//#endif //#endif
TrySaveGame(); TrySaveGame();
DisapplySignalsToGame(); DisapplySignalsToGame();