Only use entity color if use_color = true

[dungeon_game.git] / plugins / monster / monster.c

diff --git a/plugins/monster/monster.c b/plugins/monster/monster.c
index 6cb14ffd49de7ec60e72df098db0bb0801235b30..02957da9abd6d52e2bbe5afd1c4524ff6b449c8a 100644 (file)
--- a/plugins/monster/monster.c
+++ b/plugins/monster/monster.c
@@ -1,16 +1,17 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include "../game/game.h"
-
-static struct entity monster;
+#include "../score/score.h"
 
 struct monster_data
 {
        double timer;
 };
 
-static void monster_spawn(struct entity *self)
+static void monster_spawn(struct entity *self, void *data)
 {
+       (void) data;
+
        self->meta = malloc(sizeof(struct monster_data));
        ((struct monster_data *) self->meta)->timer = 0.5;
 }
@@ -26,7 +27,7 @@ static void monster_step(struct entity *self, struct entity_step_data stepdata)
        }
 }
 
-static void monster_on_collide_with_entity(struct entity *self, struct entity *other)
+static void monster_collide_with_entity(struct entity *self, struct entity *other)
 {
        if (other == &player)
                add_health(other, -1);
@@ -38,33 +39,36 @@ static void monster_death(struct entity *self)
        self->remove = true;
 }
 
+static struct entity monster_entity = {
+       .name = "monster",
+       .x = 0,
+       .y = 0,
+       .color = {0},
+       .use_color = false,
+       .texture = "👾",
+       .remove = false,
+       .meta = NULL,
+       .health = 5,
+       .max_health = 5,
+       .collide_with_entities = true,
+
+       .on_step = &monster_step,
+       .on_collide = NULL,
+       .on_collide_with_entity = &monster_collide_with_entity,
+       .on_spawn = &monster_spawn,
+       .on_remove = NULL,
+       .on_death = &monster_death,
+       .on_damage = NULL,
+};
+
+
 static void spawn_monster(int x, int y)
 {
-       spawn(monster, x, y);
+       spawn(monster_entity, x, y, NULL);
 }
 
 __attribute__((constructor)) static void init()
 {
-       monster = (struct entity) {
-               .name = "monster",
-               .x = 0,
-               .y = 0,
-               .color = get_color("#FF00F6"),
-               .texture = "👾",
-               .remove = false,
-               .meta = NULL,
-               .health = 5,
-               .max_health = 5,
-               .collide_with_entities = true,
-
-               .on_step = &monster_step,
-               .on_collide = NULL,
-               .on_collide_with_entity = &monster_on_collide_with_entity,
-               .on_spawn = &monster_spawn,
-               .on_remove = NULL,
-               .on_death = &monster_death,
-       };
-
        register_air_function((struct generator_function) {
                .chance = 50,
                .callback = &spawn_monster,