Mercurial > molko
comparison libmlk-rpg/mlk/rpg/battle-state-check.c @ 438:25a56ca53ac2
core: update mlk-alloc module
author | David Demelier <markand@malikania.fr> |
---|---|
date | Mon, 17 Oct 2022 14:22:07 +0200 |
parents | 4e78f045e8c0 |
children | 9c3b3935f0aa |
comparison
equal
deleted
inserted
replaced
437:e1eebc6bf25d | 438:25a56ca53ac2 |
---|---|
86 if (!bt->effects) { | 86 if (!bt->effects) { |
87 tracef("can't create a fadeout effect without a drawable_stack"); | 87 tracef("can't create a fadeout effect without a drawable_stack"); |
88 return; | 88 return; |
89 } | 89 } |
90 | 90 |
91 fade = alloc_new0(sizeof (*fade)); | 91 fade = mlk_alloc_new0(sizeof (*fade)); |
92 fade->ch = et->ch; | 92 fade->ch = et->ch; |
93 fade->x = et->x; | 93 fade->x = et->x; |
94 fade->y = et->y; | 94 fade->y = et->y; |
95 fade->alpha = 250; | 95 fade->alpha = 250; |
96 fade->dw.data = fade; | 96 fade->dw.data = fade; |
97 fade->dw.draw = fadeout_draw; | 97 fade->dw.draw = fadeout_draw; |
98 fade->dw.update = fadeout_update; | 98 fade->dw.update = fadeout_update; |
99 fade->dw.finish = fadeout_finish; | 99 fade->dw.finish = fadeout_finish; |
100 | 100 |
101 if (drawable_stack_add(bt->effects, &fade->dw) < 0) | 101 if (drawable_stack_add(bt->effects, &fade->dw) < 0) |
102 free(fade); | 102 mlk_alloc_free(fade); |
103 } | 103 } |
104 | 104 |
105 static int | 105 static int |
106 is_dead(const struct battle *bt) | 106 is_dead(const struct battle *bt) |
107 { | 107 { |
195 { | 195 { |
196 assert(battle_ok(bt)); | 196 assert(battle_ok(bt)); |
197 | 197 |
198 struct battle_state *self; | 198 struct battle_state *self; |
199 | 199 |
200 self = alloc_new0(sizeof (*self)); | 200 self = mlk_alloc_new0(sizeof (*self)); |
201 self->data = bt; | 201 self->data = bt; |
202 self->update = update; | 202 self->update = update; |
203 self->draw = draw; | 203 self->draw = draw; |
204 self->finish = finish; | 204 self->finish = finish; |
205 | 205 |