diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-30 10:53:06 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-30 10:53:06 +0000 |
commit | 262b8e18ed8cb58afb40a816ac0fdedfe3a7db5f (patch) | |
tree | 681a9cbb6c22669c6e8b7ab749228a3cd691a903 /crawl-ref/source/makeitem.cc | |
parent | 51d8f1fc9cc8ed4280b9c53b135ccb0521e84889 (diff) | |
download | crawl-ref-262b8e18ed8cb58afb40a816ac0fdedfe3a7db5f.tar.gz crawl-ref-262b8e18ed8cb58afb40a816ac0fdedfe3a7db5f.zip |
Massive overhaul to move towards coord_def().
This might have introduced some bugs: I now get intermittent crashes
on startup (this might have to do with the changes to special_room.)
Sorry about that - committing before I need to do any more big conflict
resolutions. Fixes coming later.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6732 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makeitem.cc')
-rw-r--r-- | crawl-ref/source/makeitem.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index c4b171508d..3351714bfa 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2840,8 +2840,7 @@ int items( int allow_uniques, // not just true-false, if (dont_place) { - item.x = 0; - item.y = 0; + item.pos.reset(); item.link = NON_ITEM; } else @@ -2923,8 +2922,7 @@ static void _give_monster_item(monsters *mon, int thing, mon->name(DESC_PLAIN).c_str()); #endif - mthing.x = 0; - mthing.y = 0; + mthing.pos.reset(); mthing.link = NON_ITEM; unset_ident_flags(mthing, ISFLAG_IDENT_MASK); @@ -3647,8 +3645,7 @@ static item_make_species_type _give_weapon(monsters *mon, int level, if (item.base_type == OBJ_UNASSIGNED) return (item_race); - item.x = 0; - item.y = 0; + item.pos.reset(); item.link = NON_ITEM; if (!force_item && mons_is_unique( mon->type )) |