More updates

This commit is contained in:
Walter Julius Hennecke 2013-10-13 00:50:21 +02:00
parent 35f8ee0283
commit c097714e81
13 changed files with 53 additions and 30 deletions

View file

@ -168,6 +168,7 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS</PreprocessorDefinitions>
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
</ClCompile>
<ClCompile Include="..\game\bg_list.c" />
<ClCompile Include="..\game\bg_misc.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS</PreprocessorDefinitions>
@ -459,13 +460,13 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS</PreprocessorDefinitions>
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
</ClCompile>
<ClCompile Include="list.c" />
<ClCompile Include="lua_cent.c" />
<ClCompile Include="lua_cfx.c" />
<ClCompile Include="lua_refent.c" />
<ClCompile Include="cg_logger.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\game\bg_list.h" />
<ClInclude Include="..\game\bg_local.h" />
<ClInclude Include="..\game\bg_public.h" />
<ClInclude Include="cg_anims.h" />
@ -477,7 +478,6 @@
<ClInclude Include="fx_local.h" />
<ClInclude Include="..\game\q_shared.h" />
<ClInclude Include="..\game\surfaceflags.h" />
<ClInclude Include="list.h" />
<ClInclude Include="tr_types.h" />
<ClCompile Include="cg_logger.h" />
</ItemGroup>

View file

@ -146,7 +146,10 @@
<ClCompile Include="lua_refent.c">
<Filter>Source Files\lua</Filter>
</ClCompile>
<ClCompile Include="list.c">
<ClCompile Include="cg_logger.h">
<Filter>Header Files</Filter>
</ClCompile>
<ClCompile Include="..\game\bg_list.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@ -163,9 +166,6 @@
<ClInclude Include="cg_local.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="cg_logger.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="cg_public.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -190,7 +190,7 @@
<ClInclude Include="cg_lua.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="list.h">
<ClInclude Include="..\game\bg_list.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

View file

@ -1,6 +1,7 @@
#include "g_local.h"
#include "g_breakable.h"
#include "g_spawn.h"
#include "g_items.h"
/**
* \brief A func_breakables health has sunk to or under zero

View file

@ -7,6 +7,7 @@
#include "g_cmds.h"
#include "g_main.h"
#include "g_spawn.h"
#include "g_items.h"
reconData_t g_reconData[MAX_RECON_NAMES]; //!< recon data for a limited ammount of clients
int32_t g_reconNum;

View file

@ -91,4 +91,14 @@ free fall from their spawn points
*/
qboolean FinishSpawningDetpack( gentity_t* ent, int32_t itemIndex );
//! Min ammount of weapons a player can have for each weapons
extern vmCvar_t* Min_Weapons[];
//! Max ammount of weapons a player can have for each weapons
extern vmCvar_t* Max_Weapons[];
//RPG-X: Marcin: for easier lookup - 30/12/2008
int32_t Max_Weapon(int32_t num);
int32_t Min_Weapon(int32_t num);
#endif /* _G_ITEMS_H */

View file

@ -3010,21 +3010,6 @@ int trap_GeneticParentsAndChildSelection(int numranks, float* ranks, int* paren
qboolean LineOfSight( gentity_t* ent1, gentity_t* ent2 ); //Phenix
qboolean IsBorg( gentity_t* ent ); //GSIO01 | 08/05/2009
//TiM - load usables scan text
qboolean G_SetupUsablesStrings( void );
//RPG-X: Marcin: for easier lookup - 30/12/2008
int32_t Max_Weapon(int32_t num);
int32_t Min_Weapon(int32_t num);
//! Max ammount of weapons a player can have for each weapons
extern vmCvar_t* Max_Weapons[];
//! Min ammount of weapons a player can have for each weapons
extern vmCvar_t* Min_Weapons[];
// SP support
void Touch_Multi(gentity_t* self, gentity_t* other, trace_t* trace);
void Use_Multi(gentity_t* ent, gentity_t* other, gentity_t* activator);
//OUMS
/** \typedef holoData_t

View file

@ -11,6 +11,7 @@
#include "bg_lex.h"
#include "bg_misc.h"
#include "g_logger.h"
#include "g_usable.h"
extern void BG_LoadItemNames(void);
extern qboolean BG_ParseRankNames ( char* fileName, rankNames_t rankNames[], size_t size );

View file

@ -1,4 +1,5 @@
#include "g_local.h"
#include "g_usable.h"
#include "g_spawn.h"
#include "g_client.h"

View file

@ -1,2 +1,10 @@
#ifndef G_USABLE_H_
#define G_USABLE_H_
#include "g_local.h"
//TiM - load usables scan text
qboolean G_SetupUsablesStrings( void );
#endif /* G_USABLE_H_ */

View file

@ -247,7 +247,7 @@
<ClCompile Include="lgc.c" />
<ClCompile Include="linit.c" />
<ClCompile Include="liolib.c" />
<ClCompile Include="list.c" />
<ClCompile Include="bg_list.c" />
<ClCompile Include="llex.c" />
<ClCompile Include="lmathlib.c" />
<ClCompile Include="lmem.c" />
@ -510,10 +510,12 @@
<ClInclude Include="g_local.h" />
<ClInclude Include="g_lua.h" />
<ClInclude Include="g_main.h" />
<ClInclude Include="g_missile.h" />
<ClInclude Include="g_public.h" />
<ClInclude Include="g_spawn.h" />
<ClInclude Include="g_sql.h" />
<ClInclude Include="g_team.h" />
<ClInclude Include="g_usable.h" />
<ClInclude Include="g_weapon.h" />
<ClInclude Include="g_logger.h" />
<ClInclude Include="inv.h" />
@ -525,7 +527,7 @@
<ClInclude Include="ldo.h" />
<ClInclude Include="lfunc.h" />
<ClInclude Include="lgc.h" />
<ClInclude Include="list.h" />
<ClInclude Include="bg_list.h" />
<ClInclude Include="llex.h" />
<ClInclude Include="llimits.h" />
<ClInclude Include="lmem.h" />

View file

@ -270,9 +270,6 @@
<ClCompile Include="lua_cvar.c">
<Filter>Source Files\lua</Filter>
</ClCompile>
<ClCompile Include="list.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="md5.c">
<Filter>Source Files</Filter>
</ClCompile>
@ -288,6 +285,9 @@
<ClCompile Include="g_logger.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="bg_list.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ai_chat.h">
@ -464,9 +464,6 @@
<ClInclude Include="g_weapon.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="list.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="g_cinematic.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -503,6 +500,15 @@
<ClInclude Include="g_logger.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="bg_list.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="g_missile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="g_usable.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="game.def">

View file

@ -163,6 +163,7 @@
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\game\bg_list.c" />
<ClCompile Include="..\game\bg_misc.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS</PreprocessorDefinitions>
@ -492,6 +493,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\game\bg_list.h" />
<ClInclude Include="..\game\bg_public.h" />
<ClInclude Include="keycodes.h" />
<ClInclude Include="..\game\q_shared.h" />

View file

@ -155,6 +155,9 @@
<ClCompile Include="ui_logger.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\game\bg_list.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\game\bg_public.h">
@ -184,6 +187,9 @@
<ClInclude Include="ui_logger.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\game\bg_list.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="ui.def">