mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2024-12-23 01:59:43 +08:00
Modified SDK for GCC 4.1
This commit is contained in:
Scott Ehlert
parent
325306db96
commit
4c2b8fd6c4
@ -110,14 +110,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tier1", "tier1\tier1-2003.v
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "phonemeextractor", "utils\phonemeextractor\phonemeextractor-2003.vcproj", "{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "choreoobjects", "choreoobjects\choreoobjects-2003.vcproj", "{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hlmv", "utils\hlmv\hlmv-2003.vcproj", "{F3704DBF-8055-413C-B027-399E5DBCA4DD}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hlmv", "utils\hlmv\hlmv-2003.vcproj", "{F3704DBF-8055-413C-B027-399E5DBCA4DD}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "phonemeextractor", "utils\phonemeextractor\phonemeextractor-2003.vcproj", "{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
@ -212,14 +218,18 @@ Global
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Debug.Build.0 = Debug|Win32
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Release.ActiveCfg = Release|Win32
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Release.Build.0 = Release|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Debug.ActiveCfg = Debug|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Debug.Build.0 = Debug|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Release.ActiveCfg = Release|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Release.Build.0 = Release|Win32
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Debug.ActiveCfg = Debug|Win32
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Debug.Build.0 = Debug|Win32
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Release.ActiveCfg = Release|Win32
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Release.Build.0 = Release|Win32
|
||||
{F3704DBF-8055-413C-B027-399E5DBCA4DD}.Debug.ActiveCfg = Debug|Win32
|
||||
{F3704DBF-8055-413C-B027-399E5DBCA4DD}.Debug.Build.0 = Debug|Win32
|
||||
{F3704DBF-8055-413C-B027-399E5DBCA4DD}.Release.ActiveCfg = Release|Win32
|
||||
{F3704DBF-8055-413C-B027-399E5DBCA4DD}.Release.Build.0 = Release|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Debug.ActiveCfg = Debug|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Debug.Build.0 = Debug|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Release.ActiveCfg = Release|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Release.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
|
||||
@ -2,38 +2,38 @@ Microsoft Visual Studio Solution File, Format Version 9.00
|
||||
# Visual Studio 2005
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glview", "utils\glview\glview-2005.vcproj", "{BD1604CA-F401-4C4B-821C-251F5AE157FE}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "height2normal", "utils\height2normal\height2normal-2005.vcproj", "{0FDD99E4-130F-493C-8202-4C0236CC47EA}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "serverplugin_empty", "utils\serverplugin_sample\serverplugin_empty-2005.vcproj", "{B6572CBE-7C7F-4FFF-94DE-AFBBBAB11C64}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "studiomdl", "utils\studiomdl\studiomdl-2005.vcproj", "{AE28536E-885A-41BF-99A4-41A7E424B869}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tgadiff", "utils\tgadiff\tgadiff-2005.vcproj", "{0CE0AF8A-A977-4538-9D63-BCB76DE1BAC6}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vbsp", "utils\vbsp\vbsp-2005.vcproj", "{B78B6271-B19A-4CF6-926E-40B643548E23}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vice", "utils\vice\vice-2005.vcproj", "{3CE6E7A9-89EC-4304-8D72-5B602B4DBD09}"
|
||||
@ -48,8 +48,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vprojtomake", "utils\vprojt
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vrad", "utils\vrad\vrad-2005.vcproj", "{FC0F5DE3-F09F-4EF6-98F9-BA762FFF268D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vrad_launcher", "utils\vrad_launcher\vrad_launcher-2005.vcproj", "{914F19DF-64EC-4E7D-8B01-76477BF06479}"
|
||||
@ -59,20 +59,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vrad_launcher", "utils\vrad
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtf2tga", "utils\vtf2tga\vtf2tga-2005.vcproj", "{2A1F656C-053C-46A4-AE33-304C1D865E0C}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtfdiff", "utils\vtfdiff\vtfdiff-2005.vcproj", "{0A368DE7-D34A-48D3-B517-996BFF2D0D5D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vvis", "utils\vvis\vvis-2005.vcproj", "{5B065E70-6EE0-4B47-BA64-113D2F81220D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vvis_launcher", "utils\vvis_launcher\vvis_launcher-2005.vcproj", "{4C0B9915-E8FF-4089-8927-FC934BFC1E4A}"
|
||||
@ -91,8 +91,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demoinfo", "utils\demoinfo\
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "motionmapper", "utils\motionmapper\motionmapper-2005.vcproj", "{A882FC08-8B92-4D4F-89BF-75BCEC2BAE11}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QC_Eyes", "utils\qc_eyes\QC_Eyes-2005.vcproj", "{D373436F-7DBF-468B-A3E4-601FB8556544}"
|
||||
@ -101,14 +101,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathlib", "mathlib\mathlib-
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tier1", "tier1\tier1-2005.vcproj", "{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "choreoobjects", "choreoobjects\choreoobjects-2005.vcproj", "{0A940BE3-0C70-4D6F-A9F8-C39B483E3796}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hlmv", "utils\hlmv\hlmv-2005.vcproj", "{F3704DBF-8055-413C-B027-399E5DBCA4DD}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "phonemeextractor", "utils\phonemeextractor\phonemeextractor-2005.vcproj", "{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
{E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720} = {E1DA9FB8-FB4C-4B14-91A6-98BCED6B9720}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hlmv", "utils\hlmv\hlmv-2005.vcproj", "{F3704DBF-8055-413C-B027-399E5DBCA4DD}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
@ -199,14 +205,18 @@ Global
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}.Release|Win32.Build.0 = Release|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Release|Win32.Build.0 = Release|Win32
|
||||
{0A940BE3-0C70-4D6F-A9F8-C39B483E3796}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{0A940BE3-0C70-4D6F-A9F8-C39B483E3796}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{0A940BE3-0C70-4D6F-A9F8-C39B483E3796}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{0A940BE3-0C70-4D6F-A9F8-C39B483E3796}.Release|Win32.Build.0 = Release|Win32
|
||||
{F3704DBF-8055-413C-B027-399E5DBCA4DD}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{F3704DBF-8055-413C-B027-399E5DBCA4DD}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{F3704DBF-8055-413C-B027-399E5DBCA4DD}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{F3704DBF-8055-413C-B027-399E5DBCA4DD}.Release|Win32.Build.0 = Release|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{8A35F55B-B5C2-47A0-8C4A-5857A8E20385}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
293
choreoobjects/choreoactor.cpp
Normal file
293
choreoobjects/choreoactor.cpp
Normal file
@ -0,0 +1,293 @@
|
||||
//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
|
||||
//
|
||||
// Purpose:
|
||||
//
|
||||
// $NoKeywords: $
|
||||
//=============================================================================//
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "choreoactor.h"
|
||||
#include "choreochannel.h"
|
||||
#include "choreoscene.h"
|
||||
#include "tier1/utlbuffer.h"
|
||||
|
||||
// memdbgon must be the last include file in a .cpp file!!!
|
||||
#include "tier0/memdbgon.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
CChoreoActor::CChoreoActor( void )
|
||||
{
|
||||
Init();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *name -
|
||||
//-----------------------------------------------------------------------------
|
||||
CChoreoActor::CChoreoActor( const char *name )
|
||||
{
|
||||
Init();
|
||||
SetName( name );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: // Assignment
|
||||
// Input : src -
|
||||
// Output : CChoreoActor&
|
||||
//-----------------------------------------------------------------------------
|
||||
CChoreoActor& CChoreoActor::operator=( const CChoreoActor& src )
|
||||
{
|
||||
m_bActive = src.m_bActive;
|
||||
|
||||
Q_strncpy( m_szName, src.m_szName, sizeof( m_szName ) );
|
||||
Q_strncpy( m_szFacePoserModelName, src.m_szFacePoserModelName, sizeof( m_szFacePoserModelName ) );
|
||||
|
||||
for ( int i = 0; i < src.m_Channels.Size(); i++ )
|
||||
{
|
||||
CChoreoChannel *c = src.m_Channels[ i ];
|
||||
CChoreoChannel *newChannel = new CChoreoChannel();
|
||||
newChannel->SetActor( this );
|
||||
*newChannel = *c;
|
||||
AddChannel( newChannel );
|
||||
}
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoActor::Init( void )
|
||||
{
|
||||
m_szName[ 0 ] = 0;
|
||||
m_szFacePoserModelName[ 0 ] = 0;
|
||||
m_bActive = true;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *name -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoActor::SetName( const char *name )
|
||||
{
|
||||
assert( strlen( name ) < MAX_ACTOR_NAME );
|
||||
Q_strncpy( m_szName, name, sizeof( m_szName ) );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Output : const char
|
||||
//-----------------------------------------------------------------------------
|
||||
const char *CChoreoActor::GetName( void )
|
||||
{
|
||||
return m_szName;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Output : int
|
||||
//-----------------------------------------------------------------------------
|
||||
int CChoreoActor::GetNumChannels( void )
|
||||
{
|
||||
return m_Channels.Size();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : channel -
|
||||
// Output : CChoreoChannel
|
||||
//-----------------------------------------------------------------------------
|
||||
CChoreoChannel *CChoreoActor::GetChannel( int channel )
|
||||
{
|
||||
if ( channel < 0 || channel >= m_Channels.Size() )
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return m_Channels[ channel ];
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *channel -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoActor::AddChannel( CChoreoChannel *channel )
|
||||
{
|
||||
m_Channels.AddToTail( channel );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *channel -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoActor::RemoveChannel( CChoreoChannel *channel )
|
||||
{
|
||||
int idx = FindChannelIndex( channel );
|
||||
if ( idx == -1 )
|
||||
return;
|
||||
|
||||
m_Channels.Remove( idx );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoActor::RemoveAllChannels()
|
||||
{
|
||||
m_Channels.RemoveAll();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : c1 -
|
||||
// c2 -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoActor::SwapChannels( int c1, int c2 )
|
||||
{
|
||||
CChoreoChannel *temp;
|
||||
|
||||
temp = m_Channels[ c1 ];
|
||||
m_Channels[ c1 ] = m_Channels[ c2 ];
|
||||
m_Channels[ c2 ] = temp;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *channel -
|
||||
// Output : int
|
||||
//-----------------------------------------------------------------------------
|
||||
int CChoreoActor::FindChannelIndex( CChoreoChannel *channel )
|
||||
{
|
||||
for ( int i = 0; i < m_Channels.Size(); i++ )
|
||||
{
|
||||
if ( channel == m_Channels[ i ] )
|
||||
{
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *name -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoActor::SetFacePoserModelName( const char *name )
|
||||
{
|
||||
Q_strncpy( m_szFacePoserModelName, name, sizeof( m_szFacePoserModelName ) );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Output : char const
|
||||
//-----------------------------------------------------------------------------
|
||||
const char *CChoreoActor::GetFacePoserModelName( void ) const
|
||||
{
|
||||
return m_szFacePoserModelName;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : active -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoActor::SetActive( bool active )
|
||||
{
|
||||
m_bActive = active;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Output : Returns true on success, false on failure.
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CChoreoActor::GetActive( void ) const
|
||||
{
|
||||
return m_bActive;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoActor::MarkForSaveAll( bool mark )
|
||||
{
|
||||
SetMarkedForSave( mark );
|
||||
|
||||
int c = GetNumChannels();
|
||||
for ( int i = 0; i < c; i++ )
|
||||
{
|
||||
CChoreoChannel *channel = GetChannel( i );
|
||||
channel->MarkForSaveAll( mark );
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *name -
|
||||
// Output : CChoreoChannel
|
||||
//-----------------------------------------------------------------------------
|
||||
CChoreoChannel *CChoreoActor::FindChannel( const char *name )
|
||||
{
|
||||
int c = GetNumChannels();
|
||||
for ( int i = 0; i < c; i++ )
|
||||
{
|
||||
CChoreoChannel *channel = GetChannel( i );
|
||||
if ( !Q_stricmp( channel->GetName(), name ) )
|
||||
return channel;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void CChoreoActor::SaveToBuffer( CUtlBuffer& buf, CChoreoScene *pScene )
|
||||
{
|
||||
int i, c;
|
||||
buf.PutString( GetName() );
|
||||
|
||||
c = GetNumChannels();
|
||||
buf.PutShort( c );
|
||||
for ( i = 0; i < c; i++ )
|
||||
{
|
||||
CChoreoChannel *channel = GetChannel( i );
|
||||
Assert( channel );
|
||||
channel->SaveToBuffer( buf, pScene );
|
||||
}
|
||||
|
||||
/*
|
||||
if ( Q_strlen( a->GetFacePoserModelName() ) > 0 )
|
||||
{
|
||||
FilePrintf( buf, level + 1, "faceposermodel \"%s\"\n", a->GetFacePoserModelName() );
|
||||
}
|
||||
*/
|
||||
buf.PutChar( GetActive() ? 1 : 0 );
|
||||
}
|
||||
|
||||
bool CChoreoActor::RestoreFromBuffer( CUtlBuffer& buf, CChoreoScene *pScene )
|
||||
{
|
||||
char sz[ 256 ];
|
||||
buf.GetString( sz, sizeof( sz ) );
|
||||
|
||||
SetName( sz );
|
||||
|
||||
int i;
|
||||
int c = buf.GetShort();
|
||||
for ( i = 0; i < c; i++ )
|
||||
{
|
||||
CChoreoChannel *channel = pScene->AllocChannel();
|
||||
Assert( channel );
|
||||
if ( channel->RestoreFromBuffer( buf, pScene, this ) )
|
||||
{
|
||||
AddChannel( channel );
|
||||
channel->SetActor( this );
|
||||
continue;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
SetActive( buf.GetChar() == 1 ? true : false );
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
562
choreoobjects/choreochannel.cpp
Normal file
562
choreoobjects/choreochannel.cpp
Normal file
@ -0,0 +1,562 @@
|
||||
//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
|
||||
//
|
||||
// Purpose:
|
||||
//
|
||||
// $NoKeywords: $
|
||||
//
|
||||
//=============================================================================//
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "choreochannel.h"
|
||||
#include "choreoevent.h"
|
||||
#include "choreoscene.h"
|
||||
#include "utlrbtree.h"
|
||||
#include "tier1/utlbuffer.h"
|
||||
|
||||
// memdbgon must be the last include file in a .cpp file!!!
|
||||
#include "tier0/memdbgon.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
CChoreoChannel::CChoreoChannel( void )
|
||||
{
|
||||
Init();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *name -
|
||||
//-----------------------------------------------------------------------------
|
||||
CChoreoChannel::CChoreoChannel(const char *name )
|
||||
{
|
||||
Init();
|
||||
SetName( name );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Assignment
|
||||
// Input : src -
|
||||
//-----------------------------------------------------------------------------
|
||||
CChoreoChannel& CChoreoChannel::operator=( const CChoreoChannel& src )
|
||||
{
|
||||
m_bActive = src.m_bActive;
|
||||
Q_strncpy( m_szName, src.m_szName, sizeof( m_szName ) );
|
||||
for ( int i = 0; i < src.m_Events.Size(); i++ )
|
||||
{
|
||||
CChoreoEvent *e = src.m_Events[ i ];
|
||||
CChoreoEvent *newEvent = new CChoreoEvent( e->GetScene() );
|
||||
*newEvent = *e;
|
||||
AddEvent( newEvent );
|
||||
newEvent->SetChannel( this );
|
||||
newEvent->SetActor( m_pActor );
|
||||
}
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *name -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoChannel::SetName( const char *name )
|
||||
{
|
||||
assert( Q_strlen( name ) < MAX_CHANNEL_NAME );
|
||||
Q_strncpy( m_szName, name, sizeof( m_szName ) );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Output : const char
|
||||
//-----------------------------------------------------------------------------
|
||||
const char *CChoreoChannel::GetName( void )
|
||||
{
|
||||
return m_szName;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Output : int
|
||||
//-----------------------------------------------------------------------------
|
||||
int CChoreoChannel::GetNumEvents( void )
|
||||
{
|
||||
return m_Events.Size();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : event -
|
||||
// Output : CChoreoEvent
|
||||
//-----------------------------------------------------------------------------
|
||||
CChoreoEvent *CChoreoChannel::GetEvent( int event )
|
||||
{
|
||||
if ( event < 0 || event >= m_Events.Size() )
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return m_Events[ event ];
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *event -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoChannel::AddEvent( CChoreoEvent *event )
|
||||
{
|
||||
m_Events.AddToTail( event );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *event -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoChannel::RemoveEvent( CChoreoEvent *event )
|
||||
{
|
||||
int idx = FindEventIndex( event );
|
||||
if ( idx == -1 )
|
||||
return;
|
||||
|
||||
m_Events.Remove( idx );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoChannel::RemoveAllEvents()
|
||||
{
|
||||
m_Events.RemoveAll();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *event -
|
||||
// Output : int
|
||||
//-----------------------------------------------------------------------------
|
||||
int CChoreoChannel::FindEventIndex( CChoreoEvent *event )
|
||||
{
|
||||
for ( int i = 0; i < m_Events.Size(); i++ )
|
||||
{
|
||||
if ( event == m_Events[ i ] )
|
||||
{
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoChannel::Init( void )
|
||||
{
|
||||
m_szName[ 0 ] = 0;
|
||||
SetActor( NULL );
|
||||
m_bActive = true;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Output : CChoreoActor
|
||||
//-----------------------------------------------------------------------------
|
||||
CChoreoActor *CChoreoChannel::GetActor( void )
|
||||
{
|
||||
return m_pActor;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : *actor -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoChannel::SetActor( CChoreoActor *actor )
|
||||
{
|
||||
m_pActor = actor;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Input : active -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoChannel::SetActive( bool active )
|
||||
{
|
||||
m_bActive = active;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
// Output : Returns true on success, false on failure.
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CChoreoChannel::GetActive( void ) const
|
||||
{
|
||||
return m_bActive;
|
||||
}
|
||||
|
||||
static bool ChoreEventStartTimeLessFunc( CChoreoEvent * const &p1, CChoreoEvent * const &p2 )
|
||||
{
|
||||
CChoreoEvent *e1;
|
||||
CChoreoEvent *e2;
|
||||
|
||||
e1 = const_cast< CChoreoEvent * >( p1 );
|
||||
e2 = const_cast< CChoreoEvent * >( p2 );
|
||||
|
||||
return e1->GetStartTime() < e2->GetStartTime();
|
||||
}
|
||||
|
||||
void CChoreoChannel::ReconcileGestureTimes()
|
||||
{
|
||||
// Sort gesture events within channel by starting time
|
||||
CUtlRBTree< CChoreoEvent * > sortedGestures( 0, 0, ChoreEventStartTimeLessFunc );
|
||||
int i;
|
||||
// Sort items
|
||||
int c = GetNumEvents();
|
||||
for ( i = 0; i < c; i++ )
|
||||
{
|
||||
CChoreoEvent *e = GetEvent( i );
|
||||
Assert( e );
|
||||
if ( e->GetType() != CChoreoEvent::GESTURE )
|
||||
continue;
|
||||
|
||||
sortedGestures.Insert( e );
|
||||
}
|
||||
|
||||
// Now walk list of gestures
|
||||
if ( !sortedGestures.Count() )
|
||||
return;
|
||||
|
||||
CChoreoEvent *previous = NULL;
|
||||
|
||||
for ( i = sortedGestures.FirstInorder(); i != sortedGestures.InvalidIndex(); i = sortedGestures.NextInorder( i ) )
|
||||
{
|
||||
CChoreoEvent *event = sortedGestures[ i ];
|
||||
|
||||
if ( !previous )
|
||||
{
|
||||
// event->SetStartTime( 0.0f );
|
||||
}
|
||||
else if ( previous->GetSyncToFollowingGesture() )
|
||||
{
|
||||
// TODO: ask the sequence for what tags to match
|
||||
|
||||
CEventAbsoluteTag *pEntryTag = event->FindEntryTag( CChoreoEvent::PLAYBACK );
|
||||
CEventAbsoluteTag *pExitTag = previous->FindExitTag( CChoreoEvent::PLAYBACK );
|
||||
|
||||
if (pEntryTag && pExitTag)
|
||||
{
|
||||
float entryTime = pEntryTag->GetAbsoluteTime( );
|
||||
|
||||
// get current decay rate of previous gesture
|
||||
float duration = previous->GetDuration();
|
||||
float decayTime = (1.0 - pExitTag->GetPercentage()) * duration;
|
||||
|
||||
// adjust the previous gestures end time to current apex + existing decay rate
|
||||
previous->RescaleGestureTimes( previous->GetStartTime(), entryTime + decayTime );
|
||||
previous->SetEndTime( entryTime + decayTime );
|
||||
|
||||
// set the previous gestures end tag to the current apex
|
||||
pExitTag->SetAbsoluteTime( entryTime );
|
||||
|
||||
event->PreventTagOverlap( );
|
||||
previous->PreventTagOverlap( );
|
||||
}
|
||||
// BUG: Tracker 3298: ywb 1/31/04
|
||||
// I think this fixes the issue with abutting past NULL gestures on paste:
|
||||
// Here's the bug report:
|
||||
// -------------------------
|
||||
// When copying and pasteing posture and gesture clips in face poser the beginings of the clips stretch
|
||||
// to the begining of the scene even if there is a null gesture in place at the begining.
|
||||
// -------------------------
|
||||
/*
|
||||
else if ( pEntryTag && !Q_stricmp( previous->GetName(), "NULL" ) )
|
||||
{
|
||||
// If the previous was a null event, then do a bit of fixup
|
||||
event->SetStartTime( previous->GetEndTime() );
|
||||
|
||||
event->PreventTagOverlap( );
|
||||
}
|
||||
*/
|
||||
|
||||
// The previous event decays from it's end dispaly end time to the current event's display start time
|
||||
// The next event starts just after the display end time of the previous event
|
||||
}
|
||||
|
||||
previous = event;
|
||||
}
|
||||
|
||||
if ( previous )
|
||||
{
|
||||
CChoreoScene *scene = previous->GetScene();
|
||||
if ( scene )
|
||||
{
|
||||
// HACK: Could probably do better by allowing user to drag the blue "end time" bar
|
||||
//float finish = scene->FindStopTime();
|
||||
//previous->RescaleGestureTimes( previous->GetStartTime(), finish );
|
||||
//previous->SetEndTime( finish );
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
c = 0;
|
||||
for ( i = sortedGestures.FirstInorder(); i != sortedGestures.InvalidIndex(); i = sortedGestures.NextInorder( i ) )
|
||||
{
|
||||
CChoreoEvent *event = sortedGestures[ i ];
|
||||
|
||||
Msg( "event %i start %f disp %f dispend %f end %f\n",
|
||||
c + 1,
|
||||
event->GetStartTime( CChoreoEvent::SIMULATION ),
|
||||
event->GetStartTime( CChoreoEvent::DISPLAY ),
|
||||
event->GetEndTime( CChoreoEvent::DISPLAY ),
|
||||
event->GetEndTime( CChoreoEvent::SIMULATION )
|
||||
);
|
||||
c++;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoChannel::MarkForSaveAll( bool mark )
|
||||
{
|
||||
SetMarkedForSave( mark );
|
||||
|
||||
int c = GetNumEvents();
|
||||
for ( int i = 0; i < c; i++ )
|
||||
{
|
||||
CChoreoEvent *e = GetEvent( i );
|
||||
e->SetMarkedForSave( mark );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
struct EventGroup
|
||||
{
|
||||
EventGroup() :
|
||||
timeSortedEvents( 0, 0, ChoreEventStartTimeLessFunc )
|
||||
{
|
||||
}
|
||||
|
||||
EventGroup( const EventGroup& src )
|
||||
:
|
||||
timeSortedEvents( 0, 0, ChoreEventStartTimeLessFunc )
|
||||
{
|
||||
timeSortedEvents.RemoveAll();
|
||||
int i = src.timeSortedEvents.FirstInorder();
|
||||
while ( i != src.timeSortedEvents.InvalidIndex() )
|
||||
{
|
||||
timeSortedEvents.Insert( src.timeSortedEvents[ i ] );
|
||||
|
||||
i = src.timeSortedEvents.NextInorder( i );
|
||||
}
|
||||
}
|
||||
|
||||
EventGroup & operator=( const EventGroup& src )
|
||||
{
|
||||
if ( this == &src )
|
||||
return *this;
|
||||
|
||||
timeSortedEvents.RemoveAll();
|
||||
int i = src.timeSortedEvents.FirstInorder();
|
||||
while ( i != src.timeSortedEvents.InvalidIndex() )
|
||||
{
|
||||
timeSortedEvents.Insert( src.timeSortedEvents[ i ] );
|
||||
|
||||
i = src.timeSortedEvents.NextInorder( i );
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
CUtlRBTree< CChoreoEvent * > timeSortedEvents;
|
||||
};
|
||||
|
||||
// Compute master/slave, count, endtime info for close captioning data
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
void CChoreoChannel::ReconcileCloseCaption()
|
||||
{
|
||||
// Create a dictionary based on the combined token name
|
||||
CUtlDict< EventGroup, int > validSpeakEventsGroupedByName;
|
||||
|
||||
int i;
|
||||
// Sort items
|
||||
int c = GetNumEvents();
|
||||
for ( i = 0; i < c; i++ )
|
||||
{
|
||||
CChoreoEvent *e = GetEvent( i );
|
||||
Assert( e );
|
||||
if ( e->GetType() != CChoreoEvent::SPEAK )
|
||||
continue;
|
||||
|
||||
CChoreoEvent::CLOSECAPTION type;
|
||||
|
||||
type = e->GetCloseCaptionType();
|
||||
if ( type == CChoreoEvent::CC_DISABLED )
|
||||
{
|
||||
e->SetUsingCombinedFile( false );
|
||||
e->SetRequiredCombinedChecksum( 0 );
|
||||
e->SetNumSlaves( 0 );
|
||||
e->SetLastSlaveEndTime( 0.0f );
|
||||
continue;
|
||||
}
|
||||
|
||||
char const *name = e->GetCloseCaptionToken();
|
||||
if ( !name || !name[0] )
|
||||
{
|
||||
// Fixup invalid slave tag
|
||||
if ( type == CChoreoEvent::CC_SLAVE )
|
||||
{
|
||||
e->SetCloseCaptionType( CChoreoEvent::CC_MASTER );
|
||||
e->SetUsingCombinedFile( false );
|
||||
e->SetRequiredCombinedChecksum( 0 );
|
||||
e->SetNumSlaves( 0 );
|
||||
e->SetLastSlaveEndTime( 0.0f );
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
int idx = validSpeakEventsGroupedByName.Find( name );
|
||||
if ( idx == validSpeakEventsGroupedByName.InvalidIndex() )
|
||||
{
|
||||
EventGroup eg;
|
||||
eg.timeSortedEvents.Insert( e );
|
||||
validSpeakEventsGroupedByName.Insert( name, eg );
|
||||
}
|
||||
else
|
||||
{
|
||||
EventGroup & eg = validSpeakEventsGroupedByName[ idx ];
|
||||
eg.timeSortedEvents.Insert( e );
|
||||
}
|
||||
}
|
||||
|
||||
c = validSpeakEventsGroupedByName.Count();
|
||||
// Now walk list of events by group
|
||||
if ( !c )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
for ( i = 0; i < c; ++i )
|
||||
{
|
||||
EventGroup & eg = validSpeakEventsGroupedByName[ i ];
|
||||
int sortedEventInGroup = eg.timeSortedEvents.Count();
|
||||
// If there's only one, just mark it valid
|
||||
if ( sortedEventInGroup <= 1 )
|
||||
{
|
||||
CChoreoEvent *e = eg.timeSortedEvents[ 0 ];
|
||||
Assert( e );
|
||||
// Make sure it's the master
|
||||
e->SetCloseCaptionType( CChoreoEvent::CC_MASTER );
|
||||
// Since it's by itself, can't be using "combined" file
|
||||
e->SetUsingCombinedFile( false );
|
||||
e->SetRequiredCombinedChecksum( 0 );
|
||||
e->SetNumSlaves( 0 );
|
||||
e->SetLastSlaveEndTime( 0.0f );
|
||||
continue;
|
||||
}
|
||||
|
||||
// Okay, read them back in of start time
|
||||
int j = eg.timeSortedEvents.FirstInorder();
|
||||
CChoreoEvent *master = NULL;
|
||||
while ( j != eg.timeSortedEvents.InvalidIndex() )
|
||||
{
|
||||
CChoreoEvent *e = eg.timeSortedEvents[ j ];
|
||||
if ( !master )
|
||||
{
|
||||
master = e;
|
||||
e->SetCloseCaptionType( CChoreoEvent::CC_MASTER );
|
||||
//e->SetUsingCombinedFile( true );
|
||||
e->SetRequiredCombinedChecksum( 0 );
|
||||
e->SetNumSlaves( sortedEventInGroup - 1 );
|
||||
e->SetLastSlaveEndTime( e->GetEndTime() );
|
||||
}
|
||||
else
|
||||
{
|
||||
// Keep bumping out the end time
|
||||
master->SetLastSlaveEndTime( e->GetEndTime() );
|
||||
e->SetCloseCaptionType( CChoreoEvent::CC_SLAVE );
|
||||
e->SetUsingCombinedFile( master->IsUsingCombinedFile() );
|
||||
e->SetRequiredCombinedChecksum( 0 );
|
||||
e->SetLastSlaveEndTime( 0.0f );
|
||||
}
|
||||
|
||||
j = eg.timeSortedEvents.NextInorder( j );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool CChoreoChannel::GetSortedCombinedEventList( char const *cctoken, CUtlRBTree< CChoreoEvent * >& events )
|
||||
{
|
||||
events.RemoveAll();
|
||||
|
||||
int i;
|
||||
// Sort items
|
||||
int c = GetNumEvents();
|
||||
for ( i = 0; i < c; i++ )
|
||||
{
|
||||
CChoreoEvent *e = GetEvent( i );
|
||||
Assert( e );
|
||||
if ( e->GetType() != CChoreoEvent::SPEAK )
|
||||
continue;
|
||||
|
||||
if ( e->GetCloseCaptionType() == CChoreoEvent::CC_DISABLED )
|
||||
continue;
|
||||
|
||||
// A master with no slaves is not a combined event
|
||||
if ( e->GetCloseCaptionType() == CChoreoEvent::CC_MASTER &&
|
||||
e->GetNumSlaves() == 0 )
|
||||
continue;
|
||||
|
||||
char const *token = e->GetCloseCaptionToken();
|
||||
if ( Q_stricmp( token, cctoken ) )
|
||||
continue;
|
||||
|
||||
events.Insert( e );
|
||||
}
|
||||
|
||||
return ( events.Count() > 0 ) ? true : false;
|
||||
}
|
||||
|
||||
void CChoreoChannel::SaveToBuffer( CUtlBuffer& buf, CChoreoScene *pScene )
|
||||
{
|
||||
buf.PutString( GetName() );
|
||||
int c = GetNumEvents();
|
||||
Assert( c <= 65535 );
|
||||
|
||||
buf.PutShort( c );
|
||||
for ( int i = 0; i < c; i++ )
|
||||
{
|
||||
CChoreoEvent *e = GetEvent( i );
|
||||
Assert( e );
|
||||
e->SaveToBuffer( buf, pScene );
|
||||
}
|
||||
|
||||
buf.PutChar( GetActive() ? 1 : 0 );
|
||||
}
|
||||
|
||||
bool CChoreoChannel::RestoreFromBuffer( CUtlBuffer& buf, CChoreoScene *pScene, CChoreoActor *pActor )
|
||||
{
|
||||
char sz[ 256 ];
|
||||
buf.GetString( sz, sizeof( sz ) );
|
||||
SetName( sz );
|
||||
|
||||
int numEvents = (int)buf.GetShort();
|
||||
for ( int i = 0 ; i < numEvents; ++i )
|
||||
{
|
||||
CChoreoEvent *e = pScene->AllocEvent();
|
||||
if ( e->RestoreFromBuffer( buf, pScene ) )
|
||||
{
|
||||
AddEvent( e );
|
||||
e->SetChannel( this );
|
||||
e->SetActor( pActor );
|
||||
continue;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
SetActive( buf.GetChar() == 1 ? true : false );
|
||||
|
||||
return true;
|
||||
}
|
||||
4204
choreoobjects/choreoevent.cpp
Normal file
4204
choreoobjects/choreoevent.cpp
Normal file
File diff suppressed because it is too large
Load Diff
161
choreoobjects/choreoobjects-2003.vcproj
Normal file
161
choreoobjects/choreoobjects-2003.vcproj
Normal file
@ -0,0 +1,161 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="choreoobjects"
|
||||
ProjectGUID="{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}"
|
||||
Keyword="Win32Proj">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="Debug"
|
||||
IntermediateDirectory="Debug"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
ImproveFloatingPointConsistency="TRUE"
|
||||
OptimizeForProcessor="3"
|
||||
AdditionalIncludeDirectories="..\common,..\public,..\public\tier1,..\game_shared"
|
||||
PreprocessorDefinitions="_WIN32;_DEBUG;_LIB;CHOREOOBJECTS_STATIC_LIB"
|
||||
MinimalRebuild="TRUE"
|
||||
ExceptionHandling="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
BufferSecurityCheck="TRUE"
|
||||
ForceConformanceInForLoopScope="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
ProgramDataBaseFileName="$(IntDir)/"
|
||||
WarningLevel="4"
|
||||
Detect64BitPortabilityProblems="FALSE"
|
||||
DebugInformationFormat="4"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\lib-vc7\public\choreoobjects.lib"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="if exist ..\..\..\lib\public\msvc7\choreoobjects.lib attrib -r ..\..\..\lib\public\msvc7\choreoobjects.lib
|
||||
if exist ..\..\..\lib\public\msvc7\choreoobjects.pdb attrib -r ..\..\..\lib\public\msvc7\choreoobjects.pdb
|
||||
"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\Release"
|
||||
IntermediateDirectory=".\Release"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
GlobalOptimizations="TRUE"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="TRUE"
|
||||
ImproveFloatingPointConsistency="FALSE"
|
||||
FavorSizeOrSpeed="1"
|
||||
OptimizeForProcessor="3"
|
||||
AdditionalIncludeDirectories="..\common,..\public,..\public\tier1,..\game_shared"
|
||||
PreprocessorDefinitions="_WIN32;NDEBUG;_LIB;CHOREOOBJECTS_STATIC_LIB"
|
||||
StringPooling="TRUE"
|
||||
ExceptionHandling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
ForceConformanceInForLoopScope="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="0"
|
||||
ProgramDataBaseFileName="$(IntDir)/"
|
||||
WarningLevel="4"
|
||||
Detect64BitPortabilityProblems="FALSE"
|
||||
DebugInformationFormat="2"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\lib-vc7\public\choreoobjects.lib"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="if exist ..\..\..\lib\public\msvc7\choreoobjects.lib attrib -r ..\..\..\lib\public\msvc7\choreoobjects.lib
|
||||
if exist ..\..\..\lib\public\msvc7\choreoobjects.pdb attrib -r ..\..\..\lib\public\msvc7\choreoobjects.pdb
|
||||
"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
|
||||
<File
|
||||
RelativePath=".\choreoactor.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\choreochannel.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\choreoevent.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\choreoscene.cpp">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Header Files"
|
||||
Filter="h;hpp;hxx;hm;inl;inc;xsd"
|
||||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoactor.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreochannel.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoevent.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoscene.h">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
213
choreoobjects/choreoobjects-2005.vcproj
Normal file
213
choreoobjects/choreoobjects-2005.vcproj
Normal file
@ -0,0 +1,213 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8.00"
|
||||
Name="choreoobjects"
|
||||
ProjectGUID="{0A940BE3-0C70-4D6F-A9F8-C39B483E3796}"
|
||||
RootNamespace="choreoobjects"
|
||||
Keyword="Win32Proj"
|
||||
>
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"
|
||||
/>
|
||||
</Platforms>
|
||||
<ToolFiles>
|
||||
</ToolFiles>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="Debug"
|
||||
IntermediateDirectory="Debug"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\common,..\public,..\public\tier1,..\game_shared"
|
||||
PreprocessorDefinitions="_WIN32;_DEBUG;_LIB;CHOREOOBJECTS_STATIC_LIB"
|
||||
MinimalRebuild="true"
|
||||
ExceptionHandling="1"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
BufferSecurityCheck="true"
|
||||
ForceConformanceInForLoopScope="true"
|
||||
RuntimeTypeInfo="true"
|
||||
UsePrecompiledHeader="0"
|
||||
ProgramDataBaseFileName="$(IntDir)/"
|
||||
WarningLevel="4"
|
||||
Detect64BitPortabilityProblems="false"
|
||||
DebugInformationFormat="4"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="if exist ..\..\..\lib\public\msvc7\choreoobjects.lib attrib -r ..\..\..\lib\public\msvc7\choreoobjects.lib
if exist ..\..\..\lib\public\msvc7\choreoobjects.pdb attrib -r ..\..\..\lib\public\msvc7\choreoobjects.pdb
"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\lib\public\choreoobjects.lib"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\Release"
|
||||
IntermediateDirectory=".\Release"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories="..\common,..\public,..\public\tier1,..\game_shared"
|
||||
PreprocessorDefinitions="_WIN32;NDEBUG;_LIB;CHOREOOBJECTS_STATIC_LIB;_SECURE_SCL=0"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="true"
|
||||
ForceConformanceInForLoopScope="true"
|
||||
RuntimeTypeInfo="true"
|
||||
UsePrecompiledHeader="0"
|
||||
ProgramDataBaseFileName="$(IntDir)/"
|
||||
WarningLevel="4"
|
||||
Detect64BitPortabilityProblems="false"
|
||||
DebugInformationFormat="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="if exist ..\..\..\lib\public\msvc7\choreoobjects.lib attrib -r ..\..\..\lib\public\msvc7\choreoobjects.lib
if exist ..\..\..\lib\public\msvc7\choreoobjects.pdb attrib -r ..\..\..\lib\public\msvc7\choreoobjects.pdb
"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\lib\public\choreoobjects.lib"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\choreoactor.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\choreochannel.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\choreoevent.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\choreoscene.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Header Files"
|
||||
Filter="h;hpp;hxx;hm;inl;inc;xsd"
|
||||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoactor.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreochannel.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoevent.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoscene.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
3987
choreoobjects/choreoscene.cpp
Normal file
3987
choreoobjects/choreoscene.cpp
Normal file
File diff suppressed because it is too large
Load Diff
@ -55,7 +55,7 @@ copy "$(TargetDir)"client.dll "..\..\game\hl2\bin"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\lib-vc7\public"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMTD"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="TRUE"
|
||||
@ -147,7 +147,7 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\lib-vc7\public"
|
||||
IgnoreDefaultLibraryNames="LIBCMTD,LIBCD,LIBC"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMTD"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="TRUE"
|
||||
@ -507,66 +507,6 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
<File
|
||||
RelativePath="cdll_util.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoactor.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreochannel.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoevent.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoscene.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="cl_mat_stub.cpp">
|
||||
</File>
|
||||
@ -2721,10 +2661,10 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
RelativePath="..\public\vgui\IImage.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui\IInput.h">
|
||||
RelativePath="iinput.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="iinput.h">
|
||||
RelativePath="..\public\vgui\IInput.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui\IInputInternal.h">
|
||||
@ -2964,10 +2904,10 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
RelativePath="..\public\tier1\mempool.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="menu.h">
|
||||
RelativePath="..\public\vgui_controls\Menu.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui_controls\Menu.h">
|
||||
RelativePath="menu.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui_controls\MenuItem.h">
|
||||
@ -3531,9 +3471,15 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Link Libraries"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\bitmap.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\choreoobjects.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\mathlib.lib">
|
||||
</File>
|
||||
@ -3552,6 +3498,7 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\vstdlib.lib">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
||||
@ -92,7 +92,7 @@
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="..\lib\public"
|
||||
IgnoreAllDefaultLibraries="false"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="true"
|
||||
@ -208,7 +208,7 @@
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="..\lib\public"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMTD"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="true"
|
||||
@ -670,86 +670,6 @@
|
||||
RelativePath="cdll_util.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoactor.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreochannel.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoevent.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoscene.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="cl_mat_stub.cpp"
|
||||
>
|
||||
@ -4684,10 +4604,17 @@
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Link Libraries"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\lib\public\bitmap.lib"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib\public\choreoobjects.lib"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib\public\mathlib.lib"
|
||||
>
|
||||
@ -4712,6 +4639,7 @@
|
||||
RelativePath="..\lib\public\vstdlib.lib"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
AdditionalIncludeDirectories=".\hl2mp\UI,.\hl2mp,..\game_shared\hl2mp,.\hl2_hud,.\hl2_hud\elements,../game_shared/hl2,.,.\..\Public,.\..\Public\tier1,.\..\vgui2\include,.\..\vgui2\controls,../game_shared,.\game_controls"
|
||||
PreprocessorDefinitions="HL2_EPISODIC;HL2MP;HL2_CLIENT_DLL;_DEBUG;fopen=dont_use_fopen;NO_STRING_T;CLIENT_DLL;_WINDOWS;VECTOR;strncpy=use_Q_strncpy_instead;_snprintf=use_Q_snprintf_instead;_WIN32;PROTECTED_THINGS_ENABLE"
|
||||
ExceptionHandling="FALSE"
|
||||
RuntimeLibrary="5"
|
||||
RuntimeLibrary="1"
|
||||
ForceConformanceInForLoopScope="TRUE"
|
||||
RuntimeTypeInfo="TRUE"
|
||||
UsePrecompiledHeader="3"
|
||||
@ -55,7 +55,7 @@ copy "$(TargetDir)"client.dll "..\..\game\hl2mp\bin"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\lib-vc7\public"
|
||||
IgnoreDefaultLibraryNames="LIBCMTD,LIBC,LIBCMT"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="TRUE"
|
||||
@ -114,7 +114,7 @@ copy "$(TargetDir)"client.dll "..\..\game\hl2mp\bin"
|
||||
PreprocessorDefinitions="HL2_EPISODIC;HL2MP;HL2_CLIENT_DLL;NDEBUG;NO_STRING_T;CLIENT_DLL;_WINDOWS;VECTOR;strncpy=use_Q_strncpy_instead;_snprintf=use_Q_snprintf_instead;_WIN32;PROTECTED_THINGS_ENABLE"
|
||||
StringPooling="TRUE"
|
||||
ExceptionHandling="FALSE"
|
||||
RuntimeLibrary="4"
|
||||
RuntimeLibrary="0"
|
||||
BufferSecurityCheck="FALSE"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
ForceConformanceInForLoopScope="TRUE"
|
||||
@ -147,7 +147,7 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\lib-vc7\public"
|
||||
IgnoreDefaultLibraryNames="libcd.lib,LIBCD,LIBCMT,libcmtd"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMTD"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="TRUE"
|
||||
@ -507,66 +507,6 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
<File
|
||||
RelativePath="cdll_util.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoactor.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreochannel.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoevent.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoscene.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="cl_mat_stub.cpp">
|
||||
</File>
|
||||
@ -2144,16 +2084,6 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_ar2.h">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_crossbow.cpp">
|
||||
@ -2169,80 +2099,30 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbase.h">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbase_machinegun.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbase_machinegun.h">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbasebasebludgeon.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbasebasebludgeon.h">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbasehlmpcombatweapon.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbasehlmpcombatweapon.h">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_physcannon.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_physcannon.h">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_pistol.cpp">
|
||||
@ -2252,47 +2132,15 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_rpg.h">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_shotgun.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_slam.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_slam.h">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_smg1.cpp">
|
||||
@ -2306,18 +2154,6 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath=".\hl2mp\ui\backgroundpanel.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\hl2mp\ui\backgroundpanel.h">
|
||||
@ -2348,18 +2184,6 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\hl2mp\hud_deathnotice.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
@ -2990,10 +2814,10 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
RelativePath="..\public\vgui\IImage.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="iinput.h">
|
||||
RelativePath="..\public\vgui\IInput.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui\IInput.h">
|
||||
RelativePath="iinput.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui\IInputInternal.h">
|
||||
@ -3236,10 +3060,10 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
RelativePath="..\public\tier1\mempool.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="menu.h">
|
||||
RelativePath="..\public\vgui_controls\Menu.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui_controls\Menu.h">
|
||||
RelativePath="menu.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui_controls\MenuItem.h">
|
||||
@ -3793,9 +3617,15 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Link Libraries"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\bitmap.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\choreoobjects.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\mathlib.lib">
|
||||
</File>
|
||||
@ -3814,6 +3644,7 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\vstdlib.lib">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
||||
@ -203,7 +203,7 @@
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="..\lib\public"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMTD"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="true"
|
||||
@ -665,86 +665,6 @@
|
||||
RelativePath="cdll_util.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoactor.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreochannel.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoevent.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoscene.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="cl_mat_stub.cpp"
|
||||
>
|
||||
@ -2836,20 +2756,6 @@
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_ar2.h"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_crossbow.cpp"
|
||||
@ -2870,20 +2776,6 @@
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbase.h"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbase_machinegun.cpp"
|
||||
@ -2892,20 +2784,6 @@
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbase_machinegun.h"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbasebasebludgeon.cpp"
|
||||
@ -2914,20 +2792,6 @@
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbasebasebludgeon.h"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbasehlmpcombatweapon.cpp"
|
||||
@ -2936,20 +2800,6 @@
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_hl2mpbasehlmpcombatweapon.h"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_physcannon.cpp"
|
||||
@ -2958,20 +2808,6 @@
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_physcannon.h"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_pistol.cpp"
|
||||
@ -2984,40 +2820,10 @@
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_rpg.h"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_shotgun.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_slam.cpp"
|
||||
@ -3026,20 +2832,6 @@
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_slam.h"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\hl2mp\weapon_smg1.cpp"
|
||||
@ -3056,22 +2848,6 @@
|
||||
<File
|
||||
RelativePath=".\hl2mp\ui\backgroundpanel.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\hl2mp\ui\backgroundpanel.h"
|
||||
@ -3112,22 +2888,6 @@
|
||||
<File
|
||||
RelativePath=".\hl2mp\hud_deathnotice.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
@ -3965,11 +3725,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="iinput.h"
|
||||
RelativePath="..\public\vgui\IInput.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui\IInput.h"
|
||||
RelativePath="iinput.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -4293,11 +4053,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="menu.h"
|
||||
RelativePath="..\public\vgui_controls\Menu.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui_controls\Menu.h"
|
||||
RelativePath="menu.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -5033,10 +4793,17 @@
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Link Libraries"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\lib\public\bitmap.lib"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib\public\choreoobjects.lib"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib\public\mathlib.lib"
|
||||
>
|
||||
@ -5044,24 +4811,6 @@
|
||||
<File
|
||||
RelativePath="..\lib\public\tier0.lib"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
Description=""
|
||||
CommandLine=""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
Description=""
|
||||
CommandLine=""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib\public\tier1.lib"
|
||||
@ -5078,25 +4827,8 @@
|
||||
<File
|
||||
RelativePath="..\lib\public\vstdlib.lib"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
Description=""
|
||||
CommandLine=""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release HL2MP|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
Description=""
|
||||
CommandLine=""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
||||
@ -56,7 +56,7 @@ copy "$(TargetDir)"client.dll "..\..\game\sdksample\bin"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\lib-vc7\public"
|
||||
IgnoreDefaultLibraryNames="LIBCMT,LIBC"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="TRUE"
|
||||
@ -149,7 +149,7 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\lib-vc7\public"
|
||||
IgnoreDefaultLibraryNames="libcd.lib,LIBCD,LIBCMT,libcmtd"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMTD"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="TRUE"
|
||||
@ -506,66 +506,6 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
<File
|
||||
RelativePath="cdll_util.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoactor.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreochannel.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoevent.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoscene.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="cl_mat_stub.cpp">
|
||||
</File>
|
||||
@ -1859,79 +1799,27 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sdk\c_sdk_player.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sdk\c_sdk_team.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sdk\c_sdk_team.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sdk\c_te_firebullets.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sdk\clientmode_sdk.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sdk\clientmode_sdk.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\sdk_basegrenade_projectile.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\sdk_basegrenade_projectile.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sdk\sdk_fx_impacts.cpp">
|
||||
@ -1941,16 +1829,6 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\sdk_fx_shared.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sdk\sdk_fx_weaponfx.cpp">
|
||||
@ -1963,16 +1841,6 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\sdk_gamerules.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sdk\sdk_hud_ammo.cpp">
|
||||
@ -1982,16 +1850,6 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sdk\sdk_hud_chat.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sdk\sdk_hud_health.cpp">
|
||||
@ -2013,32 +1871,12 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\sdk_playeranimstate.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sdk\sdk_prediction.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\sdk_shareddefs.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\sdk_usermessages.cpp">
|
||||
@ -2048,80 +1886,30 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\sdk_weapon_parse.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sdk\vgui\sdkviewport.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sdk\vgui\sdkviewport.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sdk\vgui\vgui_rootpanel_sdk.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="sdk\vgui\vgui_rootpanel_sdk.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\weapon_basesdkgrenade.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\weapon_basesdkgrenade.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\weapon_grenade.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\weapon_grenade.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\weapon_mp5.cpp">
|
||||
@ -2131,16 +1919,6 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\weapon_sdkbase.h">
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32">
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\sdk\weapon_shotgun.cpp">
|
||||
@ -2820,10 +2598,10 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
RelativePath="..\public\vgui\IImage.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui\IInput.h">
|
||||
RelativePath="iinput.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="iinput.h">
|
||||
RelativePath="..\public\vgui\IInput.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui\IInputInternal.h">
|
||||
@ -3066,10 +2844,10 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
RelativePath="..\public\tier1\mempool.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui_controls\Menu.h">
|
||||
RelativePath="menu.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="menu.h">
|
||||
RelativePath="..\public\vgui_controls\Menu.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\public\vgui_controls\MenuItem.h">
|
||||
@ -3635,9 +3413,15 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Link Libraries"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\bitmap.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\choreoobjects.lib">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\mathlib.lib">
|
||||
</File>
|
||||
@ -3656,6 +3440,7 @@ if exist "$(TargetDir)"client.pdb copy "$(TargetDir)"client.
|
||||
<File
|
||||
RelativePath="..\lib-vc7\public\vstdlib.lib">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
||||
@ -89,7 +89,7 @@
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="..\lib\public"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="true"
|
||||
@ -205,7 +205,7 @@
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
AdditionalLibraryDirectories="..\lib\public"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD"
|
||||
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMTD"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)/client.pdb"
|
||||
GenerateMapFile="true"
|
||||
@ -663,86 +663,6 @@
|
||||
RelativePath="cdll_util.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoactor.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreochannel.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoevent.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\game_shared\choreoscene.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug SDK|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release SDK|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="cl_mat_stub.cpp"
|
||||
>
|
||||
@ -2502,7 +2422,7 @@
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"
|
||||
ObjectFile="$(IntDir)/"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
@ -2510,7 +2430,7 @@
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ObjectFile="$(IntDir)/$(InputName)1.obj"
|
||||
ObjectFile="$(IntDir)/"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
@ -4827,10 +4747,17 @@
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Link Libraries"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\lib\public\bitmap.lib"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib\public\choreoobjects.lib"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib\public\mathlib.lib"
|
||||
>
|
||||
@ -4909,6 +4836,7 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
||||
@ -505,7 +505,7 @@ void CSpectatorGUI::Update()
|
||||
|
||||
wchar_t playerText[ 80 ], playerName[ 64 ], health[ 10 ];
|
||||
wcscpy( playerText, L"Unable to find #Spec_PlayerItem*" );
|
||||
memset( playerName, 0x0, sizeof( playerName ) * sizeof( wchar_t ) );
|
||||
memset( playerName, 0x0, sizeof( playerName ) );
|
||||
|
||||
localize()->ConvertANSIToUnicode( UTIL_SafeName(gr->GetPlayerName( playernum )), playerName, sizeof( playerName ) );
|
||||
int iHealth = gr->GetHealth( playernum );
|
||||
|
||||
@ -199,7 +199,7 @@ void CHUDAutoAim::OnThink()
|
||||
QAngle targetangles;
|
||||
QAngle delta;
|
||||
|
||||
float dist = (pLocalPlayer->m_HL2Local.m_vecAutoAimPoint - pLocalPlayer->GetAbsOrigin()).Length();
|
||||
// float dist = (pLocalPlayer->m_HL2Local.m_vecAutoAimPoint - pLocalPlayer->GetAbsOrigin()).Length();
|
||||
|
||||
engine->GetViewAngles( viewangles );
|
||||
|
||||
|
||||
@ -1136,7 +1136,7 @@ float CResponseSystem::ScoreCriteriaAgainstRuleCriteria( const AI_CriteriaSet& s
|
||||
if ( verbose )
|
||||
{
|
||||
DevMsg( "matched, weight %4.2f (s %4.2f x c %4.2f)",
|
||||
score, w, c->weight );
|
||||
score, w, c->weight.GetFloat() );
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -1525,7 +1525,7 @@ void CResponseSystem::DescribeResponseGroup( ResponseGroup *group, int selected,
|
||||
i == selected ? "-> " : " ",
|
||||
AI_Response::DescribeResponse( r->GetType() ),
|
||||
r->value,
|
||||
r->weight );
|
||||
r->weight.GetFloat() );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -124,7 +124,7 @@ void CEffectsServer::Smoke( const Vector &origin, int mModel, float flScale, flo
|
||||
CPVSFilter filter( origin );
|
||||
if ( !SuppressTE( filter ) )
|
||||
{
|
||||
te->Smoke( filter, 0.0, &origin, mModel, flScale * 0.1f, flFramerate );
|
||||
te->Smoke( filter, 0.0, &origin, mModel, flScale * 0.1f, static_cast<int>(flFramerate) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -274,8 +274,8 @@ void CEntityFlame::FlameThink( void )
|
||||
{
|
||||
const float ENTITYFLAME_MOVE_AWAY_DIST = 24.0f;
|
||||
// Make a sound near my origin, and up a little higher (in case I'm on the ground, so NPC's still hear it)
|
||||
CSoundEnt::InsertSound( SOUND_MOVE_AWAY, GetAbsOrigin(), ENTITYFLAME_MOVE_AWAY_DIST, 0.1f, this, SOUNDENT_CHANNEL_REPEATED_DANGER );
|
||||
CSoundEnt::InsertSound( SOUND_MOVE_AWAY, GetAbsOrigin() + Vector( 0, 0, 48.0f ), ENTITYFLAME_MOVE_AWAY_DIST, 0.1f, this, SOUNDENT_CHANNEL_REPEATING );
|
||||
CSoundEnt::InsertSound( SOUND_MOVE_AWAY, GetAbsOrigin(), static_cast<int>(ENTITYFLAME_MOVE_AWAY_DIST), 0.1f, this, SOUNDENT_CHANNEL_REPEATED_DANGER );
|
||||
CSoundEnt::InsertSound( SOUND_MOVE_AWAY, GetAbsOrigin() + Vector( 0, 0, 48.0f ), static_cast<int>(ENTITYFLAME_MOVE_AWAY_DIST), 0.1f, this, SOUNDENT_CHANNEL_REPEATING );
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@ -381,7 +381,7 @@ void CEnvBeam::Strike( void )
|
||||
if ( pStart == NULL || pEnd == NULL )
|
||||
return;
|
||||
|
||||
m_speed = clamp( m_speed, 0, MAX_BEAM_SCROLLSPEED );
|
||||
m_speed = static_cast<int>(clamp( m_speed, 0, MAX_BEAM_SCROLLSPEED ));
|
||||
|
||||
int pointStart = IsStaticPointEntity( pStart );
|
||||
int pointEnd = IsStaticPointEntity( pEnd );
|
||||
@ -710,7 +710,7 @@ void CEnvBeam::BeamUpdateVars( void )
|
||||
|
||||
m_nNumBeamEnts = 2;
|
||||
|
||||
m_speed = clamp( m_speed, 0, MAX_BEAM_SCROLLSPEED );
|
||||
m_speed = static_cast<int>(clamp( m_speed, 0, MAX_BEAM_SCROLLSPEED ));
|
||||
|
||||
// NOTE: If the end entity is the beam itself (and the start entity
|
||||
// isn't *also* the beam itself, we've got problems. This is a problem
|
||||
|
||||
@ -245,6 +245,8 @@ void CEnvShake::ApplyShake( ShakeCommand_t command )
|
||||
case SHAKE_FREQUENCY:
|
||||
m_pShakeController->WakeObjects();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -61,6 +61,7 @@ END_DATADESC()
|
||||
//-----------------------------------------------------------------------------
|
||||
// List of maps in HL2 that we must apply our skybox fog fixup hack to
|
||||
//-----------------------------------------------------------------------------
|
||||
#ifdef HL2_DLL
|
||||
static const char *s_pBogusFogMaps[] =
|
||||
{
|
||||
"d1_canals_01",
|
||||
@ -84,6 +85,7 @@ static const char *s_pBogusFogMaps[] =
|
||||
"d3_citadel_01",
|
||||
NULL
|
||||
};
|
||||
#endif
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Constructor, destructor
|
||||
|
||||
@ -309,7 +309,7 @@ void Templates_StartUniqueInstance( void )
|
||||
g_iCurrentTemplateInstance++;
|
||||
|
||||
// Make sure there's enough room to fit it into the string
|
||||
int iMax = pow(10.0f, (int)((strlen(ENTITYIO_FIXUP_STRING) - 1))); // -1 for the &
|
||||
int iMax = static_cast<int>(pow(10.0f, (int)((strlen(ENTITYIO_FIXUP_STRING) - 1)))); // -1 for the &
|
||||
if ( g_iCurrentTemplateInstance >= iMax )
|
||||
{
|
||||
// We won't hit this.
|
||||
|
||||
@ -629,14 +629,9 @@ bool CAI_BaseActor::CheckSceneEventCompletion( CSceneEventInfo *info, float curr
|
||||
Assert( info->m_pScene );
|
||||
Assert( info->m_pEvent );
|
||||
|
||||
switch ( event->GetType() )
|
||||
if (event->GetType() == CChoreoEvent::GENERIC)
|
||||
{
|
||||
case CChoreoEvent::GENERIC:
|
||||
{
|
||||
switch( info->m_nType)
|
||||
{
|
||||
case SCENE_AI_HOLSTER:
|
||||
case SCENE_AI_UNHOLSTER:
|
||||
if (info->m_nType == SCENE_AI_HOLSTER || info->m_nType == SCENE_AI_UNHOLSTER)
|
||||
{
|
||||
if (info->m_iLayer == -1)
|
||||
{
|
||||
@ -652,8 +647,6 @@ bool CAI_BaseActor::CheckSceneEventCompletion( CSceneEventInfo *info, float curr
|
||||
return (t <= preload);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return BaseClass::CheckSceneEventCompletion( info, currenttime, scene, event );
|
||||
}
|
||||
@ -1665,6 +1658,8 @@ void CAI_BaseActor::PlayExpressionForState( NPC_STATE state )
|
||||
SetExpression( STRING(m_iszDeathExpression) );
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -81,11 +81,11 @@ public:
|
||||
m_flBlinktime( 0 ),
|
||||
m_hLookTarget( NULL ),
|
||||
m_iszExpressionScene( NULL_STRING ),
|
||||
m_iszExpressionOverride( NULL_STRING ),
|
||||
m_iszIdleExpression( NULL_STRING ),
|
||||
m_iszAlertExpression( NULL_STRING ),
|
||||
m_iszCombatExpression( NULL_STRING ),
|
||||
m_iszDeathExpression( NULL_STRING ),
|
||||
m_iszExpressionOverride( NULL_STRING )
|
||||
m_iszDeathExpression( NULL_STRING )
|
||||
{
|
||||
memset( m_flextarget, 0, 64 * sizeof( m_flextarget[0] ) );
|
||||
}
|
||||
|
||||
@ -152,14 +152,18 @@ ConVar ai_test_moveprobe_ignoresmall( "ai_test_moveprobe_ignoresmall", "0" );
|
||||
#ifndef _RETAIL
|
||||
#define DbgEnemyMsg if ( !ai_debug_enemies.GetBool() ) ; else DevMsg
|
||||
#else
|
||||
#define DbgEnemyMsg if ( 0 ) ; else DevMsg
|
||||
#define DbgEnemyMsg DevMsg
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_AI_FRAME_THINK_LIMITS
|
||||
#define DbgFrameLimitMsg DevMsg
|
||||
#else
|
||||
#if defined __GNUC__ || (defined _MSC_VER && _MSC_VER >= 1400)
|
||||
#define DbgFrameLimitMsg(...)
|
||||
#else
|
||||
#define DbgFrameLimitMsg (void)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// NPC damage adjusters
|
||||
ConVar sk_npc_head( "sk_npc_head","2" );
|
||||
@ -1280,10 +1284,10 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
CTakeDamageInfo m_info;
|
||||
Vector m_VecDir;
|
||||
int m_ContentsMask;
|
||||
Ray_t *m_pRay;
|
||||
CTakeDamageInfo m_info;
|
||||
};
|
||||
|
||||
void CBaseEntity::TraceAttackToTriggers( const CTakeDamageInfo &info, const Vector& start, const Vector& end, const Vector& dir )
|
||||
@ -1436,12 +1440,12 @@ void CBaseEntity::CreateBubbleTrailTracer( const Vector &vecShotSrc, const Vecto
|
||||
if ( flLengthSqr > SHOT_UNDERWATER_BUBBLE_DIST * SHOT_UNDERWATER_BUBBLE_DIST )
|
||||
{
|
||||
VectorMA( vecShotSrc, SHOT_UNDERWATER_BUBBLE_DIST, vecShotDir, vecBubbleEnd );
|
||||
nBubbles = WATER_BULLET_BUBBLES_PER_INCH * SHOT_UNDERWATER_BUBBLE_DIST;
|
||||
nBubbles = static_cast<int>(WATER_BULLET_BUBBLES_PER_INCH * SHOT_UNDERWATER_BUBBLE_DIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
float flLength = sqrt(flLengthSqr) - 0.1f;
|
||||
nBubbles = WATER_BULLET_BUBBLES_PER_INCH * flLength;
|
||||
nBubbles = static_cast<int>(WATER_BULLET_BUBBLES_PER_INCH * flLength);
|
||||
VectorMA( vecShotSrc, flLength, vecShotDir, vecBubbleEnd );
|
||||
}
|
||||
|
||||
@ -2078,7 +2082,7 @@ CBaseGrenade* CAI_BaseNPC::IncomingGrenade(void)
|
||||
continue;
|
||||
|
||||
// Check if it's near me
|
||||
iDist = ( pBG->GetAbsOrigin() - GetAbsOrigin() ).Length();
|
||||
iDist = static_cast<int>(( pBG->GetAbsOrigin() - GetAbsOrigin() ).Length());
|
||||
if ( iDist <= NPC_GRENADE_FEAR_DIST )
|
||||
return pBG;
|
||||
|
||||
@ -3157,7 +3161,7 @@ void CAI_BaseNPC::UpdateEfficiency( bool bInPVS )
|
||||
int iPVSOffset = (bInPVS) ? 0 : NO_PVS_OFFSET;
|
||||
int iMapping = iStateOffset + iPVSOffset + iFacingOffset + range;
|
||||
|
||||
Assert( iMapping < ARRAYSIZE( mappings ) );
|
||||
Assert( iMapping < static_cast<int>(ARRAYSIZE( mappings )) );
|
||||
|
||||
AI_Efficiency_t efficiency = mappings[iMapping];
|
||||
|
||||
@ -3439,7 +3443,7 @@ void CAI_BaseNPC::RebalanceThinks()
|
||||
{
|
||||
rebalanceCandidates.Sort( ThinkRebalanceCompare );
|
||||
|
||||
int iMaxThinkersPerTick = ceil( (float)( rebalanceCandidates.Count() + 1 ) / (float)iTicksPer10Hz ); // +1 to account for "this"
|
||||
int iMaxThinkersPerTick = static_cast<int>(ceil( (float)( rebalanceCandidates.Count() + 1 ) / (float)iTicksPer10Hz )); // +1 to account for "this"
|
||||
|
||||
int iCurTickDistributing = min( gpGlobals->tickcount, rebalanceCandidates[0].iNextThinkTick );
|
||||
int iRemainingThinksToDistribute = iMaxThinkersPerTick - 1; // Start with one fewer first time because "this" is
|
||||
@ -4213,6 +4217,9 @@ void CAI_BaseNPC::SetState( NPC_STATE State )
|
||||
DevMsg( 2, "Stripped\n" );
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
bool fNotifyChange = false;
|
||||
@ -4900,6 +4907,8 @@ NPC_STATE CAI_BaseNPC::SelectIdealState( void )
|
||||
m_pSquad->SquadNewEnemy( GetEnemy() );
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4944,6 +4953,10 @@ NPC_STATE CAI_BaseNPC::SelectIdealState( void )
|
||||
|
||||
case NPC_STATE_DEAD:
|
||||
return NPC_STATE_DEAD;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// The best ideal state is the current ideal state.
|
||||
@ -4970,7 +4983,7 @@ void CAI_BaseNPC::GiveWeapon( string_t iszWeaponName )
|
||||
// If I have a name, make my weapon match it with "_weapon" appended
|
||||
if ( GetEntityName() != NULL_STRING )
|
||||
{
|
||||
pWeapon->SetName( AllocPooledString(UTIL_VarArgs("%s_weapon", GetEntityName())) );
|
||||
pWeapon->SetName( AllocPooledString(UTIL_VarArgs("%s_weapon", STRING(GetEntityName()))) );
|
||||
}
|
||||
|
||||
Weapon_Equip( pWeapon );
|
||||
@ -6204,6 +6217,9 @@ bool CAI_BaseNPC::IsActivityMovementPhased( Activity activity )
|
||||
case ACT_RUN_CROUCH_AIM:
|
||||
case ACT_RUN_PROTECTED:
|
||||
return true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -6662,7 +6678,7 @@ void CAI_BaseNPC::NPCInit ( void )
|
||||
// If I have a name, make my weapon match it with "_weapon" appended
|
||||
if ( GetEntityName() != NULL_STRING )
|
||||
{
|
||||
pWeapon->SetName( AllocPooledString(UTIL_VarArgs("%s_weapon", GetEntityName())) );
|
||||
pWeapon->SetName( AllocPooledString(UTIL_VarArgs("%s_weapon", STRING(GetEntityName()))) );
|
||||
}
|
||||
Weapon_Equip( pWeapon );
|
||||
}
|
||||
@ -7568,7 +7584,7 @@ CBaseEntity *CAI_BaseNPC::BestEnemy( void )
|
||||
DbgEnemyMsg( this, " (%s displaced)\n", pBestEnemy->GetDebugName() );
|
||||
|
||||
iBestPriority = IRelationPriority ( pEnemy );
|
||||
iBestDistSq = (pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr();
|
||||
iBestDistSq = static_cast<int>((pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr());
|
||||
pBestEnemy = pEnemy;
|
||||
bBestUnreachable = bUnreachable;
|
||||
fBestSeen = TRS_NONE;
|
||||
@ -7584,7 +7600,7 @@ CBaseEntity *CAI_BaseNPC::BestEnemy( void )
|
||||
// currently think is the best visible enemy. No need to do
|
||||
// a distance check, just get mad at this one for now.
|
||||
iBestPriority = IRelationPriority ( pEnemy );
|
||||
iBestDistSq = ( pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr();
|
||||
iBestDistSq = static_cast<int>(( pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr());
|
||||
pBestEnemy = pEnemy;
|
||||
bBestUnreachable = bUnreachable;
|
||||
fBestSeen = TRS_NONE;
|
||||
@ -7595,7 +7611,7 @@ CBaseEntity *CAI_BaseNPC::BestEnemy( void )
|
||||
// this entity is disliked just as much as the entity that
|
||||
// we currently think is the best visible enemy, so we only
|
||||
// get mad at it if it is closer.
|
||||
iDistSq = ( pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr();
|
||||
iDistSq = static_cast<int>(( pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr());
|
||||
|
||||
bool bAcceptCurrent = false;
|
||||
bool bCloser = ( iDistSq < iBestDistSq );
|
||||
@ -7759,6 +7775,8 @@ Activity CAI_BaseNPC::GetReloadActivity( CAI_Hint* pHint )
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
return nReloadActivity;
|
||||
@ -7790,6 +7808,8 @@ Activity CAI_BaseNPC::GetCoverActivity( CAI_Hint *pHint )
|
||||
nCoverActivity = ACT_COVER_LOW;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -8581,9 +8601,9 @@ void CAI_BaseNPC::DrawDebugGeometryOverlays(void)
|
||||
CBaseCombatCharacter *npcEnemy = (eMemory->hEnemy)->MyCombatCharacterPointer();
|
||||
if (npcEnemy)
|
||||
{
|
||||
float r,g,b;
|
||||
int r,g,b;
|
||||
char debugText[255];
|
||||
debugText[0] = NULL;
|
||||
debugText[0] = 0;
|
||||
|
||||
if (npcEnemy == GetEnemy())
|
||||
{
|
||||
@ -8654,8 +8674,8 @@ void CAI_BaseNPC::DrawDebugGeometryOverlays(void)
|
||||
Vector upVec = Vector(0,0,2);
|
||||
Vector sideVec;
|
||||
CrossProduct( vEnemyFacing, upVec, sideVec);
|
||||
NDebugOverlay::Line(eyePos+sideVec+upVec, eyePos-sideVec-upVec, r,g,b, false,0);
|
||||
NDebugOverlay::Line(eyePos+sideVec-upVec, eyePos-sideVec+upVec, r,g,b, false,0);
|
||||
NDebugOverlay::Line(eyePos+sideVec+upVec, eyePos-sideVec-upVec, r, g, b, false, 0);
|
||||
NDebugOverlay::Line(eyePos+sideVec-upVec, eyePos-sideVec+upVec, r, g, b, false, 0);
|
||||
|
||||
NDebugOverlay::Text( eyePos, debugText, false, 0.0 );
|
||||
}
|
||||
@ -8775,7 +8795,7 @@ int CAI_BaseNPC::DrawDebugTextOverlays(void)
|
||||
// Print State
|
||||
// --------------
|
||||
static const char *pStateNames[] = { "None", "Idle", "Alert", "Combat", "Scripted", "PlayDead", "Dead" };
|
||||
if ( (int)m_NPCState < ARRAYSIZE(pStateNames) )
|
||||
if ( static_cast<size_t>(m_NPCState) < ARRAYSIZE(pStateNames) )
|
||||
{
|
||||
Q_snprintf(tempstr,sizeof(tempstr),"Stat: %s, ", pStateNames[m_NPCState] );
|
||||
EntityText(text_offset,tempstr,0);
|
||||
@ -8797,8 +8817,8 @@ int CAI_BaseNPC::DrawDebugTextOverlays(void)
|
||||
// -----------------
|
||||
int navTypeIndex = (int)GetNavType() + 1;
|
||||
static const char *pMoveNames[] = { "None", "Ground", "Jump", "Fly", "Climb" };
|
||||
Assert( navTypeIndex >= 0 && navTypeIndex < ARRAYSIZE(pMoveNames) );
|
||||
if ( navTypeIndex < ARRAYSIZE(pMoveNames) )
|
||||
Assert( navTypeIndex >= 0 && navTypeIndex < static_cast<int>(ARRAYSIZE(pMoveNames)) );
|
||||
if ( static_cast<size_t>(navTypeIndex) < ARRAYSIZE(pMoveNames) )
|
||||
{
|
||||
Q_snprintf(tempstr,sizeof(tempstr),"Move: %s, ", pMoveNames[navTypeIndex] );
|
||||
EntityText(text_offset,tempstr,0);
|
||||
@ -9040,7 +9060,7 @@ void CAI_BaseNPC::ReportAIState( void )
|
||||
static const char *pStateNames[] = { "None", "Idle", "Alert", "Combat", "Scripted", "PlayDead", "Dead" };
|
||||
|
||||
DevMsg( "%s: ", GetClassname() );
|
||||
if ( (int)m_NPCState < ARRAYSIZE(pStateNames) )
|
||||
if ( static_cast<size_t>(m_NPCState) < ARRAYSIZE(pStateNames) )
|
||||
DevMsg( "State: %s, ", pStateNames[m_NPCState] );
|
||||
|
||||
if( m_Activity != ACT_INVALID && m_IdealActivity != ACT_INVALID )
|
||||
@ -9510,7 +9530,7 @@ Vector CAI_BaseNPC::GetActualShootTrajectory( const Vector &shootOrigin )
|
||||
|
||||
return shotDir;
|
||||
}
|
||||
#endif HL2_DLL
|
||||
#endif // HL2_DLL
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@ -10185,7 +10205,7 @@ bool CAI_BaseNPC::ShouldPlayIdleSound( void )
|
||||
//-----------------------------------------------------------------------------
|
||||
void CAI_BaseNPC::MakeAIFootstepSound( float volume, float duration )
|
||||
{
|
||||
CSoundEnt::InsertSound( SOUND_COMBAT, EyePosition(), volume, duration, this, SOUNDENT_CHANNEL_NPC_FOOTSTEP );
|
||||
CSoundEnt::InsertSound( SOUND_COMBAT, EyePosition(), static_cast<int>(volume), duration, this, SOUNDENT_CHANNEL_NPC_FOOTSTEP );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -10698,7 +10718,7 @@ int CAI_BaseNPC::Save( ISave &save )
|
||||
{
|
||||
const char *pszSchedule = m_pSchedule->GetName();
|
||||
|
||||
Assert( Q_strlen( pszSchedule ) < sizeof( saveHeader.szSchedule ) - 1 );
|
||||
Assert( static_cast<size_t>(Q_strlen( pszSchedule )) < sizeof( saveHeader.szSchedule ) - 1 );
|
||||
Q_strncpy( saveHeader.szSchedule, pszSchedule, sizeof( saveHeader.szSchedule ) );
|
||||
|
||||
CRC32_Init( &saveHeader.scheduleCrc );
|
||||
@ -10719,7 +10739,7 @@ int CAI_BaseNPC::Save( ISave &save )
|
||||
if ( pIdealSchedule )
|
||||
{
|
||||
const char *pszIdealSchedule = pIdealSchedule->GetName();
|
||||
Assert( Q_strlen( pszIdealSchedule ) < sizeof( saveHeader.szIdealSchedule ) - 1 );
|
||||
Assert( static_cast<size_t>(Q_strlen( pszIdealSchedule )) < sizeof( saveHeader.szIdealSchedule ) - 1 );
|
||||
Q_strncpy( saveHeader.szIdealSchedule, pszIdealSchedule, sizeof( saveHeader.szIdealSchedule ) );
|
||||
}
|
||||
}
|
||||
@ -10731,7 +10751,7 @@ int CAI_BaseNPC::Save( ISave &save )
|
||||
if ( pFailSchedule )
|
||||
{
|
||||
const char *pszFailSchedule = pFailSchedule->GetName();
|
||||
Assert( Q_strlen( pszFailSchedule ) < sizeof( saveHeader.szFailSchedule ) - 1 );
|
||||
Assert( static_cast<size_t>(Q_strlen( pszFailSchedule )) < sizeof( saveHeader.szFailSchedule ) - 1 );
|
||||
Q_strncpy( saveHeader.szFailSchedule, pszFailSchedule, sizeof( saveHeader.szFailSchedule ) );
|
||||
}
|
||||
}
|
||||
@ -10741,7 +10761,7 @@ int CAI_BaseNPC::Save( ISave &save )
|
||||
const char *pszSequenceName = GetSequenceName( GetSequence() );
|
||||
if ( pszSequenceName && *pszSequenceName )
|
||||
{
|
||||
Assert( Q_strlen( pszSequenceName ) < sizeof( saveHeader.szSequence ) - 1 );
|
||||
Assert( static_cast<size_t>(Q_strlen( pszSequenceName )) < sizeof( saveHeader.szSequence ) - 1 );
|
||||
Q_strncpy( saveHeader.szSequence, pszSequenceName, sizeof(saveHeader.szSequence) );
|
||||
}
|
||||
}
|
||||
@ -13567,6 +13587,9 @@ bool CAI_BaseNPC::IsCrouchedActivity( Activity activity )
|
||||
case ACT_COVER_SMG1_LOW:
|
||||
case ACT_RELOAD_SMG1_LOW:
|
||||
return true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
@ -336,8 +336,6 @@ void CAI_BasePhysicsFlyingBot::TranslateNavGoal( CBaseEntity *pTarget, Vector &c
|
||||
//-----------------------------------------------------------------------------
|
||||
IMotionEvent::simresult_e CAI_BasePhysicsFlyingBot::Simulate( IPhysicsMotionController *pController, IPhysicsObject *pObject, float deltaTime, Vector &linear, AngularImpulse &angular )
|
||||
{
|
||||
static int count;
|
||||
|
||||
IPhysicsObject *pPhysicsObject = VPhysicsGetObject();
|
||||
// Assert( pPhysicsObject );
|
||||
if (!pPhysicsObject)
|
||||
|
||||
@ -1132,7 +1132,7 @@ void CAI_BaseNPC::StartTask( const Task_t *pTask )
|
||||
{
|
||||
if (!GetHintNode())
|
||||
{
|
||||
SetHintNode( CAI_HintManager::FindHint( this, HINT_NONE, pTask->flTaskData, 2000 ) );
|
||||
SetHintNode( CAI_HintManager::FindHint( this, HINT_NONE, static_cast<int>(pTask->flTaskData), 2000 ) );
|
||||
}
|
||||
if (GetHintNode())
|
||||
{
|
||||
@ -1330,7 +1330,7 @@ void CAI_BaseNPC::StartTask( const Task_t *pTask )
|
||||
break;
|
||||
|
||||
case TASK_SET_SCHEDULE:
|
||||
if ( !SetSchedule( pTask->flTaskData ) )
|
||||
if ( !SetSchedule( static_cast<int>(pTask->flTaskData) ) )
|
||||
TaskFail(FAIL_SCHEDULE_NOT_FOUND);
|
||||
break;
|
||||
|
||||
@ -2537,7 +2537,7 @@ void CAI_BaseNPC::StartTask( const Task_t *pTask )
|
||||
}
|
||||
case TASK_SPEAK_SENTENCE:
|
||||
{
|
||||
SpeakSentence(pTask->flTaskData);
|
||||
SpeakSentence(static_cast<int>(pTask->flTaskData));
|
||||
TaskComplete();
|
||||
break;
|
||||
}
|
||||
@ -2842,7 +2842,7 @@ void CAI_BaseNPC::StartTask( const Task_t *pTask )
|
||||
{
|
||||
int iMinDist, iMaxDist, iParameter;
|
||||
|
||||
iParameter = pTask->flTaskData;
|
||||
iParameter = static_cast<int>(pTask->flTaskData);
|
||||
|
||||
iMinDist = iParameter / 10000;
|
||||
iMaxDist = iParameter - (iMinDist * 10000);
|
||||
|
||||
@ -15,11 +15,15 @@
|
||||
#include "networkvar.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#endif
|
||||
#include <typeinfo>
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#pragma warning(disable:4290)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined( _WIN32 )
|
||||
#pragma once
|
||||
@ -262,28 +266,28 @@ public:
|
||||
{
|
||||
if ( condition >= ID_SPACE_OFFSET && condition < ID_SPACE_OFFSET + 10000 ) // it's local to us
|
||||
condition = GetClassScheduleIdSpace()->ConditionLocalToGlobal( condition );
|
||||
GetOuter()->SetCondition( condition );
|
||||
this->GetOuter()->SetCondition( condition );
|
||||
}
|
||||
|
||||
bool HasCondition( int condition )
|
||||
{
|
||||
if ( condition >= ID_SPACE_OFFSET && condition < ID_SPACE_OFFSET + 10000 ) // it's local to us
|
||||
condition = GetClassScheduleIdSpace()->ConditionLocalToGlobal( condition );
|
||||
return GetOuter()->HasCondition( condition );
|
||||
return this->GetOuter()->HasCondition( condition );
|
||||
}
|
||||
|
||||
bool HasInterruptCondition( int condition )
|
||||
{
|
||||
if ( condition >= ID_SPACE_OFFSET && condition < ID_SPACE_OFFSET + 10000 ) // it's local to us
|
||||
condition = GetClassScheduleIdSpace()->ConditionLocalToGlobal( condition );
|
||||
return GetOuter()->HasInterruptCondition( condition );
|
||||
return this->GetOuter()->HasInterruptCondition( condition );
|
||||
}
|
||||
|
||||
void ClearCondition( int condition )
|
||||
{
|
||||
if ( condition >= ID_SPACE_OFFSET && condition < ID_SPACE_OFFSET + 10000 ) // it's local to us
|
||||
condition = GetClassScheduleIdSpace()->ConditionLocalToGlobal( condition );
|
||||
GetOuter()->ClearCondition( condition );
|
||||
this->GetOuter()->ClearCondition( condition );
|
||||
}
|
||||
|
||||
protected:
|
||||
@ -298,7 +302,7 @@ protected:
|
||||
}
|
||||
virtual CAI_ClassScheduleIdSpace *GetClassScheduleIdSpace()
|
||||
{
|
||||
return GetOuter()->GetClassScheduleIdSpace();
|
||||
return this->GetOuter()->GetClassScheduleIdSpace();
|
||||
}
|
||||
|
||||
static CAI_ClassScheduleIdSpace &AccessClassScheduleIdSpaceDirect()
|
||||
@ -968,7 +972,7 @@ inline void CAI_BehaviorHost<BASE_NPC>::ChangeBehaviorTo( CAI_BehaviorBase *pNew
|
||||
if ( pOldBehavior )
|
||||
{
|
||||
pOldBehavior->EndScheduleSelection();
|
||||
VacateStrategySlot();
|
||||
this->VacateStrategySlot();
|
||||
}
|
||||
|
||||
OnChangeRunningBehavior( pOldBehavior, pNewBehavior );
|
||||
|
||||
@ -169,7 +169,7 @@ void CAI_AssaultBehavior::ClearAssaultPoint( void )
|
||||
}
|
||||
else
|
||||
{
|
||||
DevMsg("**ERROR: Can't find next assault point: %s\n", m_hAssaultPoint->m_NextAssaultPointName );
|
||||
DevMsg("**ERROR: Can't find next assault point: %s\n", STRING(m_hAssaultPoint->m_NextAssaultPointName) );
|
||||
|
||||
// Bomb out of assault behavior.
|
||||
m_AssaultCue = CUE_NO_ASSAULT;
|
||||
@ -785,7 +785,7 @@ void CAI_AssaultBehavior::SetParameters( string_t rallypointname, AssaultCue_t a
|
||||
|
||||
if( !pBest )
|
||||
{
|
||||
DevMsg("%s Didn't find a best rally point!\n", GetOuter()->GetEntityName() );
|
||||
DevMsg("%s Didn't find a best rally point!\n", STRING(GetOuter()->GetEntityName()) );
|
||||
return;
|
||||
}
|
||||
|
||||
@ -887,6 +887,8 @@ bool CAI_AssaultBehavior::PollAssaultCue( void )
|
||||
// Player told me to go, so go!
|
||||
return m_ReceivedAssaultCue == CUE_COMMANDER;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
@ -2289,7 +2289,7 @@ AI_FollowFormation_t *AIGetFormation( AI_Formations_t formation )
|
||||
{
|
||||
if ( formation < 0 )
|
||||
formation = (AI_Formations_t)0;
|
||||
else if ( formation >= ARRAYSIZE( g_AI_Formations ) )
|
||||
else if ( static_cast<size_t>(formation) >= ARRAYSIZE( g_AI_Formations ) )
|
||||
formation = (AI_Formations_t)(ARRAYSIZE( g_AI_Formations ) - 1 );
|
||||
|
||||
return g_AI_Formations[formation];
|
||||
|
||||
@ -52,9 +52,9 @@ END_DATADESC();
|
||||
// Constructor
|
||||
//-----------------------------------------------------------------------------
|
||||
CAI_PassengerBehavior::CAI_PassengerBehavior( void ) :
|
||||
m_bEnabled( false ),
|
||||
m_hVehicle( NULL ),
|
||||
m_PassengerState( PASSENGER_STATE_OUTSIDE ),
|
||||
m_hVehicle( NULL ),
|
||||
m_bEnabled( false ),
|
||||
m_PassengerIntent( PASSENGER_INTENT_NONE ),
|
||||
m_nTransitionSequence( -1 )
|
||||
{
|
||||
|
||||
@ -59,7 +59,7 @@ void CRopeAnchor::Spawn()
|
||||
flDist = fabs( GetOwnerEntity()->GetAbsOrigin().z - GetAbsOrigin().z );
|
||||
}
|
||||
|
||||
m_hRope = CRopeKeyframe::CreateWithSecondPointDetached( this, -1, flDist, RAPPEL_ROPE_WIDTH, "cable/cable.vmt", 5, true );
|
||||
m_hRope = CRopeKeyframe::CreateWithSecondPointDetached( this, -1, static_cast<int>(flDist), RAPPEL_ROPE_WIDTH, "cable/cable.vmt", 5, true );
|
||||
|
||||
ASSERT( m_hRope != NULL );
|
||||
|
||||
|
||||
@ -1110,7 +1110,7 @@ void CAI_MappedActivityBehavior_Temporary::UpdateTranslateActivityMap()
|
||||
|
||||
CBaseCombatWeapon *pWeapon = GetOuter()->GetActiveWeapon();
|
||||
const char *pszWeaponClass = ( pWeapon ) ? pWeapon->GetClassname() : "";
|
||||
for ( int i = 0; i < ARRAYSIZE(mappings); i++ )
|
||||
for ( size_t i = 0; i < ARRAYSIZE(mappings); i++ )
|
||||
{
|
||||
if ( !mappings[i].pszWeapon || stricmp( mappings[i].pszWeapon, pszWeaponClass ) == 0 )
|
||||
{
|
||||
|
||||
@ -961,7 +961,7 @@ int CAI_BlendedMotor::BuildInsertNode( int i, float flTime )
|
||||
|
||||
Assert( flTime > 0.0 );
|
||||
|
||||
for (i; i < m_scriptTurn.Count() - 1; i++)
|
||||
for (; i < m_scriptTurn.Count() - 1; i++)
|
||||
{
|
||||
if (m_scriptTurn[i].flTime < flTime)
|
||||
{
|
||||
@ -1203,12 +1203,8 @@ void CAI_BlendedMotor::BuildVelocityScript( const AILocalMoveGoal_t &move )
|
||||
script.flMaxVelocity = 0;
|
||||
}
|
||||
break;
|
||||
/*
|
||||
case NAV_FLY:
|
||||
// FIXME: can there be a NAV_GROUND -> NAV_FLY transition?
|
||||
script.flMaxVelocity = 0;
|
||||
default:
|
||||
break;
|
||||
*/
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@ -212,8 +212,8 @@ class CAI_BlendingHost : public BASE_NPC
|
||||
{
|
||||
DECLARE_CLASS_NOFRIEND( CAI_BlendingHost, BASE_NPC );
|
||||
public:
|
||||
const CAI_BlendedMotor *GetBlendedMotor() const { return assert_cast<const CAI_BlendedMotor *>(GetMotor()); }
|
||||
CAI_BlendedMotor * GetBlendedMotor() { return assert_cast<CAI_BlendedMotor *>(GetMotor()); }
|
||||
const CAI_BlendedMotor *GetBlendedMotor() const { return assert_cast<const CAI_BlendedMotor *>(this->GetMotor()); }
|
||||
CAI_BlendedMotor * GetBlendedMotor() { return assert_cast<CAI_BlendedMotor *>(this->GetMotor()); }
|
||||
|
||||
CAI_Motor *CreateMotor()
|
||||
{
|
||||
@ -230,7 +230,7 @@ public:
|
||||
|
||||
float MaxYawSpeed( void )
|
||||
{
|
||||
float override = GetBlendedMotor()->OverrideMaxYawSpeed( GetActivity() );
|
||||
float override = GetBlendedMotor()->OverrideMaxYawSpeed( this->GetActivity() );
|
||||
if ( override != -1 )
|
||||
return override;
|
||||
return BaseClass::MaxYawSpeed();
|
||||
|
||||
@ -329,6 +329,8 @@ int CAI_BaseNPC::TranslateSchedule( int scheduleType )
|
||||
return SCHED_ALERT_WALK;
|
||||
case NPC_STATE_COMBAT:
|
||||
return SCHED_COMBAT_WALK;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
@ -311,7 +311,7 @@ int CAI_HintManager::FindAllHints( CAI_BaseNPC *pNPC, const Vector &position, co
|
||||
// If we have no hints, bail
|
||||
int c = CAI_HintManager::gm_AllHints.Count();
|
||||
if ( !c )
|
||||
return NULL;
|
||||
return 0;
|
||||
|
||||
// Remove the nearest flag. It makes now sense with random.
|
||||
bool hadNearest = hintCriteria.HasFlag( bits_HINT_NODE_NEAREST );
|
||||
@ -682,7 +682,7 @@ int CAI_HintManager::GetFlags( const char *token )
|
||||
|
||||
char *lowercase = (char *)_alloca( len + 1 );
|
||||
Q_strncpy( lowercase, token, len+1 );
|
||||
strlwr( lowercase );
|
||||
Q_strlower( lowercase );
|
||||
|
||||
if ( strstr( "none", lowercase ) )
|
||||
{
|
||||
@ -1003,6 +1003,8 @@ bool CAI_Hint::IsViewable(void)
|
||||
{
|
||||
case HINT_WORLD_VISUALLY_INTERESTING:
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
@ -1551,7 +1553,7 @@ hinttypedescs_t g_pszHintDescriptions[] =
|
||||
//-----------------------------------------------------------------------------
|
||||
const char *GetHintTypeDescription( Hint_e iHintType )
|
||||
{
|
||||
for ( int i = 0; i < ARRAYSIZE(g_pszHintDescriptions); i++ )
|
||||
for ( size_t i = 0; i < ARRAYSIZE(g_pszHintDescriptions); i++ )
|
||||
{
|
||||
if ( g_pszHintDescriptions[i].iType == iHintType )
|
||||
return g_pszHintDescriptions[i].pszDesc;
|
||||
@ -1581,7 +1583,7 @@ void CC_ai_drop_hint( void )
|
||||
{
|
||||
Msg("Invalid hint type specified. Format: ai_drop_hint <hint type>\nValid hint types:\n");
|
||||
|
||||
for ( int i = 0; i < ARRAYSIZE(g_pszHintDescriptions); i++ )
|
||||
for ( size_t i = 0; i < ARRAYSIZE(g_pszHintDescriptions); i++ )
|
||||
{
|
||||
Msg("%d : %s\n", g_pszHintDescriptions[i].iType, g_pszHintDescriptions[i].pszDesc );
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
struct ai_hull_t
|
||||
{
|
||||
ai_hull_t( int bit, const char *pName, const Vector &_mins, const Vector &_maxs, const Vector &_smallMins, const Vector &_smallMaxs )
|
||||
: hullBit( bit ), mins( _mins ), maxs( _maxs ), smallMins( _smallMins ), smallMaxs( _smallMaxs ), name( pName ) {}
|
||||
: hullBit( bit ), name( pName ), mins( _mins ), maxs( _maxs ), smallMins( _smallMins ), smallMaxs( _smallMaxs ) {}
|
||||
int hullBit;
|
||||
const char* name;
|
||||
|
||||
|
||||
@ -118,3 +118,4 @@ private:
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#endif // AI_MEMORY_H
|
||||
|
||||
|
||||
@ -34,14 +34,19 @@ void DebugNoteMovementFailure()
|
||||
}
|
||||
|
||||
// a place to put breakpoints
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable:4189)
|
||||
#endif
|
||||
|
||||
AIMoveResult_t DbgResult( AIMoveResult_t result )
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
if ( result < AIMR_OK )
|
||||
{
|
||||
int breakHere = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
switch ( result )
|
||||
{
|
||||
@ -750,7 +755,7 @@ void CAI_Motor::UpdateYaw( int yawSpeed )
|
||||
float ideal, current, newYaw;
|
||||
|
||||
if ( yawSpeed == -1 )
|
||||
yawSpeed = GetYawSpeed();
|
||||
yawSpeed = static_cast<int>(GetYawSpeed());
|
||||
|
||||
// NOTE: GetIdealYaw() will never exactly be reached because UTIL_AngleMod
|
||||
// also truncates the angle to 16 bits of resolution. So lets truncate it here.
|
||||
@ -908,7 +913,7 @@ AIMoveResult_t CAI_Motor::MoveNormalExecute( const AILocalMoveGoal_t &move )
|
||||
AIMR_BLOCKED_WORLD, // AIM_PARTIAL_HIT_WORLD
|
||||
AIMR_BLOCKED_WORLD, // AIM_PARTIAL_HIT_TARGET
|
||||
};
|
||||
Assert( ARRAYSIZE( moveResults ) == AIM_NUM_RESULTS && fMotorResult >= 0 && fMotorResult <= ARRAYSIZE( moveResults ) );
|
||||
Assert( (AIMotorMoveResult_t)ARRAYSIZE( moveResults ) == AIM_NUM_RESULTS && fMotorResult >= 0 && fMotorResult <= (AIMotorMoveResult_t)ARRAYSIZE( moveResults ) );
|
||||
|
||||
AIMoveResult_t result = moveResults[fMotorResult];
|
||||
|
||||
@ -1015,4 +1020,3 @@ void CAI_Motor::SetMoveType( MoveType_t val, MoveCollide_t moveCollide )
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
|
||||
@ -220,3 +220,4 @@ public:
|
||||
//=============================================================================
|
||||
|
||||
#endif // AI_MOTOR_H
|
||||
|
||||
|
||||
@ -154,3 +154,4 @@ inline bool CAI_MoveProbe::TestGroundMove( const Vector &vecActualStart, const V
|
||||
}
|
||||
|
||||
#endif // AI_MOVEPROBE_H
|
||||
|
||||
|
||||
@ -138,6 +138,8 @@ void CAI_MoveAndShootOverlay::UpdateMoveShootActivity( bool bMoveAimAtEnemy )
|
||||
case ACT_RUN:
|
||||
newActivity = ACT_RUN_AIM;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -150,6 +152,8 @@ void CAI_MoveAndShootOverlay::UpdateMoveShootActivity( bool bMoveAimAtEnemy )
|
||||
case ACT_RUN_AIM:
|
||||
newActivity = ACT_RUN;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -114,7 +114,7 @@ bool CAI_MoveSolver::Solve( const AI_MoveSuggestion_t *pSuggestions, int nSugges
|
||||
AI_MoveSuggestion_t *pHighSuggestion;
|
||||
};
|
||||
|
||||
Solution_t solutions[NUM_SOLUTIONS] = { 0 };
|
||||
Solution_t solutions[NUM_SOLUTIONS] = { {0.0f, 0.0f, NULL} };
|
||||
|
||||
//---------------------------------
|
||||
|
||||
@ -133,15 +133,15 @@ bool CAI_MoveSolver::Solve( const AI_MoveSuggestion_t *pSuggestions, int nSugges
|
||||
|
||||
// Convert arc values to solution indices relative to right post. Right is angle down, left is angle up.
|
||||
float halfSpan = current.arc.span * 0.5;
|
||||
int center = round( ( halfSpan * NUM_SOLUTIONS ) / 360 );
|
||||
int left = ( current.arc.span * NUM_SOLUTIONS ) / 360;
|
||||
int center = static_cast<int>(round( ( halfSpan * NUM_SOLUTIONS ) / 360 ));
|
||||
int left = static_cast<int>(( current.arc.span * NUM_SOLUTIONS ) / 360);
|
||||
|
||||
float angRight = current.arc.center - halfSpan;
|
||||
|
||||
if (angRight < 0.0)
|
||||
angRight += 360;
|
||||
|
||||
int base = ( angRight * NUM_SOLUTIONS ) / 360;
|
||||
int base = static_cast<int>(( angRight * NUM_SOLUTIONS ) / 360);
|
||||
|
||||
// Sweep from left to right, summing the bias. For positive suggestions,
|
||||
// the bias is further weighted to favor the center of the arc.
|
||||
|
||||
@ -90,12 +90,12 @@ int CAI_GlobalNamespace::NextGlobalBase() const
|
||||
//
|
||||
|
||||
CAI_LocalIdSpace::CAI_LocalIdSpace( bool fIsRoot )
|
||||
: m_pGlobalNamespace( NULL ),
|
||||
m_pParentIDSpace( NULL ),
|
||||
m_globalBase( (fIsRoot) ? 0 : -1 ),
|
||||
: m_globalBase( (fIsRoot) ? 0 : -1 ),
|
||||
m_localBase( (fIsRoot) ? 0 : MAX_STRING_INDEX ),
|
||||
m_localTop( -1 ),
|
||||
m_globalTop( -1 )
|
||||
m_globalTop( -1 ),
|
||||
m_pParentIDSpace( NULL ),
|
||||
m_pGlobalNamespace( NULL )
|
||||
{
|
||||
};
|
||||
|
||||
|
||||
@ -1116,7 +1116,6 @@ float CAI_Navigator::GetPathTimeToGoal()
|
||||
|
||||
AI_PathNode_t CAI_Navigator::GetNearestNode()
|
||||
{
|
||||
COMPILE_TIME_ASSERT( (int)AIN_NO_NODE == NO_NODE );
|
||||
return (AI_PathNode_t)( GetPathfinder()->NearestNodeToNPC() );
|
||||
}
|
||||
|
||||
@ -2159,6 +2158,8 @@ bool CAI_Navigator::PreMove()
|
||||
GetMotor()->MoveJumpStop();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
SetNavType( NAV_GROUND );
|
||||
@ -2364,6 +2365,8 @@ bool CAI_Navigator::Move( float flInterval )
|
||||
case NAV_FLY:
|
||||
OnMoveBlocked( &moveResult );
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -3625,6 +3628,8 @@ bool CAI_Navigator::DoFindPath( void )
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return returnCode;
|
||||
@ -3927,18 +3932,18 @@ void CAI_Navigator::DrawDebugRouteOverlay(void)
|
||||
if (waypoint)
|
||||
{
|
||||
Vector RGB = GetRouteColor(waypoint->NavType(), waypoint->Flags());
|
||||
NDebugOverlay::Line(GetLocalOrigin(), waypoint->GetPos(), RGB[0],RGB[1],RGB[2], true,0);
|
||||
NDebugOverlay::Line(GetLocalOrigin(), waypoint->GetPos(), static_cast<int>(RGB[0]),static_cast<int>(RGB[1]),static_cast<int>(RGB[2]), true,0);
|
||||
}
|
||||
|
||||
while (waypoint)
|
||||
{
|
||||
Vector RGB = GetWaypointColor(waypoint->NavType());
|
||||
NDebugOverlay::Box(waypoint->GetPos(), Vector(-3,-3,-3),Vector(3,3,3), RGB[0],RGB[1],RGB[2], true,0);
|
||||
NDebugOverlay::Box(waypoint->GetPos(), Vector(-3,-3,-3),Vector(3,3,3), static_cast<int>(RGB[0]),static_cast<int>(RGB[1]),static_cast<int>(RGB[2]), true,0);
|
||||
|
||||
if (waypoint->GetNext())
|
||||
{
|
||||
Vector RGB = GetRouteColor(waypoint->GetNext()->NavType(), waypoint->GetNext()->Flags());
|
||||
NDebugOverlay::Line(waypoint->GetPos(), waypoint->GetNext()->GetPos(),RGB[0],RGB[1],RGB[2], true,0);
|
||||
NDebugOverlay::Line(waypoint->GetPos(), waypoint->GetNext()->GetPos(),static_cast<int>(RGB[0]),static_cast<int>(RGB[1]),static_cast<int>(RGB[2]), true,0);
|
||||
}
|
||||
waypoint = waypoint->GetNext();
|
||||
}
|
||||
|
||||
@ -196,10 +196,6 @@ struct AI_NavGoal_t
|
||||
// The activity to use, or none if a previosly set activity should be used
|
||||
Activity activity;
|
||||
|
||||
// The predicted activity used after arrival
|
||||
Activity arrivalActivity;
|
||||
int arrivalSequence;
|
||||
|
||||
// The tolerance of success, or none if a previosly set tolerance should be used
|
||||
float tolerance;
|
||||
|
||||
@ -212,6 +208,10 @@ struct AI_NavGoal_t
|
||||
|
||||
// The target of the navigation, primarily used to ignore the entity in hull and line traces
|
||||
CBaseEntity * pTarget;
|
||||
|
||||
// The predicted activity used after arrival
|
||||
Activity arrivalActivity;
|
||||
int arrivalSequence;
|
||||
};
|
||||
|
||||
//-------------------------------------
|
||||
|
||||
@ -47,13 +47,13 @@ public:
|
||||
class CNodeFilter : public INodeListFilter
|
||||
{
|
||||
public:
|
||||
CNodeFilter( CAI_BaseNPC *pNPC, const Vector &pos ) : m_pNPC(pNPC), m_pos(pos)
|
||||
CNodeFilter( CAI_BaseNPC *pNPC, const Vector &pos ) : m_pos(pos), m_pNPC(pNPC)
|
||||
{
|
||||
if ( m_pNPC )
|
||||
m_capabilities = m_pNPC->CapabilitiesGet();
|
||||
}
|
||||
|
||||
CNodeFilter( const Vector &pos ) : m_pNPC(NULL), m_pos(pos)
|
||||
CNodeFilter( const Vector &pos ) : m_pos(pos), m_pNPC(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -2345,7 +2345,7 @@ void CAI_NetworkBuilder::InitClimbNodePosition(CAI_Network *pNetwork, CAI_Node *
|
||||
{
|
||||
float floorZ = GetFloorZ(origin); // FIXME: don't use this
|
||||
|
||||
if (abs(pNode->GetOrigin().z - floorZ) < 36)
|
||||
if (abs(static_cast<int>(pNode->GetOrigin().z - floorZ)) < 36)
|
||||
{
|
||||
CAI_Node *new_node = pNetwork->AddNode( pNode->GetOrigin(), pNode->m_flYaw );
|
||||
new_node->m_pHint = NULL;
|
||||
|
||||
@ -1241,7 +1241,7 @@ AI_Waypoint_t *CAI_Pathfinder::BuildRadialRoute( const Vector &vStartPos, const
|
||||
vNextPos.y += flRadius * sin( flCurAngle );
|
||||
|
||||
// Build a route from the last position to the current one
|
||||
pNextRoute = BuildLocalRoute( vLastPos, vNextPos, NULL, NULL, NO_NODE, fRouteBits, goalTolerance);
|
||||
pNextRoute = BuildLocalRoute( vLastPos, vNextPos, NULL, 0, NO_NODE, fRouteBits, goalTolerance);
|
||||
|
||||
// If we can't find a route, we failed
|
||||
if ( pNextRoute == NULL )
|
||||
@ -1270,7 +1270,7 @@ AI_Waypoint_t *CAI_Pathfinder::BuildRadialRoute( const Vector &vStartPos, const
|
||||
}
|
||||
|
||||
// Append a path to the final position
|
||||
pLastRoute = BuildLocalRoute( vLastPos, vGoalPos, NULL, NULL, NO_NODE, bAirRoute ? bits_BUILD_FLY : bits_BUILD_GROUND, goalTolerance );
|
||||
pLastRoute = BuildLocalRoute( vLastPos, vGoalPos, NULL, 0, NO_NODE, bAirRoute ? bits_BUILD_FLY : bits_BUILD_GROUND, goalTolerance );
|
||||
if ( pLastRoute == NULL )
|
||||
return NULL;
|
||||
|
||||
@ -1811,9 +1811,9 @@ void CAI_Pathfinder::CTriDebugOverlay::FadeTriOverlayLines(void)
|
||||
{
|
||||
for (int i=0;i<NUM_NPC_DEBUG_OVERLAYS;i++)
|
||||
{
|
||||
m_debugTriOverlayLine[i]->r *= 0.5;
|
||||
m_debugTriOverlayLine[i]->g *= 0.5;
|
||||
m_debugTriOverlayLine[i]->b *= 0.5;
|
||||
m_debugTriOverlayLine[i]->r = static_cast<int>(m_debugTriOverlayLine[i]->r * 0.5);
|
||||
m_debugTriOverlayLine[i]->g = static_cast<int>(m_debugTriOverlayLine[i]->g * 0.5);
|
||||
m_debugTriOverlayLine[i]->b = static_cast<int>(m_debugTriOverlayLine[i]->b * 0.5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -60,8 +60,8 @@ inline float cube( float f )
|
||||
|
||||
CAI_PlaneSolver::CAI_PlaneSolver( CAI_BaseNPC *pNpc )
|
||||
: m_pNpc( pNpc ),
|
||||
m_fSolvedPrev( false ),
|
||||
m_PrevTarget( FLT_MAX, FLT_MAX, FLT_MAX ),
|
||||
m_fSolvedPrev( false ),
|
||||
m_PrevSolution( 0 ),
|
||||
m_ClosestHaveBeenToCurrent( FLT_MAX ),
|
||||
m_TimeLastProgress( FLT_MAX ),
|
||||
|
||||
@ -137,8 +137,8 @@ private:
|
||||
CircleObstacles_t( const Vector ¢er, float radius, CBaseEntity *pEntity, AI_MoveSuggType_t type )
|
||||
: center(center),
|
||||
radius(radius),
|
||||
hEntity(pEntity),
|
||||
type(type)
|
||||
type(type),
|
||||
hEntity(pEntity)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -133,7 +133,7 @@ static CUtlMap<AIConcept_t, ConceptInfo_t *> g_ConceptInfoMap;
|
||||
static void InitConcepts( void )
|
||||
{
|
||||
g_ConceptInfoMap.SetLessFunc( CaselessStringLessThan );
|
||||
for ( int i = 0; i < ARRAYSIZE(g_ConceptInfos); i++ )
|
||||
for ( size_t i = 0; i < ARRAYSIZE(g_ConceptInfos); i++ )
|
||||
{
|
||||
g_ConceptInfoMap.Insert( g_ConceptInfos[i].concept, &g_ConceptInfos[i] );
|
||||
}
|
||||
@ -158,7 +158,7 @@ void CAI_AllySpeechManager::Spawn()
|
||||
InitConcepts();
|
||||
}
|
||||
|
||||
for ( int i = 0; i < ARRAYSIZE(g_ConceptInfos); i++ )
|
||||
for ( size_t i = 0; i < ARRAYSIZE(g_ConceptInfos); i++ )
|
||||
m_ConceptTimers.Insert( AllocPooledString( g_ConceptInfos[i].concept ), CSimpleSimTimer() );
|
||||
}
|
||||
|
||||
@ -1512,7 +1512,7 @@ bool CAI_PlayerAlly::ShouldSpeakRandom( AIConcept_t concept, int iChance )
|
||||
if ( flModifier < 0.001 )
|
||||
return false;
|
||||
|
||||
iChance = floor( (float)iChance / flModifier );
|
||||
iChance = static_cast<int>(floor( (float)iChance / flModifier ));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -239,7 +239,7 @@ bool CAI_SchedulesManager::LoadSchedulesFromBuffer( const char *prefix, char *pS
|
||||
int taskNum = 0;
|
||||
|
||||
pfile = engine->ParseFile(pfile, token, sizeof( token ) );
|
||||
while ((token[0]!=NULL) && (stricmp("Interrupts",token)))
|
||||
while ((token[0] != 0) && (stricmp("Interrupts",token)))
|
||||
{
|
||||
// Convert generic ID to sub-class specific enum
|
||||
int taskID = CAI_BaseNPC::GetTaskID(token);
|
||||
@ -477,7 +477,7 @@ bool CAI_SchedulesManager::LoadSchedulesFromBuffer( const char *prefix, char *pS
|
||||
// Now read in the interrupts
|
||||
// ==========================
|
||||
pfile = engine->ParseFile(pfile, token, sizeof( token ) );
|
||||
while ((token[0]!=NULL) && (stricmp("Schedule",token)))
|
||||
while ((token[0] != 0) && (stricmp("Schedule",token)))
|
||||
{
|
||||
// Convert generic ID to sub-class specific enum
|
||||
int condID = CAI_BaseNPC::GetConditionID(token);
|
||||
|
||||
@ -104,9 +104,9 @@ public:
|
||||
m_flPlayerTargetFOV( 0 ),
|
||||
m_fPlayerTargetLOS( TRS_NONE ),
|
||||
m_fPlayerBlockingActor( TRS_NONE ),
|
||||
m_fActorInPVS( TRS_NONE ),
|
||||
m_flMinTimeout( 0 ),
|
||||
m_flMaxTimeout( 0 ),
|
||||
m_fActorInPVS( TRS_NONE )
|
||||
m_flMaxTimeout( 0 )
|
||||
{
|
||||
#ifndef HL2_EPISODIC
|
||||
m_hActor = NULL;
|
||||
|
||||
@ -37,8 +37,7 @@ CAI_SensedObjectsManager g_AI_SensedObjectsManager;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#pragma pack(push)
|
||||
#pragma pack(1)
|
||||
#pragma pack(push, 1)
|
||||
|
||||
struct AISightIterVal_t
|
||||
{
|
||||
@ -243,7 +242,7 @@ CBaseEntity *CAI_Senses::GetFirstSeenEntity( AISightIter_t *pIter, seentype_t iS
|
||||
pIterVal->SeenArray = (char)iSeenType;
|
||||
int iFirstArray = ( iSeenType == SEEN_ALL ) ? 0 : iSeenType;
|
||||
|
||||
for ( int i = iFirstArray; i < ARRAYSIZE( m_SeenArrays ); i++ )
|
||||
for ( int i = iFirstArray; i < static_cast<int>(ARRAYSIZE( m_SeenArrays )); i++ )
|
||||
{
|
||||
if ( m_SeenArrays[i]->Count() != 0 )
|
||||
{
|
||||
@ -265,7 +264,7 @@ CBaseEntity *CAI_Senses::GetNextSeenEntity( AISightIter_t *pIter ) const
|
||||
{
|
||||
AISightIterVal_t *pIterVal = (AISightIterVal_t *)pIter;
|
||||
|
||||
for ( int i = pIterVal->array; i < ARRAYSIZE( m_SeenArrays ); i++ )
|
||||
for ( int i = pIterVal->array; i < static_cast<int>(ARRAYSIZE( m_SeenArrays )); i++ )
|
||||
{
|
||||
for ( int j = pIterVal->iNext; j < m_SeenArrays[i]->Count(); j++ )
|
||||
{
|
||||
@ -618,7 +617,7 @@ void CAI_Senses::PerformSensing( void )
|
||||
// -----------------
|
||||
// Look
|
||||
// -----------------
|
||||
Look( m_LookDist );
|
||||
Look( static_cast<int>(m_LookDist) );
|
||||
|
||||
// ------------------
|
||||
// Listen
|
||||
|
||||
@ -213,8 +213,8 @@ CAI_Expresser::CAI_Expresser( CAI_BaseNPC *pOuter )
|
||||
: CAI_Component( pOuter ),
|
||||
m_pSink( NULL ),
|
||||
m_flStopTalkTime( 0 ),
|
||||
m_flBlockedTalkTime( 0 ),
|
||||
m_flStopTalkTimeWithoutDelay( 0 ),
|
||||
m_flBlockedTalkTime( 0 ),
|
||||
m_voicePitch( 100 )
|
||||
{
|
||||
#ifdef DEBUG
|
||||
@ -828,7 +828,7 @@ void CAI_ExpresserHost_DoModifyOrAppendCriteria( CAI_BaseNPC *pSpeaker, AI_Crite
|
||||
}
|
||||
|
||||
static const char *pStateNames[] = { "None", "Idle", "Alert", "Combat", "Scripted", "PlayDead", "Dead" };
|
||||
if ( (int)pSpeaker->m_NPCState < ARRAYSIZE(pStateNames) )
|
||||
if ( (int)pSpeaker->m_NPCState < static_cast<int>(ARRAYSIZE(pStateNames)) )
|
||||
{
|
||||
set.AppendCriteria( "npcstate", UTIL_VarArgs( "[NPCState::%s]", pStateNames[pSpeaker->m_NPCState] ) );
|
||||
}
|
||||
|
||||
@ -260,15 +260,15 @@ public:
|
||||
virtual void PostSpeakDispatchResponse( AIConcept_t concept, AI_Response *response ) { return; }
|
||||
float GetResponseDuration( AI_Response *response );
|
||||
|
||||
float GetTimeSpeechComplete() const { return GetExpresser()->GetTimeSpeechComplete(); }
|
||||
float GetTimeSpeechComplete() const { return this->GetExpresser()->GetTimeSpeechComplete(); }
|
||||
|
||||
bool IsSpeaking() { return GetExpresser()->IsSpeaking(); }
|
||||
bool CanSpeak() { return GetExpresser()->CanSpeak(); }
|
||||
bool CanSpeakAfterMyself() { return GetExpresser()->CanSpeakAfterMyself(); }
|
||||
bool IsSpeaking() { return this->GetExpresser()->IsSpeaking(); }
|
||||
bool CanSpeak() { return this->GetExpresser()->CanSpeak(); }
|
||||
bool CanSpeakAfterMyself() { return this->GetExpresser()->CanSpeakAfterMyself(); }
|
||||
|
||||
void SetSpokeConcept( AIConcept_t concept, AI_Response *response, bool bCallback = true ) { GetExpresser()->SetSpokeConcept( concept, response, bCallback ); }
|
||||
float GetTimeSpokeConcept( AIConcept_t concept ) { return GetExpresser()->GetTimeSpokeConcept( concept ); }
|
||||
bool SpokeConcept( AIConcept_t concept ) { return GetExpresser()->SpokeConcept( concept ); }
|
||||
void SetSpokeConcept( AIConcept_t concept, AI_Response *response, bool bCallback = true ) { this->GetExpresser()->SetSpokeConcept( concept, response, bCallback ); }
|
||||
float GetTimeSpokeConcept( AIConcept_t concept ) { return this->GetExpresser()->GetTimeSpokeConcept( concept ); }
|
||||
bool SpokeConcept( AIConcept_t concept ) { return this->GetExpresser()->SpokeConcept( concept ); }
|
||||
|
||||
protected:
|
||||
virtual bool Speak( AIConcept_t concept, const char *modifiers = NULL, char *pszOutResponseChosen = NULL, size_t bufsize = 0 );
|
||||
@ -285,7 +285,7 @@ protected:
|
||||
template <class BASE_NPC>
|
||||
inline void CAI_ExpresserHost<BASE_NPC>::NoteSpeaking( float duration, float delay )
|
||||
{
|
||||
GetExpresser()->NoteSpeaking( duration, delay );
|
||||
this->GetExpresser()->NoteSpeaking( duration, delay );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -293,8 +293,8 @@ inline void CAI_ExpresserHost<BASE_NPC>::NoteSpeaking( float duration, float del
|
||||
template <class BASE_NPC>
|
||||
inline bool CAI_ExpresserHost<BASE_NPC>::Speak( AIConcept_t concept, const char *modifiers /*= NULL*/, char *pszOutResponseChosen /*=NULL*/, size_t bufsize /* = 0 */ )
|
||||
{
|
||||
AssertOnce( GetExpresser()->GetOuter() == this );
|
||||
return GetExpresser()->Speak( concept, modifiers, pszOutResponseChosen, bufsize );
|
||||
AssertOnce( this->GetExpresser()->GetOuter() == this );
|
||||
return this->GetExpresser()->Speak( concept, modifiers, pszOutResponseChosen, bufsize );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -302,7 +302,7 @@ inline bool CAI_ExpresserHost<BASE_NPC>::Speak( AIConcept_t concept, const char
|
||||
template <class BASE_NPC>
|
||||
inline int CAI_ExpresserHost<BASE_NPC>::PlaySentence( const char *pszSentence, float delay, float volume, soundlevel_t soundlevel, CBaseEntity *pListener )
|
||||
{
|
||||
return GetExpresser()->SpeakRawSentence( pszSentence, delay, volume, soundlevel, pListener );
|
||||
return this->GetExpresser()->SpeakRawSentence( pszSentence, delay, volume, soundlevel, pListener );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -332,7 +332,7 @@ inline IResponseSystem *CAI_ExpresserHost<BASE_NPC>::GetResponseSystem()
|
||||
template <class BASE_NPC>
|
||||
inline AI_Response *CAI_ExpresserHost<BASE_NPC>::SpeakFindResponse( AIConcept_t concept, const char *modifiers /*= NULL*/ )
|
||||
{
|
||||
return GetExpresser()->SpeakFindResponse( concept, modifiers );
|
||||
return this->GetExpresser()->SpeakFindResponse( concept, modifiers );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -340,7 +340,7 @@ inline AI_Response *CAI_ExpresserHost<BASE_NPC>::SpeakFindResponse( AIConcept_t
|
||||
template <class BASE_NPC>
|
||||
inline bool CAI_ExpresserHost<BASE_NPC>::SpeakDispatchResponse( AIConcept_t concept, AI_Response *response )
|
||||
{
|
||||
if ( GetExpresser()->SpeakDispatchResponse( concept, response ) )
|
||||
if ( this->GetExpresser()->SpeakDispatchResponse( concept, response ) )
|
||||
{
|
||||
PostSpeakDispatchResponse( concept, response );
|
||||
return true;
|
||||
@ -354,7 +354,7 @@ inline bool CAI_ExpresserHost<BASE_NPC>::SpeakDispatchResponse( AIConcept_t conc
|
||||
template <class BASE_NPC>
|
||||
inline float CAI_ExpresserHost<BASE_NPC>::GetResponseDuration( AI_Response *response )
|
||||
{
|
||||
return GetExpresser()->GetResponseDuration( response );
|
||||
return this->GetExpresser()->GetResponseDuration( response );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@ -262,7 +262,7 @@ void CAI_Squad::AddToSquad(CAI_BaseNPC *pNPC)
|
||||
|
||||
if (m_SquadMembers.Count() == MAX_SQUAD_MEMBERS)
|
||||
{
|
||||
DevMsg("Error!! Squad %s is too big!!! Replacing last member\n",this->m_Name);
|
||||
DevMsg("Error!! Squad %s is too big!!! Replacing last member\n", STRING(this->m_Name));
|
||||
m_SquadMembers.Remove(m_SquadMembers.Count()-1);
|
||||
}
|
||||
m_SquadMembers.AddToTail(pNPC);
|
||||
|
||||
@ -660,7 +660,7 @@ bool CAI_TacticalServices::FindLateralLos( const Vector &vecThreat, Vector *pRes
|
||||
int iDelta = COVER_DELTA;
|
||||
|
||||
// If we're limited in how far we're allowed to move laterally, don't bother checking past it
|
||||
int iMaxLateralDelta = GetOuter()->GetMaxTacticalLateralMovement();
|
||||
int iMaxLateralDelta = static_cast<int>(GetOuter()->GetMaxTacticalLateralMovement());
|
||||
if ( iMaxLateralDelta != MAXTACLAT_IGNORE && iMaxLateralDelta < iDelta )
|
||||
{
|
||||
iChecks = 1;
|
||||
|
||||
@ -817,7 +817,7 @@ CPathTrack *CAI_TrackPather::FindClosestPointOnPath( CPathTrack *pPath,
|
||||
// No alt paths allowed in leading mode.
|
||||
if ( pTravPath->m_paltpath )
|
||||
{
|
||||
Warning( "%s: Alternative paths in path_track not allowed when using the leading behavior!\n", GetEntityName() );
|
||||
Warning( "%s: Alternative paths in path_track not allowed when using the leading behavior!\n", STRING(GetEntityName()) );
|
||||
}
|
||||
|
||||
// Need line segments
|
||||
@ -1595,7 +1595,7 @@ void CAI_TrackPather::SetTrack( CBaseEntity *pGoalEnt )
|
||||
CPathTrack *pTrack = dynamic_cast<CPathTrack *>(pGoalEnt);
|
||||
if ( !pTrack )
|
||||
{
|
||||
DevWarning( "%s: Specified entity '%s' must be a path_track!\n", pGoalEnt->GetClassname(), pGoalEnt->GetEntityName() );
|
||||
DevWarning( "%s: Specified entity '%s' must be a path_track!\n", pGoalEnt->GetClassname(), STRING(pGoalEnt->GetEntityName()) );
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -500,12 +500,12 @@ void CBaseAnimating::SetLightingOriginRelative( string_t strLightingOriginRelati
|
||||
{
|
||||
if( !pLightingOrigin )
|
||||
{
|
||||
DevWarning( "%s: Cannot find Lighting Origin named: %s\n", GetEntityName(), strLightingOriginRelative );
|
||||
DevWarning( "%s: Cannot find Lighting Origin named: %s\n", STRING(GetEntityName()), STRING(strLightingOriginRelative) );
|
||||
}
|
||||
else
|
||||
{
|
||||
DevWarning( "%s: Specified entity '%s' must be a info_lighting_relative!\n",
|
||||
pLightingOrigin->GetClassname(), pLightingOrigin->GetEntityName() );
|
||||
pLightingOrigin->GetClassname(), STRING(pLightingOrigin->GetEntityName()) );
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1300,8 +1300,6 @@ Killed
|
||||
*/
|
||||
void CBaseCombatCharacter::Event_Killed( const CTakeDamageInfo &info )
|
||||
{
|
||||
extern ConVar npc_vphysics;
|
||||
|
||||
// Advance life state to dying
|
||||
m_lifeState = LIFE_DYING;
|
||||
|
||||
@ -2858,7 +2856,7 @@ void RadiusDamage( const CTakeDamageInfo &info, const Vector &vecSrc, float flRa
|
||||
// be less than 128 units.
|
||||
float soundRadius = max( 128.0f, flRadius * 1.5 );
|
||||
|
||||
CSoundEnt::InsertSound( SOUND_COMBAT | SOUND_CONTEXT_EXPLOSION, vecSrc, soundRadius, 0.25, info.GetInflictor() );
|
||||
CSoundEnt::InsertSound( SOUND_COMBAT | SOUND_CONTEXT_EXPLOSION, vecSrc, static_cast<int>(soundRadius), 0.25, info.GetInflictor() );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -208,7 +208,7 @@ class CWeaponLOSFilter : public CTraceFilterSkipTwoEntities
|
||||
{
|
||||
DECLARE_CLASS( CWeaponLOSFilter, CTraceFilterSkipTwoEntities );
|
||||
public:
|
||||
CWeaponLOSFilter::CWeaponLOSFilter( IHandleEntity *pHandleEntity, IHandleEntity *pHandleEntity2, int collisionGroup ) :
|
||||
CWeaponLOSFilter( IHandleEntity *pHandleEntity, IHandleEntity *pHandleEntity2, int collisionGroup ) :
|
||||
CTraceFilterSkipTwoEntities( pHandleEntity, pHandleEntity2, collisionGroup )
|
||||
{
|
||||
}
|
||||
|
||||
@ -547,8 +547,8 @@ void CBaseEntity::AddTimedOverlay( const char *msg, int endTime )
|
||||
int len = strlen(msg);
|
||||
pNewTO->msg = new char[len + 1];
|
||||
Q_strncpy(pNewTO->msg,msg, len+1);
|
||||
pNewTO->msgEndTime = gpGlobals->curtime + endTime;
|
||||
pNewTO->msgStartTime = gpGlobals->curtime;
|
||||
pNewTO->msgEndTime = static_cast<int>(gpGlobals->curtime + endTime);
|
||||
pNewTO->msgStartTime = static_cast<int>(gpGlobals->curtime);
|
||||
pNewTO->pNextTimedOverlay = m_pTimedOverlay;
|
||||
m_pTimedOverlay = pNewTO;
|
||||
}
|
||||
@ -689,7 +689,7 @@ void CBaseEntity::DrawTimedOverlays(void)
|
||||
// If messages aren't paused fade out
|
||||
if (!CBaseEntity::Debug_IsPaused())
|
||||
{
|
||||
nAlpha = 255*((gpGlobals->curtime - pTO->msgStartTime)/(pTO->msgEndTime - pTO->msgStartTime));
|
||||
nAlpha = static_cast<int>(255*((gpGlobals->curtime - pTO->msgStartTime)/(pTO->msgEndTime - pTO->msgStartTime)));
|
||||
}
|
||||
int r = 185;
|
||||
int g = 145;
|
||||
@ -3300,7 +3300,7 @@ void CBaseEntity::DrawInputOverlay(const char *szInputName, CBaseEntity *pCaller
|
||||
{
|
||||
Q_snprintf( bigstring,sizeof(bigstring), "%3.1f (%s) <-- (%s)\n", gpGlobals->curtime, szInputName, pCaller ? pCaller->GetDebugName() : NULL);
|
||||
}
|
||||
AddTimedOverlay(bigstring, 10.0);
|
||||
AddTimedOverlay(bigstring, 10);
|
||||
|
||||
if ( Value.FieldType() == FIELD_INTEGER )
|
||||
{
|
||||
@ -3331,7 +3331,7 @@ void CBaseEntity::DrawOutputOverlay(CEventAction *ev)
|
||||
{
|
||||
Q_snprintf( bigstring,sizeof(bigstring), "%3.1f (%s) --> (%s)\n", gpGlobals->curtime, STRING(ev->m_iTargetInput), STRING(ev->m_iTarget));
|
||||
}
|
||||
AddTimedOverlay(bigstring, 10.0);
|
||||
AddTimedOverlay(bigstring, 10);
|
||||
|
||||
// Now print to the console
|
||||
if ( ev->m_flDelay )
|
||||
@ -4545,7 +4545,7 @@ void CC_Find_Ent( void )
|
||||
if ( bMatches )
|
||||
{
|
||||
iCount++;
|
||||
Msg(" '%s' : '%s' (entindex %d) \n", ent->GetClassname(), ent->GetEntityName(), ent->entindex() );
|
||||
Msg(" '%s' : '%s' (entindex %d) \n", ent->GetClassname(), STRING(ent->GetEntityName()), ent->entindex() );
|
||||
}
|
||||
}
|
||||
|
||||
@ -4607,6 +4607,8 @@ void CC_Ent_Dump( void )
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// don't print out the duplicate keys
|
||||
@ -6381,8 +6383,8 @@ void CBaseEntity::SUB_PerformFadeOut( void )
|
||||
dt = 0.1f;
|
||||
}
|
||||
m_nRenderMode = kRenderTransTexture;
|
||||
int speed = max(1,256*dt); // fade out over 1 second
|
||||
SetRenderColorA( UTIL_Approach( 0, m_clrRender->a, speed ) );
|
||||
int speed = static_cast<int>(max(1,256*dt)); // fade out over 1 second
|
||||
SetRenderColorA( static_cast<byte>(UTIL_Approach( 0, m_clrRender->a, speed )) );
|
||||
}
|
||||
|
||||
bool CBaseEntity::SUB_AllowedToFade( void )
|
||||
|
||||
@ -1007,21 +1007,21 @@ public:
|
||||
|
||||
ENTITYFUNCPTR TouchSet( ENTITYFUNCPTR func, char *name )
|
||||
{
|
||||
COMPILE_TIME_ASSERT( sizeof(func) == 4 );
|
||||
COMPILE_TIME_ASSERT( sizeof(func) == MFP_SIZE );
|
||||
m_pfnTouch = func;
|
||||
FunctionCheck( (void *)*((int *)((char *)this + ( offsetof(CBaseEntity,m_pfnTouch)))), name );
|
||||
return func;
|
||||
}
|
||||
USEPTR UseSet( USEPTR func, char *name )
|
||||
{
|
||||
COMPILE_TIME_ASSERT( sizeof(func) == 4 );
|
||||
COMPILE_TIME_ASSERT( sizeof(func) == MFP_SIZE );
|
||||
m_pfnUse = func;
|
||||
FunctionCheck( (void *)*((int *)((char *)this + ( offsetof(CBaseEntity,m_pfnUse)))), name );
|
||||
return func;
|
||||
}
|
||||
ENTITYFUNCPTR BlockedSet( ENTITYFUNCPTR func, char *name )
|
||||
{
|
||||
COMPILE_TIME_ASSERT( sizeof(func) == 4 );
|
||||
COMPILE_TIME_ASSERT( sizeof(func) == MFP_SIZE );
|
||||
m_pfnBlocked = func;
|
||||
FunctionCheck( (void *)*((int *)((char *)this + ( offsetof(CBaseEntity,m_pfnBlocked)))), name );
|
||||
return func;
|
||||
@ -1789,7 +1789,7 @@ inline void CBaseEntity::SetName( string_t newName )
|
||||
|
||||
inline bool CBaseEntity::NameMatches( const char *pszNameOrWildcard )
|
||||
{
|
||||
if ( IDENT_STRINGS(m_iName, pszNameOrWildcard) )
|
||||
if ( IDENT_STRINGS(m_iName, MAKE_STRING(pszNameOrWildcard)) )
|
||||
return true;
|
||||
return NameMatchesComplex( pszNameOrWildcard );
|
||||
}
|
||||
@ -1803,7 +1803,7 @@ inline bool CBaseEntity::NameMatches( string_t nameStr )
|
||||
|
||||
inline bool CBaseEntity::ClassMatches( const char *pszClassOrWildcard )
|
||||
{
|
||||
if ( IDENT_STRINGS(m_iClassname, pszClassOrWildcard ) )
|
||||
if ( IDENT_STRINGS(m_iClassname, MAKE_STRING(pszClassOrWildcard) ) )
|
||||
return true;
|
||||
return ClassMatchesComplex( pszClassOrWildcard );
|
||||
}
|
||||
|
||||
@ -361,6 +361,8 @@ bool CBaseFlex::ClearSceneEvent( CSceneEventInfo *info, bool fastKill, bool canc
|
||||
}
|
||||
}
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -642,7 +644,7 @@ bool CBaseFlex::HandleStartGestureSceneEvent( CSceneEventInfo *info, CChoreoScen
|
||||
if ( looping )
|
||||
{
|
||||
DevMsg( 1, "vcd error, gesture %s of model %s is marked as STUDIO_LOOPING!\n",
|
||||
event->GetParameters(), GetModelName() );
|
||||
event->GetParameters(), STRING(GetModelName()) );
|
||||
}
|
||||
|
||||
SetLayerLooping( info->m_iLayer, false ); // force to not loop
|
||||
@ -731,6 +733,9 @@ bool CBaseFlex::StartSceneEvent( CSceneEventInfo *info, CChoreoScene *scene, CCh
|
||||
|
||||
case CChoreoEvent::EXPRESSION: // These are handled client-side
|
||||
return true;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
@ -47,7 +47,7 @@ void CBaseGrenadeConcussion::FallThink(void)
|
||||
Remove( );
|
||||
return;
|
||||
}
|
||||
CSoundEnt::InsertSound ( SOUND_DANGER, GetAbsOrigin() + GetAbsVelocity() * 0.5, GetAbsVelocity().Length( ), 0.2 );
|
||||
CSoundEnt::InsertSound ( SOUND_DANGER, GetAbsOrigin() + GetAbsVelocity() * 0.5, static_cast<int>(GetAbsVelocity().Length()), 0.2 );
|
||||
|
||||
SetNextThink( gpGlobals->curtime + random->RandomFloat(0.05, 0.1) );
|
||||
|
||||
|
||||
@ -325,8 +325,8 @@ inline CBitStringT<BASE_OPS>::CBitStringT(int numBits)
|
||||
template <class BASE_OPS>
|
||||
inline bool CBitStringT<BASE_OPS>::GetBit( int bitNum ) const
|
||||
{
|
||||
Assert( bitNum >= 0 && bitNum < Size() );
|
||||
const int *pInt = GetInts() + BitString_Int( bitNum );
|
||||
Assert( bitNum >= 0 && bitNum < this->Size() );
|
||||
const int *pInt = this->GetInts() + BitString_Int( bitNum );
|
||||
return ( ( *pInt & BitString_Bit( bitNum ) ) != 0 );
|
||||
}
|
||||
|
||||
@ -335,8 +335,8 @@ inline bool CBitStringT<BASE_OPS>::GetBit( int bitNum ) const
|
||||
template <class BASE_OPS>
|
||||
inline void CBitStringT<BASE_OPS>::SetBit( int bitNum )
|
||||
{
|
||||
Assert( bitNum >= 0 && bitNum < Size() );
|
||||
int *pInt = GetInts() + BitString_Int( bitNum );
|
||||
Assert( bitNum >= 0 && bitNum < this->Size() );
|
||||
int *pInt = this->GetInts() + BitString_Int( bitNum );
|
||||
*pInt |= BitString_Bit( bitNum );
|
||||
}
|
||||
|
||||
@ -345,8 +345,8 @@ inline void CBitStringT<BASE_OPS>::SetBit( int bitNum )
|
||||
template <class BASE_OPS>
|
||||
inline void CBitStringT<BASE_OPS>::ClearBit(int bitNum)
|
||||
{
|
||||
Assert( bitNum >= 0 && bitNum < Size() );
|
||||
int *pInt = GetInts() + BitString_Int( bitNum );
|
||||
Assert( bitNum >= 0 && bitNum < this->Size() );
|
||||
int *pInt = this->GetInts() + BitString_Int( bitNum );
|
||||
*pInt &= ~BitString_Bit( bitNum );
|
||||
}
|
||||
|
||||
@ -362,10 +362,10 @@ inline void CBitStringT<BASE_OPS>::And(const CBitStringT &addStr, CBitStringT *o
|
||||
ValidateOperand( *out );
|
||||
|
||||
int * pDest = out->GetInts();
|
||||
const int *pOperand1 = GetInts();
|
||||
const int *pOperand1 = this->GetInts();
|
||||
const int *pOperand2 = addStr.GetInts();
|
||||
|
||||
for (int i = GetNumInts() - 1; i >= 0 ; --i)
|
||||
for (int i = this->GetNumInts() - 1; i >= 0 ; --i)
|
||||
{
|
||||
pDest[i] = pOperand1[i] & pOperand2[i];
|
||||
}
|
||||
@ -383,10 +383,10 @@ inline void CBitStringT<BASE_OPS>::Or(const CBitStringT &orStr, CBitStringT *out
|
||||
ValidateOperand( *out );
|
||||
|
||||
int * pDest = out->GetInts();
|
||||
const int *pOperand1 = GetInts();
|
||||
const int *pOperand1 = this->GetInts();
|
||||
const int *pOperand2 = orStr.GetInts();
|
||||
|
||||
for (int i = GetNumInts() - 1; i >= 0; --i)
|
||||
for (int i = this->GetNumInts() - 1; i >= 0; --i)
|
||||
{
|
||||
pDest[i] = pOperand1[i] | pOperand2[i];
|
||||
}
|
||||
@ -401,10 +401,10 @@ template <class BASE_OPS>
|
||||
inline void CBitStringT<BASE_OPS>::Xor(const CBitStringT &xorStr, CBitStringT *out) const
|
||||
{
|
||||
int * pDest = out->GetInts();
|
||||
const int *pOperand1 = GetInts();
|
||||
const int *pOperand1 = this->GetInts();
|
||||
const int *pOperand2 = xorStr.GetInts();
|
||||
|
||||
for (int i = GetNumInts() - 1; i >= 0; --i)
|
||||
for (int i = this->GetNumInts() - 1; i >= 0; --i)
|
||||
{
|
||||
pDest[i] = pOperand1[i] ^ pOperand2[i];
|
||||
}
|
||||
@ -421,9 +421,9 @@ inline void CBitStringT<BASE_OPS>::Not(CBitStringT *out) const
|
||||
ValidateOperand( *out );
|
||||
|
||||
int * pDest = out->GetInts();
|
||||
const int *pOperand = GetInts();
|
||||
const int *pOperand = this->GetInts();
|
||||
|
||||
for (int i = GetNumInts() - 1; i >= 0; --i)
|
||||
for (int i = this->GetNumInts() - 1; i >= 0; --i)
|
||||
{
|
||||
pDest[i] = ~(pOperand[i]);
|
||||
}
|
||||
@ -440,7 +440,7 @@ inline void CBitStringT<BASE_OPS>::Copy(CBitStringT *out) const
|
||||
ValidateOperand( *out );
|
||||
Assert( out != this );
|
||||
|
||||
memcpy( out->GetInts(), GetInts(), GetNumInts() * sizeof( int ) );
|
||||
memcpy( out->GetInts(), this->GetInts(), this->GetNumInts() * sizeof( int ) );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -454,11 +454,11 @@ inline bool CBitStringT<BASE_OPS>::IsAllClear(void) const
|
||||
// Number of available bits may be more than the number
|
||||
// actually used, so make sure to mask out unused bits
|
||||
// before testing for zero
|
||||
(const_cast<CBitStringT *>(this))->GetInts()[GetNumInts()-1] &= ~CBitStringT<BASE_OPS>::GetEndMask(); // external semantics of const retained
|
||||
(const_cast<CBitStringT *>(this))->GetInts()[this->GetNumInts()-1] &= ~CBitStringT<BASE_OPS>::GetEndMask(); // external semantics of const retained
|
||||
|
||||
for (int i = GetNumInts() - 1; i >= 0; --i)
|
||||
for (int i = this->GetNumInts() - 1; i >= 0; --i)
|
||||
{
|
||||
if ( GetInts()[i] !=0 )
|
||||
if ( this->GetInts()[i] !=0 )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -477,11 +477,11 @@ inline bool CBitStringT<BASE_OPS>::IsAllSet(void) const
|
||||
// Number of available bits may be more than the number
|
||||
// actually used, so make sure to mask out unused bits
|
||||
// before testing for set bits
|
||||
(const_cast<CBitStringT *>(this))->GetInts()[GetNumInts()-1] |= CBitStringT<BASE_OPS>::GetEndMask(); // external semantics of const retained
|
||||
(const_cast<CBitStringT *>(this))->GetInts()[this->GetNumInts()-1] |= CBitStringT<BASE_OPS>::GetEndMask(); // external semantics of const retained
|
||||
|
||||
for (int i = GetNumInts() - 1; i >= 0; --i)
|
||||
for (int i = this->GetNumInts() - 1; i >= 0; --i)
|
||||
{
|
||||
if ( GetInts()[i] != ~0 )
|
||||
if ( this->GetInts()[i] != ~0 )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -497,8 +497,8 @@ inline bool CBitStringT<BASE_OPS>::IsAllSet(void) const
|
||||
template <class BASE_OPS>
|
||||
inline void CBitStringT<BASE_OPS>::SetAllBits(void)
|
||||
{
|
||||
if ( GetInts() )
|
||||
memset( GetInts(), 0xff, GetNumInts() * sizeof(int) );
|
||||
if ( this->GetInts() )
|
||||
memset( this->GetInts(), 0xff, this->GetNumInts() * sizeof(int) );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -509,8 +509,8 @@ inline void CBitStringT<BASE_OPS>::SetAllBits(void)
|
||||
template <class BASE_OPS>
|
||||
inline void CBitStringT<BASE_OPS>::ClearAllBits(void)
|
||||
{
|
||||
if ( GetInts() )
|
||||
memset( GetInts(), 0, GetNumInts() * sizeof(int) );
|
||||
if ( this->GetInts() )
|
||||
memset( this->GetInts(), 0, this->GetNumInts() * sizeof(int) );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -518,8 +518,8 @@ inline void CBitStringT<BASE_OPS>::ClearAllBits(void)
|
||||
template <class BASE_OPS>
|
||||
inline void CBitStringT<BASE_OPS>::DebugPrintBits(void) const
|
||||
{
|
||||
(const_cast<CBitStringT *>(this))->GetInts()[GetNumInts()-1] &= ~CBitStringT<BASE_OPS>::GetEndMask(); // external semantics of const retained
|
||||
DebugPrintBitStringBits( GetInts(), GetNumInts() );
|
||||
(const_cast<CBitStringT *>(this))->GetInts()[this->GetNumInts()-1] &= ~CBitStringT<BASE_OPS>::GetEndMask(); // external semantics of const retained
|
||||
DebugPrintBitStringBits( this->GetInts(), this->GetNumInts() );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -527,8 +527,8 @@ inline void CBitStringT<BASE_OPS>::DebugPrintBits(void) const
|
||||
template <class BASE_OPS>
|
||||
inline void CBitStringT<BASE_OPS>::SaveBitString(CUtlBuffer& buf) const
|
||||
{
|
||||
(const_cast<CBitStringT *>(this))->GetInts()[GetNumInts()-1] &= ~CBitStringT<BASE_OPS>::GetEndMask(); // external semantics of const retained
|
||||
::SaveBitString( GetInts(), GetNumInts(), buf );
|
||||
(const_cast<CBitStringT *>(this))->GetInts()[this->GetNumInts()-1] &= ~CBitStringT<BASE_OPS>::GetEndMask(); // external semantics of const retained
|
||||
::SaveBitString( this->GetInts(), this->GetNumInts(), buf );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -536,8 +536,8 @@ inline void CBitStringT<BASE_OPS>::SaveBitString(CUtlBuffer& buf) const
|
||||
template <class BASE_OPS>
|
||||
inline void CBitStringT<BASE_OPS>::LoadBitString(CUtlBuffer& buf)
|
||||
{
|
||||
(const_cast<CBitStringT *>(this))->GetInts()[GetNumInts()-1] &= ~CBitStringT<BASE_OPS>::GetEndMask();
|
||||
::LoadBitString( GetInts(), GetNumInts(), buf );
|
||||
(const_cast<CBitStringT *>(this))->GetInts()[this->GetNumInts()-1] &= ~CBitStringT<BASE_OPS>::GetEndMask();
|
||||
::LoadBitString( this->GetInts(), this->GetNumInts(), buf );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@ -701,7 +701,7 @@ void CFuncRotating::RampPitchVol( void )
|
||||
|
||||
float fpitch = FANPITCHMIN + (FANPITCHMAX - FANPITCHMIN) * fpct;
|
||||
|
||||
int pitch = clamp(fpitch, 0, 255);
|
||||
int pitch = static_cast<int>(clamp(fpitch, 0, 255));
|
||||
if (pitch == PITCH_NORM)
|
||||
{
|
||||
pitch = PITCH_NORM - 1;
|
||||
|
||||
@ -141,19 +141,19 @@ bool CBaseButton::KeyValue( const char *szKeyName, const char *szValue )
|
||||
{
|
||||
if (FStrEq(szKeyName, "locked_sound"))
|
||||
{
|
||||
m_bLockedSound = atof(szValue);
|
||||
m_bLockedSound = static_cast<byte>(atof(szValue));
|
||||
}
|
||||
else if (FStrEq(szKeyName, "locked_sentence"))
|
||||
{
|
||||
m_bLockedSentence = atof(szValue);
|
||||
m_bLockedSentence = static_cast<byte>(atof(szValue));
|
||||
}
|
||||
else if (FStrEq(szKeyName, "unlocked_sound"))
|
||||
{
|
||||
m_bUnlockedSound = atof(szValue);
|
||||
m_bUnlockedSound = static_cast<byte>(atof(szValue));
|
||||
}
|
||||
else if (FStrEq(szKeyName, "unlocked_sentence"))
|
||||
{
|
||||
m_bUnlockedSentence = atof(szValue);
|
||||
m_bUnlockedSentence = static_cast<byte>(atof(szValue));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -1200,6 +1200,7 @@ void variant_t::SetOther( void *data )
|
||||
|
||||
case FIELD_EHANDLE: *((EHANDLE *)data) = eVal; break;
|
||||
case FIELD_CLASSPTR: *((CBaseEntity **)data) = eVal; break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1252,6 +1253,8 @@ bool variant_t::Convert( fieldtype_t newType )
|
||||
SetBool( iVal != 0 );
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -1271,6 +1274,8 @@ bool variant_t::Convert( fieldtype_t newType )
|
||||
SetBool( flVal != 0 );
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -1358,6 +1363,9 @@ bool variant_t::Convert( fieldtype_t newType )
|
||||
SetEntity( ent );
|
||||
return true;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
break;
|
||||
@ -1377,9 +1385,13 @@ bool variant_t::Convert( fieldtype_t newType )
|
||||
}
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// invalid conversion
|
||||
@ -1457,6 +1469,9 @@ const char *variant_t::ToString( void ) const
|
||||
Q_strncpy( szBuf, pszName, 512 );
|
||||
return (szBuf);
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return("No conversion to string");
|
||||
|
||||
@ -830,7 +830,7 @@ void CC_Player_TestDispatchEffect( void )
|
||||
AngleVectors( vecAngles, &data.m_vNormal );
|
||||
}
|
||||
data.m_nEntIndex = pPlayer->entindex();
|
||||
data.m_fFlags = flags;
|
||||
data.m_fFlags = static_cast<int>(flags);
|
||||
data.m_flMagnitude = magnitude;
|
||||
data.m_flScale = scale;
|
||||
DispatchEffect( (char *)engine->Cmd_Argv(1), data );
|
||||
@ -1148,6 +1148,7 @@ void CC_HurtMe_f(void)
|
||||
|
||||
static ConCommand hurtme("hurtme", CC_HurtMe_f, "Hurts the player.\n\tArguments: <health to lose>", FCVAR_CHEAT);
|
||||
|
||||
#ifdef _DEBUG
|
||||
static bool IsInGroundList( CBaseEntity *ent, CBaseEntity *ground )
|
||||
{
|
||||
if ( !ground || !ent )
|
||||
@ -1169,6 +1170,7 @@ static bool IsInGroundList( CBaseEntity *ent, CBaseEntity *ground )
|
||||
return false;
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
static int DescribeGroundList( CBaseEntity *ent )
|
||||
{
|
||||
|
||||
@ -128,7 +128,7 @@ void CTargetChangeGravity::InputChangeGrav( inputdata_t &inputdata )
|
||||
|
||||
// Save the gravity to restore it in InputResetGrav
|
||||
if ( m_iOldGrav )
|
||||
m_iOldGrav = pl->GetGravity();
|
||||
m_iOldGrav = static_cast<int>(pl->GetGravity());
|
||||
|
||||
pl->SetGravity(m_iGravity);
|
||||
}
|
||||
|
||||
@ -175,7 +175,7 @@ void CTerrainMorph::MorphThink( void )
|
||||
//Msg( "Strength: %f - Radius: %f\n", params.m_flStrength, params.m_flRadius );
|
||||
|
||||
TerrainMod_Add( type, params );
|
||||
m_iIterations += params.m_flStrength;
|
||||
m_iIterations += static_cast<int>(params.m_flStrength);
|
||||
}
|
||||
#if 0
|
||||
NDebugOverlay::Line( m_Params.m_vecLocation, m_Params.m_vecLocation + Vector( 200, 200, 0 ), 0,255,0, true, 3 );
|
||||
|
||||
@ -214,11 +214,11 @@ bool CBaseDoor::KeyValue( const char *szKeyName, const char *szValue )
|
||||
{
|
||||
if (FStrEq(szKeyName, "locked_sentence"))
|
||||
{
|
||||
m_bLockedSentence = atof(szValue);
|
||||
m_bLockedSentence = static_cast<byte>(atof(szValue));
|
||||
}
|
||||
else if (FStrEq(szKeyName, "unlocked_sentence"))
|
||||
{
|
||||
m_bUnlockedSentence = atof(szValue);
|
||||
m_bUnlockedSentence = static_cast<byte>(atof(szValue));
|
||||
}
|
||||
else
|
||||
return BaseClass::KeyValue( szKeyName, szValue );
|
||||
@ -454,6 +454,8 @@ void CBaseDoor::Activate( void )
|
||||
case TS_AT_BOTTOM:
|
||||
UpdateAreaPortals( false );
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef HL1_DLL
|
||||
|
||||
@ -968,7 +968,7 @@ void CTestEffect::Think( void )
|
||||
for (i = 0; i < m_iBeam; i++)
|
||||
{
|
||||
t = (gpGlobals->curtime - m_flBeamTime[i]) / ( 3 + m_flStartTime - m_flBeamTime[i]);
|
||||
m_pBeam[i]->SetBrightness( 255 * t );
|
||||
m_pBeam[i]->SetBrightness( static_cast<int>(255 * t) );
|
||||
// m_pBeam[i]->SetScrollRate( 20 * t );
|
||||
}
|
||||
SetNextThink( gpGlobals->curtime + 0.1f );
|
||||
@ -1149,11 +1149,11 @@ void CBlood::InputEmitBlood( inputdata_t &inputdata )
|
||||
{
|
||||
if ( HasSpawnFlags( SF_BLOOD_STREAM ) )
|
||||
{
|
||||
UTIL_BloodStream( BloodPosition(inputdata.pActivator), Direction(), Color(), BloodAmount() );
|
||||
UTIL_BloodStream( BloodPosition(inputdata.pActivator), Direction(), Color(), static_cast<int>(BloodAmount()) );
|
||||
}
|
||||
else
|
||||
{
|
||||
UTIL_BloodDrips( BloodPosition(inputdata.pActivator), Direction(), Color(), BloodAmount() );
|
||||
UTIL_BloodDrips( BloodPosition(inputdata.pActivator), Direction(), Color(), static_cast<int>(BloodAmount()) );
|
||||
}
|
||||
|
||||
if ( HasSpawnFlags( SF_BLOOD_DECAL ) )
|
||||
@ -1190,7 +1190,7 @@ void CBlood::InputEmitBlood( inputdata_t &inputdata )
|
||||
nFlags |= FX_BLOODSPRAY_GORE;
|
||||
}
|
||||
|
||||
UTIL_BloodSpray(GetAbsOrigin(), Direction(), Color(), BloodAmount(), nFlags);
|
||||
UTIL_BloodSpray(GetAbsOrigin(), Direction(), Color(), static_cast<int>(BloodAmount()), nFlags);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1591,7 +1591,7 @@ void CEnvWind::Spawn( void )
|
||||
SetSolid( SOLID_NONE );
|
||||
AddEffects( EF_NODRAW );
|
||||
|
||||
m_EnvWindShared.Init( entindex(), 0, gpGlobals->frametime, GetLocalAngles().y, 0 );
|
||||
m_EnvWindShared.Init( entindex(), 0, gpGlobals->frametime, static_cast<int>(GetLocalAngles().y), 0 );
|
||||
|
||||
SetThink( &CEnvWind::WindThink );
|
||||
SetNextThink( gpGlobals->curtime );
|
||||
|
||||
@ -146,7 +146,7 @@ public:
|
||||
void Clear()
|
||||
{
|
||||
m_simThinkList.Purge();
|
||||
for ( int i = 0; i < ARRAYSIZE(m_entinfoIndex); i++ )
|
||||
for ( size_t i = 0; i < ARRAYSIZE(m_entinfoIndex); i++ )
|
||||
{
|
||||
m_entinfoIndex[i] = 0xFFFF;
|
||||
}
|
||||
|
||||
@ -109,7 +109,7 @@ void CEnvEntityMaker::Activate( void )
|
||||
// check for valid template
|
||||
if ( m_iszTemplate == NULL_STRING )
|
||||
{
|
||||
Warning( "env_entity_maker %s has no template entity!\n", GetEntityName() );
|
||||
Warning( "env_entity_maker %s has no template entity!\n", STRING(GetEntityName()) );
|
||||
UTIL_Remove( this );
|
||||
return;
|
||||
}
|
||||
@ -131,7 +131,7 @@ CPointTemplate *CEnvEntityMaker::FindTemplate()
|
||||
CPointTemplate *pTemplate = dynamic_cast<CPointTemplate *>(gEntList.FindEntityByName( NULL, STRING(m_iszTemplate) ));
|
||||
if ( !pTemplate )
|
||||
{
|
||||
Warning( "env_entity_maker %s failed to find template %s.\n", GetEntityName(), STRING(m_iszTemplate) );
|
||||
Warning( "env_entity_maker %s failed to find template %s.\n", STRING(GetEntityName()), STRING(m_iszTemplate) );
|
||||
}
|
||||
|
||||
return pTemplate;
|
||||
|
||||
@ -92,7 +92,7 @@ void CEnvMicrophone::Spawn(void)
|
||||
{ SF_MICROPHONE_SOUND_EXPLOSION, SOUND_CONTEXT_EXPLOSION },
|
||||
};
|
||||
|
||||
for (int i = 0; i < sizeof(nFlags) / sizeof(nFlags[0]); i++)
|
||||
for (size_t i = 0; i < sizeof(nFlags) / sizeof(nFlags[0]); i++)
|
||||
{
|
||||
if (m_spawnflags & nFlags[i][0])
|
||||
{
|
||||
|
||||
@ -64,9 +64,9 @@ BEGIN_SIMPLE_DATADESC( FailPosition_t )
|
||||
END_DATADESC();
|
||||
|
||||
CAI_PassengerBehaviorCompanion::CAI_PassengerBehaviorCompanion( void ) :
|
||||
m_flUnseenDuration( 0.0f ),
|
||||
m_flNextOverturnWarning( 0.0f ),
|
||||
m_flOverturnedDuration( 0.0f ),
|
||||
m_flUnseenDuration( 0.0f ),
|
||||
m_nExitAttempts( 0 )
|
||||
{
|
||||
memset( &m_vehicleState, 0, sizeof( m_vehicleState ) );
|
||||
|
||||
@ -70,8 +70,8 @@ impactdamagetable_t gZombiePassengerImpactDamageTable =
|
||||
// Constructor
|
||||
//-----------------------------------------------------------------------------
|
||||
CAI_PassengerBehaviorZombie::CAI_PassengerBehaviorZombie( void ) :
|
||||
m_flLastVerticalLean( 0.0f ),
|
||||
m_flLastLateralLean( 0.0f ),
|
||||
m_flLastVerticalLean( 0.0f ),
|
||||
m_flNextLeapTime( 0.0f )
|
||||
{
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@ class CGravityVortexController : public CBaseEntity
|
||||
|
||||
public:
|
||||
|
||||
CGravityVortexController( void ) : m_flEndTime( 0.0f ), m_flRadius( 256 ), m_flStrength( 256 ), m_flMass( 0.0f ) {}
|
||||
CGravityVortexController( void ) : m_flMass( 0.0f ), m_flEndTime( 0.0f ), m_flRadius( 256 ), m_flStrength( 256 ) {}
|
||||
float GetConsumedMass( void ) const;
|
||||
|
||||
static CGravityVortexController *Create( const Vector &origin, float radius, float strength, float duration );
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
#endif
|
||||
|
||||
#include "basegrenade_shared.h"
|
||||
#include "sprite.h"
|
||||
#include "Sprite.h"
|
||||
|
||||
extern ConVar hopwire_trap;
|
||||
|
||||
|
||||
@ -44,7 +44,7 @@ CBaseEntity *CTempEntTester::Create( const Vector &vecOrigin, const QAngle &vecA
|
||||
if ( single_te && single_te[0] )
|
||||
{
|
||||
Q_strncpy( classname, single_te ,sizeof(classname));
|
||||
strlwr( classname );
|
||||
Q_strlower( classname );
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -81,7 +81,7 @@ void CTempEntTester::Spawn( void )
|
||||
{
|
||||
char name[ 128 ];
|
||||
Q_strncpy( name, m_pCurrent->GetName() ,sizeof(name));
|
||||
strlwr( name );
|
||||
Q_strlower( name );
|
||||
if ( strstr( name, m_szClass ) )
|
||||
{
|
||||
break;
|
||||
|
||||
@ -293,7 +293,7 @@ void CEnvExplosion::InputExplode( inputdata_t &inputdata )
|
||||
}
|
||||
|
||||
//Get the damage override if specified
|
||||
int iRadius = ( m_iRadiusOverride > 0 ) ? m_iRadiusOverride : ( m_iMagnitude * 2.5f );
|
||||
int iRadius = ( m_iRadiusOverride > 0 ) ? m_iRadiusOverride : ( static_cast<int>(m_iMagnitude * 2.5f) );
|
||||
|
||||
CPASFilter filter( vecExplodeOrigin );
|
||||
te->Explosion( filter, 0.0,
|
||||
|
||||
@ -940,7 +940,7 @@ void CFire::Update( float simTime )
|
||||
if ( m_flDamageTime <= gpGlobals->curtime )
|
||||
{
|
||||
m_flDamageTime = gpGlobals->curtime + fire_dmginterval.GetFloat();
|
||||
outputDamage = (fire_dmgbase.GetFloat() + outputHeat * fire_dmgscale.GetFloat() * m_flDamageScale) * fire_dmginterval.GetFloat();
|
||||
outputDamage = static_cast<int>((fire_dmgbase.GetFloat() + outputHeat * fire_dmgscale.GetFloat() * m_flDamageScale) * fire_dmginterval.GetFloat());
|
||||
if ( outputDamage )
|
||||
{
|
||||
damage = true;
|
||||
@ -957,7 +957,7 @@ void CFire::Update( float simTime )
|
||||
}
|
||||
else if ( FClassnameIs( pOther, "env_fire" ) )
|
||||
{
|
||||
if ( fireCount < ARRAYSIZE(pFires) )
|
||||
if ( fireCount < static_cast<int>(ARRAYSIZE(pFires)) )
|
||||
{
|
||||
pFires[fireCount] = (CFire *)pOther;
|
||||
fireCount++;
|
||||
|
||||
@ -48,7 +48,7 @@ public:
|
||||
|
||||
void InputStartFogTransition(inputdata_t &data);
|
||||
|
||||
int CFogController::DrawDebugTextOverlays(void);
|
||||
int DrawDebugTextOverlays(void);
|
||||
|
||||
void SetLerpValues( void );
|
||||
void Spawn( void );
|
||||
|
||||
@ -741,7 +741,7 @@ bool CFourWheelVehiclePhysics::Think()
|
||||
m_nLastSpeed = m_nSpeed;
|
||||
m_nSpeed = ( int )carSpeed;
|
||||
m_nRPM = ( int )carState.engineRPM;
|
||||
m_nHasBoost = vehicleData.engine.boostDelay; // if we have any boost delay, vehicle has boost ability
|
||||
m_nHasBoost = static_cast<int>(vehicleData.engine.boostDelay); // if we have any boost delay, vehicle has boost ability
|
||||
|
||||
m_pVehicle->Update( gpGlobals->frametime, m_controls);
|
||||
|
||||
|
||||
@ -183,7 +183,7 @@ inline int CFourWheelVehiclePhysics::GetSpeed() const
|
||||
|
||||
inline int CFourWheelVehiclePhysics::GetMaxSpeed() const
|
||||
{
|
||||
return INS2MPH(m_pVehicle->GetVehicleParams().engine.maxSpeed);
|
||||
return static_cast<int>(INS2MPH(m_pVehicle->GetVehicleParams().engine.maxSpeed));
|
||||
}
|
||||
|
||||
inline int CFourWheelVehiclePhysics::GetRPM() const
|
||||
|
||||
@ -55,11 +55,11 @@ extern Vector g_vecAttackDir;
|
||||
"item_rpg_round", // 12
|
||||
"unused (item_smg1_grenade) 13",// 13
|
||||
"item_box_sniper_rounds", // 14
|
||||
"unused (???) 15", // 15
|
||||
"unused (?) 15", // 15
|
||||
"weapon_stunstick", // 16
|
||||
"unused (weapon_ar1) 17", // 17
|
||||
"weapon_ar2", // 18
|
||||
"unused (???) 19", // 19
|
||||
"unused (?) 19", // 19
|
||||
"weapon_rpg", // 20
|
||||
"weapon_smg1", // 21
|
||||
"unused (weapon_smg2) 22", // 22
|
||||
@ -209,13 +209,13 @@ bool CBreakable::KeyValue( const char *szKeyName, const char *szValue )
|
||||
else if (FStrEq(szKeyName, "spawnobject") )
|
||||
{
|
||||
int object = atoi( szValue );
|
||||
if ( object > 0 && object < ARRAYSIZE(pSpawnObjects) )
|
||||
if ( object > 0 && object < static_cast<int>(ARRAYSIZE(pSpawnObjects)) )
|
||||
m_iszSpawnObject = MAKE_STRING( pSpawnObjects[object] );
|
||||
}
|
||||
else if (FStrEq(szKeyName, "propdata") )
|
||||
{
|
||||
int pdata = atoi( szValue );
|
||||
if ( pdata > 0 && pdata < ARRAYSIZE(pFGDPropData) )
|
||||
if ( pdata > 0 && pdata < static_cast<int>(ARRAYSIZE(pFGDPropData)) )
|
||||
{
|
||||
m_iszPropData = MAKE_STRING( pFGDPropData[pdata] );
|
||||
}
|
||||
@ -452,7 +452,7 @@ void CBreakable::Precache( void )
|
||||
else
|
||||
{
|
||||
// Actually, precache all possible objects...
|
||||
for ( int i = 0; i < ARRAYSIZE(pSpawnObjects) ; ++i )
|
||||
for ( size_t i = 0; i < ARRAYSIZE(pSpawnObjects) ; ++i )
|
||||
{
|
||||
if ( !pSpawnObjects[ i ] )
|
||||
continue;
|
||||
@ -717,6 +717,9 @@ void CBreakable::TraceAttack( const CTakeDamageInfo &info, const Vector &vecDir,
|
||||
case matUnbreakableGlass:
|
||||
g_pEffects->Ricochet( ptr->endpos, (vecDir*-1.0f) );
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -978,7 +981,7 @@ void CBreakable::Die( void )
|
||||
CCollisionProperty *pCollisionProp = CollisionProp();
|
||||
|
||||
Vector vSize = pCollisionProp->OBBSize();
|
||||
int iCount = ( vSize[0] * vSize[1] + vSize[1] * vSize[2] + vSize[2] * vSize[0] ) / ( 3 * 12 * 12 );
|
||||
int iCount = static_cast<int>(( vSize[0] * vSize[1] + vSize[1] * vSize[2] + vSize[2] * vSize[0] ) / ( 3 * 12 * 12 ));
|
||||
|
||||
if ( iCount > func_break_max_pieces.GetInt() )
|
||||
{
|
||||
@ -1034,7 +1037,7 @@ void CBreakable::Die( void )
|
||||
|
||||
if ( Explodable() )
|
||||
{
|
||||
ExplosionCreate( vecSpot, pCollisionProp->GetCollisionAngles(), this, GetExplosiveDamage(), GetExplosiveRadius(), true );
|
||||
ExplosionCreate( vecSpot, pCollisionProp->GetCollisionAngles(), this, static_cast<int>(GetExplosiveDamage()), static_cast<int>(GetExplosiveRadius()), true );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -91,7 +91,7 @@ public:
|
||||
float GetDmgModClub( void ) { return m_flDmgModClub; }
|
||||
float GetDmgModExplosive( void ) { return m_flDmgModExplosive; }
|
||||
void SetExplosiveRadius( float flRadius ) { m_explodeRadius = flRadius; }
|
||||
void SetExplosiveDamage( float flDamage ) { m_ExplosionMagnitude = flDamage; }
|
||||
void SetExplosiveDamage( float flDamage ) { m_ExplosionMagnitude = static_cast<int>(flDamage); }
|
||||
float GetExplosiveRadius( void ) { return m_explodeRadius; }
|
||||
float GetExplosiveDamage( void ) { return m_ExplosionMagnitude; }
|
||||
void SetPhysicsDamageTable( string_t iszTableName ) { m_iszPhysicsDamageTableName = iszTableName; }
|
||||
|
||||
@ -367,8 +367,8 @@ void CBreakableSurface::TraceAttack( const CTakeDamageInfo &info, const Vector &
|
||||
// Figure out which panel has taken the damage and break it
|
||||
float flWidth,flHeight;
|
||||
PanePos(ptr->endpos,&flWidth,&flHeight);
|
||||
int nWidth = flWidth;
|
||||
int nHeight = flHeight;
|
||||
int nWidth = static_cast<int>(flWidth);
|
||||
int nHeight = static_cast<int>(flHeight);
|
||||
|
||||
if ( ShatterPane(nWidth, nHeight,vecDir*500,ptr->endpos) )
|
||||
{
|
||||
@ -438,8 +438,8 @@ void CBreakableSurface::TraceAttack( const CTakeDamageInfo &info, const Vector &
|
||||
{
|
||||
PanePos(ptr->endpos,&flWidth,&flHeight);
|
||||
}
|
||||
int nWidth = flWidth;
|
||||
int nHeight = flHeight;
|
||||
int nWidth = static_cast<int>(flWidth);
|
||||
int nHeight = static_cast<int>(flHeight);
|
||||
|
||||
// Blow out a roughly circular patch of tile with some randomness
|
||||
for (int width =nWidth-4;width<nWidth+4;width++)
|
||||
|
||||
@ -44,7 +44,7 @@ bool CFuncLadderEndPoint::Validate()
|
||||
CFuncLadderEndPoint *other = dynamic_cast< CFuncLadderEndPoint * >( GetNextTarget() );
|
||||
if ( !other )
|
||||
{
|
||||
DevMsg( 1, "func_ladderendpoint(%s) without matching target\n", GetEntityName() );
|
||||
DevMsg( 1, "func_ladderendpoint(%s) without matching target\n", STRING(GetEntityName()) );
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@ -182,7 +182,7 @@ void CGameUI::InputActivate( inputdata_t &inputdata )
|
||||
CBaseEntity *pEntity = gEntList.FindEntityByName( NULL, inputdata.value.String(), this, inputdata.pActivator, inputdata.pCaller );
|
||||
if ( pEntity == NULL || pEntity->IsPlayer() == false )
|
||||
{
|
||||
Warning( "%s InputActivate: entity %s not found or is not a player!\n", GetEntityName(), inputdata.value.String() );
|
||||
Warning( "%s InputActivate: entity %s not found or is not a player!\n", STRING(GetEntityName()), inputdata.value.String() );
|
||||
return;
|
||||
}
|
||||
|
||||
@ -193,7 +193,7 @@ void CGameUI::InputActivate( inputdata_t &inputdata )
|
||||
// Otherwise try to use the activator
|
||||
if ( inputdata.pActivator == NULL || inputdata.pActivator->IsPlayer() == false )
|
||||
{
|
||||
Warning( "%s InputActivate: invalid or missing !activator!\n", GetEntityName(), inputdata.value.String() );
|
||||
Warning( "%s InputActivate: invalid or missing !activator!\n", STRING(GetEntityName()), inputdata.value.String() );
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -443,7 +443,7 @@ void DrawAllDebugOverlays( void )
|
||||
|
||||
char tempstr[512];
|
||||
Q_snprintf(tempstr, sizeof(tempstr),"%s: Mass: %.2f kg / %.2f lb (%s)",
|
||||
ent->GetModelName(), ent->VPhysicsGetObject()->GetMass(),
|
||||
STRING(ent->GetModelName()), ent->VPhysicsGetObject()->GetMass(),
|
||||
kg2lbs(ent->VPhysicsGetObject()->GetMass()),
|
||||
GetMassEquivalent(ent->VPhysicsGetObject()->GetMass()));
|
||||
ent->EntityText(0, tempstr, 0);
|
||||
@ -522,7 +522,7 @@ bool CServerGameDLL::DLLInit(CreateInterfaceFn engineFactory,
|
||||
|
||||
g_pSharedChangeInfo = engine->GetSharedEdictChangeInfo();
|
||||
|
||||
MathLib_Init( 2.2f, 2.2f, 0.0f, 2.0f );
|
||||
MathLib_Init( 2.2f, 2.2f, 0.0f, 2 );
|
||||
|
||||
// save these in case other system inits need them
|
||||
factorylist_t factories;
|
||||
@ -1396,14 +1396,13 @@ void CServerGameDLL::GetSaveCommentEx( char *text, int maxlength, float flMinute
|
||||
{
|
||||
char comment[64];
|
||||
const char *pName;
|
||||
int i;
|
||||
|
||||
char const *mapname = STRING( gpGlobals->mapname );
|
||||
|
||||
pName = NULL;
|
||||
|
||||
// Try to find a matching title comment for this mapname
|
||||
for ( i = 0; i < ARRAYSIZE(gTitleComments) && !pName; i++ )
|
||||
for ( size_t i = 0; i < ARRAYSIZE(gTitleComments) && !pName; i++ )
|
||||
{
|
||||
if ( !Q_strnicmp( mapname, gTitleComments[i].pBSPName, strlen(gTitleComments[i].pBSPName) ) )
|
||||
{
|
||||
@ -1438,9 +1437,9 @@ void CServerGameDLL::GetSaveCommentEx( char *text, int maxlength, float flMinute
|
||||
}
|
||||
else
|
||||
{
|
||||
int totalSeconds = gpGlobals->curtime + flSeconds;
|
||||
int minutes = (int)( totalSeconds / 60.0f ) + flMinutes;
|
||||
int seconds = (int)fmod( totalSeconds, 60.0f );
|
||||
int totalSeconds = static_cast<int>(gpGlobals->curtime + flSeconds);
|
||||
int minutes = static_cast<int>(( totalSeconds / 60.0f ) + flMinutes);
|
||||
int seconds = static_cast<int>(fmod( totalSeconds, 60.0f ));
|
||||
|
||||
// Wow, this guy/gal must suck...!
|
||||
if ( minutes >= 1000 )
|
||||
@ -1518,7 +1517,7 @@ void CServerGameDLL::LoadMessageOfTheDay()
|
||||
|
||||
int length = filesystem->Size( motdfile.GetString(), "GAME" );
|
||||
|
||||
if ( length <= 0 || length >= (sizeof(data)-1) )
|
||||
if ( length <= 0 || length >= static_cast<int>((sizeof(data)-1)) )
|
||||
{
|
||||
DevMsg("Invalid file size for %s\n", motdfile.GetString() );
|
||||
return;
|
||||
@ -1549,7 +1548,7 @@ void UpdateChapterRestrictions( const char *mapname )
|
||||
// look at the chapter for this map
|
||||
char chapterTitle[64];
|
||||
chapterTitle[0] = 0;
|
||||
for ( int i = 0; i < ARRAYSIZE(gTitleComments); i++ )
|
||||
for ( size_t i = 0; i < ARRAYSIZE(gTitleComments); i++ )
|
||||
{
|
||||
if ( !Q_strnicmp( mapname, gTitleComments[i].pBSPName, strlen(gTitleComments[i].pBSPName) ) )
|
||||
{
|
||||
@ -1572,7 +1571,7 @@ void UpdateChapterRestrictions( const char *mapname )
|
||||
return;
|
||||
|
||||
// make sure the specified chapter title is unlocked
|
||||
strlwr( chapterTitle );
|
||||
Q_strlower( chapterTitle );
|
||||
|
||||
const char *pGameDir = CommandLine()->ParmValue( "-game", "hl2" );
|
||||
|
||||
@ -2151,7 +2150,7 @@ void CServerGameClients::ClientSetupVisibility( edict_t *pViewEntity, edict_t *p
|
||||
portalNums[iOutPortal] = pCur->m_portalNumber;
|
||||
isOpen[iOutPortal] = pCur->UpdateVisibility( org, fovDistanceAdjustFactor, bIsOpenOnClient );
|
||||
++iOutPortal;
|
||||
if ( iOutPortal >= ARRAYSIZE( portalNums ) )
|
||||
if ( iOutPortal >= static_cast<int>(ARRAYSIZE( portalNums )) )
|
||||
{
|
||||
engine->SetAreaPortalStates( portalNums, isOpen, iOutPortal );
|
||||
iOutPortal = 0;
|
||||
@ -2166,7 +2165,7 @@ void CServerGameClients::ClientSetupVisibility( edict_t *pViewEntity, edict_t *p
|
||||
{
|
||||
if ( pCur->m_portalNumber < 0 )
|
||||
continue;
|
||||
else if ( pCur->m_portalNumber >= sizeof( portalBits ) * 8 )
|
||||
else if ( pCur->m_portalNumber >= static_cast<int>((sizeof( portalBits ) * 8)) )
|
||||
Error( "ClientSetupVisibility: portal number (%d) too large", pCur->m_portalNumber );
|
||||
else
|
||||
portalBits[pCur->m_portalNumber >> 3] |= (1 << (pCur->m_portalNumber & 7));
|
||||
@ -2338,7 +2337,7 @@ void CServerGameClients::GetBugReportInfo( char *buf, int buflen )
|
||||
ent->entindex(),
|
||||
ent->GetClassname(),
|
||||
STRING( ent->GetEntityName() ),
|
||||
ent->GetModelName() );
|
||||
STRING( ent->GetModelName() ) );
|
||||
}
|
||||
|
||||
// get any sounds that were spoken by NPCs recently
|
||||
|
||||
@ -92,7 +92,7 @@ void CGenericActor::HandleAnimEvent( animevent_t *pEvent )
|
||||
//=========================================================
|
||||
int CGenericActor::GetSoundInterests ( void )
|
||||
{
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
//=========================================================
|
||||
|
||||
@ -126,7 +126,7 @@ void CGenericNPC::HandleAnimEvent( animevent_t *pEvent )
|
||||
//=========================================================
|
||||
int CGenericNPC::GetSoundInterests ( void )
|
||||
{
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
//=========================================================
|
||||
|
||||
@ -645,7 +645,7 @@ CBaseEntity *CAI_FuncTankBehavior::BestEnemy( void )
|
||||
{
|
||||
bBestSeen = ( pNPC->GetSenses()->DidSeeEntity( pEnemy ) || pNPC->FVisible( pEnemy ) ); // @TODO (toml 04-02-03): Need to optimize CanSeeEntity() so multiple calls in frame do not recalculate, rather cache
|
||||
iBestPriority = pNPC->IRelationPriority( pEnemy );
|
||||
iBestDistSq = (pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr();
|
||||
iBestDistSq = static_cast<int>((pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr());
|
||||
pBestEnemy = pEnemy;
|
||||
bBestUnreachable = bUnreachable;
|
||||
}
|
||||
@ -656,7 +656,7 @@ CBaseEntity *CAI_FuncTankBehavior::BestEnemy( void )
|
||||
// currently think is the best visible enemy. No need to do
|
||||
// a distance check, just get mad at this one for now.
|
||||
iBestPriority = pNPC->IRelationPriority ( pEnemy );
|
||||
iBestDistSq = ( pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr();
|
||||
iBestDistSq = static_cast<int>(( pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr());
|
||||
pBestEnemy = pEnemy;
|
||||
bBestUnreachable = bUnreachable;
|
||||
}
|
||||
@ -665,7 +665,7 @@ CBaseEntity *CAI_FuncTankBehavior::BestEnemy( void )
|
||||
// this entity is disliked just as much as the entity that
|
||||
// we currently think is the best visible enemy, so we only
|
||||
// get mad at it if it is closer.
|
||||
iDistSq = ( pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr();
|
||||
iDistSq = static_cast<int>(( pEnemy->GetAbsOrigin() - GetAbsOrigin() ).LengthSqr());
|
||||
|
||||
bool bCloser = ( iDistSq < iBestDistSq ) ;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user