Fix compile error that emerged in the merge

64BitMouse · Feb 16, 2022 · da5f926 · da5f926
1 parent e536d14
commit da5f926
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/build-windows-visual-studio/sm64ex.vcxproj b/build-windows-visual-studio/sm64ex.vcxproj
@@ -463,6 +463,7 @@
     <ClCompile Include="..\src\pc\djui\djui_chat_box.c" />
     <ClCompile Include="..\src\pc\djui\djui_chat_message.c" />
     <ClCompile Include="..\src\pc\djui\djui_checkbox.c" />
+    <ClCompile Include="..\src\pc\djui\djui_hud_utils.c" />
     <ClCompile Include="..\src\pc\djui\djui_inputbox.c" />
     <ClCompile Include="..\src\pc\djui\djui_panel_cheats.c" />
     <ClCompile Include="..\src\pc\djui\djui_panel_controls.c" />
@@ -939,6 +940,7 @@
     <ClInclude Include="..\src\pc\djui\djui_chat_box.h" />
     <ClInclude Include="..\src\pc\djui\djui_chat_message.h" />
     <ClInclude Include="..\src\pc\djui\djui_checkbox.h" />
+    <ClInclude Include="..\src\pc\djui\djui_hud_utils.h" />
     <ClInclude Include="..\src\pc\djui\djui_inputbox.h" />
     <ClInclude Include="..\src\pc\djui\djui_panel_cheats.h" />
     <ClInclude Include="..\src\pc\djui\djui_panel_controls.h" />

diff --git a/build-windows-visual-studio/sm64ex.vcxproj.filters b/build-windows-visual-studio/sm64ex.vcxproj.filters
@@ -4890,6 +4890,9 @@
     <ClCompile Include="..\src\pc\network\ban_list.c">
       <Filter>Source Files\src\pc\network</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\pc\djui\djui_hud_utils.c">
+      <Filter>Source Files\src\pc\djui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\actors\common0.h">
@@ -6055,5 +6058,8 @@
     <ClInclude Include="..\src\pc\network\ban_list.h">
       <Filter>Source Files\src\pc\network</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\pc\djui\djui_hud_utils.h">
+      <Filter>Source Files\src\pc\djui</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/developer/network.sh b/developer/network.sh
@@ -19,8 +19,8 @@ fi
 
 # no debug, direct
 $FILE --server 27015 --configfile sm64config_server.txt  &
-#sleep 2
-#$FILE --client 127.0.0.1 27015 --configfile sm64config_client.txt  &
+sleep 2
+$FILE --client 127.0.0.1 27015 --configfile sm64config_client.txt  &
 exit
 
 # debug on server

diff --git a/src/pc/djui/djui_hud_utils.c b/src/pc/djui/djui_hud_utils.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <PR/ultratypes.h>
 #include <PR/gbi.h>
+#include <string.h>
 
 #include "pc/gfx/gfx_pc.h"
 #include "pc/gfx/gfx_window_manager_api.h"