ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/Daodan/src/Oni_Character.h

Comparing Daodan/src/Oni_Character.h (file contents):
Revision 692 by alloc, Thu Mar 7 17:26:13 2013 UTC vs.
Revision 739 by iritscen, Sun Mar 24 14:41:49 2013 UTC

#	Line 9 | Line 9 | enum {
9		team_syndicate,
10		team_neutral,
11		team_securityguard,
12	<	team_rougekonoko,
12	>	team_roguekonoko,
13		team_switzerland,
14		team_syndicateaccessory,
15		};
#	Line 35 | Line 35 | typedef enum {
35		ONcCharacterFlag_WasUpdated                             =       0x00000800,     // this character's animation was changed
36
37		ONcCharacterFlag_BeingThrown                    =       0x00001000,     // this character is being thrown
38	<	ONcCharacterFlag_DontUseGunVarient              =       0x00002000,     // this character should not use a weapon varient
38	>	ONcCharacterFlag_DontUseGunVariant              =       0x00002000,     // this character should not use a weapon variant
39		ONcCharacterFlag_Draw                                   =       0x00004000,     // DoFrame has been executed for this character
40		ONcCharacterFlag_InUse                                  =       0x00008000,     // this character is active and in use
41
42	<	ONcCharacterFlag_DontUseFightVarient    =       0x00010000,
42	>	ONcCharacterFlag_DontUseFightVariant    =       0x00010000,
43		ONcCharacterFlag_NoCollision                    =       0x00020000,     // no collision for this character
44		ONcCharacterFlag_Teleporting                    =       0x00040000,     // this character is teleporting and does not accept collision
45		ONcCharacterFlag_NoCorpse                               =       0x00080000,     // no corpse for this character
#	Line 47 | Line 47 | typedef enum {
47		ONcCharacterFlag_ActiveLock                             =       0x00100000,     // the character is locked active
48		ONcCharacterFlag_ChrAnimate                             =       0x00200000,     // the character is currently runing a chr_animate command
49		ONcCharacterFlag_AIMovement                             =       0x00400000,     // the character is using AI movement
50	<	ONcCharacterFlag_NeutralUninterruptable =       0x00800000,     // running an uninterruptable neutral interaction
50	>	ONcCharacterFlag_NeutralUninterruptible =       0x00800000,     // running an uninterruptible neutral interaction
51
52		ONcCharacterFlag_NoShadow                               =       0x01000000,     //
53		ONcCharacterFlag_Invincible                             =       0x02000000,     // character is invincible

Diff Legend

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