summaryrefslogtreecommitdiff
path: root/src/painter.c
diff options
context:
space:
mode:
authorOxore <oxore@protonmail.com>2019-07-28 21:23:27 +0300
committerOxore <oxore@protonmail.com>2019-07-28 22:03:03 +0300
commit1a0886d852bb8a0d9428dc6f54c1e503d06073a0 (patch)
tree0b49cd355b514f4bd5877f08a41fad7f6269a3e1 /src/painter.c
parenteae3a50f9c791c9aa7dae39cc87d63e0488c4cee (diff)
Refactor idlist, move all global vars to local scope
- Replace list_foreach with LIST_FOREACH macro. - Remove `game` global variable and make it local everywhere. - Move global vars `fld`, `nxt` and `texts` into `game` struct. - Add `static` qualifier to engine.c's specific global vars. - Move `sfRenderWindow window` global var to local scope
Diffstat (limited to 'src/painter.c')
-rw-r--r--src/painter.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/painter.c b/src/painter.c
index a9029b1..5c4a0db 100644
--- a/src/painter.c
+++ b/src/painter.c
@@ -248,7 +248,11 @@ static void draw_drawable(void *obj)
void painter_draw()
{
sfRenderWindow_clear(window, (sfColor)UIBGCOLOR);
- list_foreach(drawables, draw_drawable);
+
+ LIST_FOREACH(drawables, drawable) {
+ draw_drawable(drawable->obj);
+ }
+
sfRenderWindow_display(window);
}
@@ -278,7 +282,10 @@ void painter_destroy_drawable(size_t id)
void painter_destroy_drawables()
{
- list_foreach(drawables, destroy_drawable);
+ LIST_FOREACH(drawables, drawable) {
+ destroy_drawable(drawable->obj);
+ }
+
list_destroy(drawables);
drawables = 0;
}