From d3a9477470751e8158a1fbec71eb57bffcdfc7e8 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Thu, 7 Oct 2021 17:40:21 +1100
Subject: [PATCH] Web: Move emscripten_set_main_loop from Game.c to
 Window_Web.c

---
 src/Game.c       | 11 +++--------
 src/Window_Web.c |  4 ++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Game.c b/src/Game.c
index bed08ea28..9b9d9b6c5 100644
--- a/src/Game.c
+++ b/src/Game.c
@@ -36,9 +36,6 @@
 #include "Protocol.h"
 #include "Picking.h"
 #include "Animations.h"
-#ifdef CC_BUILD_WEB
-#include <emscripten.h>
-#endif
 
 struct _GameData Game;
 cc_bool Game_UseCPEBlocks;
@@ -623,7 +620,7 @@ void Game_Free(void* obj) {
 
 #ifdef CC_BUILD_WEB
 static cc_uint64 lastRender;
-static void Game_DoFrame(void) {
+void Game_DoFrame(void) {
 	cc_uint64 render; 
 	double time;
 	Game_DoFrameBody()
@@ -631,10 +628,8 @@ static void Game_DoFrame(void) {
 
 static void Game_RunLoop(void) {
 	lastRender = Stopwatch_Measure();
-	emscripten_set_main_loop(Game_DoFrame, 0, false);
-	/* The Game_SetFpsLimit call back in Game_Load does nothing because no main loop yet */
-	/*  Now thats there's a main loop, Game_SetFpsLimit will actually do something */
-	Game_SetFpsLimit(Options_GetEnum(OPT_FPS_LIMIT, 0, FpsLimit_Names, FPS_LIMIT_COUNT));
+	/* Window_Web.c sets Game_DoFrame as the main loop callback function */
+	/* (i.e. web browser is in charge of calling Game_DoFrame, not us) */
 }
 
 cc_bool Game_ShouldClose(void) {
diff --git a/src/Window_Web.c b/src/Window_Web.c
index c6d22b8fc..90e96ef1e 100644
--- a/src/Window_Web.c
+++ b/src/Window_Web.c
@@ -350,8 +350,12 @@ extern int interop_IsAndroid(void);
 extern int interop_IsIOS(void);
 extern void interop_AddClipboardListeners(void);
 extern void interop_ForceTouchPageLayout(void);
+
+extern void Game_DoFrame(void);
 void Window_Init(void) {
 	int is_ios, droid;
+	emscripten_set_main_loop(Game_DoFrame, 0, false);
+
 	DisplayInfo.Width  = GetScreenWidth();
 	DisplayInfo.Height = GetScreenHeight();
 	DisplayInfo.Depth  = 24;