From d777318642b79c24a92db5e9876005e34b639ae8 Mon Sep 17 00:00:00 2001
From: jummy <jimmyk3.14159@gmail.com>
Date: Sat, 9 Nov 2024 16:58:54 -0600
Subject: [PATCH] oops

---
 src/decor.h | 47 +++++++++++++++++++++++++++++++++--------------
 src/def.h   | 14 ++++++++++----
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/decor.h b/src/decor.h
index ff98d48..bc9b266 100644
--- a/src/decor.h
+++ b/src/decor.h
@@ -52,13 +52,32 @@ MoveObject;
 
 typedef struct
 {
-	short type;
-	short x;
-	short y;
-	short z;
+	char type;
+	char data1;
+	short data2;
+	short data3;
+	short data4;
 }
 NetMessage;
 
+typedef struct
+{
+	char size;
+	char type;
+	short keyPress;
+	int time;
+	short blupiPosX;
+	short blupiPosY;
+	short blupiIcon;
+	short blupiSec;
+	char blupiChannel;
+	char blupiTransport;
+	char unk12;
+	char nbMessages;
+	NetMessage messages[MAXMESSAGEPERPACKET];
+}
+NetPacket;
+
 typedef struct
 {
 	short majRev;
@@ -343,7 +362,7 @@ public:
 	void	StartSploutchGlu(POINT pos);
 	BOOL	ObjectStart(POINT pos, int type, int speed);
 	BOOL	ObjectStart(POINT pos, int type, int speed, BOOL bMulti);
-	BOOL	ObjectDelete(POINT pos, int type, BOOL bMulti = FALSE);
+	BOOL	ObjectDelete(POINT pos, int type, BOOL bMulti = TRUE);
 	void	MoveObjectStep();
 	void	MoveObjectStepLine(int i);
 	void	MoveObjectStepIcon(int i);
@@ -379,11 +398,11 @@ public:
 	void	NetPlaySound(short channel, POINT pos);
 	void	NetStopSound(short channel);
 	void	NetDataFlush();
-	void	NetFUN_155e0(BYTE _foo, short _bar);
+	void	NetSendBarePacket(BYTE _foo, short _bar);
 	void	TreatNetData();
 	void	DoNetSmooth(int player);
 	void	NetAdjustToLift();
-	void	FUN_15da0(int rank, short step);
+	void	NetAscenseurSynchro(int rank, short step);
 	void	NetPlayerCollide(POINT pos, int *out);
 	void	NetMessageIndexFlush();
 	BOOL	NetMessagePush(NetMessage *message);
@@ -507,16 +526,16 @@ protected:
 	int			m_netPacketsSent2;
 	int			m_netPacketsReceived;
 	int			m_netPacketsReceived2;
-	POINT		m_netPos[MAXNETPLAYER];
-	int			m_netIcons[MAXNETPLAYER];
-	int			m_netUnk1[MAXNETPLAYER];
-	int			m_netUnk2[MAXNETPLAYER];
+	POINT		m_netBlupiPos[MAXNETPLAYER];
+	int			m_netBlupiIcon[MAXNETPLAYER];
+	int			m_netBlupiSec[MAXNETPLAYER];
+	int			m_netBlupiTransport[MAXNETPLAYER];
 	int			m_netTransports[MAXNETPLAYER]; // index of lift ridden by each player, or -1
-	int			m_netPlayerPacketsReceived[MAXNETPLAYER];
-	int			m_netPlayerPacketsReceived2[MAXNETPLAYER];
+	int			m_netTimes[MAXNETPLAYER];
+	int			m_netPrevTimes[MAXNETPLAYER];
 	int			m_netTimeSincePacket[MAXNETPLAYER];
 	POINT		m_netVitesses[MAXNETPLAYER];
-	POINT		m_netUnk4[MAXNETPLAYER];
+	POINT		m_netBlupiPrevPos[MAXNETPLAYER];
 	POINT		m_netPacketPos;
 	int			m_netPacketIcon;
 	NetMessage	m_netMessages[MAXNETMESSAGE];
diff --git a/src/def.h b/src/def.h
index 31c14fa..95c2d1b 100644
--- a/src/def.h
+++ b/src/def.h
@@ -35,6 +35,7 @@
 #define MAXSAVE			6
 #define MAXDEMO        9999
 #define MAXINDEX	   20
+#define MAXMESSAGEPERPACKET 5
 
 #define LXIMAGE			640		// dimensions de la fenêtre de jeu
 #define LYIMAGE			480
@@ -91,6 +92,14 @@ enum {
 	CHMAX = CHTEMP
 };
 
+enum {
+	PK_LEAVE = 8,
+	PK_LOST,
+	PK_DIE,
+
+	PK_PAUSE = 12,
+};
+
 enum {
 	MESS_RESUME = 0,
 	MESS_PAUSE,
@@ -100,11 +109,8 @@ enum {
 	MESS_5,
 	MESS_6,
 	MESS_7,
-	MESS_LEAVE,
-	MESS_LOST,
-	MESS_START,
+	MESS_START = 10,
 	MESS_11,
-	MESS_PAUSE2,
 
 	MESS_OBJECTSTART = 20,
 	MESS_OBJECTDELETE,