diff --git a/client/main.c b/client/main.c index c03411a..3ff1cb0 100644 --- a/client/main.c +++ b/client/main.c @@ -84,10 +84,10 @@ int main(int argc, char** argv){ model = GSModelOpen(engine, "game:/mdl/fish.gsm"); - GSClientToggleSkybox(GSEngineGetClient(engine), GSTrue); + GSClientSetSkybox(GSEngineGetClient(engine), GSTrue); if((sound = GSSoundOpen(GSClientGetSoundEngine(GSEngineGetClient(engine)), "game:/shanghai.mp3")) != NULL){ - GSSoundToggleLoop(sound, 1); + GSSoundSetLoop(sound, 1); GSSoundStart(sound); } diff --git a/engine/include/GearSrc/Client.h b/engine/include/GearSrc/Client.h index d09e4ef..1f631db 100644 --- a/engine/include/GearSrc/Client.h +++ b/engine/include/GearSrc/Client.h @@ -13,7 +13,7 @@ GSDECL void GSClientDestroy(GSClient client); GSDECL void GSClientStep(GSClient client); GSDECL GSGL GSClientGetGL(GSClient client); GSDECL GSSoundEngine GSClientGetSoundEngine(GSClient client); -GSDECL void GSClientToggleSkybox(GSClient client, GSBool toggle); +GSDECL void GSClientSetSkybox(GSClient client, GSBool toggle); #ifdef __cplusplus } diff --git a/engine/include/GearSrc/Sound.h b/engine/include/GearSrc/Sound.h index 47304eb..2230050 100644 --- a/engine/include/GearSrc/Sound.h +++ b/engine/include/GearSrc/Sound.h @@ -12,7 +12,7 @@ extern "C" { GSDECL GSSound GSSoundNew(GSSoundEngine sengine); GSDECL GSSound GSSoundOpen(GSSoundEngine sengine, const char* path); GSDECL void GSSoundClose(GSSound sound); -GSDECL void GSSoundToggleLoop(GSSound sound, GSBool toggle); +GSDECL void GSSoundSetLoop(GSSound sound, GSBool toggle); GSDECL void GSSoundStart(GSSound sound); GSDECL void GSSoundResume(GSSound sound); GSDECL void GSSoundPause(GSSound audio); diff --git a/engine/src/sound/sound.c b/engine/src/sound/sound.c index e4c246d..51ba1d1 100644 --- a/engine/src/sound/sound.c +++ b/engine/src/sound/sound.c @@ -108,7 +108,7 @@ void GSSoundClose(GSSound sound) { free(sound); } -void GSSoundToggleLoop(GSSound sound, GSBool toggle) { +void GSSoundSetLoop(GSSound sound, GSBool toggle) { GSSoundLock(sound); sound->loop = toggle; GSSoundUnlock(sound); diff --git a/submodule/milsko b/submodule/milsko index 5413332..64c3cdb 160000 --- a/submodule/milsko +++ b/submodule/milsko @@ -1 +1 @@ -Subproject commit 5413332506b2929c30c169a3f68934252d39cfff +Subproject commit 64c3cdb4a511b0b9efcd538a4c1bc82cbbda7dc8