Index: Daodan/src/flatline/Flatline.c
===================================================================
--- Daodan/src/flatline/Flatline.c	(revision 877)
+++ Daodan/src/flatline/Flatline.c	(revision 878)
@@ -15,5 +15,5 @@
 
 uint32_t last1 = 0; uint32_t last2 = 0;
-player_info Players[MAX_PLAYERS] = {{0}, {0}, {0}, {0}};
+player_info Players[MAX_PLAYERS];
 player_info * PlayerList[MAX_CONNECTIONS] = {0};
 multiplayer_status MultiplayerStatus;
@@ -33,5 +33,5 @@
 
 
-short TRrAnimation_GetType(char* anim)
+short TRrAnimation_GetType(const void* anim)
 {
 	return *(short*)(anim + 0x15A);
@@ -42,5 +42,5 @@
 {
 	ONCC		*ONCC	= Char->ONCC;
-	void		*TRAC	= ONCC->TRAC;
+	void		*TRAC	= (void*)ONCC->TRAC;
 	short	index = Char->Number;
 	short animType;
Index: Daodan/src/flatline/Flatline_BSL.c
===================================================================
--- Daodan/src/flatline/Flatline_BSL.c	(revision 877)
+++ Daodan/src/flatline/Flatline_BSL.c	(revision 878)
@@ -211,5 +211,5 @@
 }
 
-uint16_t tele(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
+uint16_t ONICALL tele(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
 {
 	ActiveCharacter *AC = ONrGetActiveCharacter(ONgGameState->PlayerCharacter);
Index: Daodan/src/flatline/Flatline_Hooks.c
===================================================================
--- Daodan/src/flatline/Flatline_Hooks.c	(revision 877)
+++ Daodan/src/flatline/Flatline_Hooks.c	(revision 878)
@@ -4,5 +4,5 @@
 
 //Don't modify this.
-char * FLrHook_DoorOpen( DoorObject *Door, Character *Char)
+char* ONICALL FLrHook_DoorOpen( DoorObject *Door, Character *Char)
 {
 	int crashStop;		
@@ -22,5 +22,5 @@
 	return (char*)(Door->Door.class);
 }
-short FLrHook_ConsoleActivate( void *inObject, Character *inCharacter )
+short ONICALL FLrHook_ConsoleActivate( void *inObject, Character *inCharacter )
 {
 	if(server_started)
@@ -54,5 +54,5 @@
 */
 
-void FLrHook_Lasers( Character* Char )
+void ONICALL FLrHook_Lasers( Character* Char )
 {
 	ONiDrawWeaponSight( Char );
Index: Daodan/src/flatline/Flatline_Hooks.h
===================================================================
--- Daodan/src/flatline/Flatline_Hooks.h	(revision 877)
+++ Daodan/src/flatline/Flatline_Hooks.h	(revision 878)
@@ -3,7 +3,7 @@
 
 #include "../Oni.h"
-char * FLrHook_DoorOpen( DoorObject *Door, Character *Char);
-short FLrHook_ConsoleActivate( void *inObject, Character *inCharacter );
-void FLrHook_Lasers( Character* PlayerChar );
+char* ONICALL FLrHook_DoorOpen( DoorObject *Door, Character *Char);
+short ONICALL FLrHook_ConsoleActivate( void *inObject, Character *inCharacter );
+void ONICALL FLrHook_Lasers( Character* PlayerChar );
 
 #endif
Index: Daodan/src/patches/Patches.c
===================================================================
--- Daodan/src/patches/Patches.c	(revision 877)
+++ Daodan/src/patches/Patches.c	(revision 878)
@@ -226,5 +226,5 @@
 }
 
-// Adds new BSL functions if usedaodanbsl is enabled
+// Adds new BSL functions
 void DD_Patch_DaodanInit()
 {
@@ -249,10 +249,9 @@
 	DDrPatch_NOOP((char*)(OniExe + 0x000E1957), 6 );
 	DDrPatch_MakeCall((void*)(OniExe + 0x000E17F6), FLrHook_Lasers );
-
 	
 	//Flatline related stuff
 	DDrPatch_MakeCall((void*)(OniExe + 0x000FBCEA), DDrText_Hook);
 	
-	DDrPatch_Int32((int*)(OniExe + 0x000B24D2), FLrSpawnHack);
+	DDrPatch_Int32((int*)(OniExe + 0x000B24D2), (unsigned int)FLrSpawnHack);
 
 	DDrPatch_NOOP((char*)(OniExe + 0x000C26CB), 6);