fixed issues with merge

src/Makefile

@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -Wextra -pedantic -std=c99
+CFLAGS = -ggdb -Wall -Wextra -pedantic -std=c99
 
 ifeq ($(OS),Windows_NT)
 	CFLAGS += -lpdcurses
@@ -7,7 +7,7 @@ else
 	CFLAGS += -lncurses
 endif
 
-FalloutTerminal: main.o print.o intro.o pass.o
+FalloutTerminal: main.o print.o intro.o pass.o fileParse.o
 	$(CC) -o $@ $^ $(CFLAGS) 
 
 main.o: main.c intro.c pass.c
@@ -18,6 +18,8 @@ print.o: print.c
 
 pass.o: pass.c print.c
 
+fileParse.o: fileParse.c
+
 clean:
 	rm -f *.o FalloutTerminal
 	#TODO conditional for Windows

src/main.c

@@ -8,10 +8,9 @@
 #include <time.h>
 #include "intro.h"
 #include "pass.h"
+#include "fileParse.h"
 
-int main(){
-
-    // TODO  get input from args here. Pass it to pass
+int main(int argc, char * argv[]){
 
     srand ( (unsigned)time(NULL) );
     initscr();
@@ -26,8 +25,17 @@ int main(){
         attron(COLOR_PAIR(1));
     }
 
+    FILE *fp = NULL;
+
+    if(argc > 1)
+        fp = fopen(argv[1], "r");
+
+    readFile(fp);
+
     intro();
     pass();
+
     
     return 0;
 }
+

src/pass.c

@@ -533,32 +533,3 @@ void pass(){
     endwin();
     exit(0);
 }
-
-int main(int argc, char * argv[]){
-
-    srand ( (unsigned)time(NULL) );
-    initscr();
-    noecho();
-    refresh();
-    attron(A_BOLD);
-    nodelay(stdscr, 1);
-    if(has_colors() == 1){
-        /* Colors */
-        start_color();
-        init_pair(1,COLOR_GREEN,COLOR_BLACK);
-        attron(COLOR_PAIR(1));
-    }
-
-    FILE *fp = NULL;
-
-    if(argc > 1)
-        fp = fopen(argv[1], "r");
-
-    readFile(fp);
-
-    intro();
-    pass();
-
-    
-    return 0;
-}