From 7caca1d362ff7e0041d1665cd638bdee98a5b9c7 Mon Sep 17 00:00:00 2001
From: Paul Dino Jones <paul@spacefreak18.xyz>
Date: Fri, 22 Nov 2024 16:21:08 -0500
Subject: [PATCH] fix issues with simapi mapping correctly when using simd

---
 src/monocoque/gameloop/gameloop.c | 11 ++++++-----
 src/monocoque/gameloop/loopdata.h |  1 +
 src/monocoque/simulatorapi/simapi |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/monocoque/gameloop/gameloop.c b/src/monocoque/gameloop/gameloop.c
index 98a6bd6..805a7ba 100644
--- a/src/monocoque/gameloop/gameloop.c
+++ b/src/monocoque/gameloop/gameloop.c
@@ -252,7 +252,7 @@ void shmdatamapcallback(uv_timer_t* handle)
     //appstate = 2;
     if (appstate == 2)
     {
-        simdatamap(simdata, simmap, NULL, f->sim, false, NULL);
+        simdatamap(simdata, simmap, NULL, f->map, false, NULL);
         looprun(ms, f, simdata);
     }
 
@@ -285,7 +285,7 @@ void shmdatamapcallback(uv_timer_t* handle)
                 }
             }
             free(devices);
-            int r = simfree(simdata, simmap, f->sim);
+            int r = simfree(simdata, simmap, f->map);
             slogd("simfree returned %i", r);
             f->numdevices = 0;
             slogi("stopped mapping data, press q again to quit");
@@ -328,7 +328,7 @@ static void on_udp_recv(uv_udp_t* handle, ssize_t nread, const uv_buf_t* rcvbuf,
 
     if (appstate == 2)
     {
-        simdatamap(simdata, simmap, NULL, f->sim, true, a);
+        simdatamap(simdata, simmap, NULL, f->map, true, a);
         looprun(ms, f, simdata);
     }
 
@@ -361,7 +361,7 @@ static void on_udp_recv(uv_udp_t* handle, ssize_t nread, const uv_buf_t* rcvbuf,
                 }
             }
             free(devices);
-            int r = simfree(simdata, simmap, f->sim);
+            int r = simfree(simdata, simmap, f->map);
             slogd("simfree returned %i", r);
             f->numdevices = 0;
             slogi("stopped mapping data, press q again to quit");
@@ -416,10 +416,11 @@ void datacheckcallback(uv_timer_t* handle)
 
     if ( appstate == 1 )
     {
-        SimInfo si = getSim(simdata, simmap, f->ms->force_udp_mode, startudp);
+        SimInfo si = getSim(simdata, simmap, f->ms->force_udp_mode, startudp, false);
         //TODO: move all this to a siminfo struct in loop_data
         f->simstate = si.isSimOn;
         f->sim = si.simulatorapi;
+        f->map = si.mapapi;
         f->use_udp = si.SimUsesUDP;
 
         if(f->ms->force_udp_mode == true)
diff --git a/src/monocoque/gameloop/loopdata.h b/src/monocoque/gameloop/loopdata.h
index e24d93e..768f7ab 100644
--- a/src/monocoque/gameloop/loopdata.h
+++ b/src/monocoque/gameloop/loopdata.h
@@ -13,6 +13,7 @@ typedef struct loop_data
 {
     uv_work_t req;
     SimulatorAPI sim;
+    SimulatorAPI map;
     bool use_udp;
     bool simstate;
     bool uion;
diff --git a/src/monocoque/simulatorapi/simapi b/src/monocoque/simulatorapi/simapi
index 9ba82cf..38beedd 160000
--- a/src/monocoque/simulatorapi/simapi
+++ b/src/monocoque/simulatorapi/simapi
@@ -1 +1 @@
-Subproject commit 9ba82cf3908c497e206149bbe6def2a1760895cd
+Subproject commit 38beedde521035d9891df9b71c4ffeac3489548a