From 8e4060bc99fabf8c9e0d11f2eebe2aaea9c7ec48 Mon Sep 17 00:00:00 2001
From: Edi De Candido <decandidoedi@gmail.com>
Date: Tue, 23 May 2023 15:41:23 +0200
Subject: [PATCH] kity

---
 Makefile         | 4 ++--
 inc/custom_shm.h | 2 ++
 inc/custom_sig.h | 2 ++
 inc/forza4.h     | 2 ++
 inc/server.h     | 2 ++
 inc/structures.h | 8 --------
 src/custom_sig.c | 2 ++
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 7627c99..04c2bea 100644
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,8 @@ ARGSCLIENT2			:= Molla
 OPEN_NEW_TERMINAL	:= kitty
 
 test: comp
-	$(OPEN_NEW_TERMINAL) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT1)
-	$(OPEN_NEW_TERMINAL) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT2)
+	$(OPEN_NEW_TERMINAL) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT1) |\
+	$(OPEN_NEW_TERMINAL) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT2) |\
 	./$(TARGET1) $(ARGSSERVER)
 
 comp: server_c client_c
diff --git a/inc/custom_shm.h b/inc/custom_shm.h
index f6ecc07..a016c18 100644
--- a/inc/custom_shm.h
+++ b/inc/custom_shm.h
@@ -3,6 +3,8 @@
 
 #include <structures.h>
 
+int _SHMID;
+
 int getShmid(int row, int col);
 tile_t * shmServerAt(int shmid);
 tile_t * shmClientAt(int shmid); 
diff --git a/inc/custom_sig.h b/inc/custom_sig.h
index 541ca9c..59c827e 100644
--- a/inc/custom_sig.h
+++ b/inc/custom_sig.h
@@ -3,6 +3,8 @@
 
 #define TIME_TO_RESET 2
 
+pid_t _PIDS[2];
+
 void sigHandlerServer(int sig);
 void setupServerSignalHandler();
 
diff --git a/inc/forza4.h b/inc/forza4.h
index 52df3ff..ee10e5e 100644
--- a/inc/forza4.h
+++ b/inc/forza4.h
@@ -8,6 +8,8 @@
 #define DIAGONAL        _COLLUMS - 1
 #define DIAGONAL_INV    _COLLUMS + 1
 
+tile_t *_BOARD;
+
 // global variable
 static int _ROWS;
 static int _COLLUMS;
diff --git a/inc/server.h b/inc/server.h
index b39faad..64337ba 100644
--- a/inc/server.h
+++ b/inc/server.h
@@ -3,6 +3,8 @@
 
 #include <structures.h>
 
+input_server_t _INPUT_S;
+
 input_server_t check_input(int argc, char *argv[]);
 
 #endif
\ No newline at end of file
diff --git a/inc/structures.h b/inc/structures.h
index acfab9e..ef27f35 100644
--- a/inc/structures.h
+++ b/inc/structures.h
@@ -32,12 +32,4 @@ typedef enum {
     PLAYER2
 } tile_t;
 
-int _SHMID;
-
-tile_t *_BOARD;
-
-pid_t _PIDS[2];
-
-input_server_t _INPUT_S;
-
 #endif
\ No newline at end of file
diff --git a/src/custom_sig.c b/src/custom_sig.c
index cc863d4..b960c0c 100644
--- a/src/custom_sig.c
+++ b/src/custom_sig.c
@@ -11,6 +11,8 @@
 #include <errExit.h>
 #include <custom_msgq.h>
 #include <custom_sem.h>
+#include <custom_shm.h>
+#include <forza4.h>
 
 static int sigint_count = 2;