walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Use rising parameter for flames.

This commit is contained in:
Steve 2018-03-21 08:20:34 +00:00
parent a91cb02b5a
commit 4e7bbf7190
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/entities/blobs/bob.c
View File

@ -313,7 +313,7 @@ static void doBobInAir(void)
if (--world.bob->jpEffectTimer <= 0) if (--world.bob->jpEffectTimer <= 0)
{ {
addFlameParticles(world.bob->x + (world.bob->facing * 25) + rrnd(-1, 1), world.bob->y + 25 + rrnd(-1, 1)); addFlameParticles(world.bob->x + (world.bob->facing * 25) + rrnd(-1, 1), world.bob->y + 25 + rrnd(-1, 1), 0);
world.bob->jpEffectTimer = 1; world.bob->jpEffectTimer = 1;
} }

2
src/entities/blobs/bob.h
View File

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define SWIM_SPEED 3 #define SWIM_SPEED 3
#define WALK_SPEED 5 #define WALK_SPEED 5
extern void addFlameParticles(float x, float y); extern void addFlameParticles(float x, float y, int rising);
extern void addTeleportStars(Entity *e); extern void addTeleportStars(Entity *e);
extern void clearControl(int type); extern void clearControl(int type);
extern void fireGrenade(Entity *e); extern void fireGrenade(Entity *e);

2
src/entities/bullets/missile.c
View File

@ -46,7 +46,7 @@ static void tick(void)
if (b->health % 2) if (b->health % 2)
{ {
addFlameParticles(b->x + (b->facing * b->w) + rrnd(-2, 2), b->y + (b->h / 2)); addFlameParticles(b->x + (b->facing * b->w) + rrnd(-2, 2), b->y + (b->h / 2), 0);
} }
} }

2
src/entities/bullets/missile.h
View File

@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../../common.h" #include "../../common.h"
extern void addExplosion(float x, float y, int radius, Entity *owner); extern void addExplosion(float x, float y, int radius, Entity *owner);
extern void addFlameParticles(float x, float y); extern void addFlameParticles(float x, float y, int rising);
extern void initMissile(Bullet *b); extern void initMissile(Bullet *b);
extern int rrnd(int low, int high); extern int rrnd(int low, int high);

10
src/world/particles.c
View File

@ -160,6 +160,11 @@ void addSmokeParticles(float x, float y, int rising)
p->spriteTime = 5; p->spriteTime = 5;
p->spriteFrame = 0; p->spriteFrame = 0;
p->destroyAfterAnim = 1; p->destroyAfterAnim = 1;
if (rising)
{
p->dy = rrnd(-5, -1);
}
} }
void addFlameParticles(float x, float y, int rising) void addFlameParticles(float x, float y, int rising)
@ -176,6 +181,11 @@ void addFlameParticles(float x, float y, int rising)
p->spriteTime = 5; p->spriteTime = 5;
p->spriteFrame = 0; p->spriteFrame = 0;
p->destroyAfterAnim = 1; p->destroyAfterAnim = 1;
if (rising)
{
p->dy = rrnd(-5, -1);
}
} }
void addExplosionParticles(float x, float y, float radius, int amount) void addExplosionParticles(float x, float y, float radius, int amount)