ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-22 12:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #17 from asmodev/asmo/vs2017

Browse source 
Code updates to support VS2017 compilation. Does not include project …
This commit is contained in:
pierow 2018-07-31 23:04:13 -04:00 committed by GitHub
commit 8563f5b367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 745 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main/source/HPB_bot/dlls/HPB_bot.vcproj
View file

@ -16,8 +16,8 @@
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -88,8 +88,8 @@
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE">

6
main/source/cl_dll/ammo.cpp
View file

@ -103,7 +103,7 @@ void WeaponsResource :: LoadAllWeaponSprites( void )
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
inline void LoadWeaponSprite( client_sprite_t* ptr, HSPRITE& sprite, wrect_t& bounds )
inline void LoadWeaponSprite( client_sprite_t* ptr, AVHHSPRITE& sprite, wrect_t& bounds )
{
if( ptr )
{
@ -300,7 +300,7 @@ void WeaponsResource::SetAmmo( int iId, int iCount )
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
HSPRITE* WeaponsResource::GetAmmoPicFromWeapon( int iAmmoId, wrect_t& rect )
AVHHSPRITE* WeaponsResource::GetAmmoPicFromWeapon( int iAmmoId, wrect_t& rect )
{
for ( int i = 0; i < MAX_WEAPONS; i++ )
{
@ -533,7 +533,7 @@ void WeaponsResource :: SelectSlot( int iSlot, int fAdvance, int iDirection )
int giBucketHeight, giBucketWidth, giABHeight, giABWidth; // Ammo Bar width and height
HSPRITE ghsprBuckets; // Sprite for top row of weapons menu
AVHHSPRITE ghsprBuckets; // Sprite for top row of weapons menu
DECLARE_MESSAGE(m_Ammo, CurWeapon ); // Current weapon and clip
DECLARE_MESSAGE(m_Ammo, WeaponList); // new weapon type

10
main/source/cl_dll/ammo.h
View file

@ -38,15 +38,15 @@ struct WEAPON
int iCount; // # of itesm in plist
HSPRITE hActive;
AVHHSPRITE hActive;
wrect_t rcActive;
HSPRITE hInactive;
AVHHSPRITE hInactive;
wrect_t rcInactive;
HSPRITE hAmmo;
AVHHSPRITE hAmmo;
wrect_t rcAmmo;
HSPRITE hAmmo2;
AVHHSPRITE hAmmo2;
wrect_t rcAmmo2;
HSPRITE hCrosshair;
AVHHSPRITE hCrosshair;
wrect_t rcCrosshair;
/* HSPRITE hAutoaim;

4
main/source/cl_dll/ammohistory.cpp
View file

@ -38,7 +38,7 @@ int HISTORY_DRAW_TIME = 5;
struct ITEM_INFO
{
char szName[MAX_ITEM_NAME];
HSPRITE spr;
AVHHSPRITE spr;
wrect_t rect;
};
@ -104,7 +104,7 @@ int HistoryResource :: DrawAmmoHistory( float flTime )
else if ( rgAmmoHistory[i].type == HISTSLOT_AMMO )
{
wrect_t rcPic;
HSPRITE *spr = gWR.GetAmmoPicFromWeapon( rgAmmoHistory[i].iId, rcPic );
AVHHSPRITE *spr = gWR.GetAmmoPicFromWeapon( rgAmmoHistory[i].iId, rcPic );
int r, g, b;
gHUD.GetPrimaryHudColor(r, g, b);

2
main/source/cl_dll/ammohistory.h
View file

@ -53,7 +53,7 @@ public:
int CountAmmo( int iId );
int GetAmmo( int iId );
void SetAmmo( int iId, int iCount );
HSPRITE* GetAmmoPicFromWeapon( int iAmmoId, wrect_t& rect ); //TODO: fix bass-ackwards arrangement and store sprites with ammo types
AVHHSPRITE* GetAmmoPicFromWeapon( int iAmmoId, wrect_t& rect ); //TODO: fix bass-ackwards arrangement and store sprites with ammo types
void AddWeapon( WEAPON* wp );
void PickupWeapon( WEAPON* wp );

8
main/source/cl_dll/chud.h
View file

@ -10,7 +10,7 @@ class CHud
{
private:
HUDLIST *m_pHudList;
HSPRITE m_hsprLogo;
AVHHSPRITE m_hsprLogo;
int m_iLogo;
client_sprite_t *m_pSpriteList;
int m_iSpriteCount;
@ -19,7 +19,7 @@ private:
public:
HSPRITE m_hsprCursor;
AVHHSPRITE m_hsprCursor;
float m_flTime; // the current client time
float m_fOldTime; // the time at which the HUD was last redrawn
float m_wsFOV; //fov recalc corrected for widescreen
@ -46,7 +46,7 @@ public:
private:
// the memory for these arrays are allocated in the first call to CHud::VidInit(), when the hud.txt and associated sprites are loaded.
// freed in ~CHud()
HSPRITE *m_rghSprites; /*[HUD_SPRITE_COUNT]*/ // the sprites loaded from hud.txt
AVHHSPRITE *m_rghSprites; /*[HUD_SPRITE_COUNT]*/ // the sprites loaded from hud.txt
wrect_t *m_rgrcRects; /*[HUD_SPRITE_COUNT]*/
char *m_rgszSpriteNames; /*[HUD_SPRITE_COUNT][MAX_SPRITE_NAME_LENGTH]*/
@ -54,7 +54,7 @@ private:
public:
HSPRITE GetSprite( int index )
AVHHSPRITE GetSprite( int index )
{
return (index < 0) ? 0 : m_rghSprites[index];
}

14
main/source/cl_dll/chudmisc.h
View file

@ -187,7 +187,7 @@ public:
int MsgFunc_Train(const char *pszName, int iSize, void *pbuf);
private:
HSPRITE m_hSprite;
AVHHSPRITE m_hSprite;
int m_iPos;
};
@ -343,8 +343,8 @@ public:
int MsgFunc_Battery(const char *pszName, int iSize, void *pbuf );
private:
HSPRITE m_hSprite1;
HSPRITE m_hSprite2;
AVHHSPRITE m_hSprite1;
AVHHSPRITE m_hSprite2;
wrect_t *m_prc1;
wrect_t *m_prc2;
int m_iBat;
@ -368,9 +368,9 @@ public:
int MsgFunc_FlashBat(const char *pszName, int iSize, void *pbuf );
private:
HSPRITE m_hSprite1;
HSPRITE m_hSprite2;
HSPRITE m_hBeam;
AVHHSPRITE m_hSprite1;
AVHHSPRITE m_hSprite2;
AVHHSPRITE m_hBeam;
wrect_t *m_prc1;
wrect_t *m_prc2;
wrect_t *m_prcBeam;
@ -492,7 +492,7 @@ private:
typedef struct
{
char szSpriteName[MAX_ICONSPRITENAME_LENGTH];
HSPRITE spr;
AVHHSPRITE spr;
wrect_t rc;
unsigned char r, g, b;
} icon_sprite_t;

8
main/source/cl_dll/cl_dll.vcproj
View file

@ -15,8 +15,8 @@
<Configurations>
<Configuration
Name="Developer - debug|Win32"
OutputDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -99,8 +99,8 @@
</Configuration>
<Configuration
Name="Developer - release|Win32"
OutputDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"

18
main/source/cl_dll/cl_dll.vcxproj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Playtest|Win32">
<Configuration>Playtest</Configuration>
@ -14,7 +14,7 @@
<SccLocalPath />
<SccProvider />
<ProjectGuid>{665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}</ProjectGuid>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'" Label="Configuration">
@ -22,7 +22,7 @@
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>false</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -39,13 +39,17 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'">client</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'">
<IncludePath>.;zlib-1.2.8;includes\zlib-1.2.8;source\includes\zlib-1.2.8;main\source\includes\zlib-1.2.8;$(IncludePath)</IncludePath>
<CustomBuildAfterTargets />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\particles;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\fmod\inc;$(SolutionDir)\includes\vgui\include;../public;../common;../external;../pm_shared;../game_shared;../mod;../util;../ui;../engine;../cl_dll;../dlls</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;AVH_CLIENT;USE_OLDAUTH</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;AVH_CLIENT;USE_OLDAUTH;_X86_</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
@ -63,13 +67,14 @@
<BrowseInformation>true</BrowseInformation>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<BufferSecurityCheck>true</BufferSecurityCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<ShowIncludes>false</ShowIncludes>
</ClCompile>
<Link>
<AdditionalDependencies>particles.lib;vgui.lib;zlib.lib;libpng.lib;wsock32.lib;sdl2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)\particles\WIN32_Release;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\particles\Release;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries>
<ProgramDatabaseFile>
@ -84,6 +89,7 @@
<TreatLinkerWarningAsErrors>
</TreatLinkerWarningAsErrors>
<AdditionalOptions>/NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>
<OutputFile>$(SolutionDir)..\cl_dlls\client.dll</OutputFile>
</Link>
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

6
main/source/cl_dll/cl_util.h
View file

@ -94,8 +94,8 @@ int ScreenWidth();
// Gets the height & width of a sprite, at the specified frame
inline int SPR_Height( HSPRITE x, int f ) { return gEngfuncs.pfnSPR_Height(x, f); }
inline int SPR_Width( HSPRITE x, int f ) { return gEngfuncs.pfnSPR_Width(x, f); }
inline int SPR_Height( AVHHSPRITE x, int f ) { return gEngfuncs.pfnSPR_Height(x, f); }
inline int SPR_Width( AVHHSPRITE x, int f ) { return gEngfuncs.pfnSPR_Width(x, f); }
inline client_textmessage_t *TextMessageGet( const char *pName ) { return gEngfuncs.pfnTextMessageGet( pName ); }
inline int TextMessageDrawChar( int x, int y, int number, int r, int g, int b )
@ -141,7 +141,7 @@ inline void UnpackRGB(int &r, int &g, int &b, unsigned long ulRGB)\
void FillRGBAClipped(vgui::Panel* inPanel, int inStartX, int inStartY, int inWidth, int inHeight, int r, int g, int b, int a);
HSPRITE LoadSprite(const char *pszName);
AVHHSPRITE LoadSprite(const char *pszName);
//bool LocalizeString(const char* inMessage, char* outBuffer, int inBufferSize);
bool LocalizeString(const char* inMessage, string& outputString);

4
main/source/cl_dll/health.h
View file

@ -103,8 +103,8 @@ public:
float m_fFade;
private:
HSPRITE m_hSprite;
HSPRITE m_hDamage;
AVHHSPRITE m_hSprite;
AVHHSPRITE m_hDamage;
DAMAGE_IMAGE m_dmg[NUM_DMG_TYPES];
int m_bitsDamage;

2
main/source/cl_dll/hud.cpp
View file

@ -351,7 +351,7 @@ void CHud :: VidInit( void )
}
// allocated memory for sprite handle arrays
m_rghSprites = new HSPRITE[m_iSpriteCount];
m_rghSprites = new AVHHSPRITE[m_iSpriteCount];
m_rgrcRects = new wrect_t[m_iSpriteCount];
m_rgszSpriteNames = new char[m_iSpriteCount * MAX_SPRITE_NAME_LENGTH];

4
main/source/cl_dll/hud_spectator.cpp
View file

@ -1711,7 +1711,7 @@ void CHudSpectator::CheckOverviewEntities()
bool CHudSpectator::AddOverviewEntity( int type, struct cl_entity_s *ent, const char *modelname)
{
HSPRITE hSprite = 0;
AVHHSPRITE hSprite = 0;
double duration = -1.0f; // duration -1 means show it only this frame;
int theFrame = 0;
bool theSuccess = false;
@ -1820,7 +1820,7 @@ void CHudSpectator::DeathMessage(int victim)
AddOverviewEntityToList(m_hsprPlayerDead, pl, gEngfuncs.GetClientTime() + 2.0f, 0, kRenderTransTexture, 1, 1, 1);
}
bool CHudSpectator::AddOverviewEntityToList(HSPRITE sprite, cl_entity_t *ent, double killTime, int inFrame, int inRenderMode, float r, float g, float b)
bool CHudSpectator::AddOverviewEntityToList(AVHHSPRITE sprite, cl_entity_t *ent, double killTime, int inFrame, int inRenderMode, float r, float g, float b)
{
for ( int i = 0; i< MAX_OVERVIEW_ENTITIES; i++ )
{

22
main/source/cl_dll/hud_spectator.h
View file

@ -46,7 +46,7 @@ typedef struct overviewInfo_s {
typedef struct overviewEntity_s {
HSPRITE hSprite;
AVHHSPRITE hSprite;
struct cl_entity_s * entity;
double killTime;
int mFrame;
@ -65,7 +65,7 @@ public:
void Reset();
void CheckSettings();
void InitHUDData( void );
bool AddOverviewEntityToList( HSPRITE sprite, cl_entity_t * ent, double killTime, int inFrame, int inRenderMode, float r, float g, float b);
bool AddOverviewEntityToList(AVHHSPRITE sprite, cl_entity_t * ent, double killTime, int inFrame, int inRenderMode, float r, float g, float b);
void DeathMessage(int victim);
bool AddOverviewEntity( int type, struct cl_entity_s *ent, const char *modelname );
void CheckOverviewEntities();
@ -120,15 +120,15 @@ public:
private:
vec3_t m_vPlayerPos[MAX_PLAYERS];
HSPRITE m_hsprPlayerMarine;
HSPRITE m_hsprPlayerAlien;
HSPRITE m_hsprCamera;
HSPRITE m_hsprPlayerDead;
HSPRITE m_hsprViewcone;
HSPRITE m_hsprUnkownMap;
HSPRITE m_hsprBeam;
HSPRITE m_hCrosshair;
HSPRITE m_hsprWhite;
AVHHSPRITE m_hsprPlayerMarine;
AVHHSPRITE m_hsprPlayerAlien;
AVHHSPRITE m_hsprCamera;
AVHHSPRITE m_hsprPlayerDead;
AVHHSPRITE m_hsprViewcone;
AVHHSPRITE m_hsprUnkownMap;
AVHHSPRITE m_hsprBeam;
AVHHSPRITE m_hCrosshair;
AVHHSPRITE m_hsprWhite;
wrect_t m_crosshairRect;

2
main/source/cl_dll/tri.cpp
View file

@ -195,7 +195,7 @@ void CL_DLLEXPORT HUD_DrawNormalTriangles( void )
void DrawHitBox(const OBBox& inBox)
{
HSPRITE sprite = SPR_Load("sprites/white.spr");
AVHHSPRITE sprite = SPR_Load("sprites/white.spr");
vec3_t theBoxPoint[8];

2
main/source/cl_dll/util.cpp
View file

@ -254,7 +254,7 @@ void FillRGBAClipped(vgui::Panel* inPanel, int inStartX, int inStartY, int inWid
}
HSPRITE LoadSprite(const char *pszName)
AVHHSPRITE LoadSprite(const char *pszName)
{
int i;
char sz[256];

8
main/source/dlls/compatibility.cpp Normal file
View file

@ -0,0 +1,8 @@
#include <cstdio>
FILE _iob[] = { *stdin, *stdout, *stderr };
extern "C" FILE * __cdecl __iob_func(void)
{
return _iob;
}

8
main/source/dlls/hl.vcproj
View file

@ -15,8 +15,8 @@
<Configurations>
<Configuration
Name="Developer - release|Win32"
OutputDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)/"
IntermediateDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)/"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -89,8 +89,8 @@
</Configuration>
<Configuration
Name="Developer - debug|Win32"
OutputDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="V:\temp\$(ProjectName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE">

51
main/source/dlls/hl.vcxproj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Developer - debug|Win32">
<Configuration>Developer - debug</Configuration>
@ -26,29 +26,29 @@
<SccLocalPath />
<SccProvider />
<ProjectGuid>{BC87A180-F17B-83FC-5D7D-470FAD003ABC}</ProjectGuid>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Playtest - balance disabled|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Developer - debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Developer - release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -68,11 +68,11 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Developer - release|Win32'">V:\temp\$(ProjectName)\$(Configuration)/\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Developer - release|Win32'">V:\temp\$(ProjectName)\$(Configuration)/\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Developer - release|Win32'">$(SolutionDir)$(Configuration)/\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Developer - release|Win32'">$(Configuration)/\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Developer - release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Developer - debug|Win32'">V:\temp\$(ProjectName)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Developer - debug|Win32'">V:\temp\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Developer - debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Developer - debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Developer - debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'">.\Playtest\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'">$(Configuration)\</IntDir>
@ -82,12 +82,14 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Playtest - balance disabled|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'">ns</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'">
<CustomBuildAfterTargets />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Developer - release|Win32'">
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir);U:\include\stlport;U:\include\nexus;U:\include\lua;U:\include\particle;U:\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_SECURE_PRERELEASE_BUILD;USE_OLDAUTH</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
@ -104,6 +106,8 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\includes\lua\include;$(SolutionDir)\particles\;$(SolutionDir)\includes\vgui\include;$(SolutionDir)\includes\libcurl-7.50-nossl\include;$(SolutionDir)\common;$(SolutionDir)\public;$(SolutionDir)\util;$(SolutionDir)\engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>winmm.lib;ws2_32.lib;particles.lib;liblua.lib;liblualib.lib;ssleay32.lib;libeay32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -136,7 +140,6 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Developer - debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir);U:\include\stlport;U:\include\nexus;U:\include\lua;U:\include\particle;U:\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_SECURE_PRERELEASE_BUILD;USE_OLDAUTH</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@ -151,6 +154,8 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\includes\lua\include;$(SolutionDir)\particles\;$(SolutionDir)\includes\vgui\include;$(SolutionDir)\includes\libcurl-7.50-nossl\include;$(SolutionDir)\common;$(SolutionDir)\public;$(SolutionDir)\util;$(SolutionDir)\engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>winmm.lib;ws2_32.lib;particles.lib;liblua.lib;liblualib.lib;nexus_server.lib;ssleay32.lib;libeay32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -190,11 +195,10 @@
<Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\includes\lua\include;$(SolutionDir)\particles\;$(SolutionDir)\includes\vgui\include;$(SolutionDir)\includes\libcurl-7.50-nossl\include;$(SolutionDir)\common;$(SolutionDir)\public;$(SolutionDir)\util;$(SolutionDir)\engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_NO_NEXUS;USE_OLDAUTH</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
@ -207,9 +211,11 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\includes\lua\include;$(SolutionDir)\particles\;$(SolutionDir)\includes\vgui\include;$(SolutionDir)\includes\libcurl-7.50-nossl\include;$(SolutionDir)\common;$(SolutionDir)\public;$(SolutionDir)\util;$(SolutionDir)\engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>winmm.lib;ws2_32.lib;particles.lib;lua5.1.lib;libcurl_a.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>winmm.lib;ws2_32.lib;particles.lib;lua5.1.lib;libcurl_a.lib;%(AdditionalDependencies);legacy_stdio_definitions.lib</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreSpecificDefaultLibraries>gdi32.lib user32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\hl.def</ModuleDefinitionFile>
@ -221,9 +227,10 @@
<SetChecksum>false</SetChecksum>
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
<AdditionalOptions>/NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>
<AdditionalLibraryDirectories>$(SolutionDir)\includes\lua\lib;$(SolutionDir)\particles\WIN32_Release;$(SolutionDir)\includes\libcurl-7.50-nossl;$(SolutionDir)\includes\vgui\lib\win32_vc6;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)includes\lua\lib;$(SolutionDir)particles\Release;$(SolutionDir)includes\libcurl-7.50-nossl;$(SolutionDir)includes\vgui\lib\win32_vc6;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<OutputFile>C:\Program Files (x86)\Steam\steamapps\common\Half-Life\ns\dlls\$(TargetName)$(TargetExt)</OutputFile>
</Link>
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -245,11 +252,10 @@
<Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir);U:\include\stlport;U:\include\nexus;U:\include\lua;U:\include\particle;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;SERVER;AVH_PLAYTEST_BUILD</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_NO_NEXUS;SERVER;AVH_PLAYTEST_BUILD;USE_OLDAUTH</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
@ -262,12 +268,14 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\includes\lua\include;$(SolutionDir)\particles\;$(SolutionDir)\includes\vgui\include;$(SolutionDir)\includes\libcurl-7.50-nossl\include;$(SolutionDir)\common;$(SolutionDir)\public;$(SolutionDir)\util;$(SolutionDir)\engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>winmm.lib;ws2_32.lib;particles.lib;liblua.lib;liblualib.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libcurl_a.lib;winmm.lib;ws2_32.lib;particles.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)..\dlls\ns.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>U:\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\includes\libcurl-7.50-nossl;$(SolutionDir)\particles\Release;U:\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>gdi32.lib user32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>.\hl.def</ModuleDefinitionFile>
<ProgramDatabaseFile>
@ -362,6 +370,7 @@
<Optimization Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Playtest|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile Include="compatibility.cpp" />
<ClCompile Include="doors.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Developer - debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Developer - debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

3
main/source/dlls/hl.vcxproj.filters
View file

@ -509,6 +509,9 @@
<ClCompile Include="..\textrep\TRFactory.cpp">
<Filter>textrep</Filter>
</ClCompile>
<ClCompile Include="compatibility.cpp">
<Filter>util</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="activity.h">

2
main/source/dlls/util.h
View file

@ -282,7 +282,7 @@ typedef enum { ignore_monsters=1, dont_ignore_monsters=0, missile=2 } IGNORE_MON
typedef enum { ignore_glass=1, dont_ignore_glass=0 } IGNORE_GLASS;
extern void UTIL_TraceLine (const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, edict_t *pentIgnore, TraceResult *ptr);
extern void UTIL_TraceLine (const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, IGNORE_GLASS ignoreGlass, edict_t *pentIgnore, TraceResult *ptr);
typedef enum { point_hull=0, human_hull=1, large_hull=2, head_hull=3 };
typedef enum { point_hull=0, human_hull=1, large_hull=2, head_hull=3 } enum_hull;
extern void UTIL_TraceHull (const Vector &vecStart, const Vector &vecEnd, IGNORE_MONSTERS igmon, int hullNumber, edict_t *pentIgnore, TraceResult *ptr);
extern TraceResult UTIL_GetGlobalTrace (void);
extern void UTIL_TraceModel (const Vector &vecStart, const Vector &vecEnd, int hullNumber, edict_t *pentModel, TraceResult *ptr);

26
main/source/engine/APIProxy.h
View file

@ -218,11 +218,11 @@ typedef struct
// ********************************************************
// Function type declarations for engine exports
typedef HSPRITE (*pfnEngSrc_pfnSPR_Load_t ) ( const char *szPicName );
typedef int (*pfnEngSrc_pfnSPR_Frames_t ) ( HSPRITE hPic );
typedef int (*pfnEngSrc_pfnSPR_Height_t ) ( HSPRITE hPic, int frame );
typedef int (*pfnEngSrc_pfnSPR_Width_t ) ( HSPRITE hPic, int frame );
typedef void (*pfnEngSrc_pfnSPR_Set_t ) ( HSPRITE hPic, int r, int g, int b );
typedef AVHHSPRITE (*pfnEngSrc_pfnSPR_Load_t ) ( const char *szPicName );
typedef int (*pfnEngSrc_pfnSPR_Frames_t ) ( AVHHSPRITE hPic );
typedef int (*pfnEngSrc_pfnSPR_Height_t ) ( AVHHSPRITE hPic, int frame );
typedef int (*pfnEngSrc_pfnSPR_Width_t ) ( AVHHSPRITE hPic, int frame );
typedef void (*pfnEngSrc_pfnSPR_Set_t ) ( AVHHSPRITE hPic, int r, int g, int b );
typedef void (*pfnEngSrc_pfnSPR_Draw_t ) ( int frame, int x, int y, const struct rect_s *prc );
typedef void (*pfnEngSrc_pfnSPR_DrawHoles_t ) ( int frame, int x, int y, const struct rect_s *prc );
typedef void (*pfnEngSrc_pfnSPR_DrawAdditive_t ) ( int frame, int x, int y, const struct rect_s *prc );
@ -231,7 +231,7 @@ typedef void (*pfnEngSrc_pfnSPR_DisableScissor_t ) ( void );
typedef struct client_sprite_s * (*pfnEngSrc_pfnSPR_GetList_t ) ( char *psz, int *piCount );
typedef void (*pfnEngSrc_pfnFillRGBA_t ) ( int x, int y, int width, int height, int r, int g, int b, int a );
typedef int (*pfnEngSrc_pfnGetScreenInfo_t ) ( struct SCREENINFO_s *pscrinfo );
typedef void (*pfnEngSrc_pfnSetCrosshair_t ) ( HSPRITE hspr, wrect_t rc, int r, int g, int b );
typedef void (*pfnEngSrc_pfnSetCrosshair_t ) ( AVHHSPRITE hspr, wrect_t rc, int r, int g, int b );
typedef struct cvar_s * (*pfnEngSrc_pfnRegisterVariable_t ) ( char *szName, char *szValue, int flags );
typedef float (*pfnEngSrc_pfnGetCvarFloat_t ) ( char *szName );
typedef char* (*pfnEngSrc_pfnGetCvarString_t ) ( char *szName );
@ -283,7 +283,7 @@ typedef int (*pfnEngSrc_PM_WaterEntity_t ) ( float *p );
typedef struct pmtrace_s * (*pfnEngSrc_PM_TraceLine_t ) ( float *start, float *end, int flags, int usehull, int ignore_pe );
typedef struct model_s * (*pfnEngSrc_CL_LoadModel_t ) ( const char *modelname, int *index );
typedef int (*pfnEngSrc_CL_CreateVisibleEntity_t ) ( int type, struct cl_entity_s *ent );
typedef const struct model_s * (*pfnEngSrc_GetSpritePointer_t ) ( HSPRITE hSprite );
typedef const struct model_s * (*pfnEngSrc_GetSpritePointer_t ) ( AVHHSPRITE hSprite );
typedef void (*pfnEngSrc_pfnPlaySoundByNameAtLocation_t ) ( char *szSound, float volume, float *origin );
typedef unsigned short (*pfnEngSrc_pfnPrecacheEvent_t ) ( int type, const char* psz );
typedef void (*pfnEngSrc_pfnPlaybackEvent_t ) ( int flags, const struct edict_s *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
@ -495,10 +495,10 @@ typedef struct cl_enginefuncs_s
// Function type declarations for engine destination functions
typedef void (*pfnEngDst_pfnSPR_Load_t ) ( const char ** );
typedef void (*pfnEngDst_pfnSPR_Frames_t ) ( HSPRITE * );
typedef void (*pfnEngDst_pfnSPR_Height_t ) ( HSPRITE *, int * );
typedef void (*pfnEngDst_pfnSPR_Width_t ) ( HSPRITE *, int * );
typedef void (*pfnEngDst_pfnSPR_Set_t ) ( HSPRITE *, int *, int *, int * );
typedef void (*pfnEngDst_pfnSPR_Frames_t ) ( AVHHSPRITE * );
typedef void (*pfnEngDst_pfnSPR_Height_t ) ( AVHHSPRITE *, int * );
typedef void (*pfnEngDst_pfnSPR_Width_t ) ( AVHHSPRITE *, int * );
typedef void (*pfnEngDst_pfnSPR_Set_t ) ( AVHHSPRITE *, int *, int *, int * );
typedef void (*pfnEngDst_pfnSPR_Draw_t ) ( int *, int *, int *, const struct rect_s ** );
typedef void (*pfnEngDst_pfnSPR_DrawHoles_t ) ( int *, int *, int *, const struct rect_s ** );
typedef void (*pfnEngDst_pfnSPR_DrawAdditive_t ) ( int *, int *, int *, const struct rect_s ** );
@ -507,7 +507,7 @@ typedef void (*pfnEngDst_pfnSPR_DisableScissor_t ) ( void );
typedef void (*pfnEngDst_pfnSPR_GetList_t ) ( char **, int ** );
typedef void (*pfnEngDst_pfnFillRGBA_t ) ( int *, int *, int *, int *, int *, int *, int *, int * );
typedef void (*pfnEngDst_pfnGetScreenInfo_t ) ( struct SCREENINFO_s ** );
typedef void (*pfnEngDst_pfnSetCrosshair_t ) ( HSPRITE *, struct rect_s *, int *, int *, int * );
typedef void (*pfnEngDst_pfnSetCrosshair_t ) ( AVHHSPRITE *, struct rect_s *, int *, int *, int * );
typedef void (*pfnEngDst_pfnRegisterVariable_t ) ( char **, char **, int * );
typedef void (*pfnEngDst_pfnGetCvarFloat_t ) ( char ** );
typedef void (*pfnEngDst_pfnGetCvarString_t ) ( char ** );
@ -559,7 +559,7 @@ typedef void (*pfnEngDst_PM_WaterEntity_t ) ( float ** );
typedef void (*pfnEngDst_PM_TraceLine_t ) ( float **, float **, int *, int *, int * );
typedef void (*pfnEngDst_CL_LoadModel_t ) ( const char **, int ** );
typedef void (*pfnEngDst_CL_CreateVisibleEntity_t ) ( int *, struct cl_entity_s ** );
typedef void (*pfnEngDst_GetSpritePointer_t ) ( HSPRITE * );
typedef void (*pfnEngDst_GetSpritePointer_t ) ( AVHHSPRITE * );
typedef void (*pfnEngDst_pfnPlaySoundByNameAtLocation_t ) ( char **, float *, float ** );
typedef void (*pfnEngDst_pfnPrecacheEvent_t ) ( int *, const char* * );
typedef void (*pfnEngDst_pfnPlaybackEvent_t ) ( int *, const struct edict_s **, unsigned short *, float *, float **, float **, float *, float *, int *, int *, int *, int * );

2
main/source/engine/cdll_int.h
View file

@ -35,7 +35,7 @@ extern "C" {
// this file is included by both the engine and the client-dll,
// so make sure engine declarations aren't done twice
typedef int HSPRITE; // handle to a graphic
typedef int AVHHSPRITE; // handle to a graphic
#define SCRINFO_SCREENFLASH 1
#define SCRINFO_STRETCHED 2

2
main/source/game_shared/voice_status.h
View file

@ -192,7 +192,7 @@ public:
// Squelch mode stuff.
bool m_bInSquelchMode;
HSPRITE m_VoiceHeadModel; // Voice head model (goes above players who are speaking).
AVHHSPRITE m_VoiceHeadModel; // Voice head model (goes above players who are speaking).
float m_VoiceHeadModelHeight; // Height above their head to place the model.
vgui::Image *m_pSpeakerLabelIcon; // Icon next to speaker labels.

511
main/source/includes/zlib-1.2.8/zconf.h.included Normal file
View file

@ -0,0 +1,511 @@
/* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-2013 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id$ */
#ifndef ZCONF_H
#define ZCONF_H
/*
* If you *really* need a unique prefix for all types and library functions,
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
* Even better than compiling with -DZ_PREFIX would be to use configure to set
* this permanently in zconf.h using "./configure --zprefix".
*/
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
# define Z_PREFIX_SET
/* all linked symbols */
# define _dist_code z__dist_code
# define _length_code z__length_code
# define _tr_align z__tr_align
# define _tr_flush_bits z__tr_flush_bits
# define _tr_flush_block z__tr_flush_block
# define _tr_init z__tr_init
# define _tr_stored_block z__tr_stored_block
# define _tr_tally z__tr_tally
# define adler32 z_adler32
# define adler32_combine z_adler32_combine
# define adler32_combine64 z_adler32_combine64
# ifndef Z_SOLO
# define compress z_compress
# define compress2 z_compress2
# define compressBound z_compressBound
# endif
# define crc32 z_crc32
# define crc32_combine z_crc32_combine
# define crc32_combine64 z_crc32_combine64
# define deflate z_deflate
# define deflateBound z_deflateBound
# define deflateCopy z_deflateCopy
# define deflateEnd z_deflateEnd
# define deflateInit2_ z_deflateInit2_
# define deflateInit_ z_deflateInit_
# define deflateParams z_deflateParams
# define deflatePending z_deflatePending
# define deflatePrime z_deflatePrime
# define deflateReset z_deflateReset
# define deflateResetKeep z_deflateResetKeep
# define deflateSetDictionary z_deflateSetDictionary
# define deflateSetHeader z_deflateSetHeader
# define deflateTune z_deflateTune
# define deflate_copyright z_deflate_copyright
# define get_crc_table z_get_crc_table
# ifndef Z_SOLO
# define gz_error z_gz_error
# define gz_intmax z_gz_intmax
# define gz_strwinerror z_gz_strwinerror
# define gzbuffer z_gzbuffer
# define gzclearerr z_gzclearerr
# define gzclose z_gzclose
# define gzclose_r z_gzclose_r
# define gzclose_w z_gzclose_w
# define gzdirect z_gzdirect
# define gzdopen z_gzdopen
# define gzeof z_gzeof
# define gzerror z_gzerror
# define gzflush z_gzflush
# define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_
# define gzgets z_gzgets
# define gzoffset z_gzoffset
# define gzoffset64 z_gzoffset64
# define gzopen z_gzopen
# define gzopen64 z_gzopen64
# ifdef _WIN32
# define gzopen_w z_gzopen_w
# endif
# define gzprintf z_gzprintf
# define gzvprintf z_gzvprintf
# define gzputc z_gzputc
# define gzputs z_gzputs
# define gzread z_gzread
# define gzrewind z_gzrewind
# define gzseek z_gzseek
# define gzseek64 z_gzseek64
# define gzsetparams z_gzsetparams
# define gztell z_gztell
# define gztell64 z_gztell64
# define gzungetc z_gzungetc
# define gzwrite z_gzwrite
# endif
# define inflate z_inflate
# define inflateBack z_inflateBack
# define inflateBackEnd z_inflateBackEnd
# define inflateBackInit_ z_inflateBackInit_
# define inflateCopy z_inflateCopy
# define inflateEnd z_inflateEnd
# define inflateGetHeader z_inflateGetHeader
# define inflateInit2_ z_inflateInit2_
# define inflateInit_ z_inflateInit_
# define inflateMark z_inflateMark
# define inflatePrime z_inflatePrime
# define inflateReset z_inflateReset
# define inflateReset2 z_inflateReset2
# define inflateSetDictionary z_inflateSetDictionary
# define inflateGetDictionary z_inflateGetDictionary
# define inflateSync z_inflateSync
# define inflateSyncPoint z_inflateSyncPoint
# define inflateUndermine z_inflateUndermine
# define inflateResetKeep z_inflateResetKeep
# define inflate_copyright z_inflate_copyright
# define inflate_fast z_inflate_fast
# define inflate_table z_inflate_table
# ifndef Z_SOLO
# define uncompress z_uncompress
# endif
# define zError z_zError
# ifndef Z_SOLO
# define zcalloc z_zcalloc
# define zcfree z_zcfree
# endif
# define zlibCompileFlags z_zlibCompileFlags
# define zlibVersion z_zlibVersion
/* all zlib typedefs in zlib.h and zconf.h */
# define Byte z_Byte
# define Bytef z_Bytef
# define alloc_func z_alloc_func
# define charf z_charf
# define free_func z_free_func
# ifndef Z_SOLO
# define gzFile z_gzFile
# endif
# define gz_header z_gz_header
# define gz_headerp z_gz_headerp
# define in_func z_in_func
# define intf z_intf
# define out_func z_out_func
# define uInt z_uInt
# define uIntf z_uIntf
# define uLong z_uLong
# define uLongf z_uLongf
# define voidp z_voidp
# define voidpc z_voidpc
# define voidpf z_voidpf
/* all zlib structs in zlib.h and zconf.h */
# define gz_header_s z_gz_header_s
# define internal_state z_internal_state
#endif
#if defined(__MSDOS__) && !defined(MSDOS)
# define MSDOS
#endif
#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
# define OS2
#endif
#if defined(_WINDOWS) && !defined(WINDOWS)
# define WINDOWS
#endif
#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
# ifndef WIN32
# define WIN32
# endif
#endif
#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
# ifndef SYS16BIT
# define SYS16BIT
# endif
# endif
#endif
/*
* Compile with -DMAXSEG_64K if the alloc function cannot allocate more
* than 64k bytes at a time (needed on systems with 16-bit int).
*/
#ifdef SYS16BIT
# define MAXSEG_64K
#endif
#ifdef MSDOS
# define UNALIGNED_OK
#endif
#ifdef __STDC_VERSION__
# ifndef STDC
# define STDC
# endif
# if __STDC_VERSION__ >= 199901L
# ifndef STDC99
# define STDC99
# endif
# endif
#endif
#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
# define STDC
#endif
#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
# define STDC
#endif
#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
# define STDC
#endif
#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
# define STDC
#endif
#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
# define STDC
#endif
#ifndef STDC
# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
# define const /* note: need a more gentle solution here */
# endif
#endif
#if defined(ZLIB_CONST) && !defined(z_const)
# define z_const const
#else
# define z_const
#endif
/* Some Mac compilers merge all .h files incorrectly: */
#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
# define NO_DUMMY_DECL
#endif
/* Maximum value for memLevel in deflateInit2 */
#ifndef MAX_MEM_LEVEL
# ifdef MAXSEG_64K
# define MAX_MEM_LEVEL 8
# else
# define MAX_MEM_LEVEL 9
# endif
#endif
/* Maximum value for windowBits in deflateInit2 and inflateInit2.
* WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
* created by gzip. (Files created by minigzip can still be extracted by
* gzip.)
*/
#ifndef MAX_WBITS
# define MAX_WBITS 15 /* 32K LZ77 window */
#endif
/* The memory requirements for deflate are (in bytes):
(1 << (windowBits+2)) + (1 << (memLevel+9))
that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
plus a few kilobytes for small objects. For example, if you want to reduce
the default memory requirements from 256K to 128K, compile with
make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
Of course this will generally degrade compression (there's no free lunch).
The memory requirements for inflate are (in bytes) 1 << windowBits
that is, 32K for windowBits=15 (default value) plus a few kilobytes
for small objects.
*/
/* Type declarations */
#ifndef OF /* function prototypes */
# ifdef STDC
# define OF(args) args
# else
# define OF(args) ()
# endif
#endif
#ifndef Z_ARG /* function prototypes for stdarg */
# if defined(STDC) || defined(Z_HAVE_STDARG_H)
# define Z_ARG(args) args
# else
# define Z_ARG(args) ()
# endif
#endif
/* The following definitions for FAR are needed only for MSDOS mixed
* model programming (small or medium model with some far allocations).
* This was tested only with MSC; for other MSDOS compilers you may have
* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
* just define FAR to be empty.
*/
#ifdef SYS16BIT
# if defined(M_I86SM) || defined(M_I86MM)
/* MSC small or medium model */
# define SMALL_MEDIUM
# ifdef _MSC_VER
# define FAR _far
# else
# define FAR far
# endif
# endif
# if (defined(__SMALL__) || defined(__MEDIUM__))
/* Turbo C small or medium model */
# define SMALL_MEDIUM
# ifdef __BORLANDC__
# define FAR _far
# else
# define FAR far
# endif
# endif
#endif
#if defined(WINDOWS) || defined(WIN32)
/* If building or using zlib as a DLL, define ZLIB_DLL.
* This is not mandatory, but it offers a little performance increase.
*/
# ifdef ZLIB_DLL
# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
# ifdef ZLIB_INTERNAL
# define ZEXTERN extern __declspec(dllexport)
# else
# define ZEXTERN extern __declspec(dllimport)
# endif
# endif
# endif /* ZLIB_DLL */
/* If building or using zlib with the WINAPI/WINAPIV calling convention,
* define ZLIB_WINAPI.
* Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
*/
# ifdef ZLIB_WINAPI
# ifdef FAR
# undef FAR
# endif
# include <windows.h>
/* No need for _export, use ZLIB.DEF instead. */
/* For complete Windows compatibility, use WINAPI, not __stdcall. */
# define ZEXPORT WINAPI
# ifdef WIN32
# define ZEXPORTVA WINAPIV
# else
# define ZEXPORTVA FAR CDECL
# endif
# endif
#endif
#if defined (__BEOS__)
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport)
# define ZEXPORTVA __declspec(dllexport)
# else
# define ZEXPORT __declspec(dllimport)
# define ZEXPORTVA __declspec(dllimport)
# endif
# endif
#endif
#ifndef ZEXTERN
# define ZEXTERN extern
#endif
#ifndef ZEXPORT
# define ZEXPORT
#endif
#ifndef ZEXPORTVA
# define ZEXPORTVA
#endif
#ifndef FAR
# define FAR
#endif
#if !defined(__MACTYPES__)
typedef unsigned char Byte; /* 8 bits */
#endif
typedef unsigned int uInt; /* 16 bits or more */
typedef unsigned long uLong; /* 32 bits or more */
#ifdef SMALL_MEDIUM
/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
# define Bytef Byte FAR
#else
typedef Byte FAR Bytef;
#endif
typedef char FAR charf;
typedef int FAR intf;
typedef uInt FAR uIntf;
typedef uLong FAR uLongf;
#ifdef STDC
typedef void const *voidpc;
typedef void FAR *voidpf;
typedef void *voidp;
#else
typedef Byte const *voidpc;
typedef Byte FAR *voidpf;
typedef Byte *voidp;
#endif
#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
# include <limits.h>
# if (UINT_MAX == 0xffffffffUL)
# define Z_U4 unsigned
# elif (ULONG_MAX == 0xffffffffUL)
# define Z_U4 unsigned long
# elif (USHRT_MAX == 0xffffffffUL)
# define Z_U4 unsigned short
# endif
#endif
#ifdef Z_U4
typedef Z_U4 z_crc_t;
#else
typedef unsigned long z_crc_t;
#endif
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
#endif
#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_STDARG_H
#endif
#ifdef STDC
# ifndef Z_SOLO
# include <sys/types.h> /* for off_t */
# endif
#endif
#if defined(STDC) || defined(Z_HAVE_STDARG_H)
# ifndef Z_SOLO
# include <stdarg.h> /* for va_list */
# endif
#endif
#ifdef _WIN32
# ifndef Z_SOLO
# include <stddef.h> /* for wchar_t */
# endif
#endif
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
* though the former does not conform to the LFS document), but considering
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
* equivalently requesting no 64-bit operations
*/
#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
# undef _LARGEFILE64_SOURCE
#endif
#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
# define Z_HAVE_UNISTD_H
#endif
#ifndef Z_SOLO
# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
# ifdef VMS
# include <unixio.h> /* for off_t */
# endif
# ifndef z_off_t
# define z_off_t off_t
# endif
# endif
#endif
#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
# define Z_LFS64
#endif
#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
# define Z_LARGE64
#endif
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
# define Z_WANT64
#endif
#if !defined(SEEK_SET) && !defined(Z_SOLO)
# define SEEK_SET 0 /* Seek from beginning of file. */
# define SEEK_CUR 1 /* Seek from current position. */
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
#endif
#ifndef z_off_t
# define z_off_t long
#endif
#if !defined(_WIN32) && defined(Z_LARGE64)
# define z_off64_t off64_t
#else
# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
# define z_off64_t __int64
# else
# define z_off64_t z_off_t
# endif
#endif
/* MVS linker does not support external names larger than 8 bytes */
#if defined(__MVS__)
#pragma map(deflateInit_,"DEIN")
#pragma map(deflateInit2_,"DEIN2")
#pragma map(deflateEnd,"DEEND")
#pragma map(deflateBound,"DEBND")
#pragma map(inflateInit_,"ININ")
#pragma map(inflateInit2_,"ININ2")
#pragma map(inflateEnd,"INEND")
#pragma map(inflateSync,"INSY")
#pragma map(inflateSetDictionary,"INSEDI")
#pragma map(compressBound,"CMBND")
#pragma map(inflate_table,"INTABL")
#pragma map(inflate_fast,"INFA")
#pragma map(inflate_copyright,"INCOPY")
#endif
#endif /* ZCONF_H */

6
main/source/mod/AvHEvents.cpp
View file

@ -1872,15 +1872,15 @@ void EV_EndJetpack(struct event_args_s* args)
void DrawCircleOnGroundAtPoint(vec3_t inOrigin, int inNumSides, int inStartAngle, int inRadius, float inR, float inG, float inB, float inA, bool inUseRedInstead, float inInnerRadius)
{
static HSPRITE theGreenSprite = 0;
static AVHHSPRITE theGreenSprite = 0;
if(!theGreenSprite)
theGreenSprite = SPR_Load("sprites/green.spr");
static HSPRITE theRedSprite = 0;
static AVHHSPRITE theRedSprite = 0;
if(!theRedSprite)
theRedSprite = SPR_Load("sprites/red.spr");
HSPRITE theSprite = theGreenSprite;
AVHHSPRITE theSprite = theGreenSprite;
if(inUseRedInstead)
theSprite = theRedSprite;

2
main/source/mod/AvHFont.h
View file

@ -50,7 +50,7 @@ public:
private:
HSPRITE mSprite;
AVHHSPRITE mSprite;
int mSpriteWidth;
int mSpriteHeight;

1
main/source/mod/AvHGamerules.cpp
View file

@ -775,6 +775,7 @@ BOOL AvHGamerules::ClientConnected( edict_t *pEntity, const char *pszName, const
theAllowedToConnect = this->GetIsClientAuthorizedToPlay(pEntity, true, false);
#endif
theAllowedToConnect = true;
if(theAllowedToConnect)
{
g_VoiceGameMgr.ClientConnected(pEntity);

6
main/source/mod/AvHHud.cpp
View file

@ -3896,7 +3896,7 @@ bool AvHHud::SetCursor(AvHOrderType inOrderType)
return theSuccess;
}
void AvHHud::GetCursor(HSPRITE& outSprite, int& outFrame)
void AvHHud::GetCursor(AVHHSPRITE& outSprite, int& outFrame)
{
if (g_iUser1 == 0)
@ -6923,7 +6923,7 @@ void AvHHud::HideCommandMenu()
gViewPort->HideCommandMenu();
}
void AvHHud::GetSpriteForUser3(AvHUser3 inUser3, int& outSprite, int& outFrame, int& outRenderMode)
void AvHHud::GetSpriteForUser3(AvHUser3 inUser3, AVHHSPRITE& outSprite, int& outFrame, int& outRenderMode)
{
switch (inUser3)
@ -7095,7 +7095,7 @@ void AvHHud::HideCrosshair()
}
void AvHHud::SetCurrentCrosshair(HSPRITE hspr, wrect_t rc, int r, int g, int b)
void AvHHud::SetCurrentCrosshair(AVHHSPRITE hspr, wrect_t rc, int r, int g, int b)
{
mCrosshairSprite = hspr;
mCrosshairRect = rc;

88
main/source/mod/AvHHud.h
View file

@ -226,7 +226,7 @@ public:
int GetCommanderIndex() const;
bool GetHasJetpack() const;
int GetHelpIconFrameFromUser3(AvHUser3 inUser3);
HSPRITE GetHelpSprite() const;
AVHHSPRITE GetHelpSprite() const;
bool GetHasAlienUpgradesAvailable() const;
bool GetIsAlien() const;
bool GetIsBeingDigested() const;
@ -370,9 +370,9 @@ public:
void RenderMiniMap(int inX, int inY, int inWidth, int inHeight);
void RenderStructureRanges();
void RenderStructureRange(vec3_t inOrigin, int inRadius, HSPRITE inSprite, int inRenderMode = kRenderNormal, int inFrame = 0, float inR = 0, float inG = 0.5, float inB = 0, float inAlpha = 1.0f);
void RenderStructureRange(vec3_t inOrigin, int inRadius, AVHHSPRITE inSprite, int inRenderMode = kRenderNormal, int inFrame = 0, float inR = 0, float inG = 0.5, float inB = 0, float inAlpha = 1.0f);
void DrawWarpedOverlaySprite(int spriteHandle, int numXFrames, int numYFrames,
void DrawWarpedOverlaySprite(AVHHSPRITE spriteHandle, int numXFrames, int numYFrames,
float inWarpXAmount = 0.0f, float inWarpYAmount = 0.0f,
float inWarpXSpeed = 0.0f, float inWarpYSpeed = 0.0f);
@ -417,7 +417,7 @@ public:
int MsgFunc_SetTech(const char* pszName, int iSize, void* pbuf);
int MsgFunc_TechSlots(const char* pszName, int iSize, void* pbuf);
void GetSpriteForUser3(AvHUser3 inUser3, int& outSprite, int& outFrame, int& outRenderMode);
void GetSpriteForUser3(AvHUser3 inUser3, AVHHSPRITE& outSprite, int& outFrame, int& outRenderMode);
int GetCurrentSquad() const;
AvHOverviewMap& GetOverviewMap();
@ -426,7 +426,7 @@ public:
void HideCrosshair();
// This function should be used instead of the global SetCrosshair.
void SetCurrentCrosshair(HSPRITE hspr, wrect_t rc, int r, int g, int b);
void SetCurrentCrosshair(AVHHSPRITE hspr, wrect_t rc, int r, int g, int b);
static void ResetGammaAtExit();
static int ResetGammaAtExitForOnExit();
@ -474,14 +474,14 @@ private:
void DrawReticleInfo();
void DrawToolTips();
// : 0000971 -- added inAlpha
void DrawWorldSprite(int inSpriteHandle, int inRenderMode, vec3_t inWorldPosition, int inFrame, float inWorldSize, float inAlpha = 1.0f);
void DrawWorldSprite(AVHHSPRITE inSpriteHandle, int inRenderMode, vec3_t inWorldPosition, int inFrame, float inWorldSize, float inAlpha = 1.0f);
// :
void DrawOrderIcon(const AvHOrder& inOrder);
void DrawOrderText(const AvHOrder& inOrder);
int GetFrameForOrderType(AvHOrderType inOrderType) const;
void GetReticleTextDrawingInfo(float& outNormX, float& outNormY, bool& outCentered) const;
void DrawTechTreeSprite(AvHMessageID inMessageID, int inPosX, int inPosY, int inWidth, int inHeight, int inFrame);
int GetTechTreeSprite(AvHMessageID inMessageID);
AVHHSPRITE GetTechTreeSprite(AvHMessageID inMessageID);
void GetTooltipDrawingInfo(float& outNormX, float& outNormY) const;
string GetRankTitle(bool inShowUnspentLevels = false) const;
bool GetShouldDisplayUser3(AvHUser3 inUser3) const;
@ -505,7 +505,7 @@ private:
virtual void ResetGame(bool inMapChanged = false);
bool SetCursor(AvHOrderType inOrderType);
void GetCursor(HSPRITE& outSprite, int& outFrame);
void GetCursor(AVHHSPRITE& outSprite, int& outFrame);
void SetSelectionEffects(EntityListType& inUnitList);
//void UpdateSelectionEffects(float inTimePassed);
@ -709,32 +709,32 @@ private:
AvHVisibleBlipList mFriendlyBlips;
bool mMarineUIDrawUI;
HSPRITE mMarineUIJetpackSprite;
AVHHSPRITE mMarineUIJetpackSprite;
HSPRITE mAlienUIEnergySprite;
HSPRITE mAlienUICloakSprite;
AVHHSPRITE mAlienUIEnergySprite;
AVHHSPRITE mAlienUICloakSprite;
HSPRITE mMembraneSprite;
HSPRITE mDigestingSprite;
HSPRITE mBackgroundSprite;
HSPRITE mTopDownTopSprite;
HSPRITE mTopDownBottomSprite;
HSPRITE mMarineTopSprite;
HSPRITE mLogoutSprite;
HSPRITE mCommandButtonSprite;
HSPRITE mCommandStatusSprite;
HSPRITE mSelectAllSprite;
AVHHSPRITE mMembraneSprite;
AVHHSPRITE mDigestingSprite;
AVHHSPRITE mBackgroundSprite;
AVHHSPRITE mTopDownTopSprite;
AVHHSPRITE mTopDownBottomSprite;
AVHHSPRITE mMarineTopSprite;
AVHHSPRITE mLogoutSprite;
AVHHSPRITE mCommandButtonSprite;
AVHHSPRITE mCommandStatusSprite;
AVHHSPRITE mSelectAllSprite;
HSPRITE mMarineOrderIndicator;
HSPRITE mMarineUpgradesSprite;
AVHHSPRITE mMarineOrderIndicator;
AVHHSPRITE mMarineUpgradesSprite;
// : 0000971
HSPRITE mTeammateOrderSprite;
AVHHSPRITE mTeammateOrderSprite;
// :
typedef map<int, int> SpriteListType;
typedef map<int, AVHHSPRITE> SpriteListType;
SpriteListType mActionButtonSprites;
//SpriteListType mHelpSprites;
int mHelpSprite;
AVHHSPRITE mHelpSprite;
typedef vector< pair<vec3_t, int> > HelpIconListType;
HelpIconListType mHelpIcons;
@ -743,30 +743,30 @@ private:
EntityListType mBuildingEffectsEntityList;
float mTimeOfLastEntityUpdate;
HSPRITE mAlienUIUpgrades;
HSPRITE mAlienUIUpgradeCategories;
AVHHSPRITE mAlienUIUpgrades;
AVHHSPRITE mAlienUIUpgradeCategories;
HSPRITE mAlienBuildSprite;
HSPRITE mMarineBuildSprite;
AVHHSPRITE mAlienBuildSprite;
AVHHSPRITE mMarineBuildSprite;
HSPRITE mAlienHealthSprite;
HSPRITE mMarineHealthSprite;
AVHHSPRITE mAlienHealthSprite;
AVHHSPRITE mMarineHealthSprite;
HSPRITE mHealthEffectsSprite;
HSPRITE mBuildCircleSprite;
AVHHSPRITE mHealthEffectsSprite;
AVHHSPRITE mBuildCircleSprite;
//HSPRITE mSiegeTurretSprite;
SelectionListType mSelectionEffects;
//HSPRITE mMappingTechSprite;
HSPRITE mHiveInfoSprite;
HSPRITE mHiveHealthSprite;
HSPRITE mOrderSprite;
HSPRITE mCursorSprite;
HSPRITE mMarineCursor;
HSPRITE mAlienCursor;
HSPRITE mAlienLifeformsCursor;
AVHHSPRITE mHiveInfoSprite;
AVHHSPRITE mHiveHealthSprite;
AVHHSPRITE mOrderSprite;
AVHHSPRITE mCursorSprite;
AVHHSPRITE mMarineCursor;
AVHHSPRITE mAlienCursor;
AVHHSPRITE mAlienLifeformsCursor;
int mCurrentCursorFrame;
int mProgressBarEntityIndex;
@ -781,8 +781,8 @@ private:
float mFogStart;
float mFogEnd;
HSPRITE mExperienceBarSprite;
HSPRITE mProgressBarSprite;
AVHHSPRITE mExperienceBarSprite;
AVHHSPRITE mProgressBarSprite;
AvHBaseInfoLocationListType mInfoLocationList;
string mLocationText;
@ -850,7 +850,7 @@ private:
StructureHUDNotificationListType mStructureNotificationList;
int mCrosshairShowCount;
HSPRITE mCrosshairSprite;
AVHHSPRITE mCrosshairSprite;
wrect_t mCrosshairRect;
int mCrosshairR;
int mCrosshairG;

38
main/source/mod/AvHHudRender.cpp
View file

@ -305,7 +305,7 @@ void SetWarpHUDSprites(bool inMode, float inWarpXAmount = 0.0f, float inWarpYAmo
gWarpYSpeed = inWarpYSpeed;
}
void DrawScaledHUDSprite(int inSpriteHandle, int inMode, int inRowsInSprite = 1, int inX = 0, int inY = 0, int inWidth = ScreenWidth(), int inHeight = ScreenHeight(), int inForceSpriteFrame = -1, float inStartU = 0.0f, float inStartV = 0.0f, float inEndU = 1.0f, float inEndV = 1.0f, float inRotateUVRadians = 0.0f, bool inUVWrapsOverFrames = false)
void DrawScaledHUDSprite(AVHHSPRITE inSpriteHandle, int inMode, int inRowsInSprite = 1, int inX = 0, int inY = 0, int inWidth = ScreenWidth(), int inHeight = ScreenHeight(), int inForceSpriteFrame = -1, float inStartU = 0.0f, float inStartV = 0.0f, float inEndU = 1.0f, float inEndV = 1.0f, float inRotateUVRadians = 0.0f, bool inUVWrapsOverFrames = false)
{
// Count number of frames
int theNumFrames = SPR_Frames(inSpriteHandle);
@ -588,7 +588,7 @@ void DrawScaledHUDSprite(int inSpriteHandle, int inMode, int inRowsInSprite = 1,
}
}
void DrawVariableScaledHUDSprite(float inFactor, int inSpriteHandle, int inMode, int inX, int inY, int inWidth, int inHeight)
void DrawVariableScaledHUDSprite(float inFactor, AVHHSPRITE inSpriteHandle, int inMode, int inX, int inY, int inWidth, int inHeight)
{
// Draw as two scaled sprites, one for the level and one for the "empty" level
// Assumes that sprite has two frames, with the empty level being frame 0 and the full frame being frame 1
@ -611,7 +611,7 @@ void DrawVariableScaledHUDSprite(float inFactor, int inSpriteHandle, int inMode,
DrawScaledHUDSprite(inSpriteHandle, inMode, 1, theX, theY, theWidth, theHeight, 0, theStartU, theStartV, theEndU, theEndV);
}
void DrawSpriteOnGroundAtPoint(vec3_t inOrigin, int inRadius, HSPRITE inSprite, int inRenderMode = kRenderNormal, int inFrame = 0, float inAlpha = 1.0f)
void DrawSpriteOnGroundAtPoint(vec3_t inOrigin, int inRadius, AVHHSPRITE inSprite, int inRenderMode = kRenderNormal, int inFrame = 0, float inAlpha = 1.0f)
{
if(gEngfuncs.pTriAPI->SpriteTexture((struct model_s *)gEngfuncs.GetSpritePointer(inSprite), inFrame))
{
@ -889,7 +889,7 @@ void AvHHud::DrawToolTips()
}
}
void AvHHud::DrawWorldSprite(int inSpriteHandle, int inRenderMode, vec3_t inWorldPosition, int inFrame, float inWorldSize, float inAlpha)
void AvHHud::DrawWorldSprite(AVHHSPRITE inSpriteHandle, int inRenderMode, vec3_t inWorldPosition, int inFrame, float inWorldSize, float inAlpha)
// : added inAlpha
{
vec3_t theUpperLeft;
@ -1415,7 +1415,7 @@ int AvHHud::GetHelpIconFrameFromUser3(AvHUser3 inUser3)
return theFrame;
}
HSPRITE AvHHud::GetHelpSprite() const
AVHHSPRITE AvHHud::GetHelpSprite() const
{
return this->mHelpSprite;
}
@ -1651,7 +1651,7 @@ void AvHHud::DrawMouseCursor(int inBaseX, int inBaseY)
if ( g_iVisibleMouse && !(this->GetInTopDownMode() && gEngfuncs.pDemoAPI->IsPlayingback()) )
{
HSPRITE theCursorSprite;
AVHHSPRITE theCursorSprite;
int theCursorFrame;
GetCursor(theCursorSprite, theCursorFrame);
@ -1696,7 +1696,7 @@ void AvHHud::DrawMouseCursor(int inBaseX, int inBaseY)
if (mSelectionBoxVisible)
{
int sprite = SPR_Load(kWhiteSprite);
AVHHSPRITE sprite = SPR_Load(kWhiteSprite);
int r, g, b;
GetPrimaryHudColor(r, g, b, true, false);
@ -2179,7 +2179,7 @@ void AvHHud::DrawActionButtons()
}
}
int AvHHud::GetTechTreeSprite(AvHMessageID inMessageID)
AVHHSPRITE AvHHud::GetTechTreeSprite(AvHMessageID inMessageID)
{
// Find the group that it belongs to (20, 30, 40, etc.)
int theMessageNumber = (int)inMessageID - (inMessageID % 10);
@ -2193,14 +2193,14 @@ int AvHHud::GetTechTreeSprite(AvHMessageID inMessageID)
sprintf(theMessageNumberString, "%d", (int)theMessageNumber);
//string theSpriteName = kTechTreeSpriteDirectory + string("/") + kTechTreeSpritePrefix + string(theMessageIDString) + string(".spr");
string theSpriteName = kTechTreeSpriteDirectory + string("/") + kTechTreeSpritePrefix + string(theMessageNumberString) + string("s.spr");
int theSpriteHandle = SPR_Load(theSpriteName.c_str());
AVHHSPRITE theSpriteHandle = SPR_Load(theSpriteName.c_str());
// Sprite handle can be 0, as I don't have sprites for all tech yet
this->mActionButtonSprites[theMessageNumber] = theSpriteHandle;
}
// Fetch sprite handle
int theSpriteHandle = this->mActionButtonSprites[theMessageNumber];
AVHHSPRITE theSpriteHandle = this->mActionButtonSprites[theMessageNumber];
return theSpriteHandle;
}
@ -2211,7 +2211,7 @@ void AvHHud::DrawTechTreeSprite(AvHMessageID inMessageID, int inPosX, int inPosY
{
// Check for alien sprites
bool theIsAlienSprite = false;
int theSpriteHandle = 0;
AVHHSPRITE theSpriteHandle = 0;
int theRenderMode = kRenderTransAlpha; // kRenderNormal
switch(inMessageID)
@ -2507,7 +2507,7 @@ void AvHHud::DrawBuildHealthEffectsForEntity(int inEntityIndex, float inAlpha)
AvHSHUGetBuildResearchState(theUser3, theUser4, theFuser1, theIsBuilding, theIsResearching, theNormalizedPercentage);
bool theDrawHealth = true;
int theSpriteToUse = this->GetIsAlien() ? this->mAlienHealthSprite : this->mMarineHealthSprite;
AVHHSPRITE theSpriteToUse = this->GetIsAlien() ? this->mAlienHealthSprite : this->mMarineHealthSprite;
bool theDrawAsRecyling = (GetHasUpgrade(theUser4, MASK_RECYCLING) && theIsOnOurTeam);
if((theIsOnOurTeam && theIsBuilding && (GetHasUpgrade(theUser4, MASK_BUILDABLE))) || theDrawAsRecyling)
@ -3050,7 +3050,7 @@ void AvHHud::RenderCommonUI()
// Now draw our current experience level, so people know how close they are to the next level
// Load alien resource and energy sprites
string theSpriteName = UINameToSprite(kCombatExperienceSprite, ScreenWidth());
int theExperienceSprite = SPR_Load(theSpriteName.c_str());
AVHHSPRITE theExperienceSprite = SPR_Load(theSpriteName.c_str());
if(theExperienceSprite)
{
@ -3103,7 +3103,7 @@ void AvHHud::RenderProgressBar(char *spriteName)
const float progressBarStayTime = 0.2f;
if (this->mProgressBarLastDrawn + progressBarStayTime > this->GetTimeOfLastUpdate())
{
HSPRITE currentSprite=0;
AVHHSPRITE currentSprite=0;
if ( spriteName && ( strcmp(spriteName, kExperienceBarSprite) == 0 ) ) {
currentSprite=this->mExperienceBarSprite;
}
@ -3603,7 +3603,7 @@ void AvHHud::RenderStructureRanges()
thePosition = AvHSHUGetRealLocation(theEntity->origin, theEntity->mins, theEntity->maxs);
//int theSprite = (theEntity->iuser3 == AVH_USER3_SIEGETURRET) ? this->mSiegeTurretSprite : this->mBuildCircleSprite;
int theSprite = this->mBuildCircleSprite;
AVHHSPRITE theSprite = this->mBuildCircleSprite;
int theDistanceRequirement = theDistanceRequirements[theDistanceCounter];
RenderStructureRange(thePosition, theDistanceRequirement, theSprite, kRenderTransAdd, 0, theRangeR, theRangeG, theRangeB, theRangeA);
@ -3630,7 +3630,7 @@ void AvHHud::RenderStructureRanges()
if(!GetHasUpgrade(theEntity->curstate.iuser4, MASK_RECYCLING))
{
//int theSprite = (theEntity->curstate.iuser3 == AVH_USER3_SIEGETURRET) ? this->mSiegeTurretSprite : this->mBuildCircleSprite;
int theSprite = this->mBuildCircleSprite;
AVHHSPRITE theSprite = this->mBuildCircleSprite;
RenderStructureRange(thePosition, theRange, theSprite, kRenderTransAdd, 0, theRangeR, theRangeG, theRangeB, theRangeA);
}
}
@ -3670,7 +3670,7 @@ void AvHHud::RenderStructureRanges()
AvHSHUGetSizeForUser3(theUser3, theMinSize, theMaxSize);
float theMaxRadius2 = max(max(theMinSize.x, theMaxSize.x), max(theMinSize.y, theMaxSize.y));
int theSprite = this->mBuildCircleSprite;
AVHHSPRITE theSprite = this->mBuildCircleSprite;
// : 0000291
// It's possible to place "on" marines if you're offset a little from center. This code and
// associated changes above and in AvHSharedUtil.cpp is to enforce a build distance around marines,
@ -3690,7 +3690,7 @@ void AvHHud::RenderStructureRanges()
}
}
void AvHHud::RenderStructureRange(vec3_t inOrigin, int inRadius, HSPRITE inSprite, int inRenderMode, int inFrame, float inR, float inG, float inB, float inAlpha)
void AvHHud::RenderStructureRange(vec3_t inOrigin, int inRadius, AVHHSPRITE inSprite, int inRenderMode, int inFrame, float inR, float inG, float inB, float inAlpha)
{
vec3_t w1;
@ -4178,7 +4178,7 @@ void AvHHud::RenderAlienUI()
}
void AvHHud::DrawWarpedOverlaySprite(int spriteHandle, int numXFrames, int numYFrames, float inWarpXAmount, float inWarpYAmount, float inWarpXSpeed, float inWarpYSpeed)
void AvHHud::DrawWarpedOverlaySprite(AVHHSPRITE spriteHandle, int numXFrames, int numYFrames, float inWarpXAmount, float inWarpYAmount, float inWarpXSpeed, float inWarpYSpeed)
{
float dx = ScreenWidth();

2
main/source/mod/AvHOverviewControl.h
View file

@ -25,7 +25,7 @@ protected:
private:
HSPRITE m_hsprWhite;
AVHHSPRITE m_hsprWhite;
};

12
main/source/mod/AvHOverviewMap.cpp
View file

@ -147,7 +147,7 @@ bool getIsOnCommMinimap(int user3) {
user3 == AVH_USER3_FUNC_RESOURCE ||
user3 == AVH_USER3_WELD;
}
void AvHOverviewMap::GetSpriteForEntity(const DrawableEntity& entity, int& outSprite, int& outFrame, int& outRenderMode, bool commanderOverview)
void AvHOverviewMap::GetSpriteForEntity(const DrawableEntity& entity, AVHHSPRITE& outSprite, int& outFrame, int& outRenderMode, bool commanderOverview)
{
outRenderMode = kRenderTransTexture;
@ -344,7 +344,7 @@ void AvHOverviewMap::DrawMiniMapEntity(const DrawInfo& inDrawInfo, const Drawabl
theEntityPosY = this->mWorldPlayerY;
}
int theSprite = 0;
AVHHSPRITE theSprite = 0;
int theFrame = 0;
int theRenderMode;
@ -406,7 +406,7 @@ void AvHOverviewMap::DrawMiniMapEntity(const DrawInfo& inDrawInfo, const Drawabl
if (inEntity.mIsLocalPlayer && mUser3 != AVH_USER3_COMMANDER_PLAYER)
{
int theSprite = SPR_Load("sprites/fov.spr");
AVHHSPRITE theSprite = SPR_Load("sprites/fov.spr");
int theFrame = 0;
int theSprWidth = SPR_Width(theSprite, theFrame);
@ -451,7 +451,7 @@ void AvHOverviewMap::DrawMiniMapEntity(const DrawInfo& inDrawInfo, const Drawabl
// Draw friendly players as little arrows on the edge of the minimap.
int theSprite = SPR_Load(kMarinePlayersSprite);
AVHHSPRITE theSprite = SPR_Load(kMarinePlayersSprite);
int theFrame = theIsWaypoint ? 4 : 3;
ASSERT(theSprite != 0);
@ -543,7 +543,7 @@ void AvHOverviewMap::DrawMiniMap(const DrawInfo& inDrawInfo)
int drawLabels=CVAR_GET_FLOAT(kvLabelMaps);
if ( mLastMinimap != drawLabels || mMiniMapSprite == -1 )
{
int tmpSpr=0;
AVHHSPRITE tmpSpr=0;
for ( int i=drawLabels; i >=0 && tmpSpr == 0 ; i-- ) {
string theMiniMapName = AvHMiniMap::GetSpriteNameFromMap(ScreenWidth(), mMapName, i);
tmpSpr = SPR_Load(theMiniMapName.c_str());
@ -636,7 +636,7 @@ void AvHOverviewMap::DrawAlerts(const DrawInfo& inDrawInfo)
AvHSpriteEnableClippingRect(true);
AvHSpriteSetClippingRect(theX, theY, theX + theWidth, theY + theHeight);
int theSprite = SPR_Load(kAlertSprite);
AVHHSPRITE theSprite = SPR_Load(kAlertSprite);
int theFrame = 0;
ASSERT(theSprite != 0);

4
main/source/mod/AvHOverviewMap.h
View file

@ -84,7 +84,7 @@ private:
void WorldToMiniMapCoords(const DrawInfo& inDrawInfo, float& x, float& y);
void Init();
void GetSpriteForEntity(const DrawableEntity& entity, int& outSprite, int& outFrame, int& outRenderMode, bool commanderOverview);
void GetSpriteForEntity(const DrawableEntity& entity, AVHHSPRITE& outSprite, int& outFrame, int& outRenderMode, bool commanderOverview);
void GetColorForEntity(const DrawableEntity& entity, float& outR, float& outG, float& outB);
void UpdateDrawData(float inCurrentTime);
@ -100,7 +100,7 @@ private:
string mMapName;
int mMiniMapSprite;
HSPRITE mReticleSprite;
AVHHSPRITE mReticleSprite;
typedef vector<DrawableEntity> DrawableEntityListType;
DrawableEntityListType mDrawableEntityList;

2
main/source/mod/AvHParticleSystem.h
View file

@ -134,7 +134,7 @@ private:
pVector mBaseEntityPos;
#ifdef AVH_CLIENT
HSPRITE mSprite;
AVHHSPRITE mSprite;
bool mIsVisible;
float mLastTimeVisibilitySetTrue;
#endif

4
main/source/mod/AvHSpriteAPI.cpp
View file

@ -297,7 +297,7 @@ void ClipPolygon(Vertex vertex[8], int& numVertices, float a, float b, float d)
}
void AvHSpriteDraw(int spriteHandle, int frame, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2)
void AvHSpriteDraw(AVHHSPRITE spriteHandle, int frame, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2)
{
gEngfuncs.pTriAPI->RenderMode(gRenderMode);
@ -496,7 +496,7 @@ void AvHSpriteDraw(int spriteHandle, int frame, float x1, float y1, float x2, fl
}
void AvHSpriteDrawTiles(int spriteHandle, int numXFrames, int numYFrames, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2)
void AvHSpriteDrawTiles(AVHHSPRITE spriteHandle, int numXFrames, int numYFrames, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2)
{
float dx = x2 - x1;

4
main/source/mod/AvHSpriteAPI.h
View file

@ -58,8 +58,8 @@ void AvHSpriteSetColor(float r, float g, float b, float a = 1);
*/
void AvHSpriteSetDepthOffset(float depthOffset);
void AvHSpriteDraw(int spriteHandle, int frame, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2);
void AvHSpriteDrawTiles(int spriteHandle, int numXFrames, int numYFrames, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2);
void AvHSpriteDraw(AVHHSPRITE spriteHandle, int frame, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2);
void AvHSpriteDrawTiles(AVHHSPRITE spriteHandle, int numXFrames, int numYFrames, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2);
void AvHSpriteEnableVGUI(bool enableVGUI);
void AvHSpriteSetVGUIOffset(int x, int y);

2
main/source/mod/AvHVisibleBlipList.cpp
View file

@ -87,7 +87,7 @@ void AvHVisibleBlipList::Draw(const pVector& inView, int kDefaultStatus)
this->mSprite[theStatus] = SPR_Load(theSpriteName.c_str());
}
int theSprite = this->mSprite[theStatus];
AVHHSPRITE theSprite = this->mSprite[theStatus];
if(!theSprite)
{
theSprite = this->mSprite[kDefaultStatus];

3
main/source/mod/AvHVisibleBlipList.h
View file

@ -39,6 +39,7 @@
#include <p_vector.h>
#endif
typedef int AVHHSPRITE;
const int kMaxBlips = 64;
class AvHVisibleBlipList
@ -69,7 +70,7 @@ public:
private:
#ifdef AVH_CLIENT
int mSprite[kNumBlipTypes];
AVHHSPRITE mSprite[kNumBlipTypes];
float mTimeBlipsReceived;
#endif

6
main/source/particles/p_vector.h
View file

@ -8,7 +8,11 @@
#ifndef particle_vector_h
#define particle_vector_h
#include <math.h>
#if _MSC_VER >= 1900 // C++11 Compatible for Visual Studio 2015 and later.
#include <cmath>
#else
#include "math.h"
#endif
#ifndef M_PI
#define M_PI 3.1415926535897932384626433f

14
main/source/particles/particles.vcxproj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,9 +12,10 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5AADD469-7488-4B34-A9FD-01CFAC5972FD}</ProjectGuid>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<Keyword>ManagedCProj</Keyword>
<RootNamespace>particles</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -22,12 +23,14 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -45,7 +48,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;..;</IncludePath>
<IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;.;$(VCToolsInstallDir)\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\um;C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\shared;..;../common;../public</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -65,6 +68,9 @@
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>$(VCInstallDir)</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>$(FrameworkPathOverride)</AdditionalUsingDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>

2
main/source/ui/FadingImageLabel.h
View file

@ -109,7 +109,7 @@ private:
string mImageName;
string mText;
bool mImageMode;
int mSprite;
AVHHSPRITE mSprite;
int mSpriteWidth;
int mSpriteHeight;

2
main/source/ui/PieNode.h
View file

@ -167,7 +167,7 @@ private:
PieNode* mParentPieNode;
string mConnectorSpriteName;
int mConnectorSprite;
AVHHSPRITE mConnectorSprite;
string mLocalizedText;
string mBaseText;

4
main/source/ui/SpritePanel.h
View file

@ -6,6 +6,8 @@
#include "ui/ReloadableComponent.h"
#include "../types.h"
typedef int AVHHSPRITE;
class SpritePanel : public vgui::Panel, public ReloadableComponent, public GammaAwareComponent
{
public:
@ -27,7 +29,7 @@ private:
string mBaseSpriteName;
string mRenderMode;
string mVAlignment;
int mSpriteHandle;
AVHHSPRITE mSpriteHandle;
float mGammaSlope;
};

2
main/source/ui/UIUtil.cpp
View file

@ -22,7 +22,7 @@
#include "cl_dll/hud.h"
#include "cl_dll/cl_util.h"
void UIDrawVariableBarSpriteHoles(int inSprite, int inX, int inY, float inPercentage, float inGammaSlope, bool inTrueHolesFalseAdditive, float inSecondaryPercentage)
void UIDrawVariableBarSpriteHoles(AVHHSPRITE inSprite, int inX, int inY, float inPercentage, float inGammaSlope, bool inTrueHolesFalseAdditive, float inSecondaryPercentage)
{
// Assumes that frame 0 is the empty sprite, frame 1 is full sprite
const int kEmptyFrame = 0;

2
main/source/util/Zassert.h
View file

@ -93,7 +93,7 @@ int emailMsgTo( char *msg, char *emailAddress );
// function declarations for the call from the assert macro.
// So, the ASSERTFUNC macro defines function in a portable way
#ifdef WIN32
#define ASSERTFUNC _CRTIMP void __cdecl _assert( void *msg, void *file, unsigned line )
#define ASSERTFUNC void __cdecl _assert( void *msg, void *file, unsigned line )
#else
#define ASSERTFUNC __dead void __assert __P((const char *msg,const char *file,int line))
#endif