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

Merge branch 'dev' into shops 

Conflicts:
	src/artifact.c
This commit is contained in:
Linus Probert 2019-03-06 22:30:17 +01:00
parent 63812fbe05 9b4a7b6cfc
commit 6009aa17f1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/artifact.c
View File

@ -219,7 +219,7 @@ artifact_render(Artifact *a, Camera *cam)
Position pos = a->sprite->pos; Position pos = a->sprite->pos;
pos.x += 4; pos.x += 4;
pos.y += 4; pos.y += 4;
particle_engine_sparkle(pos, (Dimension) { 24, 24 }, C_PURPLE, false); particle_engine_sparkle(pos, DIM(24, 24), C_PURPLE, false);
if (a->priceSprite) if (a->priceSprite)
sprite_render(a->priceSprite, cam); sprite_render(a->priceSprite, cam);
} }

2
src/map.c
View File

@ -445,7 +445,7 @@ map_destroy(Map *map)
artifact_destroy(linkedlist_pop(&map->artifacts)); artifact_destroy(linkedlist_pop(&map->artifacts));
while (map->objects != NULL) while (map->objects != NULL)
artifact_destroy(linkedlist_pop(&map->objects)); object_destroy(linkedlist_pop(&map->objects));
timer_destroy(map->monsterMoveTimer); timer_destroy(map->monsterMoveTimer);
free(map); free(map);