From 1a5cb4add59339cc2f0d2cec09df561d544c2113 Mon Sep 17 00:00:00 2001
From: Lance <moodles2@users.sourceforge.net>
Date: Fri, 15 Jul 2011 12:51:05 +0000
Subject: [PATCH] Removed qplaque.lmp and p_option.lmp from appearing on
 connected clients (only fteqw clients saw these) which blocked the menu text.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3875 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 fteqtv/qw.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/fteqtv/qw.c b/fteqtv/qw.c
index bca4f117..bd13704a 100644
--- a/fteqtv/qw.c
+++ b/fteqtv/qw.c
@@ -2610,6 +2610,11 @@ guimenu:
 
 		shownheader = false;
 
+/*
+I've removed the following from this function as it covered the menu (~Moodles):
+			"menupic 0 4 gfx/qplaque.lmp\n"
+			"menupic 96 4 gfx/p_option.lmp\n"
+*/
 		QW_StuffcmdToViewer(v,
 
 			"alias menucallback\n"
@@ -2630,8 +2635,6 @@ guimenu:
 			"}\n"
 
 			"conmenu menucallback\n"
-			"menupic 0 4 gfx/qplaque.lmp\n"
-			"menupic 96 4 gfx/p_option.lmp\n"
 
 			"menuedit 48 36 \"Óåòöåòº\" \"_server\"\n"
 
@@ -2697,6 +2700,11 @@ guidemos:
 		start = atoi(args);	//FIXME
 		QW_SetMenu(v, MENU_NONE);
 
+/*
+I've removed the following from this function as it covered the menu (~Moodles):
+			"menupic 0 4 gfx/qplaque.lmp\n"
+			"menupic 96 4 gfx/p_option.lmp\n"
+*/
 		QW_StuffcmdToViewer(v,
 
 			"alias menucallback\n"
@@ -2710,9 +2718,7 @@ guidemos:
 					"{\necho Changing stream\nsay .$option\n}\n"
 			"}\n"
 
-			"conmenu menucallback\n"
-			"menupic 0 4 gfx/qplaque.lmp\n"
-			"menupic 96 4 gfx/p_option.lmp\n",
+			"conmenu menucallback\n",
 			start - maxshowndemos, start + maxshowndemos
 		);
 
@@ -2766,6 +2772,11 @@ tuidemos:
 guiadmin:
 		if (!*cluster->adminpassword)
 		{
+/*
+I've removed the following from this function as it covered the menu (~Moodles):
+			"menupic 16 4 gfx/qplaque.lmp\n"
+			"menupic - 4 gfx/p_option.lmp\n"
+*/
 			QW_StuffcmdToViewer(v,
 
 				"alias menucallback\n"
@@ -2774,8 +2785,6 @@ guiadmin:
 				"}\n"
 
 				"conmenu menucallback\n"
-				"menupic 16 4 gfx/qplaque.lmp\n"
-				"menupic - 4 gfx/p_option.lmp\n"
 
 				"menutext 72 48 \"No admin password is set\"\n"
 				"menutext 72 56 \"Admin access is prohibited\"\n"
@@ -2786,6 +2795,11 @@ guiadmin:
 			QW_SetMenu(v, MENU_ADMIN);
 		else
 		{
+/*
+I've removed the following from this function as it covered the menu (~Moodles):
+				"menupic 16 4 gfx/qplaque.lmp\n"
+				"menupic - 4 gfx/p_option.lmp\n"
+*/
 			QW_StuffcmdToViewer(v,
 
 				"alias menucallback\n"
@@ -2797,8 +2811,6 @@ guiadmin:
 				"}\n"
 
 				"conmenu menucallback\n"
-				"menupic 16 4 gfx/qplaque.lmp\n"
-				"menupic - 4 gfx/p_option.lmp\n"
 
 				"menuedit 16 32 \"        Password\" \"_password\"\n"