ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/Daodan/src/flatline/Flatline.c
(Generate patch)

Comparing:
Daodan/src/Flatline.c (file contents), Revision 876 by gumby, Sat Jun 1 20:29:59 2013 UTC vs.
Daodan/src/flatline/Flatline.c (file contents), Revision 877 by alloc, Sun Jun 2 11:25:34 2013 UTC

# Line 1 | Line 1
1   #include "Flatline.h"
2 < #include "Oni_Character.h"
3 < #include "Oni_Gamestate.h"
4 < #include "Oni_Symbols.h"
2 > #include "../Oni_Character.h"
3 > #include "../Oni_GameState.h"
4 > #include "../Oni_Symbols.h"
5   #include "Flatline_Client.h"
6   #include "Flatline_Server.h"
7   #include "Flatline_Events.h"
8 < #include "Daodan_Utility.h"
9 < #include <Windows.h>
8 > #include "../Daodan_Utility.h"
9 > #include <windows.h>
10   //#include <sys/time.h>
11   #include <time.h>
12   #include <float.h>
13 +
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}};
18   player_info * PlayerList[MAX_CONNECTIONS] = {0};
# Line 586 | Line 588 | bool FlatlineInitialize()
588          memset( PlayerList, 0, 4 * MAX_PLAYERS );
589          memset( &MultiplayerStatus, 0, sizeof( multiplayer_status ));
590          return 1;
591 < }
591 > }

Diff Legend

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