diff options
| -rw-r--r-- | src/enums/being/attacktype.h | 4 | ||||
| -rw-r--r-- | src/enums/being/beingaction.h | 18 | ||||
| -rw-r--r-- | src/enums/being/targetcursortype.h | 2 | ||||
| -rw-r--r-- | src/enums/events/mousebutton.h | 10 | ||||
| -rw-r--r-- | src/enums/events/mouseeventtype.h | 20 | ||||
| -rw-r--r-- | src/enums/gui/chatmsgtype.h | 6 | ||||
| -rw-r--r-- | src/enums/gui/usercolorid.h | 2 | ||||
| -rw-r--r-- | src/enums/net/partyshare.h | 6 | ||||
| -rw-r--r-- | src/enums/resources/spritedirection.h | 18 | ||||
| -rw-r--r-- | src/enums/state.h | 2 |
10 files changed, 44 insertions, 44 deletions
diff --git a/src/enums/being/attacktype.h b/src/enums/being/attacktype.h index f09f6b3e0..d6107655c 100644 --- a/src/enums/being/attacktype.h +++ b/src/enums/being/attacktype.h @@ -40,8 +40,8 @@ enumStart(AttackType) CRITICAL = 10, FLEE = 11, TOUCH_SKILL = 12, - MISS = 0xffff, // pseudo value for miss attacks - SKILLMISS // pseudo value for skill miss attacks + MISS = 0xffff, // pseudo value for miss attacks + SKILLMISS = 0x10000 // pseudo value for skill miss attacks } enumEnd(AttackType); diff --git a/src/enums/being/beingaction.h b/src/enums/being/beingaction.h index 7769bc180..0b7c2d832 100644 --- a/src/enums/being/beingaction.h +++ b/src/enums/being/beingaction.h @@ -27,15 +27,15 @@ enumStart(BeingAction) { - STAND = 0, - MOVE = 1, - ATTACK = 2, - CAST = 3, - SIT = 4, - DEAD = 5, - HURT = 6, - SPAWN = 7, - PRESTAND + STAND = 0, + MOVE = 1, + ATTACK = 2, + CAST = 3, + SIT = 4, + DEAD = 5, + HURT = 6, + SPAWN = 7, + PRESTAND = 8 } enumEnd(BeingAction); diff --git a/src/enums/being/targetcursortype.h b/src/enums/being/targetcursortype.h index 890a6ad9e..22dbfeda2 100644 --- a/src/enums/being/targetcursortype.h +++ b/src/enums/being/targetcursortype.h @@ -27,7 +27,7 @@ enumStart(TargetCursorType) { NONE = -1, - NORMAL = 0, + NORMAL, IN_RANGE, NUM_TCT } diff --git a/src/enums/events/mousebutton.h b/src/enums/events/mousebutton.h index 3b43092f7..25c798f37 100644 --- a/src/enums/events/mousebutton.h +++ b/src/enums/events/mousebutton.h @@ -68,11 +68,11 @@ enumStart(MouseButton) { - WHEEL = -1, - EMPTY = 0, - LEFT, - RIGHT, - MIDDLE + WHEEL = -1, + EMPTY = 0, + LEFT = 1, + RIGHT = 2, + MIDDLE = 3 } enumEnd(MouseButton); diff --git a/src/enums/events/mouseeventtype.h b/src/enums/events/mouseeventtype.h index 1808e6b0b..ecb2187f1 100644 --- a/src/enums/events/mouseeventtype.h +++ b/src/enums/events/mouseeventtype.h @@ -68,16 +68,16 @@ enumStart(MouseEventType) { - MOVED = 0, - PRESSED, - RELEASED, - WHEEL_MOVED_DOWN, - WHEEL_MOVED_UP, - CLICKED, - ENTERED, - EXITED, - DRAGGED, - RELEASED2 = 100 + MOVED = 0, + PRESSED = 1, + RELEASED = 2, + WHEEL_MOVED_DOWN = 3, + WHEEL_MOVED_UP = 4, + CLICKED = 5, + ENTERED = 6, + EXITED = 7, + DRAGGED = 8, + RELEASED2 = 100 } enumEnd(MouseEventType); diff --git a/src/enums/gui/chatmsgtype.h b/src/enums/gui/chatmsgtype.h index 979e07ca1..194d3f80e 100644 --- a/src/enums/gui/chatmsgtype.h +++ b/src/enums/gui/chatmsgtype.h @@ -27,15 +27,15 @@ enumStart(ChatMsgType) { - BY_GM = 0, + BY_UNKNOWN = -1, + BY_GM, BY_PLAYER, BY_OTHER, BY_SERVER, BY_CHANNEL, ACT_WHISPER, // getting whispered at ACT_IS, // equivalent to "/me" on IRC - BY_LOGGER, - BY_UNKNOWN = -1 + BY_LOGGER } enumEnd(ChatMsgType); diff --git a/src/enums/gui/usercolorid.h b/src/enums/gui/usercolorid.h index 336a1f43b..fa36a78b1 100644 --- a/src/enums/gui/usercolorid.h +++ b/src/enums/gui/usercolorid.h @@ -29,7 +29,7 @@ enumStart(UserColorId) { NO_COLOR = -1, - LABEL_BEING = 0, + LABEL_BEING, BEING, FRIEND, DISREGARDED, diff --git a/src/enums/net/partyshare.h b/src/enums/net/partyshare.h index 4e11b93ea..2da820d50 100644 --- a/src/enums/net/partyshare.h +++ b/src/enums/net/partyshare.h @@ -27,9 +27,9 @@ enumStart(PartyShare) { - UNKNOWN = -1, - NO, - YES, + UNKNOWN = -1, + NO = 0, + YES = 1, NOT_POSSIBLE = 2 } enumEnd(PartyShare); diff --git a/src/enums/resources/spritedirection.h b/src/enums/resources/spritedirection.h index c25ef9f8d..55cd606a7 100644 --- a/src/enums/resources/spritedirection.h +++ b/src/enums/resources/spritedirection.h @@ -27,16 +27,16 @@ namespace SpriteDirection { enum Type { - DEFAULT = 0, - UP = 1, - DOWN = 2, - LEFT = 3, - RIGHT = 4, - UPLEFT = 5, - UPRIGHT = 6, - DOWNLEFT = 7, + DEFAULT = 0, + UP = 1, + DOWN = 2, + LEFT = 3, + RIGHT = 4, + UPLEFT = 5, + UPRIGHT = 6, + DOWNLEFT = 7, DOWNRIGHT = 8, - INVALID + INVALID = 9 }; } // namespace SpriteDirection diff --git a/src/enums/state.h b/src/enums/state.h index 21bdf3e65..cc52c86a1 100644 --- a/src/enums/state.h +++ b/src/enums/state.h @@ -32,7 +32,7 @@ enumStart(State) { ERROR = -1, - START = 0, + START, CHOOSE_SERVER, CONNECT_SERVER, PRE_LOGIN, |