aboutsummaryrefslogtreecommitdiff
path: root/towernbullet.h
diff options
context:
space:
mode:
authorGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-17 13:53:11 +0000
committerGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-17 13:53:11 +0000
commit63f8d56df059a3783f42889033549b524af829cf (patch)
tree6025ec9fe030dd4fc21983f841c0e08596f9692a /towernbullet.h
parentfd7ea15571b43dcacc7a88cf720fb7e103f19042 (diff)
downloadbullet-lab-remix-63f8d56df059a3783f42889033549b524af829cf.tar.xz
Draft a new level.
Diffstat (limited to 'towernbullet.h')
-rw-r--r--towernbullet.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/towernbullet.h b/towernbullet.h
index 5bf3226..f5fd77a 100644
--- a/towernbullet.h
+++ b/towernbullet.h
@@ -77,6 +77,7 @@ int CreateBullet2(double x,double y,double bs,double rad,bool eff=false,bool inv
bullet[i].alterColor=blue;
bullet[i].alterColor2=COLOR_COUNT;
bullet[i].lifetime=0;
+ bullet[i].whirem=0;
bullet[i].scollable=true;
bullet[i].collable=true;
bullet[i].bulletaccel=bullet[i].limv=0;
@@ -347,8 +348,13 @@ void ProcessBullet2(int i)
if (!DisablePlayer)
{
//experimental new coor processing code, FPS independent
- if (bullet[i].bulletaccel>0&&bullet[i].bulletspeed<bullet[i].limv)bullet[i].bulletspeed+=bullet[i].bulletaccel*(1000.0f/hge->Timer_GetFPS());
- if (bullet[i].bulletaccel<0&&bullet[i].bulletspeed>bullet[i].limv)bullet[i].bulletspeed+=bullet[i].bulletaccel*(1000.0f/hge->Timer_GetFPS());
+ if (bullet[i].whirem<=0)
+ {
+ if (bullet[i].bulletaccel>0&&bullet[i].bulletspeed<bullet[i].limv)bullet[i].bulletspeed+=bullet[i].bulletaccel*(1000.0f/hge->Timer_GetFPS());
+ if (bullet[i].bulletaccel<0&&bullet[i].bulletspeed>bullet[i].limv)bullet[i].bulletspeed+=bullet[i].bulletaccel*(1000.0f/hge->Timer_GetFPS());
+ }
+ else
+ bullet[i].whirem-=1000.0f/hge->Timer_GetFPS();
bullet[i].bulletpos.x-=bsscale*bullet[i].bulletspeed*(bullet[i].bulletdir.x)/20*(1000.0f/hge->Timer_GetFPS());
bullet[i].bulletpos.y-=bsscale*bullet[i].bulletspeed*(bullet[i].bulletdir.y)/20*(1000.0f/hge->Timer_GetFPS());
}