From 56c092674fbab17268d0ee0f2c5fd07c02ae2b33 Mon Sep 17 00:00:00 2001
From: Andrew Pamment <apamment@yandex.com>
Date: Wed, 23 Mar 2016 14:21:08 +1000
Subject: [PATCH] Added goodbye ansi, port now specified on cmd line

---
 ansis/goodbye.ans | 14 ++++++++++++++
 bbs.c             |  3 +++
 doors.c           |  2 +-
 main.c            |  8 +++++---
 main_menu.c       |  2 +-
 5 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 ansis/goodbye.ans

diff --git a/ansis/goodbye.ans b/ansis/goodbye.ans
new file mode 100644
index 0000000..85bced1
--- /dev/null
+++ b/ansis/goodbye.ans
@@ -0,0 +1,14 @@
+[?7h
+ÜÜÜ
+ÜܲÛÛÜÜÜÜ    ²±Û
+²ÛÛÜÜ ÜÛÛÛÛÛßÛÛÛÛݲÛÛÜÜ Û   ÜÜ   ÜÜß
+ÜÛÛÛÛÛßÛÛÛÛÝ ²²ÛÛÛÜÜÛÛÛÛÝ  ÜÛÛÛÛÛßÛÛÛÛÝ  ܲ²ÛÛÛÛÛÛÛÜÜÜß
+ß²ÛÛÛÜÜÜÜÜÜ ÞÛÛÛÛ²± ÜÜÜÜÜ Þ²²ÛÛÛÜÜÛÛÛÛÝ Þ±²ÛÛÛ°°²ÛÛÛÛÜܲ²ÛÛß²ÛÛÛÛ
+ÜÜÜÜÜ  ÛÛÛÛÛ±°ßÛ²°Ý ²²ÛÛ±±ÛÛÛÛ²± ÜÜÜÜÜ Û°ÛÛÛ²°±±ÛÛÛ²Þ±ÛÛÛÛÝ°²ÛÛÛ²
+Þ°ßÛ²°Ý ²²ÛÛ±Þß °ßÛÛÜÛ°°ß°Þ°ßÛ²°Ý ²²ÛÛ±Þ°ßÛ±±Ý°°ÛÛÛ±Û°ÛÛÛ±±Û±ÛÛ±
+ß °ßÛÛÜÛ°°ß°Ü°°ÛÛÛÝ ß °ßÛÛÜÛ°°ß°ß°Û °ÛÜÛ°ÛÝ°ÞÛ±±ß°Ý°°°ßÝ°
+ÜßÜÜ°°ßßßßßÜ°°ÛÛÛÝ   ÜÜ   ²°ß۱߰ Û  ÜÛ Û ²
+ßßß  ßß ßßßßßßß
+
+Thanks for visiting! Come back soon!
+
diff --git a/bbs.c b/bbs.c
index 1e59ed6..f390ef6 100644
--- a/bbs.c
+++ b/bbs.c
@@ -520,5 +520,8 @@ void runbbs(int socket, char *config_path) {
 	
 	// main menu
 	main_menu(socket, user);
+	
+	s_displayansi(socket, "goodbye");
+	
 	disconnect(socket);
 }
diff --git a/doors.c b/doors.c
index facd55a..bdaef9d 100644
--- a/doors.c
+++ b/doors.c
@@ -65,7 +65,7 @@ int door_menu(int socket, struct user_record *user) {
 	while (!dodoors) {
 		s_displayansi(socket, "doors");
 		
-		sprintf(prompt, "TL: %dm :> ", user->timeleft);
+		sprintf(prompt, "\r\nTL: %dm :> ", user->timeleft);
 		s_putstring(socket, prompt);
 		
 		c = s_getc(socket);
diff --git a/main.c b/main.c
index eabc9f4..d3fd263 100644
--- a/main.c
+++ b/main.c
@@ -11,9 +11,10 @@ int main(int argc, char **argv) {
 	int socket_desc, client_sock, c, *new_sock;
 	int pid;
 	struct sockaddr_in server, client;
+	int port;
 	
-	if (argc < 2) {
-		printf("Usage ./magicka bbs.ini\n");
+	if (argc < 3) {
+		printf("Usage ./magicka bbs.ini port\n");
 		exit(1);
 	}
 	
@@ -22,10 +23,11 @@ int main(int argc, char **argv) {
 		printf("Couldn't create socket..\n");
 		return 1;
 	}
+	port = atoi(argv[2]);
 	
 	server.sin_family = AF_INET;
 	server.sin_addr.s_addr = INADDR_ANY;
-	server.sin_port = htons(2300);
+	server.sin_port = htons(port);
 	
 	if (bind(socket_desc, (struct sockaddr *)&server, sizeof(server)) < 0) {
 		perror("Bind Failed, Error\n");
diff --git a/main_menu.c b/main_menu.c
index e6c977d..83cc06c 100644
--- a/main_menu.c
+++ b/main_menu.c
@@ -14,7 +14,7 @@ void main_menu(int socket, struct user_record *user) {
 		s_displayansi(socket, "mainmenu");
 		
 		
-		sprintf(prompt, "TL: %dm :> ", user->timeleft);
+		sprintf(prompt, "\r\nTL: %dm :> ", user->timeleft);
 		s_putstring(socket, prompt);
 		
 		c = s_getc(socket);