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

Init debris and flesh chunks.

This commit is contained in:
Steve 2018-02-05 08:37:54 +00:00
parent d10356c42c
commit 20404fd6eb
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/entities/decoration/debris.c
View File

@ -24,11 +24,9 @@ static void tick(void);
static void action(void); static void action(void);
static void touch(Entity *other); static void touch(Entity *other);
void initDebris(Entity *e) void initDebris(Decoration *d)
{ {
Decoration *d; initEntity((Entity*)d);
initEntity(e);
d = (Decoration*)self; d = (Decoration*)self;

8
src/entities/decoration/fleshChunk.c
View File

@ -24,13 +24,9 @@ static void tick(void);
static void action(void); static void action(void);
static void touch(Entity *other); static void touch(Entity *other);
void initFleshChunk(Entity *e) void initFleshChunk(Decoration *d)
{ {
Decoration *d; initEntity((Entity*)d);
initEntity(e);
d = (Decoration*)e;
d->type = ET_DECORATION; d->type = ET_DECORATION;

10
src/world/effects.c
View File

@ -44,8 +44,7 @@ void addSmallFleshChunk(float x, float y)
chunk = malloc(sizeof(Decoration)); chunk = malloc(sizeof(Decoration));
memset(chunk, 0, sizeof(Decoration)); memset(chunk, 0, sizeof(Decoration));
world.entityTail->next = (Entity*)chunk; initFleshChunk(chunk);
world.entityTail = (Entity*)chunk;
chunk->x = x; chunk->x = x;
chunk->y = y; chunk->y = y;
@ -53,6 +52,8 @@ void addSmallFleshChunk(float x, float y)
chunk->dy = 0; chunk->dy = 0;
chunk->health = FPS / 4; chunk->health = FPS / 4;
chunk->sprite[0] = chunk->sprite[1] = chunk->sprite[2] = fleshChunk[0]; chunk->sprite[0] = chunk->sprite[1] = chunk->sprite[2] = fleshChunk[0];
chunk->spriteFrame = 0;
} }
void throwFleshChunks(float x, float y, int amount) void throwFleshChunks(float x, float y, int amount)
@ -64,8 +65,7 @@ void throwFleshChunks(float x, float y, int amount)
{ {
chunk = malloc(sizeof(Decoration)); chunk = malloc(sizeof(Decoration));
memset(chunk, 0, sizeof(Decoration)); memset(chunk, 0, sizeof(Decoration));
world.entityTail->next = (Entity*)chunk; initFleshChunk(chunk);
world.entityTail = (Entity*)chunk;
chunk->x = x; chunk->x = x;
chunk->y = y; chunk->y = y;
@ -73,6 +73,8 @@ void throwFleshChunks(float x, float y, int amount)
chunk->dy = -rrnd(10, 15); chunk->dy = -rrnd(10, 15);
chunk->health = FPS * rrnd(3, 12); chunk->health = FPS * rrnd(3, 12);
chunk->sprite[0] = chunk->sprite[1] = chunk->sprite[2] = fleshChunk[i % 3]; chunk->sprite[0] = chunk->sprite[1] = chunk->sprite[2] = fleshChunk[i % 3];
chunk->spriteFrame = 0;
} }
} }

1
src/world/effects.h
View File

@ -22,5 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern int rrnd(int low, int high); extern int rrnd(int low, int high);
extern Sprite *getSprite(char *name); extern Sprite *getSprite(char *name);
extern void initFleshChunk(Decoration *d);
extern World world; extern World world;