Changeset 585

Timestamp:

Jan 25, 2011, 6:18:05 PM (14 years ago)

Author:

gumby

Message:

Getting there. Throws still rarely crash and classes aren't synced.

Location:

Daodan/MSVC

Files:

• Flatline.c (modified) (8 diffs)
• Flatline_Client.c (modified) (1 diff)
• Flatline_PacketBuilder.c (modified) (5 diffs)

Daodan/MSVC/Flatline.c

@@ -4 +4 @@
 #include "Flatline_Server.h"
 #include "Flatline_Events.h"
+#include "Daodan_Utility.h"
 #include <Windows.h>
 //#include <sys/time.h>
@@ -295 +296 @@
                 input_packet.id = PLAYER_INPUT;
                 input_packet.input_struct.Time = ONgGameState->GameTime;
-                input_packet.input_struct.Actions1 = ((GameState*)(ONgGameState))->Input.Current.Actions1;
-                input_packet.input_struct.Actions2 = ((GameState*)(ONgGameState))->Input.Current.Actions2;
-                input_packet.input_struct.MouseDeltaX = ((GameState*)(ONgGameState))->Input.MouseDeltaX;
-                input_packet.input_struct.MouseDeltaY = ((GameState*)(ONgGameState))->Input.MouseDeltaY;
+                input_packet.input_struct.Actions1 = ONgGameState->Input.Current.Actions1;
+                input_packet.input_struct.Actions2 = ONgGameState->Input.Current.Actions2;
+                input_packet.input_struct.MouseDeltaX = ONgGameState->Input.MouseDeltaX;
+                input_packet.input_struct.MouseDeltaY = ONgGameState->Input.MouseDeltaY;
 
                 sent_bytes = NetUDPSocket_Send(client_sock,(sockaddr *) &address, (char*)&input_packet, sizeof(input_struct) + FLATLINE_HEADER);
@@ -331 +332 @@
                 if(PlayerList[i] == 0) continue;
                 
+
+
                 Player = PlayerList[i]->Chr;
                 Active_Player = ONrGetActiveCharacter( PlayerList[i]->Chr);
@@ -421 +424 @@
                 if(Active_Player == 0) continue;
 
+                
+                if(client_connected) {
+                        Active_Player->PlayingFilm.Flags = 1;
+                }
+
+
                 if( client_connected && DoWeUpdateThis( PlayerList[i]->UpdateFlags, PFlag_Position) )
                 {
@@ -443 +452 @@
                                 //TODO: Check age of animation
                                 ///////////////////////////////////
-
+                                DDrConsole_PrintF("Changing animation from %s to %s", 
+                                        TMrInstance_GetInstanceName( Active_Player->Animation ),
+                                        TMrInstance_GetInstanceName( PlayerList[i]->Animation ) );
                                 // set the characters animation
                                 /*ONrCharacter_SetAnimationInternal(Player,
@@ -449 +460 @@
                                 Active_Player->AnimationToState,
                                 0,
-                                Animation);*/
+                                PlayerList[i]->Animation);*/
                                 //ONrCharacter_NewAnimationHook(Player, Active_Player);
-                                ONrCharacter_SetAnimationExternal(Player, TRrAnimation_GetFrom(PlayerList[i]->Animation), PlayerList[i]->Animation, 0);
+                                ONrCharacter_SetAnimationExternal(Player, TRrAnimation_GetFrom(PlayerList[i]->Animation), PlayerList[i]->Animation, 1);
                                 //ONrCharacter_NewAnimationHook(Player, Active_Player);
                         }
@@ -520 +531 @@
                                                 {
                                                         Target->Frame += 2;
-                                                        Target->thrownBy = Player->Number;
+                                                        DDrConsole_PrintF("Thrown by player %hi", Player->Number );
+                                                        DDrStartupMessage("Thrown by player %hi", Player->Number );
+                                                        Target->thrownBy = Player->Number & 0x00ff;
                                                 }
                                         }
@@ -535 +548 @@
                 PlayerList[i]->UpdateFlags &= ~( 1 << PFlag_Throws );
 
-                //Active_Player->PlayingFilm.Flags = 1;
                 Active_Input = &(Active_Player->Input);
 

Daodan/MSVC/Flatline_Client.c

@@ -73 +73 @@
 
 
-                                        //DDrPatch_Byte(0x04ED6FB, 0xEB);
+                                        DDrPatch_Byte(0x04ED6FB, 0xEB);
 
                                         //DDrConsole_PrintF("Slot %i",  ((connect_reply*)packet)->player_slot);

Daodan/MSVC/Flatline_PacketBuilder.c

@@ -32 +32 @@
         {
                 memcpy( DataPointer, &PI->InputFromClient, sizeof(PlayerInput));
-                PI->InputFromClient = PI->Input;
+                PI->Input = PI->InputFromClient;
 
                 FLAG_AND_INCREMENT( PFlag_Input );
@@ -99 +99 @@
         if(APlayer)
         {
-                if( memcmp(&PI->Position, &APlayer->PhyContext->Position, sizeof(Vector3)) )
+                if( (APlayer->PhyContext) && memcmp(&PI->Position, &APlayer->PhyContext->Position, sizeof(Vector3)) )
                 {
                         Vector3* ptr = (Vector3*)DataPointer;
@@ -109 +109 @@
                 if(APlayer->Animation != PI->Animation)
                 {
-                        sprintf_s( DataPointer, 32, "%s", TMrInstance_GetInstanceName( PI->Animation ) );
+                        sprintf_s( DataPointer, 32, "%s", TMrInstance_GetInstanceName( APlayer->Animation ) );
                         PI->Animation = APlayer->Animation;
                         
@@ -137 +137 @@
         }
         
-        PD->Size = (char)DataPointer - (char)PD;
+        PD->Size = (uint32_t)DataPointer - (uint32_t)PD;
 
         PI->UpdateFlags = PD->UpdateFlags;      
@@ -168 +168 @@
                         assert( BuildData[p].Size < 255 );
                         
-                        //If we hit maximum size, send the packet and reset the buffer for a new one
-                        if( BuildData[p].Size + PacketSize > max_packet_size )
+                        if( BuildData[p].Size > 0 )
                         {
-                                UDPServer_SendToAll(&OutputPacket, PacketSize + FLATLINE_HEADER);
-                        
-                                memset( OutputPacket.data, 0, PacketSize );
-                                OutputPointer = OutputPacket.data;
-                                PacketSize = 0;
+
+                                //If we hit maximum size, send the packet and reset the buffer for a new one
+                                if( BuildData[p].Size + PacketSize > max_packet_size )
+                                {
+                                        UDPServer_SendToAll(&OutputPacket, PacketSize + FLATLINE_HEADER);
+
+                                        memset( OutputPacket.data, 0, PacketSize );
+                                        OutputPointer = OutputPacket.data;
+                                        PacketSize = 0;
+                                }
+
+                                //add to the packet
+                                memcpy( OutputPointer, &BuildData[p], BuildData[p].Size );
+
+                                OutputPointer += BuildData[p].Size;
+                                PacketSize += BuildData[p].Size;
                         }
-                        
-                        //add to the packet
-                        memcpy( OutputPointer, &BuildData[p], BuildData[p].Size );
-                        
-                        OutputPointer += BuildData[p].Size;
-                        PacketSize += BuildData[p].Size;
                 }
         }