Added ‘gl_showorigins’ for debugging model origins.

Updated q2pro(6) manual page a bit.

3 files changed, 27 insertions, 26 deletions

diff --git a/debian/q2pro-client.install b/debian/q2pro-client.install
index 7fcca65..27c9acf 100644
--- a/debian/q2pro-client.install
+++ b/debian/q2pro-client.install
@@ -1,4 +1,5 @@
 usr/share/applications/q2pro.desktop
 usr/share/pixmaps/q2pro.xpm
 usr/share/games/quake2/baseq2/q2pro.menu
+usr/share/man/man6/q2pro.6
 usr/games/q2pro
diff --git a/q2pro.6 b/q2pro.6
index a738a66..152efe5 100644
--- a/q2pro.6
+++ b/q2pro.6
@@ -1,6 +1,6 @@
 .TH "Q2PRO" "6" 
 .SH "NAME" 
-Q2PRO \(em enhanced Quake II engine 
+Q2PRO \(em enhanced Quake 2 engine 
 .SH "SYNOPSIS" 
 .PP 
 \fBq2pro\fR [\fB+command \fIarguments\fR\fP]  
@@ -8,26 +8,22 @@ Q2PRO \(em enhanced Quake II engine
 .PP 
 This manual page documents briefly the \fBq2pro\fR program.
 .PP 
-Q2PRO is a Quake II engine modification, mostly compatible with the
-original one. Q2PRO is designed to be secure, fast and doesn't provide
-any graphical enhancements that are contrary to the `classic' Quake II
-look and feel. Among features Q2PRO provides are server side Multi
-View Demos, built-in GTV capabilities, network protocol optimizations.
+Q2PRO is a Quake 2 engine modification designed for online play,
+fully compatible with original Quake 2 clients and servers.
 .PP
-Both OpenGL and software refresh modules are provided, so that 3D graphics
-accelerator is not mandatory to play Q2PRO, although recommended.
+Q2PRO features enhanced graphical console, support for JPEG/PNG textures
+and MD3 models, network protocol optimizations, freely resizable main window,
+increased security and overall performance, basic built-in demo editing
+capabilities, built-in server and demo browsers.
 .PP
-Q2PRO uses SDL for video output and OSS for sound output.
+This version of Q2PRO requires a 3D graphics accelerator to play.
+Q2PRO uses SDL for video output and SDL/OSS for sound output.
 .SH "OPTIONS" 
 .PP 
-Commands on command line start with a `+', and continue until
-another `+' or end of line. Variables given on command line
-override those in normal configuration files. If the variable does not exist,
-it will be created for future use.
-.IP "\fB+set vid_ref soft\fP" 7 
-Load software refresh module (default).
-.IP "\fB+set vid_ref gl\fP" 7
-Load OpenGL refresh module. 
+Commands given on the command line start with a `+', and continue until
+another `+' or end of line. Variables given on command line override those
+given in normal configuration files. If the variable does not exist,
+it will be created for future use. Some examples of possible commands follow.
 .IP "\fB+set dedicated 1\fP" 7
 Start in dedicated server mode with no graphical output. 
 .IP "\fB+set deathmatch 1\fP" 7
@@ -43,12 +39,9 @@ Show version and exit.
 .IP "\fB/etc/default/q2pro\fP" 7
 System wide configuration file. The first one to be executed.
 .IP "\fB/usr/share/games/quake2\fP" 7
-Static Quake II data hierarchy, possibly shared with other Quake II engines.
+Root of the static Quake 2 game data hierarchy.
 .IP "\fB/usr/lib/games/quake2\fP" 7
-Quake II mod-specific .so libraries, possibly shared
-with other Quake II engines.
-.IP "\fB/usr/lib/games/q2pro\fP" 7
-Q2PRO specific game libraries and refresh modules.
+Quake 2 game mod shared libraries.
 .IP "\fB~/.q2pro\fP" 7
 User's local data hierarchy. Overrides system hierarchy.
 Any dynamic data Q2PRO produces (savegames, screenshots, demos, etc)
@@ -57,15 +50,15 @@ is written here.
 .SH "BUGS" 
 .PP 
 There are a lot more commands and variables, registered dynamically as
-various subsystems are loaded, than those few ones documented here.
+various subsystems are loaded. They are not yet documented here.
 .PP 
 Q2PRO graphical menu subsystem is incomplete.
 .SH "AUTHOR" 
 .PP 
-Quake II was written by ID Software, Inc. 
-Q2PRO was written by Andrey Nazarov <skuller-vidnoe@yandex.ru>. 
+Quake 2 engine was written by ID Software, Inc. 
+Q2PRO was written by Andrey Nazarov <skuller@skuller.ath.cx>. 
 .PP 
-This manual page was written by Andrey Nazarov <skuller-vidnoe@yandex.ru> for 
+This manual page was written by Andrey Nazarov <skuller@skuller.ath.cx> for 
 the \fBDebian\fP system (but may be used by others).  Permission is 
 granted to copy, distribute and/or modify this document under 
 the terms of the GNU General Public License, Version 2 any  
diff --git a/source/gl_main.c b/source/gl_main.c
index 69f4e3f..4baadc5 100644
--- a/source/gl_main.c
+++ b/source/gl_main.c
@@ -48,6 +48,7 @@ cvar_t *gl_drawworld;
 cvar_t *gl_drawentities;
 cvar_t *gl_drawsky;
 cvar_t *gl_showtris;
+cvar_t *gl_showorigins;
 cvar_t *gl_cull_nodes;
 cvar_t *gl_cull_models;
 cvar_t *gl_showstats;
@@ -410,6 +411,11 @@ static void GL_DrawEntities( int mask ) {
         } else {
 			Com_Error( ERR_FATAL, "%s: bad model type", __func__ );
 		}
+
+        if( gl_showorigins->integer ) {
+			GL_DrawNullModel();
+        }
+
 	}
 }
 
@@ -704,6 +710,7 @@ static void GL_Register( void ) {
 	gl_drawentities = Cvar_Get( "gl_drawentities", "1", CVAR_CHEAT );
     gl_drawsky = Cvar_Get( "gl_drawsky", "1", 0 );
     gl_showtris = Cvar_Get( "gl_showtris", "0", CVAR_CHEAT );
+    gl_showorigins = Cvar_Get( "gl_showorigins", "0", CVAR_CHEAT );
     gl_showstats = Cvar_Get( "gl_showstats", "0", 0 );
     gl_cull_nodes = Cvar_Get( "gl_cull_nodes", "1", 0 );
 	gl_cull_models = Cvar_Get( "gl_cull_models", "1", 0 );