Mercurial > molko

diff libmlk-rpg/mlk/rpg/battle.c @ 449:f2f0e73ea9da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: drawable -> mlk_drawable
author David Demelier <markand@malikania.fr>
date Sat, 18 Feb 2023 13:16:40 +0100
parents 773a082f0b91
children b26dd49f69ff
line wrap: on
line diff
--- a/libmlk-rpg/mlk/rpg/battle.c	Sat Feb 18 13:06:04 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle.c	Sat Feb 18 13:16:40 2023 +0100
@@ -51,12 +51,12 @@
 #include "spell.h"
 
 struct indicator {
-	struct drawable dw;
+	struct mlk_drawable dw;
 	struct battle_indicator bti;
 };
 
 static int
-indicator_update(struct drawable *dw, unsigned int ticks)
+indicator_update(struct mlk_drawable *dw, unsigned int ticks)
 {
 	struct indicator *id = dw->data;
 
@@ -64,7 +64,7 @@
 }
 
 static void
-indicator_draw(struct drawable *dw)
+indicator_draw(struct mlk_drawable *dw)
 {
 	const struct indicator *id = dw->data;
 
@@ -72,7 +72,7 @@
 }
 
 static void
-indicator_free(struct drawable *dw)
+indicator_free(struct mlk_drawable *dw)
 {
 	struct indicator *id = dw->data;
 
@@ -408,8 +408,8 @@
 
 	battle_indicator_start(&id->bti);
 
-	if (drawable_stack_add(bt->effects, &id->dw) < 0)
-		drawable_finish(&id->dw);
+	if (mlk_drawable_stack_add(bt->effects, &id->dw) < 0)
+		mlk_drawable_finish(&id->dw);
 }
 
 void
@@ -447,7 +447,7 @@
 	if ((comp & BATTLE_COMPONENT_ACTIONS) && bt->actions)
 		mlk_action_stack_update(bt->actions, ticks);
 	if ((comp & BATTLE_COMPONENT_DRAWABLES) && bt->effects)
-		drawable_stack_update(bt->effects, ticks);
+		mlk_drawable_stack_update(bt->effects, ticks);
 }
 
 int
@@ -477,7 +477,7 @@
 	if ((comp & BATTLE_COMPONENT_ACTIONS) && bt->actions)
 		mlk_action_stack_draw(bt->actions);
 	if ((comp & BATTLE_COMPONENT_DRAWABLES) && bt->effects)
-		drawable_stack_draw(bt->effects);
+		mlk_drawable_stack_draw(bt->effects);
 }
 
 void