From 485a3489a956588eedaf4afecd6f48487714969f Mon Sep 17 00:00:00 2001
From: Paul Dino Jones <paul@spacefreak18.xyz>
Date: Thu, 1 Dec 2022 21:23:36 +0000
Subject: [PATCH] Cleaning up sim mapper code

---
 src/monocoque/gameloop/gameloop.c      | 93 +++++++++++++++-----------
 src/monocoque/simulatorapi/simapi      |  2 +-
 src/monocoque/simulatorapi/simmapper.c |  1 -
 src/monocoque/simulatorapi/simmapper.h |  2 +-
 4 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/src/monocoque/gameloop/gameloop.c b/src/monocoque/gameloop/gameloop.c
index 1fea32c..8073537 100644
--- a/src/monocoque/gameloop/gameloop.c
+++ b/src/monocoque/gameloop/gameloop.c
@@ -33,28 +33,35 @@ int showstats(SimData* simdata)
 
             int speed = simdata->velocity;
             int digits = 0;
-            while (speed > 0)
+            if (speed > 0)
             {
-                int mod = speed % 10;
-                speed = speed / 10;
-                digits++;
+                while (speed > 0)
+                {
+                    int mod = speed % 10;
+                    speed = speed / 10;
+                    digits++;
+                }
+                speed = simdata->velocity;
+                int s[digits];
+                int digit = 0;
+                while (speed > 0)
+                {
+                    int mod = speed % 10;
+                    s[digit] = mod;
+                    speed = speed / 10;
+                    digit++;
+                }
+                speed = simdata->velocity;
+                digit = digits;
+                while (digit > 0)
+                {
+                    fputc(s[digit-1]+'0', stdout);
+                    digit--;
+                }
             }
-            speed = simdata->velocity;
-            int s[digits];
-            int digit = 0;
-            while (speed > 0)
+            else
             {
-                int mod = speed % 10;
-                s[digit] = mod;
-                speed = speed / 10;
-                digit++;
-            }
-            speed = simdata->velocity;
-            digit = digits;
-            while (digit > 0)
-            {
-                fputc(s[digit-1]+'0', stdout);
-                digit--;
+                fputc('0', stdout);
             }
             fputc(' ', stdout);
         }
@@ -69,28 +76,35 @@ int showstats(SimData* simdata)
 
             int rpms = simdata->rpms;
             int digits = 0;
-            while (rpms > 0)
+            if (rpms > 0)
             {
-                int mod = rpms % 10;
-                rpms = rpms / 10;
-                digits++;
+                while (rpms > 0)
+                {
+                    int mod = rpms % 10;
+                    rpms = rpms / 10;
+                    digits++;
+                }
+                rpms = simdata->rpms;
+                int s[digits];
+                int digit = 0;
+                while (rpms > 0)
+                {
+                    int mod = rpms % 10;
+                    s[digit] = mod;
+                    rpms = rpms / 10;
+                    digit++;
+                }
+                rpms = simdata->rpms;
+                digit = digits;
+                while (digit > 0)
+                {
+                    fputc(s[digit-1]+'0', stdout);
+                    digit--;
+                }
             }
-            rpms = simdata->rpms;
-            int s[digits];
-            int digit = 0;
-            while (rpms > 0)
+            else
             {
-                int mod = rpms % 10;
-                s[digit] = mod;
-                rpms = rpms / 10;
-                digit++;
-            }
-            rpms = simdata->rpms;
-            digit = digits;
-            while (digit > 0)
-            {
-                fputc(s[digit-1]+'0', stdout);
-                digit--;
+                fputc('0', stdout);
             }
             fputc(' ', stdout);
         }
@@ -215,7 +229,8 @@ int looper(SimDevice* devices[], int numdevices, Simulator simulator)
             }
         }
     }
-
+    fprintf(stdout, "\n");
+    fflush(stdout);
     tcsetattr(0, TCSANOW, &canonicalmode);
 
     free(simdata);
diff --git a/src/monocoque/simulatorapi/simapi b/src/monocoque/simulatorapi/simapi
index 5faf120..04fd2ca 160000
--- a/src/monocoque/simulatorapi/simapi
+++ b/src/monocoque/simulatorapi/simapi
@@ -1 +1 @@
-Subproject commit 5faf120d84378cdbe3bd8a0347f38fb9d0e9a87e
+Subproject commit 04fd2ca8ed590f562ad6423d9cf9f076daa28b95
diff --git a/src/monocoque/simulatorapi/simmapper.c b/src/monocoque/simulatorapi/simmapper.c
index 94d6162..ce81fd4 100644
--- a/src/monocoque/simulatorapi/simmapper.c
+++ b/src/monocoque/simulatorapi/simmapper.c
@@ -42,7 +42,6 @@ int simdatamap(SimData* simdata, SimMap* simmap, Simulator simulator)
             simdata->velocity = abs(ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mLocalVel.z * 3.6));
             simdata->rpms = ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mEngineRPM);
             simdata->gear = simmap->d.rf2.rf2_telemetry.mVehicles[0].mGear;
-            //simdata->gear = simmap->d.rf2.rf2_telemetry.mVehicles[0].mLapNumber;
             simdata->maxrpm - ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mEngineMaxRPM);
             break;
     }
diff --git a/src/monocoque/simulatorapi/simmapper.h b/src/monocoque/simulatorapi/simmapper.h
index cc3e606..981b050 100644
--- a/src/monocoque/simulatorapi/simmapper.h
+++ b/src/monocoque/simulatorapi/simmapper.h
@@ -1,5 +1,5 @@
 #ifndef _SIMMAPPER_H
-#define _SIMMAPPEE_H
+#define _SIMMAPPER_H
 
 #include "ac.h"
 #include "rf2.h"