merged with master

src/Makefile

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

src/intro.c

@@ -0,0 +1,71 @@
+#define _BSD_SOURCE /* for unistd.h */
+
+#ifdef _WIN32
+#   include <Windows.h>
+#   include <curses.h>
+#   define SLEEP(delay) Sleep(delay/1000)
+// Unix builds require ncurses.h for the Ncurses library.
+// Unix also requires unistd.h for usleep(microseconds).
+// usleep/1000 = Sleep
+#else
+#   include <ncurses.h>
+#   include <unistd.h>
+#   define SLEEP(delay) usleep(delay)
+#endif
+
+#include <string.h>
+
+#include "print.h"
+#include "intro.h"
+
+/// Plays the introduction sequence. 
+///
+void intro(){
+    clear();
+    SLEEP(250000);
+    
+    slowPrint("WELCOME TO ROBCO INDUSTRIES (TM) TERMLINK",strlen("WELCOME TO ROBCO INDUSTRIES (TM) TERMLINK"), 0);
+
+    move(1, 0);
+    refresh();
+    SLEEP(30000);
+    mvprintw(2,0,"%c", '>');
+    move(2,1);
+    refresh();
+    SLEEP(1500000);
+
+    slowType("SET TERMINAL/INQUIRE",strlen("SET TERMINAL/INQUIRE"), 2);
+
+    slowPrint("RIT-V300",strlen("RIT-V300"), 4);
+
+    mvprintw(6,0,"%c", '>');
+    refresh();
+    SLEEP(1500000);
+    slowType("SET FILE/PROTECTION=OWNER:RWED ACCOUNTS.F",strlen("SET FILE/PROTECTION=OWNER:RWED ACCOUNTS.F"),6);
+    
+    mvprintw(7,0,"%c", '>');
+    refresh();
+    SLEEP(1500000);
+    slowType("SET HALT RESTART/MAINT",strlen("SET HALT RESTART/MAINT"),7);
+    
+    slowPrint("Initializing Robco Industries(TM) Boot Agent v2.3.0",strlen("Initializing Robco Industries(TM) Boot Agent v2.3.0"),9);
+
+    slowPrint("RBIOS-4.02.08.00 53EE5.E7.E8",strlen("RBIOS-4.02.08.00 53EE5.E7.E8"),10);
+
+    slowPrint("Copyright 2201-22-3 Robco Ind.",strlen("Copyright 2201-22-3 Robco Ind."),11);
+
+    slowPrint( "Uppermem: 64 KB",strlen("Uppermem: 64 KB"),12);
+
+    slowPrint("Root (5A8)",strlen("Root (5A8)"),13);
+
+    slowPrint("Maintenance Mode",strlen("Maintenance Mode"),14);
+
+    mvprintw(16,0,"%c",'>');
+    refresh();
+    SLEEP(1500000);
+    slowType("RUN DEBUG/ACCOUNTS.F",strlen("RUN DEBUG/ACCOUNTS.F"),16);
+    move(16,0);
+    refresh();
+    SLEEP(50000);
+}
+

src/intro.h

@@ -0,0 +1,6 @@
+#ifndef INTRO_H
+#define INTRO_H
+
+void intro();
+
+#endif

src/main.c

@@ -0,0 +1,33 @@
+#ifdef _WIN32
+#   include <curses.h>
+#else
+#   include <ncurses.h>
+#endif
+
+#include <stdlib.h>
+#include <time.h>
+#include "intro.h"
+#include "pass.h"
+
+int main(){
+
+    // TODO  get input from args here. Pass it to pass
+
+    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));
+    }
+
+    intro();
+    pass();
+    
+    return 0;
+}

src/FalloutTerminal.c → src/pass.c

@@ -1,7 +1,5 @@
 #define _BSD_SOURCE /* for unistd.h */
 
-// Win32 builds require Windows.h for Sleep(milliseconds).
-// They also require curses.h for the PDCurses library.
 #ifdef _WIN32
 #   include <Windows.h>
 #   include <curses.h>
@@ -15,81 +13,20 @@
 #   define SLEEP(delay) usleep(delay)
 #endif
 
-#include <stdlib.h>
 #include <time.h>
 #include <string.h>
+#include <stdlib.h>
+
+#include "pass.h"
 #include "print.h"
 #include "fileParse.h"
+#include "intro.h"
 
 #define OFFSET_LEFT 0
 #define OFFSET_RIGHT 20
+#define BIGSTRING_SIZE 408
 
-/// Plays the introduction sequence. 
-///
-void intro(){
-    clear();
-    SLEEP(250000);
-    char arr[] = "WELCOME TO ROBCO INDUSTRIES (TM) TERMLINK";
-    
-    slowPrint(arr,strlen(arr), 0);
-
-    move(1, 0);
-    refresh();
-    SLEEP(30000);
-    mvprintw(2,0,"%c", '>');
-    move(2,1);
-    refresh();
-    SLEEP(1500000);
-
-    char arr2[] = "SET TERMINAL/INQUIRE";
-    slowType(arr2,strlen(arr2), 2);
-    
-
-    char arr3[] = "RIT-V300";
-    slowPrint(arr3,strlen(arr3), 4);
-
-    mvprintw(6,0,"%c", '>');
-    refresh();
-    SLEEP(1500000);
-    char arr4[] = "SET FILE/PROTECTION=OWNER:RWED ACCOUNTS.F";
-    slowType(arr4,strlen(arr4),6);
-    
-    mvprintw(7,0,"%c", '>');
-    refresh();
-    SLEEP(1500000);
-    char arr5[] = "SET HALT RESTART/MAINT";
-    slowType(arr5,strlen(arr5),7);
-    
-    char arr6[] = "Initializing Robco Industries(TM) Boot Agent v2.3.0";
-    slowPrint(arr6,strlen(arr6),9);
-
-    char arr7[] = "RBIOS-4.02.08.00 53EE5.E7.E8";
-    slowPrint(arr7,strlen(arr7),10);
-
-    char arr8[] = "Copyright 2201-22-3 Robco Ind.";
-    slowPrint(arr8,strlen(arr8),11);
-
-    char arr9[] = "Uppermem: 64 KB";
-    slowPrint(arr9,strlen(arr9),12);
-
-    char arr10[] = "Root (5A8)";
-    slowPrint(arr10,strlen(arr10),13);
-
-    char arr11[] = "Maintenance Mode";
-    slowPrint(arr11,strlen(arr11),14);
-
-    mvprintw(16,0,"%c",'>');
-    refresh();
-    SLEEP(1500000);
-    char arr12[] = "RUN DEBUG/ACCOUNTS.F";
-    slowType(arr12,strlen(arr12),16);
-    move(16,0);
-    refresh();
-    SLEEP(50000);
-}
-
-
-int currentCharContains(char arr[],char c){
+static int currentCharContains(char arr[],char c){
     int i;
     for(i=0; i<12; i++)
         if(arr[i]==c)
@@ -97,7 +34,7 @@ int currentCharContains(char arr[],char c){
     return 0;
 }
 
-int getCharLoc(int y, int x){
+static int getCharLoc(int y, int x){
     /* Left side */
     if(x<19)
         return 12*(y-5)+(x-7);
@@ -107,8 +44,6 @@ int getCharLoc(int y, int x){
 }
 
 void pass(){
-    static const int BIGSTRING_SIZE = 408;
-
 
     /* Start a new screen where nodelay is false */
     erase();
@@ -599,7 +534,6 @@ void pass(){
     exit(0);
 }
 
-
 int main(int argc, char * argv[]){
 
     srand ( (unsigned)time(NULL) );

src/pass.h

@@ -0,0 +1,6 @@
+#ifndef PASS_H
+#define PASS_H
+
+void pass();
+
+#endif

src/print.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include "print.h"
-#include "FalloutTerminal.h"
+#include "pass.h"
 
 void slowPrint(char arr[], int size, int line){
     for(int i=0; i<size; i++){  

src/print.h

@@ -1,4 +1,3 @@
-
 #ifndef PRINT_H
 #define PRINT_H