Index: Daodan/src/flatline/Flatline.c
===================================================================
--- Daodan/src/flatline/Flatline.c	(revision 879)
+++ Daodan/src/flatline/Flatline.c	(revision 881)
@@ -14,5 +14,4 @@
 #define isnan(x) ((x) != (x))
 
-uint32_t last1 = 0; uint32_t last2 = 0;
 player_info Players[MAX_PLAYERS];
 player_info * PlayerList[MAX_CONNECTIONS] = {0};
@@ -28,7 +27,11 @@
 };
 
-#define BETTER_SYNC
-
-
+typedef struct
+{
+	uint16_t x;
+	uint16_t y;
+} IMtPoint2D;
+
+extern uint16_t max_connections;
 
 
@@ -77,5 +80,4 @@
 }
 
-extern uint16_t max_connections;
 uint16_t FLr_FindEmptyListSlot() {
 	int j;
@@ -87,15 +89,9 @@
 	return -1;
 }
-typedef struct
-{
-	uint16_t x;
-	uint16_t y;
-} IMtPoint2D;
-static flatline_packet cache_input = {0};
 
 
 void * ONICALL FLrInput_Update_Keys(void) 
 {
-	uint32_t i;
+	int32_t i;
 	flatline_packet all_input = {0};
 	int16_t InputIndex = 0;
Index: Daodan/src/flatline/Flatline.h
===================================================================
--- Daodan/src/flatline/Flatline.h	(revision 879)
+++ Daodan/src/flatline/Flatline.h	(revision 881)
@@ -22,5 +22,4 @@
 #include "../Oni_Character.h"
 #include "../Oni_GameState.h"
-#include "Flatline_Packet.h"
 
 #include "../Oni_Symbols.h"
@@ -32,4 +31,74 @@
 DWORD WINAPI StartServer(void* lol);
 DWORD WINAPI StartClient(void* lol);
+
+
+typedef struct
+{
+	uint16_t ID;
+	uint16_t Size;
+	uint16_t UpdateFlags;
+	uint8_t  data[255];
+} PlayerData;
+
+
+typedef struct {
+	uint32_t Actions1;
+	uint32_t Actions2;
+	float MouseDeltaX;
+	float MouseDeltaY;	
+} PlayerInput;
+
+typedef struct {
+	float Facing;
+	float DesiredFacing;
+} PlayerFacing;
+
+typedef struct {
+	uint16_t Health;
+	uint16_t MaxHealth;
+} PlayerHealth;
+
+typedef struct {
+	uint16_t Score;
+	uint16_t Deaths;
+} PlayerScore;
+
+//Change this later to be misc info
+typedef struct {
+	uint16_t Frame;
+	uint16_t Ping;
+} PlayerFP;
+
+typedef struct {
+	uint8_t Ammo;
+	uint8_t Cells;
+	uint8_t Hypo;
+	uint8_t pad;
+	uint16_t Invis;
+	uint16_t Shield;
+} PlayerInventory;
+
+typedef struct {
+	uint16_t				throwing;
+	uint16_t				throwFrame;
+	char					throwName[32];
+} PlayerThrowData;
+
+enum
+{
+	PFlag_None,
+	PFlag_Input,
+	PFlag_Facing,	
+	PFlag_Health,		
+	PFlag_Score,		//TODO
+	PFlag_FramePing,
+	PFlag_Inventory, //TODO
+	PFlag_Class,	
+	PFlag_Position,
+	PFlag_Animation,	
+	PFlag_Throws,
+	PFlag_Max,
+	PFlag_AnimationWait,//Clients only!
+};
 
 
Index: Daodan/src/flatline/Flatline_Client.c
===================================================================
--- Daodan/src/flatline/Flatline_Client.c	(revision 879)
+++ Daodan/src/flatline/Flatline_Client.c	(revision 881)
@@ -1,5 +1,7 @@
 #include "Flatline.h"
 #include "Flatline_Client.h"
+#include "Flatline_Packet.h"
 #include "Mariusnet_Public.h"
+#include "../Daodan_Patch.h"
 //#include "PortForwardWrapper.h"
 
Index: Daodan/src/flatline/Flatline_Packet.h
===================================================================
--- Daodan/src/flatline/Flatline_Packet.h	(revision 879)
+++ Daodan/src/flatline/Flatline_Packet.h	(revision 881)
@@ -2,78 +2,10 @@
 #define FLATLINE_PACKET_H
 #include "stdint.h"
+#include "Flatline.h"
 
 
 uint16_t FLpData_PartSize( uint8_t e);
 void FLsSendPlayerData();
-//void FLcReadPlayerData( flatline_packet* Packet, int16_t Size );
-
-typedef struct
-{
-	uint16_t ID;
-	uint16_t Size;
-	uint16_t UpdateFlags;
-	uint8_t  data[255];
-} PlayerData;
-
-
-typedef struct {
-	uint32_t Actions1;
-	uint32_t Actions2;
-	float MouseDeltaX;
-	float MouseDeltaY;	
-} PlayerInput;
-
-typedef struct {
-	float Facing;
-	float DesiredFacing;
-} PlayerFacing;
-
-typedef struct {
-	uint16_t Health;
-	uint16_t MaxHealth;
-} PlayerHealth;
-
-typedef struct {
-	uint16_t Score;
-	uint16_t Deaths;
-} PlayerScore;
-
-//Change this later to be misc info
-typedef struct {
-	uint16_t Frame;
-	uint16_t Ping;
-} PlayerFP;
-
-typedef struct {
-	uint8_t Ammo;
-	uint8_t Cells;
-	uint8_t Hypo;
-	uint8_t pad;
-	uint16_t Invis;
-	uint16_t Shield;
-} PlayerInventory;
-
-typedef struct {
-	uint16_t				throwing;
-	uint16_t				throwFrame;
-	char					throwName[32];
-} PlayerThrowData;
-
-enum
-{
-	PFlag_None,
-	PFlag_Input,
-	PFlag_Facing,	
-	PFlag_Health,		
-	PFlag_Score,		//TODO
-	PFlag_FramePing,
-	PFlag_Inventory, //TODO
-	PFlag_Class,	
-	PFlag_Position,
-	PFlag_Animation,	
-	PFlag_Throws,
-	PFlag_Max,
-	PFlag_AnimationWait,//Clients only!
-};
+void FLcReadPlayerData( flatline_packet* Packet, int16_t Size );
 
 
Index: Daodan/src/flatline/Flatline_PacketBuilder.c
===================================================================
--- Daodan/src/flatline/Flatline_PacketBuilder.c	(revision 879)
+++ Daodan/src/flatline/Flatline_PacketBuilder.c	(revision 881)
@@ -2,4 +2,5 @@
 #include "../Oni_Symbols.h"
 #include <assert.h>
+#include "Flatline_Packet.h"
 
 #define FLAG_AND_INCREMENT( FLAG )	PD->UpdateFlags |= (1 << FLAG ); DataPointer += FLpData_PartSize( FLAG );
Index: Daodan/src/flatline/Flatline_PacketReader.c
===================================================================
--- Daodan/src/flatline/Flatline_PacketReader.c	(revision 879)
+++ Daodan/src/flatline/Flatline_PacketReader.c	(revision 881)
@@ -1,3 +1,4 @@
 #include "Flatline.h"
+#include "Flatline_Packet.h"
 
 bool DoWeUpdateThis( uint16_t BitSet, uint16_t Flag )
Index: Daodan/src/flatline/Mariusnet.c
===================================================================
--- Daodan/src/flatline/Mariusnet.c	(revision 879)
+++ Daodan/src/flatline/Mariusnet.c	(revision 881)
@@ -9,7 +9,4 @@
 #include "../Oni_Symbols.h"
 #include <stdio.h>
-
-#pragma comment(lib, "wininet.lib")
-
 
 char MariusLogin[32]={0};
Index: Daodan/src/flatline/Mariusnet_Public.h
===================================================================
--- Daodan/src/flatline/Mariusnet_Public.h	(revision 879)
+++ Daodan/src/flatline/Mariusnet_Public.h	(revision 881)
@@ -1,2 +1,5 @@
+#ifndef MARIUSNET_PUBLIC_H
+#define MARIUSNET_PUBLIC_H
+
 extern unsigned char MsNet_Running;
 
@@ -40,2 +43,5 @@
 } m_announcegame;
 
+int MSNet_CreateGame( m_announcegame* Game );
+
+#endif