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
  • There is currently no music volume support. cd_sdl.c needs replacing with cd_linux.c, cd_bsd.c etc..
  • -
  • In windows, alternative CD drives are accessible by "quakespasm -cddev F:\" (for example) +
  • In windows, alternative CD drives are accessible by "quakespasm -cddev F" (for example)
  • @@ -90,7 +90,7 @@ It includes 64bit CPU cupport, a new sound driver, several networking fixes, and
     cd quakespasm-0.85.3
     make
    -cp quakespasm /usr/local/games/quake (for eg)
    +cp quakespasm /usr/local/games/quake (for example)
     


    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 There is currently no music volume support. cd_sdl.c needs replacing with cd_linux.c, cd_bsd.c etc.. -In windows, alternative CD drives are accessible by "quakespasm -cddev F:\" (for example) +In windows, alternative CD drives are accessible by "quakespasm -cddev F" (for example) @@ -50,7 +50,7 @@ Just extract the source tarball, then cd quakespasm-0.85.3 make -cp quakespasm /usr/local/games/quake (for eg) +cp quakespasm /usr/local/games/quake (for example) 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 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) ______________________________________________________________________