ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/Daodan/MSVC/Oni_GameState.h

Comparing Daodan/MSVC/Oni_GameState.h (file contents):
Revision 582 by gumby, Wed Jan 19 04:35:43 2011 UTC vs.
Revision 584 by gumby, Mon Jan 24 06:45:07 2011 UTC

#	Line 995 | Line 995 | typedef struct
995		int BossShieldPower;
996		int field_1668;
997		char gap_166c[4];
998	<	int Kills;
999	<	int Damage;
998	>	uint32_t Kills;
999	>	uint32_t Damage;
1000		int field_1678;
1001		int field_167C;
1002		int CurrentConsoleActionMarker;
#	Line 1236 | Line 1236 | typedef struct
1236		__int16 throwing;
1237		__int16 thrownBy;
1238		Character* ThrowTargetCharacter;
1239	<	int targetThrow; //animation
1239	>	void* targetThrow; //animation
1240		int field_1EE4;
1241		int field_1EE8;
1242		int field_1EEC;
#	Line 1441 | Line 1441 | typedef struct
1441		char gap_1679da[2];
1442		int field_1679DC;
1443		} GameState;
1444	<	#endif
1444	>
1445
1446		typedef struct
1447		{
#	Line 1475 | Line 1475 | typedef struct
1475		int blah2;
1476		int blah3;
1477		} COtTextArea;
1478	+	#endif

Diff Legend

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