From 4e09b4c2e92806dc3230e6b9f1c2a1ff023c6080 Mon Sep 17 00:00:00 2001
From: Oxore <oxore@protonmail.com>
Date: Sat, 2 Dec 2017 18:07:04 +0300
Subject: Rearrange includes; replace uint8_t by char

---
 include/common.h    | 23 ++++++-----------------
 include/functions.h |  6 ------
 include/text.h      |  3 ---
 3 files changed, 6 insertions(+), 26 deletions(-)

(limited to 'include')

diff --git a/include/common.h b/include/common.h
index 136edaa..4452bf0 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,19 +1,10 @@
-#ifndef TCOMMON_H
-#define TCOMMON_H
-
-#include <SFML/Audio.h>
-#include <SFML/Graphics.h>
-#include <SFML/System.h>
-#include <SFML/Window/Keyboard.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <time.h>
-#include "tet_conf.h"
+/*
+ *  Types
+ *
+ * */
 
 typedef struct Cell {
-    uint8_t a; // active/empty state of cell
+    char a; // active/empty state of cell
     sfColor fColor; // fill color
 } Cell;
 
@@ -34,7 +25,7 @@ typedef struct Shape {
     int y; // y coord of shape's bottom
     int t; // shape type
     sfColor fColor; // shape color
-    uint8_t c[4][4]; // array of logic shape cells
+    char c[4][4]; // array of logic shape cells
     sfRectangleShape *p[4][4]; // array of physical shape cells
     sfVector2f cSize; // shape rectangles size variable x/y
 } Shape; 
@@ -87,5 +78,3 @@ typedef struct Text {
     char *text;
     void *sfText;
 } Text;
-
-#endif
diff --git a/include/functions.h b/include/functions.h
index 8658aa5..73979e5 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1,7 +1,3 @@
-#ifndef TFUNCTIONS_H
-#define TFUNCTIONS_H
-
-/* Prototypes of functions*/
 void tKeyCtrl();
 void initFld();
 void tTick();
@@ -26,5 +22,3 @@ void genNextShape();
 void copyShape(Shape *localSh);
 void drawNextShape();
 void freeFld();
-
-#endif
diff --git a/include/text.h b/include/text.h
index 7948c51..1171a51 100644
--- a/include/text.h
+++ b/include/text.h
@@ -1,6 +1,3 @@
-#include <SFML/Graphics.h>
-#include "common.h"
-
 FILE *openFile(char *filename);
 void checkArgs(int argc, char **argv);
 KeyMap *KeyMap_getLast(KeyMap **keyMap);
-- 
cgit v1.2.3