nzp-team/dquakeplus
0
0
Fork 0
mirror of https://github.com/nzp-team/dquakeplus.git synced 2025-03-03 15:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

GLOBAL: Use macros for cleaner platform-header includes; quakedef->nzportable_def (#58)

Browse source 
* GLOBAL: Use macros for cleaner platform-header includes; quakedef->nzportable_def

* GLOBAL: Fix concat macro

* GLOBAL: Remove unused decal.h headers
This commit is contained in:
cypress 2025-02-26 19:41:44 -08:00 committed by GitHub
parent ef84546740
commit 77ef73be15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
135 changed files with 173 additions and 207 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.ctr
View file

@ -30,7 +30,7 @@ CFLAGS := -g -fpermissive -Wall -O3 -mword-relocations \
-fomit-frame-pointer -ffunction-sections \ -fomit-frame-pointer -ffunction-sections \
$(ARCH) $(ARCH)
CFLAGS += $(INCLUDE) -DARM11 -D_3DS -DGLQUAKE CFLAGS += $(INCLUDE) -DARM11 -D_3DS -DGLQUAKE -DPLATFORM_DIRECTORY="ctr" -DPLATFORM_RENDERER="gl"
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

4
Makefile.psp
View file

@ -115,7 +115,9 @@ NET_LIBS = -lpspwlan -lpspnet_adhoc -lpspnet_adhocctl
STD_LIBS = -lstdc++ -lm -lc STD_LIBS = -lstdc++ -lm -lc
LIBS = $(GPROF_LIBS) $(GU_LIBS) $(AUDIO_LIBS) $(MISC_LIBS) $(STD_LIBS) $(NET_LIBS) LIBS = $(GPROF_LIBS) $(GU_LIBS) $(AUDIO_LIBS) $(MISC_LIBS) $(STD_LIBS) $(NET_LIBS)
CFLAGS = -ffast-math -O3 -Ofast -G0 -Wall $(GPROF_FLAGS) -Did386="0" -DPSP $(MODE) $(HARDWARE_VIDEO_ONLY_FLAGS) -DSWIZZLE32 -DPSP_MP3_HWDECODE -DFULLBRIGHT -DHL_RENDER -Wno-strict-aliasing -DPSP_VFPU CFLAGS = -ffast-math -O3 -Ofast -G0 -Wall $(GPROF_FLAGS) -Did386="0" -DPSP $(MODE) $(HARDWARE_VIDEO_ONLY_FLAGS) \
-DSWIZZLE32 -DPSP_MP3_HWDECODE -DFULLBRIGHT -DHL_RENDER -Wno-strict-aliasing -DPSP_VFPU -DPLATFORM_DIRECTORY="psp" \
-DPLATFORM_RENDERER="gu"
CXXFLAGS = -fno-rtti -Wcast-qual -Wno-write-strings -Wno-sign-compare -Wno-strict-aliasing CXXFLAGS = -fno-rtti -Wcast-qual -Wno-write-strings -Wno-sign-compare -Wno-strict-aliasing
ASFLAGS = $(CFLAGS) -c ASFLAGS = $(CFLAGS) -c

2
Makefile.rvl
View file

@ -31,7 +31,7 @@ INCLUDES :=
CFLAGS = $(MACHDEP) $(INCLUDE) \ CFLAGS = $(MACHDEP) $(INCLUDE) \
-g -Wall -O2 -Wcast-align -fno-merge-constants -fstrict-aliasing -fsingle-precision-constant -fno-aggressive-loop-optimizations \ -g -Wall -O2 -Wcast-align -fno-merge-constants -fstrict-aliasing -fsingle-precision-constant -fno-aggressive-loop-optimizations \
-DGXQUAKE -DNQ_HACK -Wtrigraphs -D__WII__ -DGXQUAKE -DNQ_HACK -Wtrigraphs -D__WII__ -DPLATFORM_DIRECTORY="wii" -DPLATFORM_RENDERER="gx"
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)

2
source/chase.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// chase.c -- chase camera code // chase.c -- chase camera code
#include "quakedef.h" #include "nzportable_def.h"
cvar_t chase_back = {"chase_back", "100"}; cvar_t chase_back = {"chase_back", "100"};
cvar_t chase_up = {"chase_up", "16"}; cvar_t chase_up = {"chase_up", "16"};

2
source/cl_demo.c
View file

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "quakedef.h" #include "nzportable_def.h"
void CL_FinishTimeDemo (void); void CL_FinishTimeDemo (void);

2
source/cl_hud.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// cl_hud.c -- status bar code // cl_hud.c -- status bar code
#include "quakedef.h" #include "nzportable_def.h"
#ifdef __PSP__ #ifdef __PSP__
#include <pspgu.h> #include <pspgu.h>

2
source/cl_input.c
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All // Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
// rights reserved. // rights reserved.
#include "quakedef.h" #include "nzportable_def.h"
/* /*
=============================================================================== ===============================================================================

2
source/cl_main.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// cl_main.c -- client main loop // cl_main.c -- client main loop
#include "quakedef.h" #include "nzportable_def.h"
#include "cl_slist.h" #include "cl_slist.h"
// we need to declare some mouse variables here, because the menu system // we need to declare some mouse variables here, because the menu system

2
source/cl_parse.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// cl_parse.c -- parse a message received from the server // cl_parse.c -- parse a message received from the server
#include "quakedef.h" #include "nzportable_def.h"
extern double hud_maxammo_starttime; extern double hud_maxammo_starttime;
extern double hud_maxammo_endtime; extern double hud_maxammo_endtime;

2
source/cl_slist.c
View file

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "quakedef.h" #include "nzportable_def.h"
#include "cl_slist.h" #include "cl_slist.h"
server_entry_t slist[MAX_SERVER_LIST]; server_entry_t slist[MAX_SERVER_LIST];

2
source/cl_tent.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// cl_tent.c -- client side temporary entities // cl_tent.c -- client side temporary entities
#include "quakedef.h" #include "nzportable_def.h"
static vec3_t playerbeam_end; // added by joe static vec3_t playerbeam_end; // added by joe

2
source/cmd.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// cmd.c -- Quake script command processing module // cmd.c -- Quake script command processing module
#include "quakedef.h" #include "nzportable_def.h"
void Cmd_ForwardToServer (void); void Cmd_ForwardToServer (void);

2
source/console.c
View file

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#include "quakedef.h" #include "nzportable_def.h"
int con_linewidth; int con_linewidth;

2
source/crc.c
View file

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

2
source/ctr/cd_null.c
View file

@ -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. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../quakedef.h" #include "../nzportable_def.h"
void CDAudio_Play(byte track, qboolean looping) void CDAudio_Play(byte track, qboolean looping)
{ {

2
source/ctr/common.c
View file

@ -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 // common.c -- misc functions used in client and server
#include "../quakedef.h" #include "../nzportable_def.h"
#define NUM_SAFE_ARGVS 7 #define NUM_SAFE_ARGVS 7

2
source/ctr/gl/gl_decal.c
View file

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

2
source/ctr/gl/gl_decal.h
View file

@ -1,2 +0,0 @@
void R_SpawnDecal (vec3_t center, vec3_t normal, vec3_t tangent, int tex, int size, int isbsp);
void R_SpawnDecalStatic (vec3_t org, int tex, int size);

2
source/ctr/gl/gl_draw.c
View file

@ -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 // draw.c -- this is the only file outside the refresh that touches the
// vid buffer // vid buffer
#include "../../quakedef.h" #include "../../nzportable_def.h"
#define GL_COLOR_INDEX8_EXT 0x80E5 #define GL_COLOR_INDEX8_EXT 0x80E5

2
source/ctr/gl/gl_fog.c
View file

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

3
source/ctr/glquake.h → source/ctr/gl/gl_main.h
View file

@ -364,4 +364,7 @@ void QMB_Q3Gunshot (vec3_t org, int skinnum, float alpha);
void QMB_Q3Teleport (vec3_t org, float alpha); void QMB_Q3Teleport (vec3_t org, float alpha);
void QMB_Q3TorchFlame (vec3_t org, float size); void QMB_Q3TorchFlame (vec3_t org, float size);
void R_SpawnDecal (vec3_t center, vec3_t normal, vec3_t tangent, int tex, int size, int isbsp);
void R_SpawnDecalStatic (vec3_t org, int tex, int size);
extern qboolean qmb_initialized; extern qboolean qmb_initialized;

2
source/ctr/gl/gl_mesh.c
View file

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

2
source/ctr/gl/gl_model.c
View file

@ -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 // models are the only shared resource between a client and server running
// on the same machine. // on the same machine.
#include "../../quakedef.h" #include "../../nzportable_def.h"
model_t *loadmodel; model_t *loadmodel;
char loadname[32]; // for hunk tags char loadname[32]; // for hunk tags

2
source/ctr/gl/gl_qmb.c
View file

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

2
source/ctr/gl/gl_refrag.c
View file

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

2
source/ctr/gl/gl_rlight.c
View file

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

2
source/ctr/gl/gl_rmain.c
View file

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

2
source/ctr/gl/gl_rmisc.c
View file

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

2
source/ctr/gl/gl_rsurf.c
View file

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

2
source/ctr/gl/gl_screen.c
View file

@ -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 // screen.c -- master for refresh, status bar, console, chat, notify, etc
#include "../../quakedef.h" #include "../../nzportable_def.h"
/* /*

2
source/ctr/gl/gl_test.c
View file

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

2
source/ctr/gl/gl_vidctr.c
View file

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

2
source/ctr/gl/gl_warp.c
View file

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

2
source/ctr/in_ctr.c
View file

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

2
source/ctr/keys.c
View file

@ -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. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../quakedef.h" #include "../nzportable_def.h"
/* /*

2
source/ctr/menu.c
View file

@ -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. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../quakedef.h" #include "../nzportable_def.h"
#include <sys/dirent.h> #include <sys/dirent.h>
extern cvar_t r_wateralpha; extern cvar_t r_wateralpha;

2
source/ctr/net_bsd.c
View file

@ -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. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../quakedef.h" #include "../nzportable_def.h"
#include "../net_loop.h" #include "../net_loop.h"
#include "net_dgrm.h" #include "net_dgrm.h"

2
source/ctr/net_dgrm.c
View file

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

2
source/ctr/net_main.c
View file

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

2
source/ctr/net_udpctr.c
View file

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

2
source/ctr/r_part.c
View file

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

2
source/ctr/sbar.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// sbar.c -- status bar code // sbar.c -- status bar code
#include "../quakedef.h" #include "../nzportable_def.h"
int sb_updates; // if >= vid.numpages, no update needed int sb_updates; // if >= vid.numpages, no update needed

2
source/ctr/snd_ctr.c
View file

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

2
source/ctr/sys_ctr.c
View file

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

2
source/ctr/touch_ctr.c
View file

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

2
source/cvar.c
View file

@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// cvar.c -- dynamic variable tracking // cvar.c -- dynamic variable tracking
#include "quakedef.h" #include "nzportable_def.h"
static cvar_t *cvar_vars; static cvar_t *cvar_vars;
static char cvar_null_string[] = ""; static char cvar_null_string[] = "";

2
source/host.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// host.c -- coordinates spawning and killing of local servers // host.c -- coordinates spawning and killing of local servers
#include "quakedef.h" #include "nzportable_def.h"
#ifdef __PSP__ #ifdef __PSP__
#include "psp/thread.h" #include "psp/thread.h"

2
source/host_cmd.c
View file

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

2
source/mathlib.c
View file

@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// mathlib.c -- math primitives // mathlib.c -- math primitives
#include <math.h> #include <math.h>
#include "quakedef.h" #include "nzportable_def.h"
#ifdef PSP_VFPU #ifdef PSP_VFPU
#include <pspmath.h> #include <pspmath.h>

2
source/matrixlib.c
View file

@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
*/ */
#include "quakedef.h" #include "nzportable_def.h"
const matrix3x4 matrix3x4_identity = const matrix3x4 matrix3x4_identity =

2
source/net_loop.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// net_loop.c // net_loop.c
#include "quakedef.h" #include "nzportable_def.h"
#include "net_loop.h" #include "net_loop.h"
qboolean localconnectpending = false; qboolean localconnectpending = false;

2
source/net_vcr.c
View file

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

113
source/quakedef.h → source/nzportable_def.h
View file

@ -17,10 +17,26 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// quakedef.h -- primary header for client // nzportable_def.h -- primary header for client
//#define GLTEST // experimental stuff //#define GLTEST // experimental stuff
#ifndef PLATFORM_DIRECTORY
#error "Unknown platform! (Please build with -DPLATFORM_DIRECTORY='your_platform')"
#endif // PLATFORM_DIRECTORY
#ifndef PLATFORM_RENDERER
#error "Unknown renderer! (Please build with -DPLATFORM_RENDERER='your_renderer')"
#endif // PLATFORM_RENDERER
#define STRINGIFY_MACRO(x) STR(x)
#define STR(x) #x
#define EXPAND(x) x
#define CONCAT(n1, n2, n3) STRINGIFY_MACRO(EXPAND(n1)EXPAND(n2)EXPAND(n3))
#define CONCAT7(n1, n2, n3, n4, n5, n6, n7) STRINGIFY_MACRO(EXPAND(n1)EXPAND(n2)EXPAND(n3)EXPAND(n4)EXPAND(n5)EXPAND(n6)EXPAND(n7))
#define PLATFORM_FILE(file) CONCAT(PLATFORM_DIRECTORY,/,file)
#define RENDERER_FILE(file) CONCAT7(PLATFORM_DIRECTORY,/,PLATFORM_RENDERER,/,PLATFORM_RENDERER,_,file)
#ifndef __PSP__ #ifndef __PSP__
#define qtrue 1 #define qtrue 1
#define qfalse 0 #define qfalse 0
@ -205,20 +221,10 @@ extern int psp_system_model;
#define SOUND_CHANNELS 8 #define SOUND_CHANNELS 8
#include PLATFORM_FILE(common.h)
#include PLATFORM_FILE(vid.h)
#include PLATFORM_FILE(sys.h)
#ifdef _3DS
#include "ctr/common.h"
#include "ctr/vid.h"
#include "ctr/sys.h"
#elif __PSP__
#include "psp/common.h"
#include "psp/vid.h"
#include "psp/sys.h"
#elif __WII__
#include "wii/common.h"
#include "wii/vid.h"
#include "wii/sys.h"
#endif // _3DS, __PSP__, __WII__
#include "zone.h" #include "zone.h"
#include "mathlib.h" #include "mathlib.h"
#include "bspfile.h" #include "bspfile.h"
@ -243,79 +249,38 @@ typedef struct
#include "wad.h" #include "wad.h"
#include "draw.h" #include "draw.h"
#include "cvar.h" #include "cvar.h"
#ifdef _3DS
#include "ctr/screen.h" #include PLATFORM_FILE(screen.h)
#include "ctr/net.h" #include PLATFORM_FILE(net.h)
#elif __PSP__
#include "psp/screen.h"
#include "psp/net.h"
#elif __WII__
#include "wii/screen.h"
#include "wii/net.h"
#endif // _3DS
#include "protocol.h" #include "protocol.h"
#include "cmd.h" #include "cmd.h"
#ifdef _3DS
#include "ctr/sbar.h" #include PLATFORM_FILE(render.h)
#endif // _3DS #include PLATFORM_FILE(client.h)
#include "cl_hud.h" #include "cl_hud.h"
#include "sound.h" #include "sound.h"
#ifdef _3DS
#include "ctr/render.h"
#include "ctr/client.h"
#elif __PSP__
#include "psp/render.h"
#include "psp/client.h"
#elif __WII__
#include "wii/render.h"
#include "wii/client.h"
#endif // _3DS
#include "progs.h"
#ifdef _3DS
#include "ctr/server.h"
#elif __PSP__
#include "psp/server.h"
#elif __WII__
#include "wii/server.h"
#endif // _3DS
#ifdef _3DS #include "progs.h"
#include "ctr/gl/gl_model.h"
#include "ctr/gl/gl_decal.h" #include PLATFORM_FILE(server.h)
#elif __WII__ #include RENDERER_FILE(model.h)
#include "wii/gx/gx_model.h"
#else
#include "psp/gu/gu_model.h"
#endif
#include "input.h" #include "input.h"
#include "world.h" #include "world.h"
#ifdef _3DS
#include "ctr/keys.h" #include PLATFORM_FILE(keys.h)
#elif __PSP__
#include "psp/keys.h"
#elif __WII__
#include "wii/keys.h"
#endif
#include "console.h" #include "console.h"
#include "view.h" #include "view.h"
#ifdef _3DS
#include "ctr/menu.h" #include PLATFORM_FILE(menu.h)
#elif __PSP__
#include "psp/menu.h"
#elif __WII__
#include "wii/menu.h"
#endif
#include "crc.h" #include "crc.h"
#include "cdaudio.h" #include "cdaudio.h"
#ifdef _3DS #include RENDERER_FILE(main.h)
#include "ctr/glquake.h"
#elif __WII__
#include "wii/gx/gxquake.h"
#else
#include "psp/gu/gu_psp.h"
#endif
//============================================================================= //=============================================================================

2
source/pr_cmds.c
View file

@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "quakedef.h" #include "nzportable_def.h"
#ifdef _3DS #ifdef _3DS
extern bool new3ds_flag; extern bool new3ds_flag;

2
source/pr_edict.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// sv_edict.c -- entity dictionary // sv_edict.c -- entity dictionary
#include "quakedef.h" #include "nzportable_def.h"
dprograms_t *progs; dprograms_t *progs;
dfunction_t *pr_functions; dfunction_t *pr_functions;

2
source/pr_exec.c
View file

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

2
source/psp/battery.cpp
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../quakedef.h" #include "../nzportable_def.h"
} }
extern cvar_t show_bat; extern cvar_t show_bat;

2
source/psp/cd.cpp
View file

@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../quakedef.h" #include "../nzportable_def.h"
} }
extern cvar_t bgmtype; extern cvar_t bgmtype;

2
source/psp/clipping.cpp
View file

@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../quakedef.h" #include "../nzportable_def.h"
} }
namespace quake namespace quake

2
source/psp/common.c
View file

@ -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 // common.c -- misc functions used in client and server
#include "../quakedef.h" #include "../nzportable_def.h"
#define NUM_SAFE_ARGVS 7 #define NUM_SAFE_ARGVS 7

2
source/psp/gu/gu_QMB.cpp
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
//entity_t *CL_NewTempEntity (void); //entity_t *CL_NewTempEntity (void);
} }

2
source/psp/gu/gu_colorquant.cpp
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include <pspgu.h> #include <pspgu.h>
#include <malloc.h> #include <malloc.h>

2
source/psp/gu/gu_decals_QMB.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// gl_decals.c // gl_decals.c
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include <pspgu.h> #include <pspgu.h>

2
source/psp/gu/gu_draw.cpp
View file

@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include "gu_dxtn.h" #include "gu_dxtn.h"

2
source/psp/gu/gu_entity_fragment.cpp
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
mnode_t *r_pefragtopnode; mnode_t *r_pefragtopnode;

2
source/psp/gu/gu_fog.cpp
View file

@ -6,7 +6,7 @@ Fogging system based on FitzQuake's implementation
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include <pspgu.h> #include <pspgu.h>

2
source/psp/gu/gu_fullbright.cpp
View file

@ -2,7 +2,7 @@
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include <pspgu.h> #include <pspgu.h>

2
source/psp/gu/gu_hlmdl.cpp
View file

@ -1,7 +1,7 @@
extern"C" extern"C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
/* /*

2
source/psp/gu/gu_images.cpp
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include <jpeglib.h> #include <jpeglib.h>
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include <pspgu.h> #include <pspgu.h>

2
source/psp/gu/gu_light.cpp
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include <pspgu.h> #include <pspgu.h>

2
source/psp/gu/gu_main.cpp
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
float TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal); float TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal);
} }

0
source/psp/gu/gu_psp.h → source/psp/gu/gu_main.h
View file

2
source/psp/gu/gu_mesh.cpp
View file

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
/* /*

2
source/psp/gu/gu_mhex2.cpp
View file

@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
/* /*

2
source/psp/gu/gu_misc.cpp
View file

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
void CL_CopyPlayerInfo (entity_t *ent, entity_t *player); void CL_CopyPlayerInfo (entity_t *ent, entity_t *player);
} }

2
source/psp/gu/gu_model.cpp
View file

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include <malloc.h> #include <malloc.h>
#include <pspgu.h> #include <pspgu.h>

2
source/psp/gu/gu_part.cpp
View file

@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#define MAX_PARTICLES 2048 // default max # of particles at one #define MAX_PARTICLES 2048 // default max # of particles at one

2
source/psp/gu/gu_psp.cpp
View file

@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <limits.h> #include <limits.h>
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include <vram.h> #include <vram.h>

2
source/psp/gu/gu_resample.cpp
View file

@ -2,7 +2,7 @@
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#define LERPBYTE(i) r = row1[i]; out[i] = (byte) ((((row2[i] - r) * lerp) >> 16) + r) #define LERPBYTE(i) r = row1[i]; out[i] = (byte) ((((row2[i] - r) * lerp) >> 16) + r)

2
source/psp/gu/gu_screen.cpp
View file

@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include <pspdisplay.h> #include <pspdisplay.h>

2
source/psp/gu/gu_surface.cpp
View file

@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#ifdef PSP_VFPU #ifdef PSP_VFPU

2
source/psp/gu/gu_warp.cpp
View file

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../../quakedef.h" #include "../../nzportable_def.h"
} }
#include "../clipping.hpp" #include "../clipping.hpp"

2
source/psp/input.cpp
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../quakedef.h" #include "../nzportable_def.h"
} }
namespace quake namespace quake

2
source/psp/keys.c
View file

@ -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. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../quakedef.h" #include "../nzportable_def.h"
/* /*

2
source/psp/main.cpp
View file

@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../quakedef.h" #include "../nzportable_def.h"
#include "thread.h" #include "thread.h"
#include "m33libs/kubridge.h" #include "m33libs/kubridge.h"
void VramSetSize(int kb); void VramSetSize(int kb);

2
source/psp/menu.c
View file

@ -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. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../quakedef.h" #include "../nzportable_def.h"
#include <pspgu.h> #include <pspgu.h>
#include <pspkernel.h> #include <pspkernel.h>

2
source/psp/net_dgrm.c
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "pspkernel.h" #include "pspkernel.h"
#include "../quakedef.h" #include "../nzportable_def.h"
#include "net_dgrm.h" #include "net_dgrm.h"
// these two macros are to make the code more readable // these two macros are to make the code more readable

2
source/psp/net_main.c
View file

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

2
source/psp/network_infrastructure.hpp
View file

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../quakedef.h" #include "../nzportable_def.h"
} }
namespace quake namespace quake

2
source/psp/network_psp.hpp
View file

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../quakedef.h" #include "../nzportable_def.h"
} }
namespace quake namespace quake

2
source/psp/sound.cpp
View file

@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../quakedef.h" #include "../nzportable_def.h"
} }
namespace quake namespace quake

2
source/psp/system.cpp
View file

@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "sys.h" #include "sys.h"
#include "../quakedef.h" #include "../nzportable_def.h"
} }
#include "fnmatch.h" #include "fnmatch.h"

2
source/psp/thread.c
View file

@ -1,6 +1,6 @@
#include <pspkernel.h> #include <pspkernel.h>
#include "../quakedef.h" #include "../nzportable_def.h"
#include "thread.h" #include "thread.h"
SceUID sound_thread; SceUID sound_thread;

2
source/psp/vram.cpp
View file

@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern "C" extern "C"
{ {
#include "../quakedef.h" #include "../nzportable_def.h"
} }
namespace quake namespace quake

2
source/snd_dma.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// snd_dma.c -- main control for any streaming sound output device // snd_dma.c -- main control for any streaming sound output device
#include "quakedef.h" #include "nzportable_def.h"

2
source/snd_mem.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// snd_mem.c: sound caching // snd_mem.c: sound caching
#include "quakedef.h" #include "nzportable_def.h"
int cache_full_cycle; int cache_full_cycle;

2
source/snd_mix.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// snd_mix.c -- portable code to mix sounds for snd_dma.c // snd_mix.c -- portable code to mix sounds for snd_dma.c
#include "quakedef.h" #include "nzportable_def.h"
#define DWORD unsigned long #define DWORD unsigned long

2
source/sv_main.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// sv_main.c -- server main program // sv_main.c -- server main program
#include "quakedef.h" #include "nzportable_def.h"
server_t sv; server_t sv;
server_static_t svs; server_static_t svs;

2
source/sv_move.c
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// sv_move.c -- monster movement // sv_move.c -- monster movement
#include "quakedef.h" #include "nzportable_def.h"
#define STEPSIZE 18 #define STEPSIZE 18

2
source/sv_phys.c
View file

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

Some files were not shown because too many files have changed in this diff Show more