ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2024-11-28 23:12:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix slashes in include paths

Browse source
This commit is contained in:
Jonathan Gray 2013-04-19 13:47:29 +10:00
parent 85e0d466e2
commit bd47e42e0e
60 changed files with 129 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/0_compiled_first/0_SH_Leak.cpp
View file

@ -5,9 +5,9 @@
#pragma warning( disable : 4663) #pragma warning( disable : 4663)
#include <windows.h> #include <windows.h>
#include "..\smartheap\smrtheap.h" #include "../smartheap/smrtheap.h"
#include "../game/q_shared.h" #include "../game/q_shared.h"
#include "..\qcommon\qcommon.h" #include "../qcommon/qcommon.h"
#include <stdio.h> #include <stdio.h>
#include <map> #include <map>
@ -15,7 +15,7 @@
using namespace std; using namespace std;
#if MEM_DEBUG #if MEM_DEBUG
#include "..\smartheap\heapagnt.h" #include "../smartheap/heapagnt.h"
static const int maxStack=2048; static const int maxStack=2048;
static int TotalMem; static int TotalMem;

2
code/Ragl/graph_triangulate.h
View file

@ -87,7 +87,7 @@
#include "graph_vs.h" #include "graph_vs.h"
#endif #endif
#if !defined(RATL_LIST_VS_INC) #if !defined(RATL_LIST_VS_INC)
#include "..\Ratl\list_vs.h" #include "../Ratl/list_vs.h"
#endif #endif
namespace ragl namespace ragl
{ {

16
code/Ragl/graph_vs.h
View file

@ -88,28 +88,28 @@
#include "ragl_common.h" #include "ragl_common.h"
#endif #endif
#if !defined(RATL_ARRAY_VS_INC) #if !defined(RATL_ARRAY_VS_INC)
#include "..\Ratl\array_vs.h" #include "../Ratl/array_vs.h"
#endif #endif
#if !defined(RATL_VECTOR_VS_INC) #if !defined(RATL_VECTOR_VS_INC)
#include "..\Ratl\vector_vs.h" #include "../Ratl/vector_vs.h"
#endif #endif
#if !defined(RATL_BITS_INC) #if !defined(RATL_BITS_INC)
#include "..\Ratl\bits_vs.h" #include "../Ratl/bits_vs.h"
#endif #endif
#if !defined(RATL_QUEUE_VS_INC) #if !defined(RATL_QUEUE_VS_INC)
#include "..\Ratl\queue_vs.h" #include "../Ratl/queue_vs.h"
#endif #endif
#if !defined(RATL_STACK_VS_INC) #if !defined(RATL_STACK_VS_INC)
#include "..\Ratl\stack_vs.h" #include "../Ratl/stack_vs.h"
#endif #endif
#if !defined(RBTREE_MAP_VS_INC) #if !defined(RBTREE_MAP_VS_INC)
#include "..\Ratl\map_vs.h" #include "../Ratl/map_vs.h"
#endif #endif
#if !defined(RATL_POOL_VS_INC) #if !defined(RATL_POOL_VS_INC)
#include "..\Ratl\pool_vs.h" #include "../Ratl/pool_vs.h"
#endif #endif
#if !defined(RATL_GRID_VS_INC) #if !defined(RATL_GRID_VS_INC)
#include "..\Ratl\grid_vs.h" #include "../Ratl/grid_vs.h"
#endif #endif
namespace ragl namespace ragl
{ {

4
code/Ragl/ragl_common.h
View file

@ -68,10 +68,10 @@
#endif #endif
#endif #endif
#if !defined(RAVL_VEC_INC) #if !defined(RAVL_VEC_INC)
#include "..\Ravl\CVec.h" #include "../Ravl/CVec.h"
#endif #endif
#if !defined(RATL_COMMON_INC) #if !defined(RATL_COMMON_INC)
#include "..\Ratl\ratl_common.h" #include "../Ratl/ratl_common.h"
#endif #endif
namespace ragl namespace ragl
{ {

2
code/Ratl/ratl.cpp
View file

@ -35,7 +35,7 @@
#if !defined(RUFL_HFILE_INC) #if !defined(RUFL_HFILE_INC)
#include "..\Rufl\hfile.h" #include "../Rufl/hfile.h"
#endif #endif

4
code/Rufl/hfile.cpp
View file

@ -15,10 +15,10 @@
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
#include "hfile.h" #include "hfile.h"
#if !defined(RATL_HANDLE_POOL_VS_INC) #if !defined(RATL_HANDLE_POOL_VS_INC)
#include "..\Ratl\handle_pool_vs.h" #include "../Ratl/handle_pool_vs.h"
#endif #endif
#if !defined(RATL_VECTOR_VS_INC) #if !defined(RATL_VECTOR_VS_INC)
#include "..\Ratl\vector_vs.h" #include "../Ratl/vector_vs.h"
#endif #endif
#if !defined(RUFL_HSTRING_INC) #if !defined(RUFL_HSTRING_INC)
#include "hstring.h" #include "hstring.h"

2
code/Rufl/hstring.cpp
View file

@ -21,7 +21,7 @@
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
#include "hstring.h" #include "hstring.h"
#include <string.h> #include <string.h>
#include "..\Ratl\hash_pool_vs.h" #include "../Ratl/hash_pool_vs.h"

2
code/cgame/FxScheduler.cpp
View file

@ -7,7 +7,7 @@
#endif #endif
#if !defined(GHOUL2_SHARED_H_INC) #if !defined(GHOUL2_SHARED_H_INC)
#include "..\game\ghoul2_shared.h" //for CGhoul2Info_v #include "../game/ghoul2_shared.h" //for CGhoul2Info_v
#endif #endif
#if !defined(G2_H_INC) #if !defined(G2_H_INC)

2
code/cgame/cg_camera.cpp
View file

@ -5,7 +5,7 @@
#include "cg_media.h" #include "cg_media.h"
#include "..\game\g_roff.h" #include "../game/g_roff.h"
bool in_camera = false; bool in_camera = false;
camera_t client_camera={0}; camera_t client_camera={0};

4
code/cgame/cg_draw.cpp
View file

@ -6,8 +6,8 @@
//#include "cg_local.h" //#include "cg_local.h"
#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"
#ifdef _XBOX #ifdef _XBOX
#include "../client/fffx.h" #include "../client/fffx.h"

8
code/cgame/cg_ents.cpp
View file

@ -5,11 +5,11 @@
//#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"
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 );

4
code/cgame/cg_event.cpp
View file

@ -7,10 +7,10 @@
#include "cg_media.h" #include "cg_media.h"
#include "FxScheduler.h" #include "FxScheduler.h"
#include "..\game\anims.h" #include "../game/anims.h"
#ifdef _XBOX #ifdef _XBOX
#include "..\client\fffx.h" #include "../client/fffx.h"
#endif #endif
#ifdef _IMMERSION #ifdef _IMMERSION

2
code/cgame/cg_info.cpp
View file

@ -3,7 +3,7 @@
//#include "cg_local.h" //#include "cg_local.h"
#include "cg_media.h" #include "cg_media.h"
#include "..\game\objectives.h" #include "../game/objectives.h"
// For printing objectives // For printing objectives

2
code/cgame/cg_main.cpp
View file

@ -6,7 +6,7 @@
#include "cg_media.h" #include "cg_media.h"
#include "FxScheduler.h" #include "FxScheduler.h"
#include "..\client\vmachine.h" #include "../client/vmachine.h"
#include "cg_lights.h" #include "cg_lights.h"
#ifdef _IMMERSION #ifdef _IMMERSION

10
code/cgame/cg_players.cpp
View file

@ -6,11 +6,11 @@
//#include "cg_local.h" //#include "cg_local.h"
#include "cg_media.h" #include "cg_media.h"
#include "FxScheduler.h" #include "FxScheduler.h"
#include "..\game\ghoul2_shared.h" #include "../game/ghoul2_shared.h"
#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 "..\Rufl\hstring.h" #include "../Rufl/hstring.h"
#define LOOK_SWING_SCALE 0.5f #define LOOK_SWING_SCALE 0.5f
#define CG_SWINGSPEED 0.3f #define CG_SWINGSPEED 0.3f

4
code/cgame/cg_predict.cpp
View file

@ -8,7 +8,7 @@
//#include "cg_local.h" //#include "cg_local.h"
#include "cg_media.h" #include "cg_media.h"
#include "..\game\g_vehicles.h" #include "../game/g_vehicles.h"
static pmove_t cg_pmove; static pmove_t cg_pmove;
@ -16,7 +16,7 @@ static int cg_numSolidEntities;
static centity_t *cg_solidEntities[MAX_ENTITIES_IN_SNAPSHOT]; static centity_t *cg_solidEntities[MAX_ENTITIES_IN_SNAPSHOT];
#if MEM_DEBUG #if MEM_DEBUG
#include "..\smartheap\heapagnt.h" #include "../smartheap/heapagnt.h"
#define CG_TRACE_PROFILE (0) #define CG_TRACE_PROFILE (0)
#endif #endif

4
code/cgame/cg_scoreboard.cpp
View file

@ -3,8 +3,8 @@
//#include "cg_local.h" //#include "cg_local.h"
#include "cg_media.h" #include "cg_media.h"
#include "..\game\objectives.h" #include "../game/objectives.h"
#include "..\game\b_local.h" #include "../game/b_local.h"
#define SCOREBOARD_WIDTH (26*BIGCHAR_WIDTH) #define SCOREBOARD_WIDTH (26*BIGCHAR_WIDTH)

4
code/cgame/cg_view.cpp
View file

@ -8,8 +8,8 @@
#include "cg_media.h" #include "cg_media.h"
#include "FxScheduler.h" #include "FxScheduler.h"
#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"
#define MASK_CAMERACLIP (MASK_SOLID) #define MASK_CAMERACLIP (MASK_SOLID)
#define CAMERA_SIZE 4 #define CAMERA_SIZE 4

6
code/cgame/cg_weapons.cpp
View file

@ -4,10 +4,10 @@
//#include "cg_local.h" //#include "cg_local.h"
#include "cg_media.h" #include "cg_media.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/anims.h"
#ifdef _IMMERSION #ifdef _IMMERSION
#include "../ff/ff.h" #include "../ff/ff.h"

8
code/client/snd_local.h
View file

@ -9,10 +9,10 @@
#include "../mp3code/mp3struct.h" #include "../mp3code/mp3struct.h"
// Open AL Specific // Open AL Specific
#include "openal\al.h" #include "openal/al.h"
#include "openal\alc.h" #include "openal/alc.h"
#include "eax\eax.h" #include "eax/eax.h"
#include "eax\eaxman.h" #include "eax/eaxman.h"
// 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);

2
code/ff/ff_MultiSet.cpp
View file

@ -2,7 +2,7 @@
#ifdef _IMMERSION #ifdef _IMMERSION
#include "..\win32\win_local.h" #include "../win32/win_local.h"
////---------------- ////----------------
/// FFMultiSet::Init /// FFMultiSet::Init

4
code/ff/ff_local.h
View file

@ -16,8 +16,8 @@
#endif #endif
// (end) Optional system features // (end) Optional system features
#include "..\game\q_shared.h" // includes ff_public.h #include "../game/q_shared.h" // includes ff_public.h
#include "..\qcommon\qcommon.h" #include "../qcommon/qcommon.h"
#define FF_MAX_PATH MAX_QPATH #define FF_MAX_PATH MAX_QPATH

2
code/game/AI_Animal.cpp
View file

@ -4,7 +4,7 @@
#include "b_local.h" #include "b_local.h"
#include "..\Ratl\vector_vs.h" #include "../Ratl/vector_vs.h"
#define MAX_PACKS 10 #define MAX_PACKS 10

2
code/game/AI_GalakMech.cpp
View file

@ -17,7 +17,7 @@
#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

10
code/game/AI_HazardTrooper.cpp
View file

@ -19,19 +19,19 @@
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
#include "b_local.h" #include "b_local.h"
#if !defined(RAVL_VEC_INC) #if !defined(RAVL_VEC_INC)
#include "..\Ravl\CVec.h" #include "../Ravl/CVec.h"
#endif #endif
#if !defined(RATL_ARRAY_VS_INC) #if !defined(RATL_ARRAY_VS_INC)
#include "..\Ratl\array_vs.h" #include "../Ratl/array_vs.h"
#endif #endif
#if !defined(RATL_VECTOR_VS_INC) #if !defined(RATL_VECTOR_VS_INC)
#include "..\Ratl\vector_vs.h" #include "../Ratl/vector_vs.h"
#endif #endif
#if !defined(RATL_HANDLE_POOL_VS_INC) #if !defined(RATL_HANDLE_POOL_VS_INC)
#include "..\Ratl\handle_pool_vs.h" #include "../Ratl/handle_pool_vs.h"
#endif #endif
#if !defined(RUFL_HSTRING_INC) #if !defined(RUFL_HSTRING_INC)
#include "..\Rufl\hstring.h" #include "../Rufl/hstring.h"
#endif #endif

2
code/game/AnimalNPC.c
View file

@ -43,7 +43,7 @@
#ifndef _JK2MP #ifndef _JK2MP
#include "g_functions.h" #include "g_functions.h"
#include "g_vehicles.h" #include "g_vehicles.h"
#include "..\game\wp_saber.h" #include "../game/wp_saber.h"
#else #else
#include "bg_vehicles.h" #include "bg_vehicles.h"
#endif #endif

8
code/game/NPC_stats.cpp
View file

@ -8,11 +8,11 @@
#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
#include "..\Ratl\string_vs.h" #include "../Ratl/string_vs.h"
#include "..\Rufl\hstring.h" #include "../Rufl/hstring.h"
#include "..\Ratl\vector_vs.h" #include "../Ratl/vector_vs.h"
extern void WP_RemoveSaber( gentity_t *ent, int saberNum ); extern void WP_RemoveSaber( gentity_t *ent, int saberNum );
extern qboolean NPCsPrecached; extern qboolean NPCsPrecached;

6
code/game/Q3_Interface.cpp
View file

@ -15,10 +15,10 @@
#include "b_local.h" #include "b_local.h"
#include "events.h" #include "events.h"
#include "g_nav.h" #include "g_nav.h"
#include "..\cgame\cg_camera.h" #include "../cgame/cg_camera.h"
#include "..\game\objectives.h" #include "../game/objectives.h"
#include "g_roff.h" #include "g_roff.h"
#include "..\cgame\cg_local.h" #include "../cgame/cg_local.h"
#include "wp_saber.h" #include "wp_saber.h"
#include "g_vehicles.h" #include "g_vehicles.h"

2
code/game/SpeederNPC.c
View file

@ -43,7 +43,7 @@
#ifndef _JK2MP #ifndef _JK2MP
#include "g_functions.h" #include "g_functions.h"
#include "g_vehicles.h" #include "g_vehicles.h"
#include "..\game\wp_saber.h" #include "../game/wp_saber.h"
#include "../cgame/cg_local.h" #include "../cgame/cg_local.h"
#else #else
#include "bg_vehicles.h" #include "bg_vehicles.h"

2
code/game/bg_vehicleLoad.c
View file

@ -36,7 +36,7 @@
#endif #endif
#ifndef _JK2MP #ifndef _JK2MP
#include "..\Ratl\string_vs.h" #include "../Ratl/string_vs.h"
#endif #endif
#ifdef QAGAME #ifdef QAGAME

2
code/game/g_active.cpp
View file

@ -4,7 +4,7 @@
#include "g_local.h" #include "g_local.h"
#include "g_functions.h" #include "g_functions.h"
#include "..\cgame\cg_local.h" #include "../cgame/cg_local.h"
#include "Q3_Interface.h" #include "Q3_Interface.h"
#include "wp_saber.h" #include "wp_saber.h"
#include "g_vehicles.h" #include "g_vehicles.h"

2
code/game/g_breakable.cpp
View file

@ -4,7 +4,7 @@
#include "g_local.h" #include "g_local.h"
#include "g_functions.h" #include "g_functions.h"
#include "..\cgame\cg_media.h" #include "../cgame/cg_media.h"
//client side shortcut hacks from cg_local.h //client side shortcut hacks from cg_local.h
//extern void CG_SurfaceExplosion( vec3_t origin, vec3_t normal, float radius, float shake_speed, qboolean smoke ); //extern void CG_SurfaceExplosion( vec3_t origin, vec3_t normal, float radius, float shake_speed, qboolean smoke );

2
code/game/g_camera.cpp
View file

@ -7,7 +7,7 @@
//#include "Q3_Interface.h" //#include "Q3_Interface.h"
//#include "anims.h" //#include "anims.h"
//#include "b_local.h" //#include "b_local.h"
#include "..\cgame\cg_camera.h" #include "../cgame/cg_camera.h"
#include "g_functions.h" #include "g_functions.h"
/* /*

2
code/game/g_functions.cpp
View file

@ -11,7 +11,7 @@
// This file contains the 8 (so far) function calls that replace the 8 function ptrs in the gentity_t structure // This file contains the 8 (so far) function calls that replace the 8 function ptrs in the gentity_t structure
#include "g_local.h" #include "g_local.h"
#include "..\cgame\cg_local.h" #include "../cgame/cg_local.h"
#include "g_functions.h" #include "g_functions.h"
void GEntity_ThinkFunc(gentity_t *self) void GEntity_ThinkFunc(gentity_t *self)

12
code/game/g_navigator.cpp
View file

@ -42,25 +42,25 @@ extern vec3_t playerMaxs;
#include "b_local.h" #include "b_local.h"
#include "g_navigator.h" #include "g_navigator.h"
#if !defined(RAGL_GRAPH_VS_INC) #if !defined(RAGL_GRAPH_VS_INC)
#include "..\Ragl\graph_vs.h" #include "../Ragl/graph_vs.h"
#endif #endif
#if !defined(RATL_GRAPH_REGION_INC) #if !defined(RATL_GRAPH_REGION_INC)
#include "..\Ragl\graph_region.h" #include "../Ragl/graph_region.h"
#endif #endif
//#if !defined(RATL_GRAPH_TRIANGULATE_INC) //#if !defined(RATL_GRAPH_TRIANGULATE_INC)
// #include "..\Ragl\graph_triangulate.h" // #include "..\Ragl\graph_triangulate.h"
//#endif //#endif
#if !defined(RATL_VECTOR_VS_INC) #if !defined(RATL_VECTOR_VS_INC)
#include "..\Ratl\vector_vs.h" #include "../Ratl/vector_vs.h"
#endif #endif
#if !defined(RUFL_HSTRING_INC) #if !defined(RUFL_HSTRING_INC)
#include "..\Rufl\hstring.h" #include "../Rufl/hstring.h"
#endif #endif
#if !defined(RUFL_HFILE_INC) #if !defined(RUFL_HFILE_INC)
#include "..\Rufl\hfile.h" #include "../Rufl/hfile.h"
#endif #endif
#if !defined(RAVL_BOUNDS_INC) #if !defined(RAVL_BOUNDS_INC)
#include "..\Ravl\CBounds.h" #include "../Ravl/CBounds.h"
#endif #endif

2
code/game/g_navigator.h
View file

@ -21,7 +21,7 @@
#if !defined(RAVL_VEC_INC) #if !defined(RAVL_VEC_INC)
#include "..\Ravl\CVec.h" #include "../Ravl/CVec.h"
#endif #endif

12
code/game/g_rail.cpp
View file

@ -28,22 +28,22 @@ class CRailMover;
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
#include "b_local.h" #include "b_local.h"
#if !defined(RATL_ARRAY_VS_INC) #if !defined(RATL_ARRAY_VS_INC)
#include "..\Ratl\array_vs.h" #include "../Ratl/array_vs.h"
#endif #endif
#if !defined(RATL_VECTOR_VS_INC) #if !defined(RATL_VECTOR_VS_INC)
#include "..\Ratl\vector_vs.h" #include "../Ratl/vector_vs.h"
#endif #endif
#if !defined(RAVL_VEC_INC) #if !defined(RAVL_VEC_INC)
#include "..\Ravl\CVec.h" #include "../Ravl/CVec.h"
#endif #endif
#if !defined(RUFL_HSTRING_INC) #if !defined(RUFL_HSTRING_INC)
#include "..\Rufl\hstring.h" #include "../Rufl/hstring.h"
#endif #endif
#if !defined(RATL_GRID_VS_INC) #if !defined(RATL_GRID_VS_INC)
#include "..\Ratl\grid_vs.h" #include "../Ratl/grid_vs.h"
#endif #endif
#if !defined(RATL_POOL_VS_INC) #if !defined(RATL_POOL_VS_INC)
#include "..\Ratl\pool_vs.h" #include "../Ratl/pool_vs.h"
#endif #endif
#ifdef _XBOX #ifdef _XBOX

2
code/game/g_target.cpp
View file

@ -982,7 +982,7 @@ void set_mission_stats_cvars( void )
} }
#include "..\cgame\cg_media.h" //access to cgs #include "../cgame/cg_media.h" //access to cgs
extern void G_ChangeMap (const char *mapname, const char *spawntarget, qboolean hub); //g_utils extern void G_ChangeMap (const char *mapname, const char *spawntarget, qboolean hub); //g_utils
void target_level_change_use(gentity_t *self, gentity_t *other, gentity_t *activator) void target_level_change_use(gentity_t *self, gentity_t *other, gentity_t *activator)
{ {

8
code/game/g_utils.cpp
View file

@ -9,9 +9,9 @@
#include "g_functions.h" #include "g_functions.h"
#ifdef _XBOX #ifdef _XBOX
#include "anims.h" #include "anims.h"
#include "..\renderer\mdx_format.h" #include "../renderer/mdx_format.h"
#include "..\qcommon\cm_public.h" #include "../qcommon/cm_public.h"
#include "..\qcommon\cm_local.h" #include "../qcommon/cm_local.h"
#endif #endif
#define ACT_ACTIVE qtrue #define ACT_ACTIVE qtrue
@ -295,7 +295,7 @@ void G_EntityPosition( int i, vec3_t ret )
//===Bypass network for sounds on specific channels==================== //===Bypass network for sounds on specific channels====================
extern void cgi_S_StartSound( const vec3_t origin, int entityNum, int entchannel, sfxHandle_t sfx ); extern void cgi_S_StartSound( const vec3_t origin, int entityNum, int entchannel, sfxHandle_t sfx );
#include "..\cgame\cg_media.h" //access to cgs #include "../cgame/cg_media.h" //access to cgs
extern qboolean CG_TryPlayCustomSound( vec3_t origin, int entityNum, soundChannel_t channel, const char *soundName, int customSoundSet ); extern qboolean CG_TryPlayCustomSound( vec3_t origin, int entityNum, soundChannel_t channel, const char *soundName, int customSoundSet );
extern cvar_t *g_timescale; extern cvar_t *g_timescale;
//NOTE: Do NOT Try to use this before the cgame DLL is valid, it will NOT work! //NOTE: Do NOT Try to use this before the cgame DLL is valid, it will NOT work!

2
code/game/q_shared.h
View file

@ -1367,7 +1367,7 @@ Ghoul2 Insert Start
*/ */
#if !defined(GHOUL2_SHARED_H_INC) #if !defined(GHOUL2_SHARED_H_INC)
#include "..\game\ghoul2_shared.h" //for CGhoul2Info_v #include "../game/ghoul2_shared.h" //for CGhoul2Info_v
#endif #endif
/* /*

2
code/ghoul2/G2_API.cpp
View file

@ -24,7 +24,7 @@
#endif #endif
#if !defined(MINIHEAP_H_INC) #if !defined(MINIHEAP_H_INC)
#include "..\qcommon\MiniHeap.h" #include "../qcommon/MiniHeap.h"
#endif #endif

2
code/qcommon/files_pc.cpp
View file

@ -771,7 +771,7 @@ Filename are relative to the quake search path
a null buffer will just return the file length without loading a null buffer will just return the file length without loading
============ ============
*/ */
#include "..\client\client.h" #include "../client/client.h"
int FS_ReadFile( const char *qpath, void **buffer ) { int FS_ReadFile( const char *qpath, void **buffer ) {
fileHandle_t h; fileHandle_t h;
byte* buf; byte* buf;

2
code/renderer/tr_types.h
View file

@ -1,7 +1,7 @@
#ifndef __TR_TYPES_H #ifndef __TR_TYPES_H
#define __TR_TYPES_H #define __TR_TYPES_H
#include "..\game\ghoul2_shared.h" #include "../game/ghoul2_shared.h"
#define MAX_DLIGHTS 32 // can't be increased, because bit flags are used on surfaces #define MAX_DLIGHTS 32 // can't be increased, because bit flags are used on surfaces
#ifdef _XBOX #ifdef _XBOX

6
code/server/sv_ccmds.cpp
View file

@ -5,9 +5,9 @@
#include "server.h" #include "server.h"
#include "..\game\weapons.h" #include "../game/weapons.h"
#include "..\game\g_items.h" #include "../game/g_items.h"
#include "..\game\statindex.h" #include "../game/statindex.h"
/* /*

10
code/server/sv_game.cpp
View file

@ -9,15 +9,15 @@
#include "../qcommon/cm_local.h" #include "../qcommon/cm_local.h"
#include "server.h" #include "server.h"
#include "..\client\vmachine.h" #include "../client/vmachine.h"
#include "..\client\client.h" #include "../client/client.h"
#include "..\renderer\tr_local.h" #include "../renderer/tr_local.h"
#include "..\renderer\tr_WorldEffects.h" #include "../renderer/tr_WorldEffects.h"
/* /*
Ghoul2 Insert Start Ghoul2 Insert Start
*/ */
#if !defined(G2_H_INC) #if !defined(G2_H_INC)
#include "..\ghoul2\G2.h" #include "../ghoul2/G2.h"
#endif #endif
/* /*

6
code/server/sv_savegame.cpp
View file

@ -17,9 +17,9 @@ extern byte *Compress_JPG(int *pOutputSize, int quality, int image_width, int im
// (EF1 behaviour). I should maybe time/date check them though? // (EF1 behaviour). I should maybe time/date check them though?
#include "server.h" #include "server.h"
#include "..\game\statindex.h" #include "../game/statindex.h"
#include "..\game\weapons.h" #include "../game/weapons.h"
#include "..\game\g_items.h" #include "../game/g_items.h"
#ifdef _XBOX #ifdef _XBOX
#include <stdlib.h> #include <stdlib.h>

2
code/server/sv_snapshot.cpp
View file

@ -4,7 +4,7 @@
#include "..\client\vmachine.h" #include "../client/vmachine.h"
#include "server.h" #include "server.h"

6
code/server/sv_world.cpp
View file

@ -11,10 +11,10 @@ Ghoul2 Insert Start
*/ */
#if !defined(GHOUL2_SHARED_H_INC) #if !defined(GHOUL2_SHARED_H_INC)
#include "..\game\ghoul2_shared.h" //for CGhoul2Info_v #include "../game/ghoul2_shared.h" //for CGhoul2Info_v
#endif #endif
#if !defined(G2_H_INC) #if !defined(G2_H_INC)
#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"
@ -27,7 +27,7 @@ Ghoul2 Insert Start
Ghoul2 Insert End Ghoul2 Insert End
*/ */
#if MEM_DEBUG #if MEM_DEBUG
#include "..\smartheap\heapagnt.h" #include "../smartheap/heapagnt.h"
#define SV_TRACE_PROFILE (0) #define SV_TRACE_PROFILE (0)
#endif #endif

2
code/ui/gameinfo.cpp
View file

@ -9,7 +9,7 @@
#include "gameinfo.h" #include "gameinfo.h"
#include "..\game\weapons.h" #include "../game/weapons.h"
gameinfo_import_t gi; gameinfo_import_t gi;

4
codemp/cgame/cg_ents.c
View file

@ -6,8 +6,8 @@
/* /*
Ghoul2 Insert Start Ghoul2 Insert Start
*/ */
#include "..\game\q_shared.h" #include "../game/q_shared.h"
#include "..\ghoul2\g2.h" #include "../ghoul2/g2.h"
/* /*
Ghoul2 Insert end Ghoul2 Insert end
*/ */

2
codemp/cgame/cg_players.c
View file

@ -2,7 +2,7 @@
// //
// cg_players.c -- handle the media and animation for player entities // cg_players.c -- handle the media and animation for player entities
#include "cg_local.h" #include "cg_local.h"
#include "..\ghoul2\g2.h" #include "../ghoul2/g2.h"
#include "bg_saga.h" #include "bg_saga.h"
extern vmCvar_t cg_thirdPersonAlpha; extern vmCvar_t cg_thirdPersonAlpha;

2
codemp/cgame/cg_servercmds.c
View file

@ -9,7 +9,7 @@
#if !defined(CL_LIGHT_H_INC) #if !defined(CL_LIGHT_H_INC)
#include "cg_lights.h" #include "cg_lights.h"
#endif #endif
#include "..\ghoul2\g2.h" #include "../ghoul2/g2.h"
#include "../ui/ui_public.h" #include "../ui/ui_public.h"
/* /*

4
codemp/cgame/cg_turret.c
View file

@ -1,6 +1,6 @@
#include "cg_local.h" #include "cg_local.h"
#include "..\game\q_shared.h" #include "../game/q_shared.h"
#include "..\ghoul2\g2.h" #include "../ghoul2/g2.h"
//rww - The turret is heavily dependant on bone angles. We can't happily set that on the server, so it is done client-only. //rww - The turret is heavily dependant on bone angles. We can't happily set that on the server, so it is done client-only.

4
codemp/client/0_SH_Leak.cpp
View file

@ -5,7 +5,7 @@
#include "client.h" #include "client.h"
#include <windows.h> #include <windows.h>
#include "..\smartheap\smrtheap.h" #include "../smartheap/smrtheap.h"
#if !defined(__Q_SHARED_H) #if !defined(__Q_SHARED_H)
#include "../game/q_shared.h" #include "../game/q_shared.h"
#endif #endif
@ -18,7 +18,7 @@
using namespace std; using namespace std;
#if MEM_DEBUG #if MEM_DEBUG
#include "..\smartheap\heapagnt.h" #include "../smartheap/heapagnt.h"
static const int maxStack=2048; static const int maxStack=2048;
static int TotalMem; static int TotalMem;

6
codemp/client/cl_main.cpp
View file

@ -15,11 +15,11 @@
#endif #endif
//rwwRMG - added: //rwwRMG - added:
#include "..\qcommon\cm_local.h" #include "../qcommon/cm_local.h"
#include "..\qcommon\cm_landscape.h" #include "../qcommon/cm_landscape.h"
#if !defined(G2_H_INC) #if !defined(G2_H_INC)
#include "..\ghoul2\G2_local.h" #include "../ghoul2/G2_local.h"
#endif #endif
#if !defined (MINIHEAP_H_INC) #if !defined (MINIHEAP_H_INC)

8
codemp/client/snd_local.h
View file

@ -9,10 +9,10 @@
#include "../mp3code/mp3struct.h" #include "../mp3code/mp3struct.h"
// Open AL Specific // Open AL Specific
#include "openal\al.h" #include "openal/al.h"
#include "openal\alc.h" #include "openal/alc.h"
#include "eax\eax.h" #include "eax/eax.h"
#include "eax\eaxman.h" #include "eax/eaxman.h"
// 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(sboolean bMute); void S_AL_MuteAllSounds(sboolean bMute);

2
codemp/game/SpeederNPC.c
View file

@ -43,7 +43,7 @@
#ifndef _JK2MP #ifndef _JK2MP
#include "g_functions.h" #include "g_functions.h"
#include "g_vehicles.h" #include "g_vehicles.h"
#include "..\game\wp_saber.h" #include "../game/wp_saber.h"
#else #else
#include "bg_vehicles.h" #include "bg_vehicles.h"
#endif #endif

2
codemp/game/bg_saber.c
View file

@ -992,7 +992,7 @@ extern gentity_t g_entities[];
#elif defined CGAME #elif defined CGAME
#include "..\cgame\cg_local.h" //ahahahahhahahaha@$!$! #include "../cgame/cg_local.h" //ahahahahhahahaha@$!$!
#endif #endif
#include "../namespace_begin.h" #include "../namespace_begin.h"

2
codemp/game/bg_vehicleLoad.c
View file

@ -36,7 +36,7 @@
#endif #endif
#ifndef _JK2MP #ifndef _JK2MP
#include "..\Ratl\string_vs.h" #include "../Ratl/string_vs.h"
#endif #endif
#ifdef QAGAME #ifdef QAGAME

2
codemp/ui/ui_main.c
View file

@ -19,7 +19,7 @@ USER INTERFACE MAIN
#include "../cgame/animtable.h" //we want this to be compiled into the module because we access it in the shared module. #include "../cgame/animtable.h" //we want this to be compiled into the module because we access it in the shared module.
#include "../game/bg_saga.h" #include "../game/bg_saga.h"
#include "..\cgame\holocronicons.h" #include "../cgame/holocronicons.h"
extern void UI_SaberAttachToChar( itemDef_t *item ); extern void UI_SaberAttachToChar( itemDef_t *item );