projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanups related to tilemap positions:
[supertux.git]
/
src
/
object
/
icecrusher.cpp
diff --git
a/src/object/icecrusher.cpp
b/src/object/icecrusher.cpp
index
1d7663f
..
aef8dd5
100644
(file)
--- a/
src/object/icecrusher.cpp
+++ b/
src/object/icecrusher.cpp
@@
-153,14
+153,12
@@
IceCrusher::found_victim()
Player* player = this->get_nearest_player();
if (!player) return false;
Player* player = this->get_nearest_player();
if (!player) return false;
- const Rect& pr = player->get_bbox();
- const Rect& br = get_bbox();
+ const Rect
f
& pr = player->get_bbox();
+ const Rect
f
& br = get_bbox();
if ((pr.p2.x > br.p1.x) && (pr.p1.x < br.p2.x) && (pr.p1.y >= br.p2.y)) {
return true;
}
return false;
}
if ((pr.p2.x > br.p1.x) && (pr.p1.x < br.p2.x) && (pr.p1.y >= br.p2.y)) {
return true;
}
return false;
}
-IMPLEMENT_FACTORY(IceCrusher, "icecrusher");
-
/* EOF */
/* EOF */