diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-17 20:03:29 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-17 20:03:29 +0000 |
| commit | 3bb42dda4732f3288155725bd26da76822c10021 (patch) | |
| tree | 49a675c5675a095e3641f85cafef08801fec3751 /src/map/map.h | |
| parent | fed863883b19c7bac0f1a65e53c6507fde6758f0 (diff) | |
| download | hercules-3bb42dda4732f3288155725bd26da76822c10021.tar.gz hercules-3bb42dda4732f3288155725bd26da76822c10021.tar.bz2 hercules-3bb42dda4732f3288155725bd26da76822c10021.tar.xz hercules-3bb42dda4732f3288155725bd26da76822c10021.zip | |
Made OnTouch zone dimensions be stored as radius instead of diameter.
Cleaned up some overly complicated area calculations.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11750 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/map.h b/src/map/map.h index f5fe6a4b6..b2660e124 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -838,7 +838,7 @@ struct npc_data { union { struct { struct script_code *script; - short xs,ys; + short xs,ys; // OnTouch area radius int guild_id; int timer,timerid,timeramount,rid; unsigned int timertick; @@ -849,9 +849,9 @@ struct npc_data { } scr; struct npc_item_list shop_item[1];// dynamic array, allocated with extra entries (last one has nameid 0) struct { - short xs,ys; - short x,y; - unsigned short mapindex; + short xs,ys; // OnTouch area radius + short x,y; // destination coords + unsigned short mapindex; // destination map } warp; } u; //Do NOT place anything afterwards... shop data NPC will override any variables from here and on! [Skotlex] |