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/files.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/files.cc')
-rw-r--r-- | crawl-ref/source/files.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index a82fc65208..183ab171a5 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -1052,7 +1052,7 @@ static void _do_lost_items(level_area_type old_level_type) continue; // Item is in player intentory, so it's not lost. - if (item.x == -1 && item.y == -1) + if (item.pos.x == -1 && item.pos.y == -1) continue; item_was_lost(item); @@ -1216,7 +1216,7 @@ bool load( dungeon_feature_type stair_taken, load_mode_type load_mode, if (you.level_type != LEVEL_ABYSS) _place_player_on_stair(old_branch, stair_taken); else - you.moveto(45, 35); + you.moveto(coord_def(45, 35)); // FIXME: should be abyss_center } crawl_view.set_player_at(you.pos(), load_mode != LOAD_VISITOR); |