diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-01-22 13:31:13 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-01-22 13:31:13 +0000 |
| commit | bd56bf8afdab16383ed8ad08412a8c807f84af85 (patch) | |
| tree | 0e963ada63bcbe3c50dd77986aaa15b9ba49816a /src/floor_item.cpp | |
| parent | 5359640b6f271af31f6423df9d661433eff89a3e (diff) | |
| download | mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.gz mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.bz2 mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.xz mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.zip | |
Merged NETWORK branch (includes BEING_OVERHAUL).
Diffstat (limited to 'src/floor_item.cpp')
| -rwxr-xr-x | src/floor_item.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/floor_item.cpp b/src/floor_item.cpp index 106ad210..4f2b84b3 100755 --- a/src/floor_item.cpp +++ b/src/floor_item.cpp @@ -86,7 +86,7 @@ void remove_floor_item(unsigned int id) } } -unsigned int find_floor_item_by_cor(unsigned short x, unsigned short y) +FloorItem* find_floor_item_by_cor(unsigned short x, unsigned short y) { FloorItems::iterator i; @@ -96,7 +96,7 @@ unsigned int find_floor_item_by_cor(unsigned short x, unsigned short y) if (floorItem->getX() == x && floorItem->getY() == y) { - return floorItem->getId(); + return floorItem; } } |