Skip to content

Commit 90d08ee

Browse files
s1lentqs1lentq
committed
Refactoring & fix warnings VS2015.
Ignore VS2015 files. Add ResetSequenceInfo in SetNewPlayerModel. Interface API CCSPlayer: Added ResetSequenceInfo and reworked RemovePlayerItem Bump minor version
1 parent 3a12271 commit 90d08ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+597
-624
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
**/msvc/*.opensdf
1313
**/msvc/*.user
1414
**/msvc/*.suo
15+
**/msvc/*.db
16+
**/msvc/*.opendb
1517
**/msvc/*.txt
1618
**/msvc/*.amplxeproj
19+
**/msvc/.vs
1720
**/msvc/ipch
1821

1922
regamedll/version/appversion.h

‎dep/cppunitlite/msvc/cppunitlite.vcxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug MP Play|Win32">
55
<Configuration>Debug MP Play</Configuration>
@@ -51,31 +51,31 @@
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5252
<ConfigurationType>StaticLibrary</ConfigurationType>
5353
<UseDebugLibraries>true</UseDebugLibraries>
54-
<PlatformToolset>v120</PlatformToolset>
54+
<PlatformToolset>v140</PlatformToolset>
5555
<CharacterSet>MultiByte</CharacterSet>
5656
</PropertyGroup>
5757
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MP|Win32'" Label="Configuration">
5858
<ConfigurationType>StaticLibrary</ConfigurationType>
5959
<UseDebugLibraries>true</UseDebugLibraries>
60-
<PlatformToolset>v120</PlatformToolset>
60+
<PlatformToolset>v140</PlatformToolset>
6161
<CharacterSet>MultiByte</CharacterSet>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MP|Win32'" Label="Configuration">
6464
<ConfigurationType>StaticLibrary</ConfigurationType>
6565
<UseDebugLibraries>true</UseDebugLibraries>
66-
<PlatformToolset>v120</PlatformToolset>
66+
<PlatformToolset>v140</PlatformToolset>
6767
<CharacterSet>MultiByte</CharacterSet>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MP Play|Win32'" Label="Configuration">
7070
<ConfigurationType>StaticLibrary</ConfigurationType>
7171
<UseDebugLibraries>true</UseDebugLibraries>
72-
<PlatformToolset>v120</PlatformToolset>
72+
<PlatformToolset>v140</PlatformToolset>
7373
<CharacterSet>MultiByte</CharacterSet>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MP Play|Win32'" Label="Configuration">
7676
<ConfigurationType>StaticLibrary</ConfigurationType>
7777
<UseDebugLibraries>true</UseDebugLibraries>
78-
<PlatformToolset>v120</PlatformToolset>
78+
<PlatformToolset>v140</PlatformToolset>
7979
<CharacterSet>MultiByte</CharacterSet>
8080
</PropertyGroup>
8181
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Nav|Win32'" Label="Configuration">
@@ -87,7 +87,7 @@
8787
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
8888
<ConfigurationType>StaticLibrary</ConfigurationType>
8989
<UseDebugLibraries>false</UseDebugLibraries>
90-
<PlatformToolset>v120</PlatformToolset>
90+
<PlatformToolset>v140</PlatformToolset>
9191
<WholeProgramOptimization>true</WholeProgramOptimization>
9292
<CharacterSet>MultiByte</CharacterSet>
9393
</PropertyGroup>

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
majorVersion=5
2-
minorVersion=1
2+
minorVersion=2
33
maintenanceVersion=0

‎regamedll/dlls/airtank.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ TYPEDESCRIPTION CAirtank::m_SaveData[] =
1212

1313
#endif
1414

15-
LINK_ENTITY_TO_CLASS(item_airtank, CAirtank, CCSAirtank);
16-
IMPLEMENT_SAVERESTORE(CAirtank, CGrenade);
15+
LINK_ENTITY_TO_CLASS(item_airtank, CAirtank, CCSAirtank)
16+
IMPLEMENT_SAVERESTORE(CAirtank, CGrenade)
1717

1818
void CAirtank::__MAKE_VHOOK(Spawn)()
1919
{

‎regamedll/dlls/ammo.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BOOL C9MMAmmo::__MAKE_VHOOK(AddAmmo)(CBaseEntity *pOther)
2424
return TRUE;
2525
}
2626

27-
LINK_ENTITY_TO_CLASS(ammo_9mm, C9MMAmmo, CCS9MMAmmo);
27+
LINK_ENTITY_TO_CLASS(ammo_9mm, C9MMAmmo, CCS9MMAmmo)
2828

2929
void CBuckShotAmmo::__MAKE_VHOOK(Spawn)()
3030
{
@@ -50,7 +50,7 @@ BOOL CBuckShotAmmo::__MAKE_VHOOK(AddAmmo)(CBaseEntity *pOther)
5050
return TRUE;
5151
}
5252

53-
LINK_ENTITY_TO_CLASS(ammo_buckshot, CBuckShotAmmo, CCSBuckShotAmmo);
53+
LINK_ENTITY_TO_CLASS(ammo_buckshot, CBuckShotAmmo, CCSBuckShotAmmo)
5454

5555
void C556NatoAmmo::__MAKE_VHOOK(Spawn)()
5656
{
@@ -76,7 +76,7 @@ BOOL C556NatoAmmo::__MAKE_VHOOK(AddAmmo)(CBaseEntity *pOther)
7676
return TRUE;
7777
}
7878

79-
LINK_ENTITY_TO_CLASS(ammo_556nato, C556NatoAmmo, CCS556NatoAmmo);
79+
LINK_ENTITY_TO_CLASS(ammo_556nato, C556NatoAmmo, CCS556NatoAmmo)
8080

8181
void C556NatoBoxAmmo::__MAKE_VHOOK(Spawn)()
8282
{
@@ -102,7 +102,7 @@ BOOL C556NatoBoxAmmo::__MAKE_VHOOK(AddAmmo)(CBaseEntity *pOther)
102102
return TRUE;
103103
}
104104

105-
LINK_ENTITY_TO_CLASS(ammo_556natobox, C556NatoBoxAmmo, CCS556NatoBoxAmmo);
105+
LINK_ENTITY_TO_CLASS(ammo_556natobox, C556NatoBoxAmmo, CCS556NatoBoxAmmo)
106106

107107
void C762NatoAmmo::__MAKE_VHOOK(Spawn)()
108108
{
@@ -128,7 +128,7 @@ BOOL C762NatoAmmo::__MAKE_VHOOK(AddAmmo)(CBaseEntity *pOther)
128128
return TRUE;
129129
}
130130

131-
LINK_ENTITY_TO_CLASS(ammo_762nato, C762NatoAmmo, CCS762NatoAmmo);
131+
LINK_ENTITY_TO_CLASS(ammo_762nato, C762NatoAmmo, CCS762NatoAmmo)
132132

133133
void C45ACPAmmo::__MAKE_VHOOK(Spawn)()
134134
{
@@ -154,7 +154,7 @@ BOOL C45ACPAmmo::__MAKE_VHOOK(AddAmmo)(CBaseEntity *pOther)
154154
return TRUE;
155155
}
156156

157-
LINK_ENTITY_TO_CLASS(ammo_45acp, C45ACPAmmo, CCS45ACPAmmo);
157+
LINK_ENTITY_TO_CLASS(ammo_45acp, C45ACPAmmo, CCS45ACPAmmo)
158158

159159
void C50AEAmmo::__MAKE_VHOOK(Spawn)()
160160
{
@@ -180,7 +180,7 @@ BOOL C50AEAmmo::__MAKE_VHOOK(AddAmmo)(CBaseEntity *pOther)
180180
return TRUE;
181181
}
182182

183-
LINK_ENTITY_TO_CLASS(ammo_50ae, C50AEAmmo, CCS50AEAmmo);
183+
LINK_ENTITY_TO_CLASS(ammo_50ae, C50AEAmmo, CCS50AEAmmo)
184184

185185
void C338MagnumAmmo::__MAKE_VHOOK(Spawn)()
186186
{
@@ -206,7 +206,7 @@ BOOL C338MagnumAmmo::__MAKE_VHOOK(AddAmmo)(CBaseEntity *pOther)
206206
return TRUE;
207207
}
208208

209-
LINK_ENTITY_TO_CLASS(ammo_338magnum, C338MagnumAmmo, CCS338MagnumAmmo);
209+
LINK_ENTITY_TO_CLASS(ammo_338magnum, C338MagnumAmmo, CCS338MagnumAmmo)
210210

211211
void C57MMAmmo::__MAKE_VHOOK(Spawn)()
212212
{
@@ -232,7 +232,7 @@ BOOL C57MMAmmo::__MAKE_VHOOK(AddAmmo)(CBaseEntity *pOther)
232232
return TRUE;
233233
}
234234

235-
LINK_ENTITY_TO_CLASS(ammo_57mm, C57MMAmmo, CCS57MMAmmo);
235+
LINK_ENTITY_TO_CLASS(ammo_57mm, C57MMAmmo, CCS57MMAmmo)
236236

237237
void C357SIGAmmo::__MAKE_VHOOK(Spawn)()
238238
{
@@ -258,4 +258,4 @@ BOOL C357SIGAmmo::__MAKE_VHOOK(AddAmmo)(CBaseEntity *pOther)
258258
return TRUE;
259259
}
260260

261-
LINK_ENTITY_TO_CLASS(ammo_357sig, C357SIGAmmo, CCS357SIGAmmo);
261+
LINK_ENTITY_TO_CLASS(ammo_357sig, C357SIGAmmo, CCS357SIGAmmo)

‎regamedll/dlls/animating.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ TYPEDESCRIPTION CBaseAnimating::m_SaveData[] =
1616

1717
#endif
1818

19-
IMPLEMENT_SAVERESTORE(CBaseAnimating, CBaseDelay);
19+
IMPLEMENT_SAVERESTORE(CBaseAnimating, CBaseDelay)
2020

2121
float CBaseAnimating::StudioFrameAdvance(float flInterval)
2222
{
@@ -116,7 +116,7 @@ void EXT_FUNC CBaseAnimating::__API_HOOK(ResetSequenceInfo)()
116116
m_flLastEventCheck = gpGlobals->time;
117117
}
118118

119-
BOOL CBaseAnimating::GetSequenceFlags()
119+
int CBaseAnimating::GetSequenceFlags()
120120
{
121121
void *pmodel = GET_MODEL_PTR(ENT(pev));
122122
return ::GetSequenceFlags(pmodel, pev);
@@ -125,7 +125,6 @@ BOOL CBaseAnimating::GetSequenceFlags()
125125
float CBaseAnimating::SetBoneController(int iController, float flValue)
126126
{
127127
void *pmodel = GET_MODEL_PTR(ENT(pev));
128-
129128
return SetController(pmodel, pev, iController, flValue);
130129
}
131130

‎regamedll/dlls/animation.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ C_DLLEXPORT int Server_GetBlendingInterface(int version, struct sv_blending_inte
537537
#ifdef REGAMEDLL_FIXES // SSE2 version
538538
void AngleQuaternion(vec_t *angles, vec_t *quaternion)
539539
{
540-
static const ALIGN16_BEG int ps_signmask[4] ALIGN16_END = { 0x80000000, 0, 0x80000000, 0 };
540+
static const ALIGN16_BEG size_t ps_signmask[4] ALIGN16_END = { 0x80000000, 0, 0x80000000, 0 };
541541

542542
__m128 a = _mm_loadu_ps(angles);
543543
a = _mm_mul_ps(a, _mm_load_ps(_ps_0p5)); //a *= 0.5

‎regamedll/dlls/bmodels.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Vector VecBModelOrigin(entvars_t *pevBModel)
3434
return pevBModel->absmin + (pevBModel->size * 0.5f);
3535
}
3636

37-
LINK_ENTITY_TO_CLASS(func_wall, CFuncWall, CCSFuncWall);
37+
LINK_ENTITY_TO_CLASS(func_wall, CFuncWall, CCSFuncWall)
3838

3939
void CFuncWall::__MAKE_VHOOK(Spawn)()
4040
{
@@ -58,7 +58,7 @@ void CFuncWall::__MAKE_VHOOK(Use)(CBaseEntity *pActivator, CBaseEntity *pCaller,
5858
}
5959
}
6060

61-
LINK_ENTITY_TO_CLASS(func_wall_toggle, CFuncWallToggle, CCSFuncWallToggle);
61+
LINK_ENTITY_TO_CLASS(func_wall_toggle, CFuncWallToggle, CCSFuncWallToggle)
6262

6363
void CFuncWallToggle::__MAKE_VHOOK(Spawn)()
6464
{
@@ -107,7 +107,7 @@ void CFuncWallToggle::__MAKE_VHOOK(Use)(CBaseEntity *pActivator, CBaseEntity *pC
107107
}
108108
}
109109

110-
LINK_ENTITY_TO_CLASS(func_conveyor, CFuncConveyor, CCSFuncConveyor);
110+
LINK_ENTITY_TO_CLASS(func_conveyor, CFuncConveyor, CCSFuncConveyor)
111111

112112
void CFuncConveyor::__MAKE_VHOOK(Spawn)()
113113
{
@@ -154,7 +154,7 @@ void CFuncConveyor::__MAKE_VHOOK(Use)(CBaseEntity *pActivator, CBaseEntity *pCal
154154
UpdateSpeed(pev->speed);
155155
}
156156

157-
LINK_ENTITY_TO_CLASS(func_illusionary, CFuncIllusionary, CCSFuncIllusionary);
157+
LINK_ENTITY_TO_CLASS(func_illusionary, CFuncIllusionary, CCSFuncIllusionary)
158158

159159
void CFuncIllusionary::__MAKE_VHOOK(KeyValue)(KeyValueData *pkvd)
160160
{
@@ -184,7 +184,7 @@ void CFuncIllusionary::__MAKE_VHOOK(Spawn)()
184184
// MAKE_STATIC(ENT(pev));
185185
}
186186

187-
LINK_ENTITY_TO_CLASS(func_monsterclip, CFuncMonsterClip, CCSFuncMonsterClip);
187+
LINK_ENTITY_TO_CLASS(func_monsterclip, CFuncMonsterClip, CCSFuncMonsterClip)
188188

189189
void CFuncMonsterClip::__MAKE_VHOOK(Spawn)()
190190
{
@@ -198,8 +198,8 @@ void CFuncMonsterClip::__MAKE_VHOOK(Spawn)()
198198
pev->flags |= FL_MONSTERCLIP;
199199
}
200200

201-
LINK_ENTITY_TO_CLASS(func_rotating, CFuncRotating, CCSFuncRotating);
202-
IMPLEMENT_SAVERESTORE(CFuncRotating, CBaseEntity);
201+
LINK_ENTITY_TO_CLASS(func_rotating, CFuncRotating, CCSFuncRotating)
202+
IMPLEMENT_SAVERESTORE(CFuncRotating, CBaseEntity)
203203

204204
void CFuncRotating::__MAKE_VHOOK(KeyValue)(KeyValueData *pkvd)
205205
{
@@ -601,8 +601,8 @@ void CFuncRotating::__MAKE_VHOOK(Blocked)(CBaseEntity *pOther)
601601
pOther->TakeDamage(pev, pev, pev->dmg, DMG_CRUSH);
602602
}
603603

604-
LINK_ENTITY_TO_CLASS(func_pendulum, CPendulum, CCSPendulum);
605-
IMPLEMENT_SAVERESTORE(CPendulum, CBaseEntity);
604+
LINK_ENTITY_TO_CLASS(func_pendulum, CPendulum, CCSPendulum)
605+
IMPLEMENT_SAVERESTORE(CPendulum, CBaseEntity)
606606

607607
void CPendulum::__MAKE_VHOOK(KeyValue)(KeyValueData *pkvd)
608608
{

‎regamedll/dlls/bot/cs_bot.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Give 3rd-party to get the virtual table of the object.
55
// Example: AMXModX module: Hamsandwich
66
// RegisterHam(Ham_Spawn, "bot", "CCSBot__Spawn", 1);
7-
LINK_ENTITY_TO_CLASS(bot, CCSBot, CAPI_CSBot);
7+
LINK_ENTITY_TO_CLASS(bot, CCSBot, CAPI_CSBot)
88
#endif
99

1010
// Return the number of bots following the given player

0 commit comments

Comments
 (0)