Fixed pragma-packing

mods/hide-and-seek.lua

@@ -144,7 +144,11 @@ function update()
     end
 
     -- check if local player is camping
+    if gGlobalSyncTable.roundEnded == 0 then
         camping_detection(gMarioStates[0])
+    else
+        sDistanceTimer = 0
+    end
 
     -- update sLastSeekerTimer
     if gGlobalSyncTable.roundEnded == 0 then

src/pc/djui/djui_base.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiBaseRect {
     f32 x;
     f32 y;
@@ -9,13 +8,11 @@ struct DjuiBaseRect {
     f32 height;
 };
 
-#pragma pack(1)
 struct DjuiBaseChild {
     struct DjuiBase* base;
     struct DjuiBaseChild* next;
 };
 
-#pragma pack(1)
 struct DjuiBasePadding {
     struct DjuiScreenValue top;
     struct DjuiScreenValue right;
@@ -23,7 +20,6 @@ struct DjuiBasePadding {
     struct DjuiScreenValue left;
 };
 
-#pragma pack(1)
 struct DjuiBase {
     struct DjuiBase* parent;
     struct DjuiBaseChild* child;

src/pc/djui/djui_bind.h

@@ -2,7 +2,6 @@
 #include "djui.h"
 #include "src/pc/configfile.h"
 
-#pragma pack(1)
 struct DjuiBind {
     struct DjuiBase base;
     struct DjuiText* text;

src/pc/djui/djui_button.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiButton {
     struct DjuiBase base;
     struct DjuiRect* rect;

src/pc/djui/djui_chat_box.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiChatBox {
     struct DjuiBase base;
     struct DjuiRect* chatContainer;

src/pc/djui/djui_chat_message.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiChatMessage {
     struct DjuiBase base;
     struct DjuiText* message;

src/pc/djui/djui_checkbox.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiCheckbox {
     struct DjuiBase base;
     struct DjuiRect* rect;

src/pc/djui/djui_flow_layout.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiFlowLayout {
     struct DjuiBase base;
     enum DjuiFlowDirection flowDirection;

src/pc/djui/djui_font.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiFont {
     f32 charWidth;
     f32 charHeight;

src/pc/djui/djui_image.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiImage {
     struct DjuiBase base;
     const u8* texture;

src/pc/djui/djui_inputbox.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiInputbox {
     struct DjuiBase base;
     char* buffer;

src/pc/djui/djui_interactable.h

@@ -20,7 +20,6 @@
 #define SCANCODE_SPACE  57
 #define SCANCODE_ESCAPE 1
 
-#pragma pack(1)
 struct DjuiInteractable {
     bool enabled;
     void (*update_style)(struct DjuiBase*);

src/pc/djui/djui_popup.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiPopup {
     struct DjuiBase base;
     struct DjuiText* text;

src/pc/djui/djui_progress_bar.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiProgressBar {
     struct DjuiBase base;
     struct DjuiRect* rect;

src/pc/djui/djui_rect.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiRect {
     struct DjuiBase base;
 };

src/pc/djui/djui_root.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiRoot {
     struct DjuiBase base;
 };

src/pc/djui/djui_selectionbox.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiSelectionbox {
     struct DjuiBase base;
     struct DjuiText* text;

src/pc/djui/djui_slider.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiSlider {
     struct DjuiBase base;
     struct DjuiRect* rect;

src/pc/djui/djui_text.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiText {
     struct DjuiBase base;
     char* message;

src/pc/djui/djui_three_panel.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiThreePanel {
     struct DjuiBase base;
     struct DjuiScreenValue minHeaderSize;

src/pc/djui/djui_types.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "djui.h"
 
-#pragma pack(1)
 struct DjuiColor {
     u8 r;
     u8 g;
@@ -12,7 +11,6 @@ struct DjuiColor {
 enum DjuiScreenValueType { DJUI_SVT_ABSOLUTE, DJUI_SVT_RELATIVE, DJUI_SVT_ASPECT_RATIO };
 enum DjuiFlowDirection { DJUI_FLOW_DIR_DOWN, DJUI_FLOW_DIR_UP, DJUI_FLOW_DIR_RIGHT, DJUI_FLOW_DIR_LEFT };
 
-#pragma pack(1)
 struct DjuiScreenValue {
     enum DjuiScreenValueType type;
     f32 value;

src/pc/lua/smlua_cobject_allowlist.c

@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include "smlua.h"
 
-#pragma pack(1)
 struct CObjectAllowListNode {
     u64 pointer;
     struct CObjectAllowListNode* next;

src/pc/mod_list.h

@@ -9,7 +9,6 @@
 
 #define MOD_PATH "./mods"
 
-#pragma pack(1)
 struct ModListEntry {
     char* name;
     FILE* fp;
@@ -26,7 +25,6 @@ struct ModListEntry {
     bool selectable;
 };
 
-#pragma pack(1)
 struct ModTable {
     struct ModListEntry* entries;
     u16 entryCount;

src/pc/network/network.c

@@ -145,7 +145,8 @@ bool network_allow_unknown_local_index(enum PacketType packetType) {
         || (packetType == PACKET_MOD_LIST)
         || (packetType == PACKET_DOWNLOAD_REQUEST)
         || (packetType == PACKET_DOWNLOAD)
-        || (packetType == PACKET_KEEP_ALIVE);
+        || (packetType == PACKET_KEEP_ALIVE)
+        || (packetType == PACKET_DEBUG_SYNC);
 }
 
 void network_send_to(u8 localIndex, struct Packet* p) {

src/pc/network/packets/packet_player.c

@@ -67,6 +67,7 @@ struct PacketPlayerData {
     u8 usedSyncID;
     u8 platformSyncID;
 };
+#pragma pack()
 
 static void read_packet_data(struct PacketPlayerData* data, struct MarioState* m) {
     u8 heldSyncID     = (m->heldObj != NULL)            ? m->heldObj->oSyncID            : 0;

src/pc/network/packets/packet_spawn_objects.c

@@ -21,6 +21,7 @@ struct SpawnObjectData {
     s32 rawData[80];
     u8 globalPlayerIndex;
 };
+#pragma pack()
 
 static u8 generate_parent_id(struct Object* objects[], u8 onIndex, bool sanitize) {
     struct Object* o = objects[onIndex];