sdl ui refactor

4 files changed, 18 insertions, 13 deletions

diff --git a/lib/cetris.c b/lib/cetris.c
index 35d92e3..38fd07b 100644
--- a/lib/cetris.c
+++ b/lib/cetris.c
@@ -485,23 +485,17 @@ CETRIS_EXPORT void init_game(cetris_game *g, cetris_config* c) {
 #endif
 
   cetris_config config;
-  if (!c) {
-    config = g->config;
-  } else {
-    config = *c;
-  }
+  if (!c) config = g->config;
+  else config = *c;
 
   // check for config errorsa
-  if (config.next_piece_delay < config.line_delay_clear) {
+  if (config.next_piece_delay < config.line_delay_clear)
     config.next_piece_delay = config.line_delay_clear;
-  }
 
-  if (!config.wait_on_clear) {
+  if (!config.wait_on_clear)
     config.next_piece_delay = 0;
-  }
 
   memset(g, 0, sizeof(cetris_game));
-
   memcpy(&g->config, &config, sizeof(cetris_config));
 
   g->board = (uint8_t **)malloc(sizeof(uint8_t *) * config.board_x);
@@ -513,8 +507,8 @@ CETRIS_EXPORT void init_game(cetris_game *g, cetris_config* c) {
   g->line_remove_tick = (ctick *)malloc(sizeof(ctick) * config.board_y);
   memset(g->line_remove_tick, 0, sizeof(ctick) * config.board_y);
 
-  g->level = config.starting_level;
   g->waiting = true;
+  g->level = config.starting_level;
 
   g->highest_line = config.board_y;
 
diff --git a/lib/cetris.h b/lib/cetris.h
index 523b867..8841df2 100644
--- a/lib/cetris.h
+++ b/lib/cetris.h
@@ -96,7 +96,8 @@ typedef struct {
   bool wait_on_clear;
 
   ctick *levels;
-  
+
+  // variable win condition
   bool (*win_condition)(cetris_game *);
 } cetris_config;
 
@@ -143,7 +144,7 @@ struct cetris_game {
   uint8_t line_combo;
   bool game_over;
 
-  // events 
+    // events 
   uint8_t line_event;
   uint8_t lock_event;
   uint8_t tetris_event;
diff --git a/lib/rules.h b/lib/rules.h
index 190e4b7..9d78086 100644
--- a/lib/rules.h
+++ b/lib/rules.h
@@ -1,3 +1,6 @@
+#ifndef RULES_H
+#define RULES_H
+
 #include <cetris.h>
 
 cetris_config tetris_ds_config;
@@ -5,3 +8,5 @@ ctick tetris_worlds_levels[20];
 
 bool twenty_line_sprint(cetris_game *g);
 bool forty_line_sprint(cetris_game *g);
+
+#endif /* RULES_H */
diff --git a/lib/timer.h b/lib/timer.h
index 2f29c84..f1f8d5d 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -1,4 +1,9 @@
+#ifndef TIMER_H
+#define TIMER_H
+
 #include <cetris.h>
 
 CETRIS_EXPORT void cetris_start_game(cetris_game *g);
 CETRIS_EXPORT void cetris_stop_game(cetris_game *g);
+
+#endif /* TIMER_H */