mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed merge error.

Browse source
This commit is contained in:
tomrus88 2010-01-10 12:47:53 +03:00
parent a04449c4ad
commit 22a60b9018
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/ObjectMgr.h
View file

@ -256,16 +256,6 @@ struct QuestPOIPoint
QuestPOIPoint() : x(0), y(0) {} QuestPOIPoint() : x(0), y(0) {}
QuestPOIPoint(int32 _x, int32 _y) : x(_x), y(_y) {} QuestPOIPoint(int32 _x, int32 _y) : x(_x), y(_y) {}
uint32 npc_option_npcflag;
uint32 action_menu_id;
uint32 action_poi_id;
uint32 action_script_id;
bool box_coded;
uint32 box_money;
std::string box_text;
uint16 cond_1;
uint16 cond_2;
uint16 cond_3;
}; };
struct QuestPOI struct QuestPOI