From 144a2a532fa96f3c1e28cf395e56a116205d5b3d Mon Sep 17 00:00:00 2001
From: Cameron Reikes <cameronreikes@gmail.com>
Date: Sun, 27 Nov 2022 18:49:05 -0800
Subject: [PATCH] No idea what to do about this bad bug

---
 Flight.vcxproj      |   2 +-
 Flight.vcxproj.user |   3 ++-
 flight.rdbg         | Bin 1525 -> 1231 bytes
 gamestate.c         |  11 ++++++++---
 release_all.bat     |   1 -
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Flight.vcxproj b/Flight.vcxproj
index 57317b9..068e088 100644
--- a/Flight.vcxproj
+++ b/Flight.vcxproj
@@ -140,7 +140,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);DEBUG_RENDERING;SERVER_ADDRESS="127.0.0.1"</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);DEBUG_RENDERING</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(ProjectDir)\thirdparty\enet\include;$(ProjectDir)\thirdparty\Chipmunk2D\include\chipmunk;$(ProjectDir)\thirdparty;$(ProjectDir)\thirdparty\Chipmunk2D\include;$(ProjectDir)\thirdparty\minilzo;$(ProjectDir)\thirdparty\opus\include</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
diff --git a/Flight.vcxproj.user b/Flight.vcxproj.user
index 8894de1..b0274e8 100644
--- a/Flight.vcxproj.user
+++ b/Flight.vcxproj.user
@@ -4,7 +4,8 @@
     <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArguments>--serve</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Host|x64'">
diff --git a/flight.rdbg b/flight.rdbg
index 4453720b4fad6e4dcdf3159a52469a45b75818ea..b1ab8e651ec159c62b66ebda11e662e73ac58b50 100644
GIT binary patch
delta 303
zcmey$eV%iI9V-J6C{F&!sKUw%WCc!UWLBH_fNOFbv&tl9T}BHipR+hWJ3l8rJ*{H$
zL?&ZKbEq&kRJcGd1EzAaFBA9V4~#mD?g*o}1&WK3W0DITi;^-+Qj7GGb%7SDPM*cc
z&FG1wYH~88AfpyoN}iE}(FP(VIkC`#k#X_?W}8r1pbJ3`W&z^d#NuLMAf1|5l37w2
zU!GZ#5uaX^SO(;90foyG^GZ@v;>%KVK;D8%#3v>vr{*w$1d16!iVRkpGfw`(Vls)9
bg$*RY$U51P)fmj<0CGV*3m|XuYgR4*n|)HR

literal 1525
zcmb_cON$gS5bhDyw>P~A9=xeAK}2>%ytvcsBA(nuPl1rBR6p2s5|Z>hev^N4tF~7d
zQI|MuK_#S8-<L1d)j6w=PY<iAT6~n>6UHPLdcf$NtUZhax}0QV`?kw+bNF7?xExz~
zaupD`!MlW<&pV&;%My+!lvI}_%G~wQ1Re8MF1kJpqq}%l%M?LEIQC{M;M4!|pu;Rf
z^x1>A0^StisU$0m0=^Vw-=z9HXu$J~LBPC-tfdc;vd$>rv<Pt1>7V1W&wP<rMO1_C
zoq!KTxjV-uf8njtA&Bm1KWt0Tvho;iMHBUUZ=G$k5#8%Do!fv(bl=L7|Ju8~13Ma&
zaNW+-$UhLW=<X0H+l;*I>N}nB;tIMa`0InJdQ1e*$lKT(mA%SQyA-T;nO6M2HX3@@
zsugMV@ev22A5_+{#mr#qLEAsp6N>TI`(82bAqBK+Eh^JD%~NLErB@EopkX~Q#z?P^
z`fdL?Z47>eMlBKam{3h*(9w)6&f!`SR0W?7Xu0;$8ZPkq?aw3jU&W@-WL$N&d(-sK
dk%8>98DIJ~jTOx9({S6wyCV4zeypdb`w~r6yNUn+

diff --git a/gamestate.c b/gamestate.c
index c8bcc00..083bac6 100644
--- a/gamestate.c
+++ b/gamestate.c
@@ -380,14 +380,19 @@ V2 player_vel(GameState *gs, Entity *player)
 {
   assert(player->is_player);
   Entity *potential_seat = get_entity(gs, player->currently_inside_of_box);
-  if (potential_seat != NULL)
+  if (potential_seat != NULL && !potential_seat->is_box)
   {
-    return cp_to_v2(cpBodyGetVelocity(get_entity(gs, potential_seat->shape_parent_entity)->body));
+    Log("Weird ass motherfucking bug where the seat inside of is an explosion or some shit\n");
+    assert(potential_seat->is_box);
   }
   else
   {
-    return cp_to_v2(cpBodyGetVelocity(player->body));
+    if (potential_seat != NULL)
+    {
+      return cp_to_v2(cpBodyGetVelocity(get_entity(gs, potential_seat->shape_parent_entity)->body));
+    }
   }
+  return cp_to_v2(cpBodyGetVelocity(player->body));
 }
 
 void grid_create(GameState *gs, Entity *e)
diff --git a/release_all.bat b/release_all.bat
index e722354..5d93e67 100644
--- a/release_all.bat
+++ b/release_all.bat
@@ -1,4 +1,3 @@
-call vcvars
 git push
 call build_release.bat
 call update_server.bat