diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-11-11 21:02:36 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-11-11 21:02:36 +0000 |
| commit | 7efefe27163548b7f61c516d6b650258a3c7d033 (patch) | |
| tree | 3615438a87ead4a9552db85b871b82ac5972b53e /src/game/game.h | |
| parent | 5702b3bfd0e20a0f99c8fecdada033e8d8802f01 (diff) | |
| download | zcatch-7efefe27163548b7f61c516d6b650258a3c7d033.tar.gz zcatch-7efefe27163548b7f61c516d6b650258a3c7d033.zip | |
many smaller changes. changed how projectiles are handled. fixed joining bug
Diffstat (limited to 'src/game/game.h')
| -rw-r--r-- | src/game/game.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/game/game.h b/src/game/game.h index 62d67cb7..53036d3d 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -26,6 +26,15 @@ inline float get_angle(vec2 dir) } +inline vec2 calc_pos(vec2 p, vec2 v, float gravity, float t) +{ + vec2 n; + n.x = p.x + v.x*t; + n.y = p.y + v.y*t - gravity*(t*t); + return n; +} + + template<typename T> inline T saturated_add(T min, T max, T current, T modifier) { |