diff options
| author |  chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb>
| 2014-02-24 03:25:05 +0000 |
|---|---|---|
| committer | chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb>
| 2014-02-24 03:25:05 +0000 |
| commit | 172056e7598d3447c682a694d824041076f3255e (patch) | |
| tree | 3ba150866d6bbcc337932e3fc59a3af9715d0d85 /towernbullet.h | |
| parent | 8cb1a0f4fcf8e7ecd54134e8d6f431b613c69091 (diff) | |
| download | bullet-lab-remix-172056e7598d3447c682a694d824041076f3255e.tar.xz | |
M trunk/CHANGELOG.TXT
M trunk/background.h
M trunk/effects.h
M trunk/global.h
M trunk/hge/CxImage/ximagif.cpp
M trunk/hge/CxImage/ximaint.cpp
M trunk/hge/CxImage/ximapng.cpp
M trunk/hge/graphics.cpp
M trunk/hge/input.cpp
M trunk/hge/resource.cpp
M trunk/hge/sound.cpp
M trunk/hge/system.cpp
M trunk/hgehelp/hgefont.cpp
M trunk/levels.h
M trunk/libcgh.h
M trunk/libcghEx.cpp
M trunk/menuitem.cpp
M trunk/menuitem.h
M trunk/menus.h
M trunk/music.h
M trunk/scorec.h
M trunk/scoresystem.h
M trunk/towernbullet.h
Diffstat (limited to 'towernbullet.h')
| -rw-r--r-- | towernbullet.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/towernbullet.h b/towernbullet.h index 7dad226..ab0c2b6 100644 --- a/towernbullet.h +++ b/towernbullet.h @@ -8,7 +8,7 @@ //I found the rendering code stupid so I MUST rewrite it RIGHT NOW. // --Announcement from Chirsno #include "effects.h" -static const char* TOWERNBULLET_H_FN="towernbullet.h"; +//static const char* TOWERNBULLET_H_FN="towernbullet.h"; void DirectBullet(Bullet &a,double rad) { @@ -1394,8 +1394,10 @@ void ProcessTower8() } int pnt=CreateBullet8(tower[i].towerpos.x,tower[i].towerpos.y,tower[i].bulletspeed,tower[i].effect); if (Dis8ref) - if (tower[i].towerpos.y<300) - DirectBullet(bullet[pnt],-pi/2);else DirectBullet(bullet[pnt],pi/2); + { + if (tower[i].towerpos.y<300) + DirectBullet(bullet[pnt],-pi/2);else DirectBullet(bullet[pnt],pi/2); + } if (tower[i].curshotcount==tower[i].shotcount) tower[i].tdir=bullet[pnt].bulletdir; else @@ -1846,7 +1848,6 @@ public: { Bullets[i].bulletpos=vector2d(3+Centre.x+range*sin(radian-i*(2*pi/BCnt))-6, 3+Centre.y-range*cos(radian-i*(2*pi/BCnt))-6); - TextureRect rct=GetTextureRect(0,_Col); Bullets[i].aC=_Col;Bullets[i].aC2=_Col2; Bullets[i].rot=0; } @@ -1874,7 +1875,6 @@ class BulletSine private: Bullet headb; vector2d a,b,lastgenerated; - double theta; Bullet* generated[400]; int gencnt; bool OutOfBound() @@ -1889,7 +1889,6 @@ public: a=_a;b=_b;lastgenerated=_a; CreateBullet2(headb,a.x,a.y,6,0); headb.redir(b); - theta=(a.y-b.y,a.x-b.x); active=true;memset(generated,0,sizeof(generated)); gencnt=0; } |