Mercurial > molko

changeset 460:8fa69c770569

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
examples: fix
author David Demelier <markand@malikania.fr>
date Mon, 27 Feb 2023 09:14:27 +0100
parents 541cb950997b
children d7874f11565f
files libmlk-example/mlk/example/spell-fire.c libmlk-rpg/mlk/rpg/battle-bar-default.c libmlk-rpg/mlk/rpg/battle-entity-state-attacking.c libmlk-rpg/mlk/rpg/battle-entity-state-blinking.c libmlk-rpg/mlk/rpg/battle-entity-state-moving.c libmlk-rpg/mlk/rpg/battle-state-ai.c libmlk-rpg/mlk/rpg/battle-state-attacking.c libmlk-rpg/mlk/rpg/battle-state-check.c libmlk-rpg/mlk/rpg/battle-state-closing.c libmlk-rpg/mlk/rpg/battle-state-menu.c libmlk-rpg/mlk/rpg/battle-state-opening.c libmlk-rpg/mlk/rpg/battle-state-rendering.c libmlk-rpg/mlk/rpg/battle-state-selection.c libmlk-rpg/mlk/rpg/battle.c
diffstat 14 files changed, 26 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/libmlk-example/mlk/example/spell-fire.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-example/mlk/example/spell-fire.c	Mon Feb 27 09:14:27 2023 +0100
@@ -86,7 +86,7 @@
 static void
 finish(struct mlk_drawable *dw)
 {
-	free(dw->data);
+	mlk_alloc_free(dw->data);
 }
 
 static void
--- a/libmlk-rpg/mlk/rpg/battle-bar-default.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-bar-default.c	Mon Feb 27 09:14:27 2023 +0100
@@ -556,7 +556,11 @@
 
 	(void)bt;
 
-	bar->items = mlk_alloc_renew0(bar->items, CHARACTER_SPELL_MAX);
+	if (!bar->items)
+		bar->items = mlk_alloc_new0(CHARACTER_SPELL_MAX, sizeof (*bar->items));
+	else
+		bar->items = mlk_alloc_renew0(bar->items, CHARACTER_SPELL_MAX);
+	
 	bar->itemsz = CHARACTER_SPELL_MAX;
 	bar->state = BATTLE_BAR_DEFAULT_STATE_GRID;
 
--- a/libmlk-rpg/mlk/rpg/battle-entity-state-attacking.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-entity-state-attacking.c	Mon Feb 27 09:14:27 2023 +0100
@@ -52,7 +52,7 @@
 {
 	(void)et;
 
-	free(st->data);
+	mlk_alloc_free(st->data);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle-entity-state-blinking.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-entity-state-blinking.c	Mon Feb 27 09:14:27 2023 +0100
@@ -50,7 +50,7 @@
 {
 	(void)et;
 
-	free(st->data);
+	mlk_alloc_free(st->data);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle-entity-state-moving.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-entity-state-moving.c	Mon Feb 27 09:14:27 2023 +0100
@@ -63,7 +63,7 @@
 {
 	(void)et;
 
-	free(st->data);
+	mlk_alloc_free(st->data);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle-state-ai.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state-ai.c	Mon Feb 27 09:14:27 2023 +0100
@@ -50,7 +50,7 @@
 {
 	(void)bt;
 
-	free(st);
+	mlk_alloc_free(st);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle-state-attacking.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state-attacking.c	Mon Feb 27 09:14:27 2023 +0100
@@ -72,7 +72,7 @@
 {
 	(void)bt;
 
-	free(st->data);
+	mlk_alloc_free(st->data);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle-state-check.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state-check.c	Mon Feb 27 09:14:27 2023 +0100
@@ -75,7 +75,7 @@
 static void
 fadeout_finish(struct mlk_drawable *dw)
 {
-	free(dw->data);
+	mlk_alloc_free(dw->data);
 }
 
 static void
@@ -164,7 +164,7 @@
 {
 	(void)bt;
 
-	free(st);
+	mlk_alloc_free(st);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle-state-closing.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state-closing.c	Mon Feb 27 09:14:27 2023 +0100
@@ -57,7 +57,7 @@
 	(void)bt;
 
 	battle_state_closing_finish(st->data);
-	free(st->data);
+	mlk_alloc_free(st->data);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle-state-menu.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state-menu.c	Mon Feb 27 09:14:27 2023 +0100
@@ -57,7 +57,7 @@
 {
 	(void)bt;
 
-	free(st);
+	mlk_alloc_free(st);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle-state-opening.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state-opening.c	Mon Feb 27 09:14:27 2023 +0100
@@ -58,7 +58,7 @@
 {
 	(void)bt;
 
-	free(st->data);
+	mlk_alloc_free(st->data);
 }
 
 int
--- a/libmlk-rpg/mlk/rpg/battle-state-rendering.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state-rendering.c	Mon Feb 27 09:14:27 2023 +0100
@@ -50,7 +50,7 @@
 	(void)bt;
 
 	battle_state_rendering_finish(st->data);
-	free(st->data);
+	mlk_alloc_free(st->data);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle-state-selection.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state-selection.c	Mon Feb 27 09:14:27 2023 +0100
@@ -161,7 +161,7 @@
 {
 	(void)bt;
 
-	free(st->data);
+	mlk_alloc_free(st->data);
 }
 
 void
--- a/libmlk-rpg/mlk/rpg/battle.c	Sun Feb 26 19:44:47 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle.c	Mon Feb 27 09:14:27 2023 +0100
@@ -77,7 +77,7 @@
 	struct indicator *id = dw->data;
 
 	battle_indicator_finish(&id->bti);
-	free(id);
+	mlk_alloc_free(id);
 }
 
 static struct battle_entity *
@@ -267,8 +267,13 @@
 	struct battle_entity **porder;
 
 	/* Create a pointer list to every entity. */
-	bt->order = mlk_alloc_renew0(bt->order, bt->teamsz + bt->enemiesz);
 	bt->ordersz = bt->teamsz + bt->enemiesz;
+
+	if (!bt->order)
+		bt->order = mlk_alloc_new0(bt->ordersz, sizeof (*bt->order));
+	else
+		bt->order = mlk_alloc_renew0(bt->order, bt->ordersz);
+
 	bt->ordercur = porder = bt->order;
 
 	for (size_t i = 0; i < bt->teamsz; ++i)
@@ -496,6 +501,6 @@
 	if (bt->state)
 		battle_state_finish(bt->state, bt);
 
-	free(bt->order);
+	mlk_alloc_free(bt->order);
 	memset(bt, 0, sizeof (*bt));
 }