From 11cd6a8ac4d077b4d082021e1dcc6c6e48bd89d8 Mon Sep 17 00:00:00 2001
From: Oxore <oxore@protonmail.com>
Date: Wed, 11 Jul 2018 01:52:05 +0300
Subject: Fix start level after gameover, refactor a bit

Set start level to 1 after gameover.
Rename function for acquiring current level latency.
Remove old font loading in main.c.
---
 src/engine.c | 8 ++++----
 src/main.c   | 7 -------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/engine.c b/src/engine.c
index df3aed1..59de551 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -90,7 +90,7 @@ static void render_level_value(void *obj)
     }
 }
 
-static int getMoveLatencyOfLevel(unsigned int level)
+static int get_level_latency(unsigned int level)
 {
     if (level > 29)
         return level_move_latency[29];
@@ -103,7 +103,7 @@ static void level_up(struct game *game)
     while (game->lines >= LEVELUP_LINES) {
         game->level++;
         game->lines -= LEVELUP_LINES;
-        game->moveLatency = getMoveLatencyOfLevel(game->level);
+        game->moveLatency = get_level_latency(game->level);
     }
 }
 
@@ -153,8 +153,8 @@ static void transition_game_over()
 {
     game.isStarted = 0;
     game.scoreCurrent = 0;
-    game.level = 0;
-    game.moveLatency = L00LATENCY;
+    game.level = 1;
+    game.moveLatency = get_level_latency(game.level);
     game.lines = 0;
 
     nxt.attr |= FLD_ATTR_INVISIBLE;
diff --git a/src/main.c b/src/main.c
index df98a0b..89754ff 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,7 +19,6 @@
 sfRenderWindow *window;
 struct idlist *texts;
 
-sfFont       *fontScore;
 struct field  fld, nxt;
 struct game   game = {
     .isStarted = 0,
@@ -54,11 +53,6 @@ int main()
     game.repKeyLeft = sfClock_create();
     game.repKeyRight = sfClock_create();
     painter_load_font("dat/arial.ttf");
-    fontScore = sfFont_createFromFile("dat/arial.ttf");
-    if (!fontScore) {
-        printf("%s font load failed", "dat/arial.ttf");
-        exit(EXIT_FAILURE);
-    }
 
     sfVideoMode mode = (sfVideoMode){450, 570, 32};
     window = sfRenderWindow_create(mode, windowName_conf, sfResize | sfClose, NULL);
@@ -111,7 +105,6 @@ int main()
         sfRenderWindow_destroy(window);
         window = 0;
     }
-    sfFont_destroy(fontScore);
     painter_destroy_font();
     sfClock_destroy(game.gameTick);
     sfClock_destroy(game.putTick);
-- 
cgit v1.2.3