diff --git a/JGE/src/JSfx.cpp b/JGE/src/JSfx.cpp index 37d40693e..a28c0cf5c 100644 --- a/JGE/src/JSfx.cpp +++ b/JGE/src/JSfx.cpp @@ -144,6 +144,16 @@ JSample *JSoundSystem::LoadSample(const char *fileName) } +void JSoundSystem::PauseMusic(JMusic *music) +{ + StopMusic(music); +} + + +void JSoundSystem::ResumeMusic(JMusic *music) +{ + PlayMusic(music); +} void JSoundSystem::PlayMusic(JMusic *music, bool looping) diff --git a/projects/mtg/wagic.xcodeproj/project.pbxproj b/projects/mtg/wagic.xcodeproj/project.pbxproj index 79fb01f8a..566049500 100755 --- a/projects/mtg/wagic.xcodeproj/project.pbxproj +++ b/projects/mtg/wagic.xcodeproj/project.pbxproj @@ -571,6 +571,7 @@ 12272FC714CD6A3900192DC7 /* InteractiveButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InteractiveButton.cpp; sourceTree = ""; }; 1235D03C14DE396D00B02B42 /* JSfx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = JSfx.cpp; path = android/JSfx.cpp; sourceTree = ""; }; 1235D03E14DE859D00B02B42 /* Wagic_Version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Wagic_Version.h; sourceTree = ""; }; + 1235D04314DEACB800B02B42 /* JSfx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSfx.cpp; sourceTree = ""; }; 12769483144127380088F6D3 /* AIPlayerBaka.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AIPlayerBaka.cpp; sourceTree = ""; }; 12769484144127380088F6D3 /* AIPlayerBakaB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AIPlayerBakaB.cpp; sourceTree = ""; }; 12769485144127380088F6D3 /* TestSuiteAI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestSuiteAI.cpp; sourceTree = ""; }; @@ -1176,6 +1177,14 @@ name = android; sourceTree = ""; }; + 1235D03F14DEAC6A00B02B42 /* psp */ = { + isa = PBXGroup; + children = ( + 1235D04314DEACB800B02B42 /* JSfx.cpp */, + ); + name = psp; + sourceTree = ""; + }; 125C5CF213B09AA200DF2F2C /* Tools */ = { isa = PBXGroup; children = ( @@ -1856,6 +1865,7 @@ CEE232AF128A01F400C34032 /* src */ = { isa = PBXGroup; children = ( + 1235D03F14DEAC6A00B02B42 /* psp */, 1235D03D14DE397200B02B42 /* android */, 12DCD02B14DBE1AF0023B966 /* ios */, 12B8121D1404B9E10092E303 /* zipFS */,