diff --git a/code/RMG/RM_Area.cpp b/code/RMG/RM_Area.cpp index cb8b44e..0942862 100644 --- a/code/RMG/RM_Area.cpp +++ b/code/RMG/RM_Area.cpp @@ -8,7 +8,7 @@ #include "../server/exe_headers.h" -#include "rm_headers.h" +#include "RM_Headers.h" #ifdef _WIN32 #pragma optimize("p", on) diff --git a/code/RMG/RM_Instance.cpp b/code/RMG/RM_Instance.cpp index 000303a..d8d4ea2 100644 --- a/code/RMG/RM_Instance.cpp +++ b/code/RMG/RM_Instance.cpp @@ -1,6 +1,6 @@ #include "../server/exe_headers.h" -#include "rm_headers.h" +#include "RM_Headers.h" #include "../qcommon/cm_terrainmap.h" /************************************************************************************************ diff --git a/code/RMG/RM_InstanceFile.cpp b/code/RMG/RM_InstanceFile.cpp index 82468d7..d98a65f 100644 --- a/code/RMG/RM_InstanceFile.cpp +++ b/code/RMG/RM_InstanceFile.cpp @@ -10,13 +10,13 @@ #include "../server/exe_headers.h" -#include "rm_headers.h" +#include "RM_Headers.h" -//#include "rm_instance_npc.h" -#include "rm_instance_bsp.h" -#include "rm_instance_random.h" -#include "rm_instance_group.h" -#include "rm_instance_void.h" +//#include "RM_Instance_NPC.h" +#include "RM_Instance_BSP.h" +#include "RM_Instance_Random.h" +#include "RM_Instance_Group.h" +#include "RM_Instance_Void.h" /************************************************************************************************ * CRMInstanceFile::CRMInstanceFile diff --git a/code/RMG/RM_Instance_BSP.cpp b/code/RMG/RM_Instance_BSP.cpp index 448cc1e..c290298 100644 --- a/code/RMG/RM_Instance_BSP.cpp +++ b/code/RMG/RM_Instance_BSP.cpp @@ -11,9 +11,9 @@ #include "../qcommon/cm_local.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" diff --git a/code/RMG/RM_Instance_Group.cpp b/code/RMG/RM_Instance_Group.cpp index 0660ca5..5936974 100644 --- a/code/RMG/RM_Instance_Group.cpp +++ b/code/RMG/RM_Instance_Group.cpp @@ -9,9 +9,9 @@ #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 diff --git a/code/RMG/RM_Instance_Random.cpp b/code/RMG/RM_Instance_Random.cpp index eae6a42..0dcada5 100644 --- a/code/RMG/RM_Instance_Random.cpp +++ b/code/RMG/RM_Instance_Random.cpp @@ -9,9 +9,9 @@ #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 diff --git a/code/RMG/RM_Instance_Void.cpp b/code/RMG/RM_Instance_Void.cpp index b092c9d..93d6349 100644 --- a/code/RMG/RM_Instance_Void.cpp +++ b/code/RMG/RM_Instance_Void.cpp @@ -9,9 +9,9 @@ #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 diff --git a/code/RMG/RM_Manager.cpp b/code/RMG/RM_Manager.cpp index 9e2d8a3..21ef3e7 100644 --- a/code/RMG/RM_Manager.cpp +++ b/code/RMG/RM_Manager.cpp @@ -8,7 +8,7 @@ #include "../server/exe_headers.h" -#include "rm_headers.h" +#include "RM_Headers.h" #include "../server/server.h" CRMObjective *CRMManager::mCurObjective=0; diff --git a/code/RMG/RM_Mission.cpp b/code/RMG/RM_Mission.cpp index fa1e034..be2940d 100644 --- a/code/RMG/RM_Mission.cpp +++ b/code/RMG/RM_Mission.cpp @@ -8,7 +8,7 @@ #include "../server/exe_headers.h" -#include "rm_headers.h" +#include "RM_Headers.h" #define ARIOCHE_CLIPBRUSH_SIZE 300 #define CVAR_OBJECTIVE 0 diff --git a/code/RMG/RM_Objective.cpp b/code/RMG/RM_Objective.cpp index 5cb4680..37a8ece 100644 --- a/code/RMG/RM_Objective.cpp +++ b/code/RMG/RM_Objective.cpp @@ -9,7 +9,7 @@ #include "../server/exe_headers.h" -#include "rm_headers.h" +#include "RM_Headers.h" /************************************************************************************************ * CRMObjective::CRMObjective diff --git a/code/RMG/RM_Path.cpp b/code/RMG/RM_Path.cpp index 8131444..25c0dba 100644 --- a/code/RMG/RM_Path.cpp +++ b/code/RMG/RM_Path.cpp @@ -7,7 +7,7 @@ ************************************************************************************************/ #include "../server/exe_headers.h" -#include "rm_headers.h" +#include "RM_Headers.h" #define max(a,b) (((a) > (b)) ? (a) : (b)) diff --git a/code/RMG/RM_Path.h b/code/RMG/RM_Path.h index a08fcf0..93b9ffa 100644 --- a/code/RMG/RM_Path.h +++ b/code/RMG/RM_Path.h @@ -18,6 +18,8 @@ #include "../qcommon/cm_randomterrain.h" #endif +#include + class CRMPathManager; // directions you can proceed from cells diff --git a/code/RMG/RM_Terrain.cpp b/code/RMG/RM_Terrain.cpp index b128b60..3a91b28 100644 --- a/code/RMG/RM_Terrain.cpp +++ b/code/RMG/RM_Terrain.cpp @@ -3,7 +3,7 @@ #include "../client/client.h" #include "../qcommon/cm_local.h" #include "../renderer/tr_types.h" -#include "rm_headers.h" +#include "RM_Headers.h" //#include "../qcommon/q_imath.h" diff --git a/code/Ratl/ratl_common.h b/code/Ratl/ratl_common.h index 8cdf7c0..9f55f14 100644 --- a/code/Ratl/ratl_common.h +++ b/code/Ratl/ratl_common.h @@ -71,6 +71,8 @@ #define STRING_H_INC #endif +#include "../game/q_shared.h" + //////////////////////////////////////////////////////////////////////////////////////// // Forward Dec. diff --git a/code/cgame/cg_draw.cpp b/code/cgame/cg_draw.cpp index 43c6b92..a63b707 100644 --- a/code/cgame/cg_draw.cpp +++ b/code/cgame/cg_draw.cpp @@ -8,6 +8,7 @@ #include "cg_media.h" #include "../game/objectives.h" #include "../game/g_vehicles.h" +#include "../game/g_local.h" #ifdef _XBOX #include "../client/fffx.h" diff --git a/code/cgame/cg_ents.cpp b/code/cgame/cg_ents.cpp index e523a01..b91cfad 100644 --- a/code/cgame/cg_ents.cpp +++ b/code/cgame/cg_ents.cpp @@ -6,10 +6,12 @@ //#include "cg_local.h" #include "cg_media.h" #include "../game/g_functions.h" -#include "../ghoul2/g2.h" +#include "../ghoul2/G2.h" #include "FxScheduler.h" #include "../game/wp_saber.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_CheckSaberInWater( centity_t *cent, centity_t *scent, int saberNum, int modelIndex, vec3_t origin, vec3_t angles ); diff --git a/code/cgame/cg_main.cpp b/code/cgame/cg_main.cpp index f4d0f46..f5680eb 100644 --- a/code/cgame/cg_main.cpp +++ b/code/cgame/cg_main.cpp @@ -8,6 +8,7 @@ #include "../client/vmachine.h" #include "cg_lights.h" +#include "../game/g_local.h" #ifdef _IMMERSION #include "../ff/ff.h" diff --git a/code/cgame/cg_players.cpp b/code/cgame/cg_players.cpp index 8e6c4cc..a6434d1 100644 --- a/code/cgame/cg_players.cpp +++ b/code/cgame/cg_players.cpp @@ -10,6 +10,8 @@ #include "../game/anims.h" #include "../game/wp_saber.h" #include "../game/g_vehicles.h" +#include "../game/g_local.h" +#include "../game/b_local.h" #include "../Rufl/hstring.h" #define LOOK_SWING_SCALE 0.5f diff --git a/code/cgame/cg_predict.cpp b/code/cgame/cg_predict.cpp index 7a53ba1..9e00934 100644 --- a/code/cgame/cg_predict.cpp +++ b/code/cgame/cg_predict.cpp @@ -7,6 +7,7 @@ //#include "cg_local.h" #include "cg_media.h" +#include "../game/g_local.h" #include "../game/g_vehicles.h" diff --git a/code/cgame/cg_view.cpp b/code/cgame/cg_view.cpp index 635b4b8..398f6ff 100644 --- a/code/cgame/cg_view.cpp +++ b/code/cgame/cg_view.cpp @@ -10,6 +10,8 @@ #include "cg_lights.h" #include "../game/wp_saber.h" #include "../game/g_vehicles.h" +#include "../game/g_local.h" +#include "../game/g_functions.h" #define MASK_CAMERACLIP (MASK_SOLID) #define CAMERA_SIZE 4 diff --git a/code/cgame/cg_weapons.cpp b/code/cgame/cg_weapons.cpp index 91d0c9a..1473a46 100644 --- a/code/cgame/cg_weapons.cpp +++ b/code/cgame/cg_weapons.cpp @@ -8,6 +8,7 @@ #include "../game/g_vehicles.h" #include "../game/anims.h" +#include "../game/g_local.h" #ifdef _IMMERSION #include "../ff/ff.h" diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp index 6d29aca..01b786c 100644 --- a/code/client/cl_main.cpp +++ b/code/client/cl_main.cpp @@ -14,7 +14,7 @@ #else #include "fffx.h" #endif // _IMMERSION -#include "../ghoul2/g2.h" +#include "../ghoul2/G2.h" #include "../RMG/RM_Headers.h" diff --git a/code/client/snd_local.h b/code/client/snd_local.h index 3d0684e..b4472e4 100644 --- a/code/client/snd_local.h +++ b/code/client/snd_local.h @@ -9,10 +9,12 @@ #include "../mp3code/mp3struct.h" // Open AL Specific -#include "openal/al.h" -#include "openal/alc.h" +#include +#include +#ifdef HAVE_EAX #include "eax/eax.h" #include "eax/eaxman.h" +#endif // Added for Open AL to know when to mute all sounds (e.g when app. loses focus) void S_AL_MuteAllSounds(qboolean bMute); diff --git a/code/client/snd_mem.cpp b/code/client/snd_mem.cpp index 108a494..ec573ad 100644 --- a/code/client/snd_mem.cpp +++ b/code/client/snd_mem.cpp @@ -8,6 +8,8 @@ #include "snd_local.h" #include "cl_mp3.h" +#include + // Open AL void S_PreProcessLipSync(sfx_t *sfx); extern int s_UseOpenAL; diff --git a/code/client/snd_music.cpp b/code/client/snd_music.cpp index bbdbc7f..4d31660 100644 --- a/code/client/snd_music.cpp +++ b/code/client/snd_music.cpp @@ -8,6 +8,7 @@ #include "../qcommon/sstring.h" #include +#include #ifdef _XBOX #include "snd_local_console.h" diff --git a/code/client/vmachine.cpp b/code/client/vmachine.cpp index 129da21..92dec58 100644 --- a/code/client/vmachine.cpp +++ b/code/client/vmachine.cpp @@ -1,5 +1,6 @@ // vmachine.cpp -- wrapper to fake virtual machine for client +#include "../game/q_shared.h" #include "vmachine.h" #pragma warning (disable : 4514) /* diff --git a/code/game/AI_GalakMech.cpp b/code/game/AI_GalakMech.cpp index 6fe0648..937e089 100644 --- a/code/game/AI_GalakMech.cpp +++ b/code/game/AI_GalakMech.cpp @@ -15,7 +15,7 @@ #include "b_local.h" #include "anims.h" #include "g_navigator.h" -#include "g_Vehicles.h" +#include "g_vehicles.h" #if !defined(RATL_VECTOR_VS_INC) #include "../Ratl/vector_vs.h" #endif diff --git a/code/game/G_Timer.cpp b/code/game/G_Timer.cpp index 8d2c205..84ee626 100644 --- a/code/game/G_Timer.cpp +++ b/code/game/G_Timer.cpp @@ -1,8 +1,8 @@ // leave this line at the top for all g_xxxx.cpp files... #include "g_headers.h" -#include "G_Local.h" -#include "../rufl/hstring.h" +#include "g_local.h" +#include "../Rufl/hstring.h" #define MAX_GTIMERS 16384 diff --git a/code/game/NPC_reactions.cpp b/code/game/NPC_reactions.cpp index 66e31ad..2341ccf 100644 --- a/code/game/NPC_reactions.cpp +++ b/code/game/NPC_reactions.cpp @@ -10,7 +10,7 @@ #include "anims.h" #include "g_functions.h" #include "wp_saber.h" -#include "g_Vehicles.h" +#include "g_vehicles.h" extern qboolean G_CheckForStrongAttackMomentum( gentity_t *self ); extern void G_AddVoiceEvent( gentity_t *self, int event, int speakDebounceTime ); diff --git a/code/game/NPC_stats.cpp b/code/game/NPC_stats.cpp index 941d93c..7a7bb7f 100644 --- a/code/game/NPC_stats.cpp +++ b/code/game/NPC_stats.cpp @@ -6,7 +6,7 @@ #include "b_public.h" #include "anims.h" #include "wp_saber.h" -#include "g_Vehicles.h" +#include "g_vehicles.h" #if !defined(RUFL_HSTRING_INC) #include "../Rufl/hstring.h" #endif diff --git a/code/game/Q3_Interface.h b/code/game/Q3_Interface.h index f9e2dd2..da1beca 100644 --- a/code/game/Q3_Interface.h +++ b/code/game/Q3_Interface.h @@ -1,7 +1,7 @@ #ifndef __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 diff --git a/code/game/b_local.h b/code/game/b_local.h index 3e20511..b79e903 100644 --- a/code/game/b_local.h +++ b/code/game/b_local.h @@ -6,7 +6,7 @@ #include "g_local.h" #include "say.h" -#include "AI.h" +#include "ai.h" #define AI_TIMERS 0//turn on to see print-outs of AI/nav timing // diff --git a/code/game/b_public.h b/code/game/b_public.h index 97f7d5b..ddb0eb1 100644 --- a/code/game/b_public.h +++ b/code/game/b_public.h @@ -2,7 +2,7 @@ #define __B_PUBLIC_H__ #include "bstate.h" -#include "AI.h" +#include "ai.h" #define NPCAI_CHECK_WEAPON 0x00000001 #define NPCAI_BURST_WEAPON 0x00000002 diff --git a/code/game/common_headers.h b/code/game/common_headers.h index dcdb925..878fb0d 100644 --- a/code/game/common_headers.h +++ b/code/game/common_headers.h @@ -14,7 +14,7 @@ // #include "../game/q_math.h" //#endif -#ifdef _XBOX +#if defined(_XBOX) || defined(__GNUC__) #define GAME_INCLUDE #include "../game/b_local.h" #include "../cgame/cg_local.h" diff --git a/code/game/g_client.cpp b/code/game/g_client.cpp index 89570c6..c753f59 100644 --- a/code/game/g_client.cpp +++ b/code/game/g_client.cpp @@ -2,7 +2,7 @@ #include "g_headers.h" -#include "IcarusInterface.h" +#include "../icarus/IcarusInterface.h" #include "Q3_Interface.h" #include "g_local.h" #include "g_functions.h" diff --git a/code/game/g_headers.cpp b/code/game/g_headers.cpp index 418c0e1..302b994 100644 --- a/code/game/g_headers.cpp +++ b/code/game/g_headers.cpp @@ -1,7 +1,7 @@ // Precompiled header file for the game dll #include "g_headers.h" -#include "NPC_Headers.h" +#include "npc_headers.h" #include "../cgame/cg_headers.h" diff --git a/code/game/g_headers.h b/code/game/g_headers.h index b449ae8..01a2be0 100644 --- a/code/game/g_headers.h +++ b/code/game/g_headers.h @@ -11,7 +11,7 @@ //#endif #if !defined(TEAMS_H_INC) - #include "../game/Teams.h" + #include "../game/teams.h" #endif //#if !defined(IGINTERFACE_H_INC) @@ -19,7 +19,7 @@ //#endif // 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/g_functions.h" #include "../game/g_nav.h" diff --git a/code/game/g_mover.cpp b/code/game/g_mover.cpp index 25fe1b7..a7bc447 100644 --- a/code/game/g_mover.cpp +++ b/code/game/g_mover.cpp @@ -4,7 +4,7 @@ #include "g_functions.h" #include "objectives.h" -#include "../Icarus/IcarusInterface.h" +#include "../icarus/IcarusInterface.h" int BMS_START = 0; diff --git a/code/game/g_public.h b/code/game/g_public.h index 26f0cd1..6b5be00 100644 --- a/code/game/g_public.h +++ b/code/game/g_public.h @@ -150,7 +150,7 @@ extern qboolean G2API_SetBoneAnglesIndex(CGhoul2Info *ghlInfo, const int index, 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); */ -#include "../ghoul2/g2.h" +#include "../ghoul2/G2.h" 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); #endif diff --git a/code/game/g_savegame.cpp b/code/game/g_savegame.cpp index d0e0b6c..87bd829 100644 --- a/code/game/g_savegame.cpp +++ b/code/game/g_savegame.cpp @@ -4,7 +4,7 @@ #include "g_headers.h" -#include "IcarusInterface.h" +#include "../icarus/IcarusInterface.h" #include "Q3_Interface.h" #include "g_local.h" #include "fields.h" diff --git a/code/game/g_shared.h b/code/game/g_shared.h index e158419..d4e07b9 100644 --- a/code/game/g_shared.h +++ b/code/game/g_shared.h @@ -4,10 +4,10 @@ #include "bg_public.h" #include "g_public.h" #include "b_public.h" -#include "../Icarus/Stdafx.h" //need stl +#include "../icarus/StdAfx.h" //need stl #include "../renderer/tr_types.h" #include "../cgame/cg_public.h" -#include "G_Vehicles.h" +#include "g_vehicles.h" #include "hitlocs.h" #include "bset.h" diff --git a/code/game/g_vehicles.cpp b/code/game/g_vehicles.cpp index 8d66716..f2d80d4 100644 --- a/code/game/g_vehicles.cpp +++ b/code/game/g_vehicles.cpp @@ -13,7 +13,7 @@ #ifndef _JK2MP #include "g_functions.h" #include "g_vehicles.h" -#include "../CGame/cg_Local.h" +#include "../cgame/cg_local.h" #else #include "bg_vehicles.h" #endif diff --git a/code/game/q_shared.h b/code/game/q_shared.h index 6519728..5730690 100644 --- a/code/game/q_shared.h +++ b/code/game/q_shared.h @@ -46,6 +46,8 @@ #include #include #include +#include +#include #ifdef _XBOX #define tvector(T) std::vector< T > diff --git a/code/ghoul2/G2_bones.cpp b/code/ghoul2/G2_bones.cpp index a713d90..96ca6a8 100644 --- a/code/ghoul2/G2_bones.cpp +++ b/code/ghoul2/G2_bones.cpp @@ -15,14 +15,14 @@ #include "../qcommon/qcommon.h" #endif -#include "../renderer/MatComp.h" +#include "../renderer/matcomp.h" #if !defined(G2_H_INC) #include "G2.h" #endif //rww - RAGDOLL_BEGIN -#include +#include #include "ghoul2_gore.h" //rww - RAGDOLL_END diff --git a/code/ghoul2/G2_misc.cpp b/code/ghoul2/G2_misc.cpp index 8c23a8b..4eb65f4 100644 --- a/code/ghoul2/G2_misc.cpp +++ b/code/ghoul2/G2_misc.cpp @@ -12,21 +12,21 @@ #include "../renderer/tr_local.h" #endif -#include "../renderer/MatComp.h" +#include "../renderer/matcomp.h" #if !defined(G2_H_INC) #include "G2.h" #endif #if !defined (MINIHEAP_H_INC) - #include "../qcommon/miniheap.h" + #include "../qcommon/MiniHeap.h" #endif #define G2_MODEL_OK(g) ((g)&&(g)->mValid&&(g)->aHeader&&(g)->currentModel&&(g)->animModel) #include "../server/server.h" -#include +#include #ifdef _G2_GORE #include "ghoul2_gore.h" diff --git a/code/icarus/BlockStream.cpp b/code/icarus/BlockStream.cpp index 552796d..9242355 100644 --- a/code/icarus/BlockStream.cpp +++ b/code/icarus/BlockStream.cpp @@ -3,7 +3,7 @@ // -- jweier // this include must remain at the top of every Icarus CPP file -#include "stdafx.h" +#include "StdAfx.h" #include "IcarusInterface.h" #include "IcarusImplementation.h" diff --git a/code/icarus/BlockStream.h b/code/icarus/BlockStream.h index f604bd5..5205e02 100644 --- a/code/icarus/BlockStream.h +++ b/code/icarus/BlockStream.h @@ -4,6 +4,8 @@ #define __INTERPRETED_BLOCK_STREAM__ #include +#include +#include typedef float vec3_t[3]; diff --git a/code/icarus/IcarusImplementation.cpp b/code/icarus/IcarusImplementation.cpp index 5190d43..cb4679d 100644 --- a/code/icarus/IcarusImplementation.cpp +++ b/code/icarus/IcarusImplementation.cpp @@ -1,6 +1,6 @@ // IcarusImplementation.cpp -#include "stdafx.h" +#include "StdAfx.h" #include "IcarusImplementation.h" #include "BlockStream.h" @@ -8,6 +8,8 @@ #include "TaskManager.h" #include "Sequencer.h" +#include "../game/q_shared.h" + #define STL_ITERATE( a, b ) for ( a = b.begin(); a != b.end(); a++ ) #define STL_INSERT( a, b ) a.insert( a.end(), b ); diff --git a/code/icarus/Sequence.cpp b/code/icarus/Sequence.cpp index 1f75f51..ac88f0f 100644 --- a/code/icarus/Sequence.cpp +++ b/code/icarus/Sequence.cpp @@ -3,7 +3,7 @@ // -- jweier // this include must remain at the top of every Icarus CPP file -#include "stdafx.h" +#include "StdAfx.h" #include "IcarusImplementation.h" #include "BlockStream.h" diff --git a/code/icarus/Sequencer.cpp b/code/icarus/Sequencer.cpp index 63c34bd..5d11ee0 100644 --- a/code/icarus/Sequencer.cpp +++ b/code/icarus/Sequencer.cpp @@ -3,7 +3,7 @@ // -- jweier // this include must remain at the top of every Icarus CPP file -#include "stdafx.h" +#include "StdAfx.h" #include "IcarusImplementation.h" #include "BlockStream.h" diff --git a/code/icarus/TaskManager.cpp b/code/icarus/TaskManager.cpp index 1be3566..84d0b28 100644 --- a/code/icarus/TaskManager.cpp +++ b/code/icarus/TaskManager.cpp @@ -4,7 +4,7 @@ // this include must remain at the top of every Icarus CPP file -#include "stdafx.h" +#include "StdAfx.h" #include "IcarusImplementation.h" #include "BlockStream.h" diff --git a/code/jpeg-6/jinclude.h b/code/jpeg-6/jinclude.h index eadcd19..f0a859b 100644 --- a/code/jpeg-6/jinclude.h +++ b/code/jpeg-6/jinclude.h @@ -70,6 +70,11 @@ #include +#ifndef WIN32 +#include +typedef int32_t INT32; +#endif + /* * We need memory copying and zeroing functions, plus strncpy(). * ANSI and System V implementations declare these in . diff --git a/code/mp3code/mp3struct.h b/code/mp3code/mp3struct.h index 33fca50..4535492 100644 --- a/code/mp3code/mp3struct.h +++ b/code/mp3code/mp3struct.h @@ -10,6 +10,10 @@ #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 (*XFORM_FUNCTION) (void *pcm, int igr); typedef IN_OUT(*DECODE_FUNCTION) (unsigned char *bs, unsigned char *pcm); diff --git a/code/mp3code/towave.c b/code/mp3code/towave.c index 5d19d00..1f8fc97 100644 --- a/code/mp3code/towave.c +++ b/code/mp3code/towave.c @@ -151,13 +151,6 @@ decode (standard decoder) reduction_code: #include "mp3struct.h" #include - -#ifndef byte -typedef unsigned char byte; -#endif - - - typedef struct id3v1_1 { char id[3]; char title[30]; // diff --git a/code/qcommon/cm_draw.h b/code/qcommon/cm_draw.h index 1058efa..5b72948 100644 --- a/code/qcommon/cm_draw.h +++ b/code/qcommon/cm_draw.h @@ -31,6 +31,13 @@ #define CEILING(a) \ ((a)==(int)(a) ? (a) : (a)>0 ? 1+(int)(a) : -(1+(int)(-a))) +#ifndef WIN32 +typedef struct { + int x; + int y; +} POINT; +#endif + #include #endif diff --git a/code/qcommon/stv_version.h b/code/qcommon/stv_version.h index f9d9b53..c9d56e0 100644 --- a/code/qcommon/stv_version.h +++ b/code/qcommon/stv_version.h @@ -1,5 +1,5 @@ // Current version of the single player game -#include "../win32/autoversion.h" +#include "../win32/AutoVersion.h" #ifdef _DEBUG #define Q3_VERSION "(debug)JA: v"VERSION_STRING_DOTTED diff --git a/code/qcommon/tri_coll_test.cpp b/code/qcommon/tri_coll_test.cpp index afe0b7f..3ffa49f 100644 --- a/code/qcommon/tri_coll_test.cpp +++ b/code/qcommon/tri_coll_test.cpp @@ -13,7 +13,7 @@ */ // leave this at the top for PCH reasons... -#include "common_headers.h" +#include "../game/common_headers.h" diff --git a/code/renderer/matcomp.c b/code/renderer/matcomp.c index 8ca16ae..32a741b 100644 --- a/code/renderer/matcomp.c +++ b/code/renderer/matcomp.c @@ -1,4 +1,4 @@ -#include "MatComp.h" +#include "matcomp.h" #include #include #include diff --git a/code/renderer/tr_animation.cpp b/code/renderer/tr_animation.cpp index 8c586b6..f1090e3 100644 --- a/code/renderer/tr_animation.cpp +++ b/code/renderer/tr_animation.cpp @@ -4,7 +4,7 @@ #include "tr_local.h" -#include "MatComp.h" +#include "matcomp.h" #ifdef VV_LIGHTING #include "tr_lightmanager.h" diff --git a/code/renderer/tr_arioche.cpp b/code/renderer/tr_arioche.cpp index 28746cf..934991b 100644 --- a/code/renderer/tr_arioche.cpp +++ b/code/renderer/tr_arioche.cpp @@ -1,7 +1,7 @@ #include "../server/exe_headers.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 diff --git a/code/renderer/tr_font.cpp b/code/renderer/tr_font.cpp index 236a68b..ebe8f04 100644 --- a/code/renderer/tr_font.cpp +++ b/code/renderer/tr_font.cpp @@ -8,6 +8,8 @@ #include "../qcommon/stringed_ingame.h" +#include + ///////////////////////////////////////////////////////////////////////////////////////////////////////// // // This file is shared in the single and multiplayer codebases, so be CAREFUL WHAT YOU ADD/CHANGE!!!!! diff --git a/code/renderer/tr_ghoul2.cpp b/code/renderer/tr_ghoul2.cpp index 4ad6c78..3d602b1 100644 --- a/code/renderer/tr_ghoul2.cpp +++ b/code/renderer/tr_ghoul2.cpp @@ -15,7 +15,7 @@ #include "tr_local.h" #endif -#include "MatComp.h" +#include "matcomp.h" #if !defined(_QCOMMON_H_) #include "../qcommon/qcommon.h" #endif @@ -57,7 +57,7 @@ void G2Time_ReportTimers(void) #endif //rww - RAGDOLL_BEGIN -#include +#include //rww - RAGDOLL_END extern cvar_t *r_Ghoul2UnSqash; diff --git a/code/renderer/tr_mesh.cpp b/code/renderer/tr_mesh.cpp index 1328242..ab0da8a 100644 --- a/code/renderer/tr_mesh.cpp +++ b/code/renderer/tr_mesh.cpp @@ -8,7 +8,7 @@ #include "tr_local.h" -#include "MatComp.h" +#include "matcomp.h" #ifdef VV_LIGHTING #include "tr_lightmanager.h" diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp index 1da774d..a86b5ee 100644 --- a/code/renderer/tr_model.cpp +++ b/code/renderer/tr_model.cpp @@ -5,7 +5,7 @@ #include "../server/exe_headers.h" #include "tr_local.h" -#include "MatComp.h" +#include "matcomp.h" #include "../qcommon/sstring.h" #define LL(x) x=LittleLong(x) diff --git a/code/renderer/tr_quicksprite.cpp b/code/renderer/tr_quicksprite.cpp index 1d20812..2c70f0e 100644 --- a/code/renderer/tr_quicksprite.cpp +++ b/code/renderer/tr_quicksprite.cpp @@ -2,7 +2,7 @@ // ////////////////////////////////////////////////////////////////////// #include "../server/exe_headers.h" -#include "tr_QuickSprite.h" +#include "tr_quicksprite.h" extern void R_BindAnimatedImage( const textureBundle_t *bundle ); diff --git a/code/renderer/tr_surfacesprites.cpp b/code/renderer/tr_surfacesprites.cpp index e27ab26..0ce0281 100644 --- a/code/renderer/tr_surfacesprites.cpp +++ b/code/renderer/tr_surfacesprites.cpp @@ -5,8 +5,8 @@ #include "../server/exe_headers.h" -#include "tr_QuickSprite.h" -#include "tr_worldeffects.h" +#include "tr_quicksprite.h" +#include "tr_WorldEffects.h" #include //for isnan /////===== Part of the VERTIGON system =====///// diff --git a/code/server/sv_init.cpp b/code/server/sv_init.cpp index 077b695..d12d918 100644 --- a/code/server/sv_init.cpp +++ b/code/server/sv_init.cpp @@ -14,7 +14,7 @@ Ghoul2 Insert Start #endif #if !defined (MINIHEAP_H_INC) - #include "../qcommon/miniheap.h" + #include "../qcommon/MiniHeap.h" #endif void CM_CleanLeafCache(void); diff --git a/code/server/sv_main.cpp b/code/server/sv_main.cpp index 6b3c1cd..64d611e 100644 --- a/code/server/sv_main.cpp +++ b/code/server/sv_main.cpp @@ -9,7 +9,7 @@ Ghoul2 Insert Start */ #if !defined (MINIHEAP_H_INC) - #include "../qcommon/miniheap.h" + #include "../qcommon/MiniHeap.h" #endif /* Ghoul2 Insert End diff --git a/code/server/sv_world.cpp b/code/server/sv_world.cpp index bb8fa6e..d011cd4 100644 --- a/code/server/sv_world.cpp +++ b/code/server/sv_world.cpp @@ -17,7 +17,7 @@ Ghoul2 Insert Start #include "../ghoul2/G2.h" #endif #if !defined (MINIHEAP_H_INC) - #include "../qcommon/miniheap.h" + #include "../qcommon/MiniHeap.h" #endif #ifdef _DEBUG diff --git a/code/unix/linux_glimp.cpp b/code/unix/linux_glimp.cpp index b84066c..474d26d 100644 --- a/code/unix/linux_glimp.cpp +++ b/code/unix/linux_glimp.cpp @@ -15,12 +15,16 @@ #include #include #include +#ifdef __linux__ #include +#endif #include #include #include #include #include +#include +#include //#include "../qcommon/qcommon.h" //#include "../client/keys.h" diff --git a/code/unix/unix_main.cpp b/code/unix/unix_main.cpp index c489a0b..b77f836 100644 --- a/code/unix/unix_main.cpp +++ b/code/unix/unix_main.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include