sys.h is no longer part of quakedef.h

sys_wina.S is now sys_x86.S (same as now gone sys_dosa.S, used on Linux too)

Updated Linux Makefile to reflect above

Linux translation table thingy now compiles properly

include/quakedef.h

@@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "common.h"
 #include "bspfile.h"
 #include "vid.h"
-#include "sys.h"
+//#include "sys.h"
 #include "zone.h"
 #include "mathlib.h"
 #include "wad.h"

include/sys.h

@@ -19,46 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sys.h -- non-portable functions
 
-//
-// Translation table for text consoles
-//
-char trans_table[256] =
-{
-	'\0', '#',  '#',  '#',  '#',  '.',  '#',  '#',
-	'#',  9,    10,   '#',  ' ',  13,   '.',  '.',
-	'[',  ']',  '0',  '1',  '2',  '3',  '4',  '5',
-	'6',  '7',  '8',  '9',  '.',  '<',  '=',  '>',
-	' ',  '!',  '"',  '#',  '$',  '%',  '&',  '\'',
-	'(',  ')',  '*',  '+',  ',',  '-',  '.',  '/',
-	'0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',
-	'8',  '9',  ':',  ';',  '<',  '=',  '>',  '?',
-	'@',  'A',  'B',  'C',  'D',  'E',  'F',  'G',
-	'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',
-	'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
-	'X',  'Y',  'Z',  '[',  '\\', ']',  '^',  '_',
-	'`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
-	'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',
-	'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
-	'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<',
-
-	'<',  '=',  '>',  '#',  '#',  '.',  '#',  '#',
-	'#',  '#',  ' ',  '#',  ' ',  '>',  '.',  '.',
-	'[',  ']',  '0',  '1',  '2',  '3',  '4',  '5',
-	'6',  '7',  '8',  '9',  '.',  '<',  '=',  '>',
-	' ',  '!',  '"',  '#',  '$',  '%',  '&',  '\'',
-	'(',  ')',  '*',  '+',  ',',  '-',  '.',  '/',
-	'0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',
-	'8',  '9',  ':',  ';',  '<',  '=',  '>',  '?',
-	'@',  'A',  'B',  'C',  'D',  'E',  'F',  'G',
-	'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',
-	'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
-	'X',  'Y',  'Z',  '[',  '\\', ']',  '^',  '_',
-	'`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
-	'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o', 
-	'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
-	'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
-};
-
+#ifndef __SYS_H
+#define __SYS_H
 
 //
 // file IO
@@ -114,3 +76,6 @@ void Sys_Printf (char *fmt, ...);
 // send text to the console
 
 void Sys_Init (void);
+
+#endif // __SYS_H
+

source/Makefile

@@ -152,7 +152,7 @@ CL_sources=\
   menu.c \
   keys.c \
   console.c \
-  sys_dosa.S
+  sys_x86.S
 
 CL_dependencies = $(patsubst %,%.d,$(basename $(CL_sources)))
 CL_objects = $(patsubst %.d,%.o,$(CL_dependencies))

source/cl_demo.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 
 void CL_FinishTimeDemo (void);

source/cl_ents.c

@@ -27,6 +27,7 @@
 */
 // cl_ents.c -- entity parsing and management
 
+#include "sys.h"
 #include "quakedef.h"
 
 extern	cvar_t	cl_predict_players;

source/cl_main.c

@@ -27,15 +27,17 @@
 */
 // cl_main.c  -- client main loop
 
+#include <ctype.h>
+
+#include "sys.h"
 #include "quakedef.h"
-#include "winquake.h"
 #ifdef _WIN32
+#include "winquake.h"
 #include "winsock.h"
 #include "in_win.h"
 #else
 #include <netinet/in.h>
 #endif
-#include <ctype.h>
 
 
 // we need to declare some mouse variables here, because the menu system

source/cl_parse.c

@@ -27,6 +27,7 @@
 */
 // cl_parse.c  -- parse a message received from the server
 
+#include "sys.h"
 #include "quakedef.h"
 
 extern     cvar_t  gl_flashblend;

source/cl_tent.c

@@ -27,6 +27,7 @@
 */
 // cl_tent.c -- client side temporary entities
 
+#include "sys.h"
 #include "quakedef.h"
 
 

source/cmd.c

@@ -27,6 +27,7 @@
 */
 // cmd.c -- Quake script command processing module
 
+#include "sys.h"
 #include "quakedef.h"
 
 void Cmd_ForwardToServer (void);

source/common.c

@@ -29,6 +29,7 @@
 
 #include <ctype.h>
 
+#include "sys.h"
 #include "quakedef.h"
                
 #define MAX_NUM_ARGVS	50

source/console.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 
 int			con_ormask;

source/d_modech.c

@@ -27,6 +27,7 @@
 */
 // d_modech.c: called when mode has just changed
 
+#include "sys.h"
 #include "quakedef.h"
 #include "d_local.h"
 

source/d_surf.c

@@ -27,6 +27,7 @@
 */
 // d_surf.c: rasterization driver surface heap manager
 
+#include "sys.h"
 #include "quakedef.h"
 #include "d_local.h"
 #include "r_local.h"

source/draw.c

@@ -28,6 +28,7 @@
 // draw.c -- this is the only file outside the refresh that touches the
 // vid buffer
 
+#include "sys.h"
 #include "quakedef.h"
 
 typedef struct {

source/gl_parse.c

@@ -27,6 +27,7 @@
 */
 // cl_parse.c  -- parse a message received from the server
 
+#include "sys.h"
 #include "quakedef.h"
 #include "glquake.h"
 

source/gl_refrag.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 
 mnode_t	*r_pefragtopnode;

source/keys.c

@@ -26,10 +26,13 @@
 	$Id$
 */
 
-#include "quakedef.h"
 #ifdef _WIN32
 #include <windows.h>
 #endif
+
+#include "sys.h"
+#include "quakedef.h"
+
 /*
 
 key up events are sent even if in console mode

source/menu.c

@@ -26,8 +26,11 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
+#ifdef _WIN32
 #include "winquake.h"
+#endif
 
 void (*vid_menudrawfn)(void);
 void (*vid_menukeyfn)(int key);

source/net_udp.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 
 #include <sys/types.h>

source/pmovetst.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 
 static	hull_t		box_hull;

source/r_alias.c

@@ -27,6 +27,7 @@
 */
 // r_alias.c: routines for setting up to draw alias models
 
+#include "sys.h"
 #include "quakedef.h"
 #include "r_local.h"
 #include "d_local.h"	// FIXME: shouldn't be needed (is needed for patch

source/r_bsp.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 #include "r_local.h"
 

source/r_efrag.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 #include "r_local.h"
 

source/r_main.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 #include "r_local.h"
 

source/r_misc.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 #include "r_local.h"
 

source/r_sprite.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 #include "r_local.h"
 

source/r_surf.c

@@ -27,6 +27,7 @@
 */
 // r_surf.c: surface-related refresh code
 
+#include "sys.h"
 #include "quakedef.h"
 #include "r_local.h"
 

source/screen.c

@@ -27,6 +27,7 @@
 */
 // screen.c -- master for refresh, status bar, console, chat, notify, etc
 
+#include "sys.h"
 #include "quakedef.h"
 #include "r_local.h"
 

source/skin.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 
 cvar_t		baseskin = {"baseskin", "base"};

source/snd_dma.c

@@ -27,6 +27,7 @@
 */
 // snd_dma.c -- main control for any streaming sound output device
 
+#include "sys.h"
 #include "quakedef.h"
 
 #ifdef _WIN32

source/snd_mem.c

@@ -27,6 +27,7 @@
 */
 // snd_mem.c: sound caching
 
+#include "sys.h"
 #include "quakedef.h"
 
 int			cache_full_cycle;

source/sys_linux.c

@@ -45,6 +45,7 @@
 #include <sys/mman.h>
 #include <errno.h>
 
+#include "sys.h"
 #include "quakedef.h"
 
 int noconinput = 0;
@@ -56,6 +57,47 @@ qboolean is_server = false;
 
 cvar_t  sys_linerefresh = {"sys_linerefresh","0"};// set for entity display
 
+//
+// Translation table for text consoles
+//
+char qfont_table[256] =
+{
+	'\0', '#',  '#',  '#',  '#',  '.',  '#',  '#',
+	'#',  9,    10,   '#',  ' ',  13,   '.',  '.',
+	'[',  ']',  '0',  '1',  '2',  '3',  '4',  '5',
+	'6',  '7',  '8',  '9',  '.',  '<',  '=',  '>',
+	' ',  '!',  '"',  '#',  '$',  '%',  '&',  '\'',
+	'(',  ')',  '*',  '+',  ',',  '-',  '.',  '/',
+	'0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',
+	'8',  '9',  ':',  ';',  '<',  '=',  '>',  '?',
+	'@',  'A',  'B',  'C',  'D',  'E',  'F',  'G',
+	'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',
+	'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
+	'X',  'Y',  'Z',  '[',  '\\', ']',  '^',  '_',
+	'`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
+	'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',
+	'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
+	'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<',
+
+	'<',  '=',  '>',  '#',  '#',  '.',  '#',  '#',
+	'#',  '#',  ' ',  '#',  ' ',  '>',  '.',  '.',
+	'[',  ']',  '0',  '1',  '2',  '3',  '4',  '5',
+	'6',  '7',  '8',  '9',  '.',  '<',  '=',  '>',
+	' ',  '!',  '"',  '#',  '$',  '%',  '&',  '\'',
+	'(',  ')',  '*',  '+',  ',',  '-',  '.',  '/',
+	'0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',
+	'8',  '9',  ':',  ';',  '<',  '=',  '>',  '?',
+	'@',  'A',  'B',  'C',  'D',  'E',  'F',  'G',
+	'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',
+	'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
+	'X',  'Y',  'Z',  '[',  '\\', ']',  '^',  '_',
+	'`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
+	'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o', 
+	'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
+	'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
+};
+
+
 // =======================================================================
 // General routines
 // =======================================================================
@@ -128,10 +170,7 @@ void Sys_Printf (char *fmt, ...)
         return;
 
 	for (p = (unsigned char *)text; *p; p++)
-		if ((*p > 128 || *p < 32) && *p != 10 && *p != 13 && *p != 9)
-			printf("[%02x]", *p);
-		else
-			putc(*p, stdout);
+		putc(qfont_table[*p], stdout);
 }
 
 void Sys_Quit (void)

source/vid_svgalib.c

@@ -36,6 +36,7 @@
 
 #include <asm/io.h>
 
+#include "sys.h"
 #include "vga.h"
 #include "vgakeyboard.h"
 #include "vgamouse.h"

source/vid_x11.c

@@ -47,6 +47,7 @@ typedef unsigned short PIXEL;
 #include <X11/keysym.h>
 #include <X11/extensions/XShm.h>
 
+#include "sys.h"
 #include "quakedef.h"
 #include "d_local.h"
 

source/wad.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 
 int			wad_numlumps;

source/zone.c

@@ -26,6 +26,7 @@
 	$Id$
 */
 
+#include "sys.h"
 #include "quakedef.h"
 
 #define	DYNAMIC_SIZE	0x20000