valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-08 19:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compilation errors after merging with latest Source SDK 2013

Browse source
This commit is contained in:
geotavros 2014-07-21 16:51:39 +03:00
parent b060e0107c
commit e15ae2e3ce
6 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
mp/game/mod_hl2mp/bin/client.dll
View file

Binary file not shown.

BIN
mp/game/mod_hl2mp/bin/server.dll
View file

Binary file not shown.

11
mp/src/game/client/client_hl2mp.vpc
View file

@ -114,6 +114,15 @@ $Project "Client (HL2MP)"
$File "hl2\vgui_rootpanel_hl2.cpp"
}
$Folder "seco"
{
$File "$SRCDIR\game\client\episodic\flesh_internal_material_proxy.cpp"
$File "$SRCDIR\game\client\game_controls\classmenu.cpp"
$File "$SRCDIR\game\shared\hl2\survival_gamerules.cpp"
$File "$SRCDIR\game\shared\secobmod\weapon_hands.cpp"
$File "$SRCDIR\game\shared\secobmod\weapon_pg.cpp"
}
$Folder "HL2MP"
{
$File "hl2mp\c_hl2mp_player.cpp"
@ -127,6 +136,8 @@ $Project "Client (HL2MP)"
$File "$SRCDIR\game\shared\hl2mp\hl2mp_player_shared.h"
$File "$SRCDIR\game\shared\hl2mp\hl2mp_weapon_parse.cpp"
$File "$SRCDIR\game\shared\hl2mp\hl2mp_weapon_parse.h"
$File "$SRCDIR\game\client\secobmod\c_vehicle_passenger_seat.cpp"
$File "$SRCDIR\game\client\secobmod\c_weapon_portalgun.cpp"
$Folder "Weapons"
{

21
mp/src/game/server/server_hl2mp.vpc
View file

@ -61,6 +61,25 @@ $Project "Server (HL2MP)"
$File "$SRCDIR\game\shared\teamplay_round_timer.cpp"
$File "$SRCDIR\game\shared\teamplay_round_timer.h"
$Folder "seco"
{
$File "$SRCDIR\game\server\ai_behavior_passenger.cpp"
$File "$SRCDIR\game\server\ai_eventresponse.cpp"
$File "$SRCDIR\game\server\episodic\ai_behavior_passenger_companion.cpp"
$File "$SRCDIR\game\server\hl2\ai_behavior_operator.cpp"
$File "$SRCDIR\game\server\hl2\grenade_spit.cpp"
$File "$SRCDIR\game\server\hl2\info_darknessmode_lightsource.cpp"
$File "$SRCDIR\game\server\hl2\npc_alyx_episodic.cpp"
$File "$SRCDIR\game\server\vehicle_choreo_generic.cpp"
$File "$SRCDIR\game\server\secobmod\companioncube.cpp"
$File "$SRCDIR\game\server\secobmod\Func_PortalMonitor1.cpp"
$File "$SRCDIR\game\server\secobmod\Func_PortalMonitor2.cpp"
$File "$SRCDIR\game\server\secobmod\npc_secobmodportal1.cpp"
$File "$SRCDIR\game\server\secobmod\npc_secobmodportal2.cpp"
$File "$SRCDIR\game\server\secobmod\vehicle_passenger_seat.cpp"
$File "$SRCDIR\game\shared\secobmod\weapon_hands.cpp"
$File "$SRCDIR\game\shared\secobmod\weapon_pg.cpp"
}
$Folder "HL2 DLL"
{
$File "hl2\ai_allymanager.cpp"
@ -140,8 +159,6 @@ $Project "Server (HL2MP)"
$File "hl2\item_suit.cpp"
$File "hl2\look_door.cpp"
$File "hl2\monster_dummy.cpp"
$File "hl2\npc_alyx.cpp"
$File "hl2\npc_alyx.h"
$File "hl2\npc_antlion.cpp"
$File "hl2\npc_antlion.h"
$File "hl2\npc_antlionguard.cpp"

9
mp/src/game/server/soundscape.cpp
View file

@ -307,14 +307,7 @@ void CEnvSoundscape::UpdateForPlayer( ss_update_t &update )
// draw myself
NDebugOverlay::Box(GetAbsOrigin(), Vector(-10,-10,-10), Vector(10,10,10), 255, 0, 255, 64, NDEBUG_PERSIST_TILL_NEXT_SERVER );
#ifdef SecobMod__Enable_Fixed_Multiplayer_AI
CBasePlayer *pPlayer = UTIL_GetLocalPlayer();
#else
// Don't use GetLocalPlayer(), because that prevents multiplayer games using this for testing with a single client in the game
CBasePlayer *pPlayer = UTIL_PlayerByIndex(1);
#endif //SecobMod__Enable_Fixed_Multiplayer_AI
if ( update.pPlayer )
if ( update.pPlayer )
{
audioparams_t &audio = update.pPlayer->GetAudioParams();
if ( audio.ent.Get() != this )

7
mp/src/game/shared/baseviewmodel_shared.cpp
View file

@ -27,6 +27,13 @@ extern ConVar in_forceuser;
#include "iclientmode.h"
#endif
#ifdef CLIENT_DLL
#include "c_hl2mp_player.h"
#include "hl2mp_player_shared.h"
#include "weapon_hl2mpbase.h"
#endif // CLIENT_DLL
// memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h"