Move 3DS specific files to subdir

Makefile

@@ -61,35 +61,35 @@ export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir))
 export DEPSDIR	:=	$(CURDIR)/$(BUILD)
 
 COMMON_OBJS =	chase.c \
-                                cl_hud.c \
+                cl_hud.c \
 				cl_demo.c \
 				cl_input.c \
 				cl_main.c \
 				cl_parse.c \
 				cl_tent.c \
 				cl_slist.c \
-				bsp_strlcpy.c \
+				ctr/bsp_strlcpy.c \
 				cmd.c \
-				common.c \
+				ctr/common.c \
 				console.c \
 				crc.c \
 				cvar.c \
 				host.c \
 				host_cmd.c \
-				keys.c \
+				ctr/keys.c \
 				mathlib.c \
 				matrixlib.c \
-				menu.c \
-				net_dgrm.c \
-				net_udpctr.c \
+				ctr/menu.c \
+				ctr/net_dgrm.c \
+				ctr/net_udpctr.c \
 				net_loop.c \
-				net_bsd.c \
-				net_main.c \
+				ctr/net_bsd.c \
+				ctr/net_main.c \
 				net_vcr.c \
 				pr_cmds.c \
 				pr_edict.c \
 				pr_exec.c \
-				sbar.c \
+				ctr/sbar.c \
 				sv_main.c \
 				sv_move.c \
 				sv_phys.c \
@@ -98,29 +98,29 @@ COMMON_OBJS =	chase.c \
 				wad.c \
 				world.c \
 				zone.c \
-				sys_ctr.c \
+				ctr/sys_ctr.c \
 				snd_dma.c \
 				snd_mix.c \
 				snd_mem.c \
-				snd_ctr.c \
-				in_ctr.c \
-				cd_null.c \
-				gl_qmb.c \
-				gl_decal.c \
-				gl_draw.c \
-		                gl_fog.c \
-				gl_mesh.c \
-				gl_model.c \
-				gl_refrag.c \
-				gl_rlight.c \
-				gl_rmain.c \
-				gl_rmisc.c \
-				gl_rsurf.c \
-				gl_screen.c \
-				gl_warp.c \
-				gl_vidctr.c \
-				r_part.c \
-				touch_ctr.c \
+				ctr/snd_ctr.c \
+				ctr/in_ctr.c \
+				ctr/cd_null.c \
+				ctr/gl/gl_qmb.c \
+				ctr/gl/gl_decal.c \
+				ctr/gl/gl_draw.c \
+		    	ctr/gl/gl_fog.c \
+				ctr/gl/gl_mesh.c \
+				ctr/gl/gl_model.c \
+				ctr/gl/gl_refrag.c \
+				ctr/gl/gl_rlight.c \
+				ctr/gl/gl_rmain.c \
+				ctr/gl/gl_rmisc.c \
+				ctr/gl/gl_rsurf.c \
+				ctr/gl/gl_screen.c \
+				ctr/gl/gl_warp.c \
+				ctr/gl/gl_vidctr.c \
+				ctr/r_part.c \
+				ctr/touch_ctr.c \
 				crypter.c
 
 CFILES		:=	$(COMMON_OBJS)
@@ -187,6 +187,8 @@ all: $(BUILD)
 
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
+	@mkdir -p $(BUILD)/ctr
+	@mkdir -p $(BUILD)/ctr/gl
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 
 #---------------------------------------------------------------------------------

source/ctr/cd_null.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "quakedef.h"
+#include "../quakedef.h"
 
 void CDAudio_Play(byte track, qboolean looping)
 {

source/ctr/common.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // common.c -- misc functions used in client and server
 
-#include "quakedef.h"
+#include "../quakedef.h"
 
 #define NUM_SAFE_ARGVS  7
 

source/ctr/common.h

@@ -27,16 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define max(a, b) ((a) > (b) ? (a) : (b))
 #endif
 
-#define CLAMP(_minval, x, _maxval) ({           \
-    const __typeof(x) x_ = (x);                 \
-    const __typeof(_minval) valmin_ = (_minval);\
-    const __typeof(_maxval) valmax_ = (_maxval);\
-    (void)(&x_ == &valmin_);                    \
-    (void)(&x_ == &valmax_);                    \
-    (x_ < valmin_) ? valmin_ :                  \
-    (x_ > valmax_) ? valmax_ : x_;              \
-})
-
 #define bound(a, b, c) ((a) >= (c) ? (a) : (b) < (a) ? (a) : (b) > (c) ? (c) : (b))
 
 #if !defined BYTE_DEFINED

source/ctr/gl/gl_decal.c

@@ -1,5 +1,5 @@
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 void R_SpawnDecal (vec3_t center, vec3_t normal, vec3_t tangent, int tex, int size, int isbsp)
 {

source/ctr/gl/gl_draw.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // draw.c -- this is the only file outside the refresh that touches the
 // vid buffer
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 #define GL_COLOR_INDEX8_EXT     0x80E5
 
@@ -2259,7 +2259,7 @@ PixEncode:
 #define STB_IMAGE_IMPLEMENTATION
 #define STBI_ONLY_JPEG
 #define STBI_ONLY_PNG
-#include "stb_image.h"
+#include "../../stb_image.h"
 byte* LoadSTBI(FILE *f, int width, int height)
 {
 	int bpp;

source/ctr/gl/gl_fog.c

@@ -5,7 +5,7 @@ Now with Quakespasm bits thrown into it!
 
 */
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 //==============================================================================
 //

source/ctr/gl/gl_mesh.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_mesh.c: triangle model functions
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 /*
 =================================================================

source/ctr/gl/gl_model.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // models are the only shared resource between a client and server running
 // on the same machine.
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 model_t	*loadmodel;
 char	loadname[32];	// for hunk tags

source/ctr/gl/gl_model.h

@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef __MODEL__
 #define __MODEL__
 
-#include "modelgen.h"
-#include "spritegn.h"
+#include "../modelgen.h"
+#include "../../spritegn.h"
 
 /*
 

source/ctr/gl/gl_qmb.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_rpart.c
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 //#define	DEFAULT_NUM_PARTICLES		8192
 #define	ABSOLUTE_MIN_PARTICLES      64

source/ctr/gl/gl_refrag.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_efrag.c
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 mnode_t	*r_pefragtopnode;
 

source/ctr/gl/gl_rlight.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_light.c
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 int	r_dlightframecount;
 

source/ctr/gl/gl_rmain.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_main.c
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 entity_t	r_worldentity;
 
@@ -447,7 +447,7 @@ void R_DrawSpriteModel (entity_t *e)
 #define NUMVERTEXNORMALS	162
 
 float	r_avertexnormals[NUMVERTEXNORMALS][3] = {
-#include "anorms.h"
+#include "../../anorms.h"
 };
 
 vec3_t	shadevector;
@@ -457,7 +457,7 @@ extern vec3_t lightcolor; // LordHavoc: .lit support to the definitions at the t
 // precalculated dot products for quantized angles
 #define SHADEDOT_QUANT 16
 float	r_avertexnormal_dots[SHADEDOT_QUANT][256] =
-#include "anorm_dots.h"
+#include "../../anorm_dots.h"
 ;
 
 float	*shadedots = r_avertexnormal_dots[0];

source/ctr/gl/gl_rmisc.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_misc.c
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 extern cvar_t r_flatlightstyles;
 

source/ctr/gl/gl_rsurf.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_surf.c: surface-related refresh code
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 #ifndef GL_RGBA4
 #define	GL_RGBA4	0

source/ctr/gl/gl_screen.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // screen.c -- master for refresh, status bar, console, chat, notify, etc
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 /*
 

source/ctr/gl/gl_test.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 #ifdef GLTEST
 

source/ctr/gl/gl_vidctr.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #include <3ds.h>
 #include <GL/picaGL.h>
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 unsigned	d_8to24table[256];
 unsigned char d_15to8table[65536];

source/ctr/gl/gl_warp.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_warp.c -- sky and water polygons
 
-#include "quakedef.h"
+#include "../../quakedef.h"
 
 extern	model_t	*loadmodel;
 

source/ctr/in_ctr.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // in_ctr.c -- for the Nintendo 3DS
 
-#include "quakedef.h"
+#include "../quakedef.h"
 #include <GL/picaGL.h>
 #include <3ds.h>
 

source/ctr/keys.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "quakedef.h"
+#include "../quakedef.h"
 
 /*
 

source/ctr/menu.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "quakedef.h"
+#include "../quakedef.h"
 #include <sys/dirent.h>
 
 extern cvar_t	r_wateralpha;

source/ctr/net_bsd.c

@@ -17,9 +17,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "quakedef.h"
+#include "../quakedef.h"
 
-#include "net_loop.h"
+#include "../net_loop.h"
 #include "net_dgrm.h"
 
 net_driver_t net_drivers[MAX_NET_DRIVERS] =

source/ctr/net_dgrm.c

@@ -52,7 +52,7 @@ unsigned long inet_addr(const char *cp);
 #endif
 #endif	// BAN_TEST
 
-#include "quakedef.h"
+#include "../quakedef.h"
 #include "net_dgrm.h"
 
 // these two macros are to make the code more readable

source/ctr/net_main.c

@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net_main.c
 
-#include "quakedef.h"
-#include "net_vcr.h"
+#include "../quakedef.h"
+#include "../net_vcr.h"
 
 qsocket_t	*net_activeSockets = NULL;
 qsocket_t	*net_freeSockets = NULL;

source/ctr/net_udpctr.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net_udp.c
 
-#include "quakedef.h"
+#include "../quakedef.h"
 #include "net_udp.h"
 
 #include <sys/socket.h>

source/ctr/r_part.c

@@ -18,8 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
-#include "r_local.h"
+#include "../quakedef.h"
 
 #define MAX_PARTICLES			2048	// default max # of particles at one
 										//  time

source/ctr/sbar.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sbar.c -- status bar code
 
-#include "quakedef.h"
+#include "../quakedef.h"
 
 
 int			sb_updates;		// if >= vid.numpages, no update needed
@@ -57,7 +57,7 @@ qpic_t      *rsb_teambord;		// PGM 01/19/97 - team color border
 //MED 01/04/97 added two more weapons + 3 alternates for grenade launcher
 qpic_t      *hsb_weapons[7][5];   // 0 is active, 1 is owned, 2-5 are flashes
 //MED 01/04/97 added array to simplify weapon parsing
-int         hipweapons[4] = {HIT_LASER_CANNON_BIT,HIT_MJOLNIR_BIT,4,HIT_PROXIMITY_GUN_BIT};
+//int         hipweapons[4] = {HIT_LASER_CANNON_BIT,HIT_MJOLNIR_BIT,4,HIT_PROXIMITY_GUN_BIT};
 //MED 01/04/97 added hipnotic items array
 qpic_t      *hsb_items[2];
 

source/ctr/snd_ctr.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
 #include <3ds.h>
-#include "quakedef.h"
+#include "../quakedef.h"
 
 #define SAMPLE_RATE   	22050
 #define NUM_SAMPLES 	2048

source/ctr/sys_ctr.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "../quakedef.h"
 #include "errno.h"
 #include "touch_ctr.h"
 

source/ctr/touch_ctr.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //FIX ME: load all hardcoded values from file
 
-#include "quakedef.h"
+#include "../quakedef.h"
 
 #include <3ds.h>
 #include "touch_ctr.h"

source/host.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 #ifdef __PSP__
-#include "thread.h"
+#include "psp/thread.h"
 #include "psp/module.h"
 #include <pspge.h>
 #include <pspsysevent.h>

source/quakedef.h

@@ -21,25 +21,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //#define	GLTEST			// experimental stuff
 
+#ifndef __PSP__
 #define qtrue 1
 #define qfalse 0
+#endif // __PSP__
 
 #define	QUAKE_GAME			// as opposed to utilities
 
-#define	VERSION				1.09
+#define	VERSION				2.0
 #define	GLQUAKE_VERSION		1.00
 #define	D3DQUAKE_VERSION	0.01
 #define	WINQUAKE_VERSION	0.996
 #define	LINUX_VERSION		1.30
 #define	X11_VERSION			1.10
 
-//define	PARANOID			// speed sapping error checking
-
-#ifdef QUAKE2
-#define	GAMENAME	"nzp"		// directory to look in by default
-#else
 #define	GAMENAME	"nzp"
-#endif
 
 #include <math.h>
 #include <string.h>
@@ -50,23 +46,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdbool.h>
 #include <ctype.h>
 
-#if defined(_WIN32) && !defined(WINDED)
-
-#if defined(_M_IX86)
-#define __i386__	1
-#endif
-
-void	VID_LockBuffer (void);
-void	VID_UnlockBuffer (void);
-
-#else
-
 #define	VID_LockBuffer()
 #define	VID_UnlockBuffer()
 
-#endif
-
-#if defined __i386__ // && !defined __sun__
+#if defined __i386__
 #define id386	1
 #else
 #define id386	0
@@ -214,84 +197,19 @@ void	VID_UnlockBuffer (void);
 
 #define	SOUND_CHANNELS		8
 
-// stock defines
-
-#define	IT_SHOTGUN				1
-#define	IT_SUPER_SHOTGUN		2
-#define	IT_NAILGUN				4
-#define	IT_SUPER_NAILGUN		8
-#define	IT_GRENADE_LAUNCHER		16
-#define	IT_ROCKET_LAUNCHER		32
-#define	IT_LIGHTNING			64
-#define IT_SUPER_LIGHTNING      128
-#define IT_SHELLS               256
-#define IT_NAILS                512
-#define IT_ROCKETS              1024
-#define IT_CELLS                2048
-#define IT_AXE                  4096
-#define IT_ARMOR1               8192
-#define IT_ARMOR2               16384
-#define IT_ARMOR3               32768
-#define IT_SUPERHEALTH          65536
-#define IT_KEY1                 131072
-#define IT_KEY2                 262144
-#define	IT_INVISIBILITY			524288
-#define	IT_INVULNERABILITY		1048576
-#define	IT_SUIT					2097152
-#define	IT_QUAD					4194304
-#define IT_SIGIL1               (1<<28)
-#define IT_SIGIL2               (1<<29)
-#define IT_SIGIL3               (1<<30)
-#define IT_SIGIL4               (1<<31)
-
-//===========================================
-//rogue changed and added defines
-
-#define RIT_SHELLS              128
-#define RIT_NAILS               256
-#define RIT_ROCKETS             512
-#define RIT_CELLS               1024
-#define RIT_AXE                 2048
-#define RIT_LAVA_NAILGUN        4096
-#define RIT_LAVA_SUPER_NAILGUN  8192
-#define RIT_MULTI_GRENADE       16384
-#define RIT_MULTI_ROCKET        32768
-#define RIT_PLASMA_GUN          65536
-#define RIT_ARMOR1              8388608
-#define RIT_ARMOR2              16777216
-#define RIT_ARMOR3              33554432
-#define RIT_LAVA_NAILS          67108864
-#define RIT_PLASMA_AMMO         134217728
-#define RIT_MULTI_ROCKETS       268435456
-#define RIT_SHIELD              536870912
-#define RIT_ANTIGRAV            1073741824
-#define RIT_SUPERHEALTH         2147483648
-
-//MED 01/04/97 added hipnotic defines
-//===========================================
-//hipnotic added defines
-#define HIT_PROXIMITY_GUN_BIT 16
-#define HIT_MJOLNIR_BIT       7
-#define HIT_LASER_CANNON_BIT  23
-#define HIT_PROXIMITY_GUN   (1<<HIT_PROXIMITY_GUN_BIT)
-#define HIT_MJOLNIR         (1<<HIT_MJOLNIR_BIT)
-#define HIT_LASER_CANNON    (1<<HIT_LASER_CANNON_BIT)
-#define HIT_WETSUIT         (1<<(23+2))
-#define HIT_EMPATHY_SHIELDS (1<<(23+3))
-
-//===========================================
-
-
-// This makes anyone on id's net privileged
-// Use for multiplayer testing only - VERY dangerous!!!
-// #define IDGODS
 
+#ifdef _3DS
+#include "ctr/common.h"
+#include "ctr/vid.h"
+#include "ctr/sys.h"
+#else
 #include "common.h"
-#include "bspfile.h"
 #include "vid.h"
 #include "sys.h"
+#endif // _3DS
 #include "zone.h"
 #include "mathlib.h"
+#include "bspfile.h"
 
 typedef struct
 {
@@ -313,40 +231,64 @@ typedef struct
 #include "wad.h"
 #include "draw.h"
 #include "cvar.h"
+#ifdef _3DS
+#include "ctr/screen.h"
+#include "ctr/net.h"
+#else
 #include "screen.h"
 #include "net.h"
+#endif // _3DS
 #include "protocol.h"
 #include "cmd.h"
-#include "sbar.h"
+#ifdef _3DS
+#include "ctr/sbar.h"
+#endif // _3DS
+#include "cl_hud.h"
 #include "sound.h"
+#ifdef _3DS
+#include "ctr/render.h"
+#include "ctr/client.h"
+#else
 #include "render.h"
 #include "client.h"
+#endif // _3DS
 #include "progs.h"
-#include "server.h"
-
-#ifdef GLQUAKE
-#include "gl_model.h"
-#include "gl_decal.h"
+#ifdef _3DS
+#include "ctr/server.h"
 #else
-#include "model.h"
-#include "d_iface.h"
+#include "server.h"
+#endif // _3DS
+
+#ifdef _3DS
+#include "ctr/gl/gl_model.h"
+#include "ctr/gl/gl_decal.h"
+#else
+#include "psp/video_hardware_model.h"
 #endif
 
 #include "input.h"
 #include "world.h"
+#ifdef _3DS
+#include "ctr/keys.h"
+#else
 #include "keys.h"
+#endif
 #include "console.h"
 #include "view.h"
+#ifdef _3DS
+#include "ctr/menu.h"
+#else
 #include "menu.h"
+#endif
 #include "crc.h"
 #include "cdaudio.h"
 
-#ifdef GLQUAKE
-#include "glquake.h"
+#ifdef _3DS
+#include "ctr/glquake.h"
+#else
+#include "psp/video_hardware.h"
 #endif
 
-#include "cl_hud.h"
-
 //=============================================================================
 
 // the host system specifies the base of the directory tree, the
@@ -384,6 +326,10 @@ extern	qboolean	host_initialized;		// true if into command execution
 extern	double		host_frametime;
 extern	byte		*host_basepal;
 extern	byte		*host_colormap;
+#ifdef __PSP__
+extern	byte		*host_q2pal;
+extern	byte		*host_h2pal;
+#endif // __PSP__
 extern	int			host_framecount;	// incremented every frame, never reset
 extern	double		realtime;			// not bounded in any way, changed at
 										// start of every frame, never reset
@@ -410,6 +356,8 @@ extern qboolean		isDedicated;
 
 extern int			minimum_memory;
 
+extern	vec3_t	NULLVEC;
+
 #define ISUNDERWATER(x) ((x) == CONTENTS_WATER || (x) == CONTENTS_SLIME || (x) == CONTENTS_LAVA)
 
 int SV_HullPointContents (hull_t *hull, int num, vec3_t p);
@@ -449,6 +397,16 @@ extern waypoint_ai waypoints[MAX_WAYPOINTS];
 extern int n_waypoints;
 extern short closest_waypoints[MAX_EDICTS];
 
+// thread structs
+typedef struct
+{
+	vec3_t origin;
+	vec3_t forward;
+	vec3_t right;
+	vec3_t up;
+	qboolean ready;
+} soundstruct_t;
+
 // ----------------------------------------------------------------------------
 // Utils for using cstdlib qsort (Quick sort)
 //
@@ -474,8 +432,9 @@ extern int argsort_comparator(const void *lhs, const void *rhs);
 extern func_t	EndFrame;
 
 
-
+#ifdef _3DS
 #define VERTEXARRAYSIZE 18360
 extern float gVertexBuffer[VERTEXARRAYSIZE];
 extern float gColorBuffer[VERTEXARRAYSIZE];
-extern float gTexCoordBuffer[VERTEXARRAYSIZE];
+extern float gTexCoordBuffer[VERTEXARRAYSIZE];
+#endif // _3DS

source/view.c

@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // view.c -- player eye positioning
 
 #include "quakedef.h"
-#include "r_local.h"
 
 #ifdef __PSP__
 #include <pspgu.h>