From 8d58b764d6b845a6153271a1b2f6de88b909398c Mon Sep 17 00:00:00 2001
From: stevenaaus <stevenaaus@af15c1b1-3010-417e-b628-4374ebc0bcbd>
Date: Sun, 29 Aug 2010 21:37:07 +0000
Subject: [PATCH] End of the world commit

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@312 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 Quake/Makefile   |  2 +-
 Quake/host_cmd.c | 12 +++++++-----
 README.html      |  4 ++--
 README.sgml      |  4 ++--
 README.txt       |  4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Quake/Makefile b/Quake/Makefile
index 41d4fc25..4773eb32 100644
--- a/Quake/Makefile
+++ b/Quake/Makefile
@@ -1,6 +1,6 @@
 # GNU Makefile for QuakeSpasm unix targets, June 21, 2010
 #
-# You need SDL and SDL_net fully installed.
+# You need SDL (and optionally SDL_net) fully installed.
 # "make DEBUG=1" builds debug client
 # "make SDLNET=1" to enable SDL_net. otherwise the socket api will be
 # used directly.
diff --git a/Quake/host_cmd.c b/Quake/host_cmd.c
index 642e9728..1287abea 100644
--- a/Quake/host_cmd.c
+++ b/Quake/host_cmd.c
@@ -1288,7 +1288,7 @@ void Host_Say(qboolean teamonly)
 	client_t *save;
 	int	j, remquot = 0;
 	const char	*p;
-    // removed unsigned keyword -- kristian
+	// removed unsigned keyword -- kristian
 	char	text[MAXCMDLINE];
 	qboolean	fromServer = false;
 
@@ -1327,8 +1327,9 @@ void Host_Say(qboolean teamonly)
 
 	j = sizeof(text) - 2 - Q_strlen(text);  // -2 for /n and null terminator
 	strncat (text, p, j);
-	if (remquot)
-		text[Q_strlen(text) - 1] = '\0';
+	j = Q_strlen(text) - 1;
+	if (remquot && text[j] == '"')
+		text[j] = '\0';
 	strcat (text, "\n");
 
 	for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++)
@@ -1390,8 +1391,9 @@ void Host_Tell_f(void)
 // check length & truncate if necessary
 	j = sizeof(text) - 2 - Q_strlen(text);  // -2 for /n and null terminator
 	strncat (text, p, j);
-	if (remquot)
-		text[Q_strlen(text) - 1] = '\0';
+	j = Q_strlen(text) - 1;
+	if (remquot && text[j] == '"')
+		text[j] = '\0';
 	strcat (text, "\n");
 
 	save = host_client;
diff --git a/README.html b/README.html
index ce836567..c1708d9e 100644
--- a/README.html
+++ b/README.html
@@ -76,7 +76,7 @@ It includes 64bit CPU cupport, a new sound driver, several networking fixes, and
 </LI>
 <LI>There is currently no music volume support. cd_sdl.c needs replacing with cd_linux.c, cd_bsd.c etc..
 </LI>
-<LI>In windows, alternative CD drives are accessible by "<B>quakespasm -cddev F:\</B>" (for example)
+<LI>In windows, alternative CD drives are accessible by "<B>quakespasm -cddev F</B>" (for example)
 </LI>
 </UL>
 </P>
@@ -90,7 +90,7 @@ It includes 64bit CPU cupport, a new sound driver, several networking fixes, and
 <PRE>
 cd quakespasm-0.85.3
 make
-cp quakespasm /usr/local/games/quake (for eg)
+cp quakespasm /usr/local/games/quake (for example)
 </PRE>
 <HR>
 <BR>
diff --git a/README.sgml b/README.sgml
index 278df96e..7b0a0710 100644
--- a/README.sgml
+++ b/README.sgml
@@ -39,7 +39,7 @@ It includes 64bit CPU cupport, a new sound driver, several networking fixes, and
 
 <item>There is currently no music volume support. cd_sdl.c needs replacing with cd_linux.c, cd_bsd.c etc..
 
-<item>In windows, alternative CD drives are accessible by "<bf>quakespasm -cddev F:\</bf>" (for example)
+<item>In windows, alternative CD drives are accessible by "<bf>quakespasm -cddev F</bf>" (for example)
 
 </itemize>
 
@@ -50,7 +50,7 @@ Just extract the source tarball, then
 <code>
 cd quakespasm-0.85.3
 make
-cp quakespasm /usr/local/games/quake (for eg)
+cp quakespasm /usr/local/games/quake (for example)
 </code>
 <newline>
 Compile time options include
diff --git a/README.txt b/README.txt
index 861e2914..97554e28 100644
--- a/README.txt
+++ b/README.txt
@@ -64,7 +64,7 @@
      replacing with cd_linux.c, cd_bsd.c etc..
 
   o  In windows, alternative CD drives are accessible by "quakespasm
-     -cddev F:\" (for example)
+     -cddev F" (for example)
 
    Visit the FitzQuake Homepage <http://www.celephais.net/fitzquake> for
   a full run-down of this engine's features.
@@ -77,7 +77,7 @@
   ______________________________________________________________________
   cd quakespasm-0.85.3
   make
-  cp quakespasm /usr/local/games/quake (for eg)
+  cp quakespasm /usr/local/games/quake (for example)
   ______________________________________________________________________