Compiler flag -DNOASM optimisation, demo playback fixed among other small things

2015-09-03 19:17:58 +02:00 · 2015-09-03 19:17:58 +02:00 · e47a9de2de
commit e47a9de2de
parent b55a563b24
34 changed files with 40 additions and 41 deletions
--- a/4
+++ b/4
@ -120,7 +120,7 @@ NGUNIX_OBJS = \
 	$(BUILDDIR)/cl_main.o \
 	$(BUILDDIR)/cl_parse.o \
 	$(BUILDDIR)/cl_tent.o \
-	$(BUILDDIR)/chase.o \
+	$(BUILDDIR)/cl_chase.o \
 	$(BUILDDIR)/cmd.o \
 	$(BUILDDIR)/common.o \
 	$(BUILDDIR)/console.o \
@ -353,7 +353,7 @@ $(BUILDDIR)/cl_parse.o : $(MOUNT_DIR)/cl_parse.c
 $(BUILDDIR)/cl_tent.o :  $(MOUNT_DIR)/cl_tent.c
 	$(DO_CC)

-$(BUILDDIR)/chase.o :    $(MOUNT_DIR)/chase.c
+$(BUILDDIR)/cl_chase.o :    $(MOUNT_DIR)/cl_chase.c
 	$(DO_CC)

 $(BUILDDIR)/cmd.o :      $(MOUNT_DIR)/cmd.c
--- a/asm/d_copy.s
+++ b/asm/d_copy.s
@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 #ifndef NOASM
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"

 	.data
--- a/asm/d_draw.s
+++ b/asm/d_draw.s
@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 #ifndef NOASM
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

--- a/asm/d_draw16.s
+++ b/asm/d_draw16.s
@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

--- a/asm/d_fog16.s
+++ b/asm/d_fog16.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

--- a/asm/d_parta.s
+++ b/asm/d_parta.s
@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "d_ifacea.h"
 #include "asm_draw.h"

--- a/asm/d_polysa.s
+++ b/asm/d_polysa.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

--- a/asm/d_scana.s
+++ b/asm/d_scana.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

--- a/asm/d_spr8.s
+++ b/asm/d_spr8.s
@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 #ifndef NOASM
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"

 #if id386
--- a/asm/d_varsa.s
+++ b/asm/d_varsa.s
@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

--- a/asm/math.s
+++ b/asm/math.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 #define GLQUAKE	1	// don't include unneeded client defs
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"


 #if	id386
--- a/asm/r_aclipa.s
+++ b/asm/r_aclipa.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

--- a/asm/r_aliasa.s
+++ b/asm/r_aliasa.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

--- a/asm/r_drawa.s
+++ b/asm/r_drawa.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

--- a/asm/r_edgea.s
+++ b/asm/r_edgea.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"

 #if	id386broken
--- a/asm/r_varsa.s
+++ b/asm/r_varsa.s
@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"

--- a/asm/snd_mixa.s
+++ b/asm/snd_mixa.s
@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 #define GLQUAKE	1	// don't include unneeded client defs
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"

 #if	id386

--- a/asm/surf16.s
+++ b/asm/surf16.s
@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"

 #if id386
--- a/asm/surf8.s
+++ b/asm/surf8.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"

 #if	id386
--- a/asm/surf8b.s
+++ b/asm/surf8b.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"

 #if	id386
--- a/asm/surf8fst.s
+++ b/asm/surf8fst.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"

 #if	id386
--- a/asm/surf8g.s
+++ b/asm/surf8g.s
@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"

 #if	id386
--- a/asm/surf8r.s
+++ b/asm/surf8r.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"

 #if	id386
--- a/asm/surf8rgb.s
+++ b/asm/surf8rgb.s
@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 #ifndef NOASM
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 #include "asm_draw.h"

 #if	id386
--- a/asm/sys_dosa.s
+++ b/asm/sys_dosa.s
@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NOASM

 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"


 	.data
--- a/asm/sys_wina.s
+++ b/asm/sys_wina.s
@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 #define GLQUAKE	1	// don't include unneeded client defs
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"

 // LATER should be id386-dependent, and have an equivalent C path

--- a/asm/worlda.s
+++ b/asm/worlda.s
@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 #define GLQUAKE	1	// don't include unneeded client defs
 #include "asm_i386.h"
-#include "quakeasm.h"
+#include "asm.h"
 //#include "d_ifacea.h"	//don't include unneeded defs	// 2001-12-28 Merged assembler files of Quake and QuakeWorld by Maddes

 #if id386
--- a/engine/cl_chase.c
+++ b/engine/cl_chase.c
--- a/engine/cl_demo.c
+++ b/engine/cl_demo.c
@ -309,7 +309,7 @@ void CL_PlayDemo_f (void)

 	if (Cmd_Argc() != 2)
 	{
-		Con_Printf ("playdemo <demoname> : plays a demo\n");	// 2000-01-21 Typo correction by Maddes
+		Con_Printf ("demo_play <demoname> : plays a demo\n");	// 2000-01-21 Typo correction by Maddes
 		return;
 	}

--- a/engine/cl_input.c
+++ b/engine/cl_input.c
@ -295,10 +295,10 @@ void CL_AdjustAngles (void)
 	if (up || down)
 		V_StopPitchDrift ();

-	if (cl.viewangles[PITCH] > 90)
-		cl.viewangles[PITCH] = 90;
-	if (cl.viewangles[PITCH] < -90)
-		cl.viewangles[PITCH] = -90;
+	if (cl.viewangles[PITCH] > (int)m_lockdown->value)
+		cl.viewangles[PITCH] = (int)m_lockdown->value;
+	if (cl.viewangles[PITCH] < (int)m_lockup->value)
+		cl.viewangles[PITCH] = (int)m_lockup->value;

 }

--- a/engine/cl_main.c
+++ b/engine/cl_main.c
@ -303,7 +303,7 @@ void CL_NextDemo (void)
 		}
 	}

-	sprintf (str,"playdemo %s\n", cls.demos[cls.demonum]);
+	sprintf (str,"demo_play %s\n", cls.demos[cls.demonum]);
 	Cbuf_InsertText (str);
 	cls.demonum++;
 }
--- a/engine/cmd.c
+++ b/engine/cmd.c
@ -501,7 +501,7 @@ void Cmd_Init (void)
 Cmd_Argc
 ============
 */
-int		Cmd_Argc (void)
+int Cmd_Argc (void)
 {
 	return cmd_argc;
 }
@ -511,7 +511,7 @@ int		Cmd_Argc (void)
 Cmd_Argv
 ============
 */
-char	*Cmd_Argv (int arg)
+char *Cmd_Argv (int arg)
 {
 	if ( (unsigned)arg >= cmd_argc )
 		return cmd_null_string;
@ -523,7 +523,7 @@ char	*Cmd_Argv (int arg)
 Cmd_Args
 ============
 */
-char		*Cmd_Args (void)
+char *Cmd_Args (void)
 {
 	return cmd_args;
 }
@ -587,7 +587,7 @@ void Cmd_TokenizeString (char *text)
 Cmd_AddCommand
 ============
 */
-void	Cmd_AddCommand (char *cmd_name, xcommand_t function)
+void Cmd_AddCommand (char *cmd_name, xcommand_t function)
 {
 	cmd_function_t	*cmd;

@ -627,7 +627,7 @@ void	Cmd_AddCommand (char *cmd_name, xcommand_t function)
 Cmd_Exists
 ============
 */
-qboolean	Cmd_Exists (char *cmd_name)
+qboolean Cmd_Exists (char *cmd_name)
 {
 	cmd_function_t	*cmd;

@ -884,7 +884,7 @@ A complete command line has been parsed, so try to execute it
 FIXME: lookupnoadd the token to speed search?
 ============
 */
-void	Cmd_ExecuteString (char *text, cmd_source_t src)
+void Cmd_ExecuteString (char *text, cmd_source_t src)
 {
 	cmd_function_t	*cmd;
 	cmdalias_t		*a;
--- a/include/quakeasm.h
+++ b/include/quakeasm.h
--- a/include/sbar.h
+++ b/include/sbar.h
@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // does, the entire thing will be redrawn for the next vid.numpages frames.
 #define	SBAR_HEIGHT		24

-extern	int			sb_lines;			// scan lines to draw
 extern	int			sb_what_lines;			// leilei - SCALED scan lines to draw

 void Sbar_Init (void);