diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-07-17 22:01:54 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-07-17 22:01:54 +0200 |
| commit | 538b81540c7e04c5b1793d50aaf9ac8958878524 (patch) | |
| tree | 3e91d482f341fffc4addacd96112407af2db50e6 /src/common | |
| parent | 9091c129381ae18831707a5005c8c7626408298b (diff) | |
| parent | 7a72ec38d336ed56d2759795d4b9db59b76868b8 (diff) | |
| download | manaserv-538b81540c7e04c5b1793d50aaf9ac8958878524.tar.gz manaserv-538b81540c7e04c5b1793d50aaf9ac8958878524.tar.bz2 manaserv-538b81540c7e04c5b1793d50aaf9ac8958878524.tar.xz manaserv-538b81540c7e04c5b1793d50aaf9ac8958878524.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/game-server/character.h
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/manaserv_protocol.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/manaserv_protocol.h b/src/common/manaserv_protocol.h index 9feedfd9..4bac0837 100644 --- a/src/common/manaserv_protocol.h +++ b/src/common/manaserv_protocol.h @@ -185,6 +185,7 @@ enum { GPMSG_BEINGS_DAMAGE = 0x0310, // { W being id, W amount }* GPMSG_CREATE_EFFECT_POS = 0x0320, // W effect id, W*2 position GPMSG_CREATE_EFFECT_BEING = 0x0321, // W effect id, W BeingID + GPMSG_CREATE_TEXT_PARTICLE = 0x0322, // S text GPMSG_SHAKE = 0x0330, // W intensityX, W intensityY, [W decay_times_10000, [W duration]] // Guild |