ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/Daodan/src/flatline/Flatline.c

Comparing Daodan/src/flatline/Flatline.c (file contents):
Revision 877 by alloc, Sun Jun 2 11:25:34 2013 UTC vs.
Revision 878 by alloc, Sun Jun 2 11:58:39 2013 UTC

#	Line 14 | Line 14
14		#define isnan(x) ((x) != (x))
15
16		uint32_t last1 = 0; uint32_t last2 = 0;
17	<	player_info Players[MAX_PLAYERS] = {{0}, {0}, {0}, {0}};
17	>	player_info Players[MAX_PLAYERS];
18		player_info * PlayerList[MAX_CONNECTIONS] = {0};
19		multiplayer_status MultiplayerStatus;
20		unsigned int lastPingTime;
#	Line 32 | Line 32 | const char * Rejection_Messages[][255] =
32
33
34
35	<	short TRrAnimation_GetType(char* anim)
35	>	short TRrAnimation_GetType(const void* anim)
36		{
37		return *(short*)(anim + 0x15A);
38		}
#	Line 41 | Line 41 | void ONrCharacter_SetAnimationInternal(C
41		short inFromState, short inNextAnimType, const void *TRAM)
42		{
43		ONCC            *ONCC   = Char->ONCC;
44	<	void            *TRAC   = ONCC->TRAC;
44	>	void            *TRAC   = (void*)ONCC->TRAC;
45		short   index = Char->Number;
46		short animType;
47

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)