ViewVC Help

View File | Revision Log | View Changeset | Root Listing

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

Comparing Daodan/src/flatline/Flatline.h (file contents):
Revision 877 by alloc, Sun Jun 2 11:25:34 2013 UTC vs.
Revision 881 by alloc, Mon Jun 3 17:01:38 2013 UTC

#	Line 21 | Line 21
21		#include "../Daodan_Console.h"
22		#include "../Oni_Character.h"
23		#include "../Oni_GameState.h"
24	–	#include "Flatline_Packet.h"
24
25		#include "../Oni_Symbols.h"
26		//#define breakpoint asm("int3")
#	Line 33 | Line 32 | DWORD WINAPI StartServer(void* lol);
32		DWORD WINAPI StartClient(void* lol);
33
34
35	+	typedef struct
36	+	{
37	+	uint16_t ID;
38	+	uint16_t Size;
39	+	uint16_t UpdateFlags;
40	+	uint8_t  data[255];
41	+	} PlayerData;
42	+
43	+
44	+	typedef struct {
45	+	uint32_t Actions1;
46	+	uint32_t Actions2;
47	+	float MouseDeltaX;
48	+	float MouseDeltaY;
49	+	} PlayerInput;
50	+
51	+	typedef struct {
52	+	float Facing;
53	+	float DesiredFacing;
54	+	} PlayerFacing;
55	+
56	+	typedef struct {
57	+	uint16_t Health;
58	+	uint16_t MaxHealth;
59	+	} PlayerHealth;
60	+
61	+	typedef struct {
62	+	uint16_t Score;
63	+	uint16_t Deaths;
64	+	} PlayerScore;
65	+
66	+	//Change this later to be misc info
67	+	typedef struct {
68	+	uint16_t Frame;
69	+	uint16_t Ping;
70	+	} PlayerFP;
71	+
72	+	typedef struct {
73	+	uint8_t Ammo;
74	+	uint8_t Cells;
75	+	uint8_t Hypo;
76	+	uint8_t pad;
77	+	uint16_t Invis;
78	+	uint16_t Shield;
79	+	} PlayerInventory;
80	+
81	+	typedef struct {
82	+	uint16_t                                throwing;
83	+	uint16_t                                throwFrame;
84	+	char                                    throwName[32];
85	+	} PlayerThrowData;
86	+
87	+	enum
88	+	{
89	+	PFlag_None,
90	+	PFlag_Input,
91	+	PFlag_Facing,
92	+	PFlag_Health,
93	+	PFlag_Score,            //TODO
94	+	PFlag_FramePing,
95	+	PFlag_Inventory, //TODO
96	+	PFlag_Class,
97	+	PFlag_Position,
98	+	PFlag_Animation,
99	+	PFlag_Throws,
100	+	PFlag_Max,
101	+	PFlag_AnimationWait,//Clients only!
102	+	};
103	+
104	+
105		//initial connection
106		typedef struct {
107		char country[2];

Diff Legend

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