diff --git a/src/game/World.h b/src/game/World.h index edee8b9b1..6a2f9328c 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -398,11 +398,12 @@ enum RealmZone // data_flags = flag_target_player_as_source = 0x01 // flag_original_source_as_target = 0x02 // flag_buddy_as_target = 0x04 -#define SCRIPT_COMMAND_EMOTE 1 // source = unit, datalong = anim_id -#define SCRIPT_COMMAND_FIELD_SET 2 // source = any, datalong = field_id, datalog2 = value -#define SCRIPT_COMMAND_MOVE_TO 3 // source = Creature, datalog2 = time, x/y/z -#define SCRIPT_COMMAND_FLAG_SET 4 // source = any, datalong = field_id, datalog2 = bitmask -#define SCRIPT_COMMAND_FLAG_REMOVE 5 // source = any, datalong = field_id, datalog2 = bitmask + // dataint = text entry from db_script_string -table +#define SCRIPT_COMMAND_EMOTE 1 // source = unit, datalong = emote_id +#define SCRIPT_COMMAND_FIELD_SET 2 // source = any, datalong = field_id, datalong2 = value +#define SCRIPT_COMMAND_MOVE_TO 3 // source = Creature, datalong2 = time, x/y/z +#define SCRIPT_COMMAND_FLAG_SET 4 // source = any, datalong = field_id, datalong2 = bitmask +#define SCRIPT_COMMAND_FLAG_REMOVE 5 // source = any, datalong = field_id, datalong2 = bitmask #define SCRIPT_COMMAND_TELEPORT_TO 6 // source or target with Player, datalong = map_id, x/y/z #define SCRIPT_COMMAND_QUEST_EXPLORED 7 // one from source or target must be Player, another GO/Creature, datalong=quest_id, datalong2=distance or 0 #define SCRIPT_COMMAND_KILL_CREDIT 8 // source or target with Player, datalong = creature entry, datalong2 = bool (0=personal credit, 1=group credit) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index dec7365a2..88cf7d75e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10488" + #define REVISION_NR "10489" #endif // __REVISION_NR_H__