projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yeti summons snowballs now
[supertux.git]
/
src
/
object
/
bullet.cpp
diff --git
a/src/object/bullet.cpp
b/src/object/bullet.cpp
index
e80491a
..
f260f5e
100644
(file)
--- a/
src/object/bullet.cpp
+++ b/
src/object/bullet.cpp
@@
-52,9
+52,9
@@
Bullet::action(float elapsed_time)
float scroll_y =
Sector::current()->camera->get_translation().y;
if (get_pos().x < scroll_x ||
float scroll_y =
Sector::current()->camera->get_translation().y;
if (get_pos().x < scroll_x ||
- get_pos().x > scroll_x +
screen->w
||
+ get_pos().x > scroll_x +
SCREEN_WIDTH
||
// get_pos().y < scroll_y ||
// get_pos().y < scroll_y ||
- get_pos().y > scroll_y +
screen->h
||
+ get_pos().y > scroll_y +
SCREEN_HEIGHT
||
life_count <= 0) {
remove_me();
return;
life_count <= 0) {
remove_me();
return;
@@
-93,7
+93,6
@@
Bullet::collision(GameObject& other, const CollisionHit& hit)
return FORCE_MOVE;
}
return FORCE_MOVE;
}
- // TODO kill badguys
return FORCE_MOVE;
}
return FORCE_MOVE;
}