diff options
| author | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2024-01-27 13:54:57 +0100 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2024-01-27 17:38:11 +0100 |
| commit | b4f904ecdcf6b0857d28ab4a877ad0f3468153f7 (patch) | |
| tree | 656b7c75ff57963e18dac972e38baf9ba3d46ddb /src/instance | |
| parent | 69f753d26f44c28668d23e0ba40bb3994141df82 (diff) | |
| download | jancity-b4f904ecdcf6b0857d28ab4a877ad0f3468153f7.tar.gz | |
Remove hp
Diffstat (limited to 'src/instance')
| -rw-r--r-- | src/instance/inc/instance.h | 10 | ||||
| -rw-r--r-- | src/instance/src/instance.c | 13 |
2 files changed, 1 insertions, 22 deletions
diff --git a/src/instance/inc/instance.h b/src/instance/inc/instance.h index ca8a606..c6f20d2 100644 --- a/src/instance/inc/instance.h +++ b/src/instance/inc/instance.h @@ -12,17 +12,12 @@ extern "C" { #endif -typedef unsigned int instance_hp; - struct instance { - bool alive, dying; - unsigned int hp; + bool alive; struct util_rect r; }; -typedef bool (*instance_attacked_cb)(struct instance *i, unsigned int ap); -typedef bool (*instance_sheltered_cb)(struct instance *self, struct instance *other); typedef void (*instance_done_cb)(struct instance *i, void *op); struct instance_render_cfg @@ -48,15 +43,12 @@ struct instance_render_cfg } prim; bool sel; - instance_hp max_hp; const struct instance_render_off { short x, y; } *off; }; -bool instance_attacked(struct instance *self, unsigned int ap); -void instance_clear_pools(void); int instance_render(const struct instance_render_cfg *cfg); int instance_render_target(const struct instance *const i, const struct camera *cam); void instance_cyclic(void); diff --git a/src/instance/src/instance.c b/src/instance/src/instance.c index 7fcd9b4..1e9e039 100644 --- a/src/instance/src/instance.c +++ b/src/instance/src/instance.c @@ -8,19 +8,6 @@ static unsigned char line_g; static bool line_g_flip; -bool instance_attacked(struct instance *const self, const instance_hp ap) -{ - if (self->hp > ap) - self->hp -= ap; - else - { - self->hp = 0; - self->alive = false; - } - - return !self->alive; -} - void instance_cyclic(void) { if (!line_g_flip) |
