Merge branch 'tmj-dev' into milek-dev

2026-03-22 15:05:03 +01:00 · 2018-04-19 23:08:39 +02:00
parent 5d717575db 430ab99f8e
commit c248b5bdf4
20 changed files with 1498 additions and 318 deletions
--- a/EU07.cpp
+++ b/EU07.cpp
@@ -368,7 +368,9 @@ int main(int argc, char *argv[])
 			|| (false == UILayer.init(window)))
 			return -1;

-		Global.pWorld = &World;
+    if( Global.bSoundEnabled ) {
+        Global.bSoundEnabled &= audio::renderer.init();
+    }

 		audio::renderer.init();
 		input::Keyboard.init();