mirror of
https://github.com/ioquake/jedi-academy.git
synced 2024-11-22 04:11:57 +00:00
fix #includes to compile on non windows without pch
This commit is contained in:
parent
53d289ddc2
commit
0c448c94df
71 changed files with 117 additions and 77 deletions
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#pragma optimize("p", on)
|
#pragma optimize("p", on)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
#include "../qcommon/cm_terrainmap.h"
|
#include "../qcommon/cm_terrainmap.h"
|
||||||
|
|
||||||
/************************************************************************************************
|
/************************************************************************************************
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
|
|
||||||
//#include "rm_instance_npc.h"
|
//#include "RM_Instance_NPC.h"
|
||||||
#include "rm_instance_bsp.h"
|
#include "RM_Instance_BSP.h"
|
||||||
#include "rm_instance_random.h"
|
#include "RM_Instance_Random.h"
|
||||||
#include "rm_instance_group.h"
|
#include "RM_Instance_Group.h"
|
||||||
#include "rm_instance_void.h"
|
#include "RM_Instance_Void.h"
|
||||||
|
|
||||||
/************************************************************************************************
|
/************************************************************************************************
|
||||||
* CRMInstanceFile::CRMInstanceFile
|
* CRMInstanceFile::CRMInstanceFile
|
||||||
|
|
|
@ -11,9 +11,9 @@
|
||||||
|
|
||||||
#include "../qcommon/cm_local.h"
|
#include "../qcommon/cm_local.h"
|
||||||
#include "../server/server.h"
|
#include "../server/server.h"
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
|
|
||||||
#include "rm_instance_bsp.h"
|
#include "RM_Instance_BSP.h"
|
||||||
|
|
||||||
#include "../client/vmachine.h"
|
#include "../client/vmachine.h"
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,9 @@
|
||||||
|
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
|
|
||||||
#include "rm_instance_group.h"
|
#include "RM_Instance_Group.h"
|
||||||
|
|
||||||
/************************************************************************************************
|
/************************************************************************************************
|
||||||
* CRMGroupInstance::CRMGroupInstance
|
* CRMGroupInstance::CRMGroupInstance
|
||||||
|
|
|
@ -9,9 +9,9 @@
|
||||||
|
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
|
|
||||||
#include "rm_instance_random.h"
|
#include "RM_Instance_Random.h"
|
||||||
|
|
||||||
/************************************************************************************************
|
/************************************************************************************************
|
||||||
* CRMRandomInstance::CRMRandomInstance
|
* CRMRandomInstance::CRMRandomInstance
|
||||||
|
|
|
@ -9,9 +9,9 @@
|
||||||
|
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
|
|
||||||
#include "rm_instance_void.h"
|
#include "RM_Instance_Void.h"
|
||||||
|
|
||||||
/************************************************************************************************
|
/************************************************************************************************
|
||||||
* CRMVoidInstance::CRMVoidInstance
|
* CRMVoidInstance::CRMVoidInstance
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
#include "../server/server.h"
|
#include "../server/server.h"
|
||||||
|
|
||||||
CRMObjective *CRMManager::mCurObjective=0;
|
CRMObjective *CRMManager::mCurObjective=0;
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
|
|
||||||
#define ARIOCHE_CLIPBRUSH_SIZE 300
|
#define ARIOCHE_CLIPBRUSH_SIZE 300
|
||||||
#define CVAR_OBJECTIVE 0
|
#define CVAR_OBJECTIVE 0
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
|
|
||||||
/************************************************************************************************
|
/************************************************************************************************
|
||||||
* CRMObjective::CRMObjective
|
* CRMObjective::CRMObjective
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
************************************************************************************************/
|
************************************************************************************************/
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
|
|
||||||
#define max(a,b) (((a) > (b)) ? (a) : (b))
|
#define max(a,b) (((a) > (b)) ? (a) : (b))
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,8 @@
|
||||||
#include "../qcommon/cm_randomterrain.h"
|
#include "../qcommon/cm_randomterrain.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
class CRMPathManager;
|
class CRMPathManager;
|
||||||
|
|
||||||
// directions you can proceed from cells
|
// directions you can proceed from cells
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "../client/client.h"
|
#include "../client/client.h"
|
||||||
#include "../qcommon/cm_local.h"
|
#include "../qcommon/cm_local.h"
|
||||||
#include "../renderer/tr_types.h"
|
#include "../renderer/tr_types.h"
|
||||||
#include "rm_headers.h"
|
#include "RM_Headers.h"
|
||||||
|
|
||||||
//#include "../qcommon/q_imath.h"
|
//#include "../qcommon/q_imath.h"
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,8 @@
|
||||||
#define STRING_H_INC
|
#define STRING_H_INC
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "../game/q_shared.h"
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Forward Dec.
|
// Forward Dec.
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include "cg_media.h"
|
#include "cg_media.h"
|
||||||
#include "../game/objectives.h"
|
#include "../game/objectives.h"
|
||||||
#include "../game/g_vehicles.h"
|
#include "../game/g_vehicles.h"
|
||||||
|
#include "../game/g_local.h"
|
||||||
|
|
||||||
#ifdef _XBOX
|
#ifdef _XBOX
|
||||||
#include "../client/fffx.h"
|
#include "../client/fffx.h"
|
||||||
|
|
|
@ -6,10 +6,12 @@
|
||||||
//#include "cg_local.h"
|
//#include "cg_local.h"
|
||||||
#include "cg_media.h"
|
#include "cg_media.h"
|
||||||
#include "../game/g_functions.h"
|
#include "../game/g_functions.h"
|
||||||
#include "../ghoul2/g2.h"
|
#include "../ghoul2/G2.h"
|
||||||
#include "FxScheduler.h"
|
#include "FxScheduler.h"
|
||||||
#include "../game/wp_saber.h"
|
#include "../game/wp_saber.h"
|
||||||
#include "../game/g_vehicles.h"
|
#include "../game/g_vehicles.h"
|
||||||
|
#include "../game/anims.h"
|
||||||
|
#include "../game/g_local.h"
|
||||||
|
|
||||||
extern void CG_AddSaberBlade( centity_t *cent, centity_t *scent, refEntity_t *saber, int renderfx, int modelIndex, vec3_t origin, vec3_t angles);
|
extern void CG_AddSaberBlade( centity_t *cent, centity_t *scent, refEntity_t *saber, int renderfx, int modelIndex, vec3_t origin, vec3_t angles);
|
||||||
extern void CG_CheckSaberInWater( centity_t *cent, centity_t *scent, int saberNum, int modelIndex, vec3_t origin, vec3_t angles );
|
extern void CG_CheckSaberInWater( centity_t *cent, centity_t *scent, int saberNum, int modelIndex, vec3_t origin, vec3_t angles );
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
#include "../client/vmachine.h"
|
#include "../client/vmachine.h"
|
||||||
#include "cg_lights.h"
|
#include "cg_lights.h"
|
||||||
|
#include "../game/g_local.h"
|
||||||
|
|
||||||
#ifdef _IMMERSION
|
#ifdef _IMMERSION
|
||||||
#include "../ff/ff.h"
|
#include "../ff/ff.h"
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
#include "../game/anims.h"
|
#include "../game/anims.h"
|
||||||
#include "../game/wp_saber.h"
|
#include "../game/wp_saber.h"
|
||||||
#include "../game/g_vehicles.h"
|
#include "../game/g_vehicles.h"
|
||||||
|
#include "../game/g_local.h"
|
||||||
|
#include "../game/b_local.h"
|
||||||
#include "../Rufl/hstring.h"
|
#include "../Rufl/hstring.h"
|
||||||
|
|
||||||
#define LOOK_SWING_SCALE 0.5f
|
#define LOOK_SWING_SCALE 0.5f
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
//#include "cg_local.h"
|
//#include "cg_local.h"
|
||||||
#include "cg_media.h"
|
#include "cg_media.h"
|
||||||
|
#include "../game/g_local.h"
|
||||||
|
|
||||||
#include "../game/g_vehicles.h"
|
#include "../game/g_vehicles.h"
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
#include "cg_lights.h"
|
#include "cg_lights.h"
|
||||||
#include "../game/wp_saber.h"
|
#include "../game/wp_saber.h"
|
||||||
#include "../game/g_vehicles.h"
|
#include "../game/g_vehicles.h"
|
||||||
|
#include "../game/g_local.h"
|
||||||
|
#include "../game/g_functions.h"
|
||||||
|
|
||||||
#define MASK_CAMERACLIP (MASK_SOLID)
|
#define MASK_CAMERACLIP (MASK_SOLID)
|
||||||
#define CAMERA_SIZE 4
|
#define CAMERA_SIZE 4
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include "../game/g_vehicles.h"
|
#include "../game/g_vehicles.h"
|
||||||
|
|
||||||
#include "../game/anims.h"
|
#include "../game/anims.h"
|
||||||
|
#include "../game/g_local.h"
|
||||||
|
|
||||||
#ifdef _IMMERSION
|
#ifdef _IMMERSION
|
||||||
#include "../ff/ff.h"
|
#include "../ff/ff.h"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#else
|
#else
|
||||||
#include "fffx.h"
|
#include "fffx.h"
|
||||||
#endif // _IMMERSION
|
#endif // _IMMERSION
|
||||||
#include "../ghoul2/g2.h"
|
#include "../ghoul2/G2.h"
|
||||||
|
|
||||||
#include "../RMG/RM_Headers.h"
|
#include "../RMG/RM_Headers.h"
|
||||||
|
|
||||||
|
|
|
@ -9,10 +9,12 @@
|
||||||
#include "../mp3code/mp3struct.h"
|
#include "../mp3code/mp3struct.h"
|
||||||
|
|
||||||
// Open AL Specific
|
// Open AL Specific
|
||||||
#include "openal/al.h"
|
#include <AL/al.h>
|
||||||
#include "openal/alc.h"
|
#include <AL/alc.h>
|
||||||
|
#ifdef HAVE_EAX
|
||||||
#include "eax/eax.h"
|
#include "eax/eax.h"
|
||||||
#include "eax/eaxman.h"
|
#include "eax/eaxman.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
// Added for Open AL to know when to mute all sounds (e.g when app. loses focus)
|
// Added for Open AL to know when to mute all sounds (e.g when app. loses focus)
|
||||||
void S_AL_MuteAllSounds(qboolean bMute);
|
void S_AL_MuteAllSounds(qboolean bMute);
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
#include "snd_local.h"
|
#include "snd_local.h"
|
||||||
#include "cl_mp3.h"
|
#include "cl_mp3.h"
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
// Open AL
|
// Open AL
|
||||||
void S_PreProcessLipSync(sfx_t *sfx);
|
void S_PreProcessLipSync(sfx_t *sfx);
|
||||||
extern int s_UseOpenAL;
|
extern int s_UseOpenAL;
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
#include "../qcommon/sstring.h"
|
#include "../qcommon/sstring.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
#ifdef _XBOX
|
#ifdef _XBOX
|
||||||
#include "snd_local_console.h"
|
#include "snd_local_console.h"
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
// vmachine.cpp -- wrapper to fake virtual machine for client
|
// vmachine.cpp -- wrapper to fake virtual machine for client
|
||||||
|
|
||||||
|
#include "../game/q_shared.h"
|
||||||
#include "vmachine.h"
|
#include "vmachine.h"
|
||||||
#pragma warning (disable : 4514)
|
#pragma warning (disable : 4514)
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include "b_local.h"
|
#include "b_local.h"
|
||||||
#include "anims.h"
|
#include "anims.h"
|
||||||
#include "g_navigator.h"
|
#include "g_navigator.h"
|
||||||
#include "g_Vehicles.h"
|
#include "g_vehicles.h"
|
||||||
#if !defined(RATL_VECTOR_VS_INC)
|
#if !defined(RATL_VECTOR_VS_INC)
|
||||||
#include "../Ratl/vector_vs.h"
|
#include "../Ratl/vector_vs.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
// leave this line at the top for all g_xxxx.cpp files...
|
// leave this line at the top for all g_xxxx.cpp files...
|
||||||
#include "g_headers.h"
|
#include "g_headers.h"
|
||||||
|
|
||||||
#include "G_Local.h"
|
#include "g_local.h"
|
||||||
#include "../rufl/hstring.h"
|
#include "../Rufl/hstring.h"
|
||||||
|
|
||||||
#define MAX_GTIMERS 16384
|
#define MAX_GTIMERS 16384
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "anims.h"
|
#include "anims.h"
|
||||||
#include "g_functions.h"
|
#include "g_functions.h"
|
||||||
#include "wp_saber.h"
|
#include "wp_saber.h"
|
||||||
#include "g_Vehicles.h"
|
#include "g_vehicles.h"
|
||||||
|
|
||||||
extern qboolean G_CheckForStrongAttackMomentum( gentity_t *self );
|
extern qboolean G_CheckForStrongAttackMomentum( gentity_t *self );
|
||||||
extern void G_AddVoiceEvent( gentity_t *self, int event, int speakDebounceTime );
|
extern void G_AddVoiceEvent( gentity_t *self, int event, int speakDebounceTime );
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "b_public.h"
|
#include "b_public.h"
|
||||||
#include "anims.h"
|
#include "anims.h"
|
||||||
#include "wp_saber.h"
|
#include "wp_saber.h"
|
||||||
#include "g_Vehicles.h"
|
#include "g_vehicles.h"
|
||||||
#if !defined(RUFL_HSTRING_INC)
|
#if !defined(RUFL_HSTRING_INC)
|
||||||
#include "../Rufl/hstring.h"
|
#include "../Rufl/hstring.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __Q3_INTERFACE__
|
#ifndef __Q3_INTERFACE__
|
||||||
#define __Q3_INTERFACE__
|
#define __Q3_INTERFACE__
|
||||||
|
|
||||||
#include "../Icarus/IcarusInterface.h"
|
#include "../icarus/IcarusInterface.h"
|
||||||
|
|
||||||
//NOTENOTE: The enums and tables in this file will obviously bitch if they are included multiple times, don't do that
|
//NOTENOTE: The enums and tables in this file will obviously bitch if they are included multiple times, don't do that
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "g_local.h"
|
#include "g_local.h"
|
||||||
#include "say.h"
|
#include "say.h"
|
||||||
|
|
||||||
#include "AI.h"
|
#include "ai.h"
|
||||||
|
|
||||||
#define AI_TIMERS 0//turn on to see print-outs of AI/nav timing
|
#define AI_TIMERS 0//turn on to see print-outs of AI/nav timing
|
||||||
//
|
//
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define __B_PUBLIC_H__
|
#define __B_PUBLIC_H__
|
||||||
|
|
||||||
#include "bstate.h"
|
#include "bstate.h"
|
||||||
#include "AI.h"
|
#include "ai.h"
|
||||||
|
|
||||||
#define NPCAI_CHECK_WEAPON 0x00000001
|
#define NPCAI_CHECK_WEAPON 0x00000001
|
||||||
#define NPCAI_BURST_WEAPON 0x00000002
|
#define NPCAI_BURST_WEAPON 0x00000002
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
// #include "../game/q_math.h"
|
// #include "../game/q_math.h"
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
#ifdef _XBOX
|
#if defined(_XBOX) || defined(__GNUC__)
|
||||||
#define GAME_INCLUDE
|
#define GAME_INCLUDE
|
||||||
#include "../game/b_local.h"
|
#include "../game/b_local.h"
|
||||||
#include "../cgame/cg_local.h"
|
#include "../cgame/cg_local.h"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#include "g_headers.h"
|
#include "g_headers.h"
|
||||||
|
|
||||||
|
|
||||||
#include "IcarusInterface.h"
|
#include "../icarus/IcarusInterface.h"
|
||||||
#include "Q3_Interface.h"
|
#include "Q3_Interface.h"
|
||||||
#include "g_local.h"
|
#include "g_local.h"
|
||||||
#include "g_functions.h"
|
#include "g_functions.h"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
// Precompiled header file for the game dll
|
// Precompiled header file for the game dll
|
||||||
|
|
||||||
#include "g_headers.h"
|
#include "g_headers.h"
|
||||||
#include "NPC_Headers.h"
|
#include "npc_headers.h"
|
||||||
#include "../cgame/cg_headers.h"
|
#include "../cgame/cg_headers.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
#if !defined(TEAMS_H_INC)
|
#if !defined(TEAMS_H_INC)
|
||||||
#include "../game/Teams.h"
|
#include "../game/teams.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//#if !defined(IGINTERFACE_H_INC)
|
//#if !defined(IGINTERFACE_H_INC)
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
// More stuff that we "need" on Xbox, as we don't use PCH
|
// More stuff that we "need" on Xbox, as we don't use PCH
|
||||||
#ifdef _XBOX
|
#if defined(_XBOX) || defined(__GNUC__)
|
||||||
#include "../game/b_local.h"
|
#include "../game/b_local.h"
|
||||||
#include "../game/g_functions.h"
|
#include "../game/g_functions.h"
|
||||||
#include "../game/g_nav.h"
|
#include "../game/g_nav.h"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "g_functions.h"
|
#include "g_functions.h"
|
||||||
#include "objectives.h"
|
#include "objectives.h"
|
||||||
|
|
||||||
#include "../Icarus/IcarusInterface.h"
|
#include "../icarus/IcarusInterface.h"
|
||||||
|
|
||||||
|
|
||||||
int BMS_START = 0;
|
int BMS_START = 0;
|
||||||
|
|
|
@ -150,7 +150,7 @@ extern qboolean G2API_SetBoneAnglesIndex(CGhoul2Info *ghlInfo, const int index,
|
||||||
qhandle_t *modelList, int blendTime, int currentTime);
|
qhandle_t *modelList, int blendTime, int currentTime);
|
||||||
extern qboolean G2API_SetBoneAnimIndex(CGhoul2Info *ghlInfo, const int index, const int startFrame, const int endFrame, const int flags, const float animSpeed, const int currentTime, const float setFrame, const int blendTime);
|
extern qboolean G2API_SetBoneAnimIndex(CGhoul2Info *ghlInfo, const int index, const int startFrame, const int endFrame, const int flags, const float animSpeed, const int currentTime, const float setFrame, const int blendTime);
|
||||||
*/
|
*/
|
||||||
#include "../ghoul2/g2.h"
|
#include "../ghoul2/G2.h"
|
||||||
extern int SG_Read (unsigned long chid, void *pvAddress, int iLength, void **ppvAddressPtr);
|
extern int SG_Read (unsigned long chid, void *pvAddress, int iLength, void **ppvAddressPtr);
|
||||||
extern int SG_ReadOptional (unsigned long chid, void *pvAddress, int iLength, void **ppvAddressPtr);
|
extern int SG_ReadOptional (unsigned long chid, void *pvAddress, int iLength, void **ppvAddressPtr);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "g_headers.h"
|
#include "g_headers.h"
|
||||||
|
|
||||||
|
|
||||||
#include "IcarusInterface.h"
|
#include "../icarus/IcarusInterface.h"
|
||||||
#include "Q3_Interface.h"
|
#include "Q3_Interface.h"
|
||||||
#include "g_local.h"
|
#include "g_local.h"
|
||||||
#include "fields.h"
|
#include "fields.h"
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
#include "bg_public.h"
|
#include "bg_public.h"
|
||||||
#include "g_public.h"
|
#include "g_public.h"
|
||||||
#include "b_public.h"
|
#include "b_public.h"
|
||||||
#include "../Icarus/Stdafx.h" //need stl
|
#include "../icarus/StdAfx.h" //need stl
|
||||||
#include "../renderer/tr_types.h"
|
#include "../renderer/tr_types.h"
|
||||||
#include "../cgame/cg_public.h"
|
#include "../cgame/cg_public.h"
|
||||||
#include "G_Vehicles.h"
|
#include "g_vehicles.h"
|
||||||
#include "hitlocs.h"
|
#include "hitlocs.h"
|
||||||
#include "bset.h"
|
#include "bset.h"
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#ifndef _JK2MP
|
#ifndef _JK2MP
|
||||||
#include "g_functions.h"
|
#include "g_functions.h"
|
||||||
#include "g_vehicles.h"
|
#include "g_vehicles.h"
|
||||||
#include "../CGame/cg_Local.h"
|
#include "../cgame/cg_local.h"
|
||||||
#else
|
#else
|
||||||
#include "bg_vehicles.h"
|
#include "bg_vehicles.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -46,6 +46,8 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
#ifdef _XBOX
|
#ifdef _XBOX
|
||||||
#define tvector(T) std::vector< T >
|
#define tvector(T) std::vector< T >
|
||||||
|
|
|
@ -15,14 +15,14 @@
|
||||||
#include "../qcommon/qcommon.h"
|
#include "../qcommon/qcommon.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../renderer/MatComp.h"
|
#include "../renderer/matcomp.h"
|
||||||
|
|
||||||
#if !defined(G2_H_INC)
|
#if !defined(G2_H_INC)
|
||||||
#include "G2.h"
|
#include "G2.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//rww - RAGDOLL_BEGIN
|
//rww - RAGDOLL_BEGIN
|
||||||
#include <FLOAT.H>
|
#include <float.h>
|
||||||
#include "ghoul2_gore.h"
|
#include "ghoul2_gore.h"
|
||||||
//rww - RAGDOLL_END
|
//rww - RAGDOLL_END
|
||||||
|
|
||||||
|
|
|
@ -12,21 +12,21 @@
|
||||||
#include "../renderer/tr_local.h"
|
#include "../renderer/tr_local.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../renderer/MatComp.h"
|
#include "../renderer/matcomp.h"
|
||||||
|
|
||||||
#if !defined(G2_H_INC)
|
#if !defined(G2_H_INC)
|
||||||
#include "G2.h"
|
#include "G2.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined (MINIHEAP_H_INC)
|
#if !defined (MINIHEAP_H_INC)
|
||||||
#include "../qcommon/miniheap.h"
|
#include "../qcommon/MiniHeap.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define G2_MODEL_OK(g) ((g)&&(g)->mValid&&(g)->aHeader&&(g)->currentModel&&(g)->animModel)
|
#define G2_MODEL_OK(g) ((g)&&(g)->mValid&&(g)->aHeader&&(g)->currentModel&&(g)->animModel)
|
||||||
|
|
||||||
#include "../server/server.h"
|
#include "../server/server.h"
|
||||||
|
|
||||||
#include <FLOAT.H>
|
#include <float.h>
|
||||||
|
|
||||||
#ifdef _G2_GORE
|
#ifdef _G2_GORE
|
||||||
#include "ghoul2_gore.h"
|
#include "ghoul2_gore.h"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
// -- jweier
|
// -- jweier
|
||||||
|
|
||||||
// this include must remain at the top of every Icarus CPP file
|
// this include must remain at the top of every Icarus CPP file
|
||||||
#include "stdafx.h"
|
#include "StdAfx.h"
|
||||||
|
|
||||||
#include "IcarusInterface.h"
|
#include "IcarusInterface.h"
|
||||||
#include "IcarusImplementation.h"
|
#include "IcarusImplementation.h"
|
||||||
|
|
|
@ -4,6 +4,8 @@
|
||||||
#define __INTERPRETED_BLOCK_STREAM__
|
#define __INTERPRETED_BLOCK_STREAM__
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
typedef float vec3_t[3];
|
typedef float vec3_t[3];
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// IcarusImplementation.cpp
|
// IcarusImplementation.cpp
|
||||||
|
|
||||||
#include "stdafx.h"
|
#include "StdAfx.h"
|
||||||
#include "IcarusImplementation.h"
|
#include "IcarusImplementation.h"
|
||||||
|
|
||||||
#include "BlockStream.h"
|
#include "BlockStream.h"
|
||||||
|
@ -8,6 +8,8 @@
|
||||||
#include "TaskManager.h"
|
#include "TaskManager.h"
|
||||||
#include "Sequencer.h"
|
#include "Sequencer.h"
|
||||||
|
|
||||||
|
#include "../game/q_shared.h"
|
||||||
|
|
||||||
#define STL_ITERATE( a, b ) for ( a = b.begin(); a != b.end(); a++ )
|
#define STL_ITERATE( a, b ) for ( a = b.begin(); a != b.end(); a++ )
|
||||||
#define STL_INSERT( a, b ) a.insert( a.end(), b );
|
#define STL_INSERT( a, b ) a.insert( a.end(), b );
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
// -- jweier
|
// -- jweier
|
||||||
|
|
||||||
// this include must remain at the top of every Icarus CPP file
|
// this include must remain at the top of every Icarus CPP file
|
||||||
#include "stdafx.h"
|
#include "StdAfx.h"
|
||||||
#include "IcarusImplementation.h"
|
#include "IcarusImplementation.h"
|
||||||
|
|
||||||
#include "BlockStream.h"
|
#include "BlockStream.h"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
// -- jweier
|
// -- jweier
|
||||||
|
|
||||||
// this include must remain at the top of every Icarus CPP file
|
// this include must remain at the top of every Icarus CPP file
|
||||||
#include "stdafx.h"
|
#include "StdAfx.h"
|
||||||
#include "IcarusImplementation.h"
|
#include "IcarusImplementation.h"
|
||||||
|
|
||||||
#include "BlockStream.h"
|
#include "BlockStream.h"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
|
|
||||||
// this include must remain at the top of every Icarus CPP file
|
// this include must remain at the top of every Icarus CPP file
|
||||||
#include "stdafx.h"
|
#include "StdAfx.h"
|
||||||
#include "IcarusImplementation.h"
|
#include "IcarusImplementation.h"
|
||||||
|
|
||||||
#include "BlockStream.h"
|
#include "BlockStream.h"
|
||||||
|
|
|
@ -70,6 +70,11 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#ifndef WIN32
|
||||||
|
#include <stdint.h>
|
||||||
|
typedef int32_t INT32;
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We need memory copying and zeroing functions, plus strncpy().
|
* We need memory copying and zeroing functions, plus strncpy().
|
||||||
* ANSI and System V implementations declare these in <string.h>.
|
* ANSI and System V implementations declare these in <string.h>.
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
|
|
||||||
#include "small_header.h" // for SAMPLE and IN_OUT
|
#include "small_header.h" // for SAMPLE and IN_OUT
|
||||||
|
|
||||||
|
#ifndef byte
|
||||||
|
typedef unsigned char byte;
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef void (*SBT_FUNCTION) (float *sample, short *pcm, int n);
|
typedef void (*SBT_FUNCTION) (float *sample, short *pcm, int n);
|
||||||
typedef void (*XFORM_FUNCTION) (void *pcm, int igr);
|
typedef void (*XFORM_FUNCTION) (void *pcm, int igr);
|
||||||
typedef IN_OUT(*DECODE_FUNCTION) (unsigned char *bs, unsigned char *pcm);
|
typedef IN_OUT(*DECODE_FUNCTION) (unsigned char *bs, unsigned char *pcm);
|
||||||
|
|
|
@ -151,13 +151,6 @@ decode (standard decoder) reduction_code:
|
||||||
#include "mp3struct.h"
|
#include "mp3struct.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
|
||||||
#ifndef byte
|
|
||||||
typedef unsigned char byte;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct id3v1_1 {
|
typedef struct id3v1_1 {
|
||||||
char id[3];
|
char id[3];
|
||||||
char title[30]; // <file basename>
|
char title[30]; // <file basename>
|
||||||
|
|
|
@ -31,6 +31,13 @@
|
||||||
#define CEILING(a) \
|
#define CEILING(a) \
|
||||||
((a)==(int)(a) ? (a) : (a)>0 ? 1+(int)(a) : -(1+(int)(-a)))
|
((a)==(int)(a) ? (a) : (a)>0 ? 1+(int)(a) : -(1+(int)(-a)))
|
||||||
|
|
||||||
|
#ifndef WIN32
|
||||||
|
typedef struct {
|
||||||
|
int x;
|
||||||
|
int y;
|
||||||
|
} POINT;
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
// Current version of the single player game
|
// Current version of the single player game
|
||||||
#include "../win32/autoversion.h"
|
#include "../win32/AutoVersion.h"
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
#define Q3_VERSION "(debug)JA: v"VERSION_STRING_DOTTED
|
#define Q3_VERSION "(debug)JA: v"VERSION_STRING_DOTTED
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// leave this at the top for PCH reasons...
|
// leave this at the top for PCH reasons...
|
||||||
#include "common_headers.h"
|
#include "../game/common_headers.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "MatComp.h"
|
#include "matcomp.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
|
|
||||||
#include "tr_local.h"
|
#include "tr_local.h"
|
||||||
#include "MatComp.h"
|
#include "matcomp.h"
|
||||||
|
|
||||||
#ifdef VV_LIGHTING
|
#ifdef VV_LIGHTING
|
||||||
#include "tr_lightmanager.h"
|
#include "tr_lightmanager.h"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "tr_local.h"
|
#include "tr_local.h"
|
||||||
#include "tr_worldeffects.h"
|
#include "tr_WorldEffects.h"
|
||||||
|
|
||||||
// Patches up the loaded map to handle the parameters passed from the UI
|
// Patches up the loaded map to handle the parameters passed from the UI
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
|
|
||||||
#include "../qcommon/stringed_ingame.h"
|
#include "../qcommon/stringed_ingame.h"
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// This file is shared in the single and multiplayer codebases, so be CAREFUL WHAT YOU ADD/CHANGE!!!!!
|
// This file is shared in the single and multiplayer codebases, so be CAREFUL WHAT YOU ADD/CHANGE!!!!!
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include "tr_local.h"
|
#include "tr_local.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "MatComp.h"
|
#include "matcomp.h"
|
||||||
#if !defined(_QCOMMON_H_)
|
#if !defined(_QCOMMON_H_)
|
||||||
#include "../qcommon/qcommon.h"
|
#include "../qcommon/qcommon.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -57,7 +57,7 @@ void G2Time_ReportTimers(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//rww - RAGDOLL_BEGIN
|
//rww - RAGDOLL_BEGIN
|
||||||
#include <FLOAT.H>
|
#include <float.h>
|
||||||
//rww - RAGDOLL_END
|
//rww - RAGDOLL_END
|
||||||
|
|
||||||
extern cvar_t *r_Ghoul2UnSqash;
|
extern cvar_t *r_Ghoul2UnSqash;
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
|
|
||||||
#include "tr_local.h"
|
#include "tr_local.h"
|
||||||
#include "MatComp.h"
|
#include "matcomp.h"
|
||||||
|
|
||||||
#ifdef VV_LIGHTING
|
#ifdef VV_LIGHTING
|
||||||
#include "tr_lightmanager.h"
|
#include "tr_lightmanager.h"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
#include "tr_local.h"
|
#include "tr_local.h"
|
||||||
#include "MatComp.h"
|
#include "matcomp.h"
|
||||||
#include "../qcommon/sstring.h"
|
#include "../qcommon/sstring.h"
|
||||||
|
|
||||||
#define LL(x) x=LittleLong(x)
|
#define LL(x) x=LittleLong(x)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
//
|
//
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
#include "tr_QuickSprite.h"
|
#include "tr_quicksprite.h"
|
||||||
|
|
||||||
extern void R_BindAnimatedImage( const textureBundle_t *bundle );
|
extern void R_BindAnimatedImage( const textureBundle_t *bundle );
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
#include "../server/exe_headers.h"
|
#include "../server/exe_headers.h"
|
||||||
|
|
||||||
|
|
||||||
#include "tr_QuickSprite.h"
|
#include "tr_quicksprite.h"
|
||||||
#include "tr_worldeffects.h"
|
#include "tr_WorldEffects.h"
|
||||||
#include <float.h> //for isnan
|
#include <float.h> //for isnan
|
||||||
|
|
||||||
/////===== Part of the VERTIGON system =====/////
|
/////===== Part of the VERTIGON system =====/////
|
||||||
|
|
|
@ -14,7 +14,7 @@ Ghoul2 Insert Start
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined (MINIHEAP_H_INC)
|
#if !defined (MINIHEAP_H_INC)
|
||||||
#include "../qcommon/miniheap.h"
|
#include "../qcommon/MiniHeap.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void CM_CleanLeafCache(void);
|
void CM_CleanLeafCache(void);
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
Ghoul2 Insert Start
|
Ghoul2 Insert Start
|
||||||
*/
|
*/
|
||||||
#if !defined (MINIHEAP_H_INC)
|
#if !defined (MINIHEAP_H_INC)
|
||||||
#include "../qcommon/miniheap.h"
|
#include "../qcommon/MiniHeap.h"
|
||||||
#endif
|
#endif
|
||||||
/*
|
/*
|
||||||
Ghoul2 Insert End
|
Ghoul2 Insert End
|
||||||
|
|
|
@ -17,7 +17,7 @@ Ghoul2 Insert Start
|
||||||
#include "../ghoul2/G2.h"
|
#include "../ghoul2/G2.h"
|
||||||
#endif
|
#endif
|
||||||
#if !defined (MINIHEAP_H_INC)
|
#if !defined (MINIHEAP_H_INC)
|
||||||
#include "../qcommon/miniheap.h"
|
#include "../qcommon/MiniHeap.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
|
|
|
@ -15,12 +15,16 @@
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#ifdef __linux__
|
||||||
#include <sys/vt.h>
|
#include <sys/vt.h>
|
||||||
|
#endif
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <semaphore.h>
|
#include <semaphore.h>
|
||||||
|
#include <dlfcn.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
//#include "../qcommon/qcommon.h"
|
//#include "../qcommon/qcommon.h"
|
||||||
//#include "../client/keys.h"
|
//#include "../client/keys.h"
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <mntent.h>
|
|
||||||
|
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue