80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

Merge remote-tracking branch 'upstream/master' into stage3

Browse source 
Conflicts:
	src/enemy.c
This commit is contained in:
Andrew "Akari" Alexeyew 2012-07-19 20:59:08 +03:00
commit 55ebc35247
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/boss.c
View file

@ -125,6 +125,7 @@ void process_boss(Boss *boss) {
if(boss->current->type != AT_Move && boss->dmg >= boss->current->dmglimit)
time = boss->current->timeout + 1;
if(time > boss->current->timeout) {
boss->current->rule(boss, EVENT_DEATH);
boss->dmg = boss->current->dmglimit + 1;
boss->current++;
if(boss->current - boss->attacks < boss->acount)

7
src/enemy.c
View file

@ -84,6 +84,13 @@ void draw_enemies(Enemy *enemies) {
}
}
void killall(Enemy *enemies) {
Enemy *e;
for(e = enemies; e; e = e->next)
e->hp = 0;
}
int enemy_flare(Projectile *p, int t) { // a[0] timeout, a[1] velocity, a[2] ref to enemy
if(t >= creal(p->args[0]) || REF(p->args[2]) == NULL) {
return ACTION_DESTROY;

2
src/enemy.h
View file

@ -58,6 +58,8 @@ void delete_enemies(Enemy **enemies);
void process_enemies(Enemy **enemies);
void killall(Enemy *enemies);
void Fairy(Enemy*, int t);
void Swirl(Enemy*, int t);
void BigFairy(Enemy*, int t);