Skip to content

Commit e5463f4

Browse files
BenLubarBenLubar
authored
Merge pull request #902 from ReactiveDrop/vindinade-particles-fix
fix vindinade particles on other grenades that inherit it and make fr…
2 parents b8686b5 + 13572e5 commit e5463f4

18 files changed

Lines changed: 167 additions & 6 deletions

‎src/game/client/swarm/c_asw_boomer_blob.cpp‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#include "cbase.h"
2+
#include "c_asw_boomer_blob.h"
3+
4+
// memdbgon must be the last include file in a .cpp file!!!
5+
#include "tier0/memdbgon.h"
6+
7+
IMPLEMENT_CLIENTCLASS_DT( C_ASW_Boomer_Blob, DT_ASW_Boomer_Blob, CASW_Boomer_Blob )
8+
9+
END_RECV_TABLE();
10+
11+
void C_ASW_Boomer_Blob::CreateSmokeTrail()
12+
{
13+
14+
}
15+
16+
void C_ASW_Boomer_Blob::Detonate()
17+
{
18+
19+
}

‎src/game/client/swarm/c_asw_boomer_blob.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#pragma once
2+
3+
#include "c_asw_grenade_vindicator.h"
4+
5+
class C_ASW_Boomer_Blob : public C_ASW_Grenade_Vindicator
6+
{
7+
DECLARE_CLASS( C_ASW_Boomer_Blob, C_ASW_Grenade_Vindicator );
8+
DECLARE_CLIENTCLASS();
9+
10+
public:
11+
virtual void Detonate();
12+
virtual void CreateSmokeTrail();
13+
};

‎src/game/client/swarm/c_asw_grenade_cluster.cpp‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#include "cbase.h"
2+
#include "c_asw_grenade_cluster.h"
3+
4+
// memdbgon must be the last include file in a .cpp file!!!
5+
#include "tier0/memdbgon.h"
6+
7+
IMPLEMENT_CLIENTCLASS_DT( C_ASW_Grenade_Cluster, DT_ASW_Grenade_Cluster, CASW_Grenade_Cluster )
8+
9+
END_RECV_TABLE();
10+
11+
void C_ASW_Grenade_Cluster::Detonate()
12+
{
13+
14+
}

‎src/game/client/swarm/c_asw_grenade_cluster.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#ifndef _INCLUDED_C_ASW_GRENADE_CLUSTER_H
2+
#define _INCLUDED_C_ASW_GRENADE_CLUSTER_H
3+
4+
#pragma once
5+
6+
#include "c_asw_grenade_vindicator.h"
7+
8+
class C_ASW_Grenade_Cluster : public C_ASW_Grenade_Vindicator
9+
{
10+
DECLARE_CLASS( C_ASW_Grenade_Cluster, C_ASW_Grenade_Vindicator );
11+
DECLARE_CLIENTCLASS();
12+
13+
public:
14+
virtual void Detonate();
15+
};
16+
17+
#endif // _INCLUDED_C_ASW_GRENADE_CLUSTER_H

‎src/game/client/swarm/c_asw_grenade_freeze.cpp‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#include "cbase.h"
2+
#include "c_asw_grenade_freeze.h"
3+
4+
// memdbgon must be the last include file in a .cpp file!!!
5+
#include "tier0/memdbgon.h"
6+
7+
IMPLEMENT_CLIENTCLASS_DT( C_ASW_Grenade_Freeze, DT_ASW_Grenade_Freeze, CASW_Grenade_Freeze )
8+
9+
END_RECV_TABLE();
10+
11+
void C_ASW_Grenade_Freeze::CreateSmokeTrail()
12+
{
13+
if ( m_pSmokeTrail )
14+
return;
15+
16+
m_pSmokeTrail = ParticleProp()->Create( "grenade_freeze_main_trail", PATTACH_ABSORIGIN_FOLLOW, -1, Vector( 0, 0, 0 ) );
17+
}
18+
19+
void C_ASW_Grenade_Freeze::Detonate()
20+
{
21+
22+
}
23+

‎src/game/client/swarm/c_asw_grenade_freeze.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#ifndef _INCLUDED_C_ASW_GRENADE_FREEZE_H
2+
#define _INCLUDED_C_ASW_GRENADE_FREEZE_H
3+
4+
#pragma once
5+
6+
#include "c_asw_grenade_cluster.h"
7+
8+
class C_ASW_Grenade_Freeze : public C_ASW_Grenade_Cluster
9+
{
10+
DECLARE_CLASS( C_ASW_Grenade_Freeze, C_ASW_Grenade_Cluster );
11+
DECLARE_CLIENTCLASS();
12+
13+
public:
14+
virtual void Detonate();
15+
virtual void CreateSmokeTrail();
16+
};
17+
18+
#endif // _INCLUDED_C_ASW_GRENADE_FREEZE_H

‎src/game/client/swarm/c_asw_grenade_vindicator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class C_ASW_Grenade_Vindicator : public C_ASW_Rifle_Grenade
1515
virtual void Spawn();
1616
virtual void OnDataChanged(DataUpdateType_t updateType);
1717
virtual void Detonate();
18-
void CreateSmokeTrail();
18+
virtual void CreateSmokeTrail();
1919

2020
bool m_bDetonated;
2121

‎src/game/client/swarm/c_asw_mortar_round.cpp‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#include "cbase.h"
2+
#include "c_asw_mortar_round.h"
3+
4+
// memdbgon must be the last include file in a .cpp file!!!
5+
#include "tier0/memdbgon.h"
6+
7+
IMPLEMENT_CLIENTCLASS_DT( C_ASW_Mortar_Round, DT_ASW_Mortar_Round, CASW_Mortar_Round )
8+
9+
END_RECV_TABLE();
10+
11+
void C_ASW_Mortar_Round::CreateSmokeTrail()
12+
{
13+
14+
}
15+
16+
void C_ASW_Mortar_Round::Detonate()
17+
{
18+
19+
}

‎src/game/client/swarm/c_asw_mortar_round.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#pragma once
2+
3+
#include "cbase.h"
4+
#include "c_asw_grenade_vindicator.h"
5+
6+
class C_ASW_Mortar_Round : public C_ASW_Grenade_Vindicator
7+
{
8+
DECLARE_CLASS( C_ASW_Mortar_Round, C_ASW_Grenade_Vindicator );
9+
DECLARE_CLIENTCLASS();
10+
11+
public:
12+
virtual void Detonate();
13+
virtual void CreateSmokeTrail();
14+
};

‎src/game/client/swarm_sdk_client.vcxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,7 @@ if exist ..\..\devtools\bin\postbuild.cmd ..\..\devtools\bin\postbuild.cmd clien
12631263
<ClCompile Include="swarm\c_asw_ammo_drop.cpp" />
12641264
<ClCompile Include="swarm\c_asw_aoegrenade_projectile.cpp" />
12651265
<ClCompile Include="swarm\c_asw_boomer.cpp" />
1266+
<ClCompile Include="swarm\c_asw_boomer_blob.cpp" />
12661267
<ClCompile Include="swarm\c_asw_buffgrenade_projectile.cpp" />
12671268
<ClCompile Include="swarm\c_asw_button_area.cpp" />
12681269
<ClCompile Include="swarm\c_asw_buzzer.cpp" />
@@ -1295,6 +1296,8 @@ if exist ..\..\devtools\bin\postbuild.cmd ..\..\devtools\bin\postbuild.cmd clien
12951296
<ClCompile Include="swarm\c_asw_gas_grenade_projectile.cpp" />
12961297
<ClCompile Include="swarm\c_asw_generic_emitter.cpp" />
12971298
<ClCompile Include="swarm\c_asw_generic_emitter_entity.cpp" />
1299+
<ClCompile Include="swarm\c_asw_grenade_cluster.cpp" />
1300+
<ClCompile Include="swarm\c_asw_grenade_freeze.cpp" />
12981301
<ClCompile Include="swarm\c_asw_grenade_vindicator.cpp" />
12991302
<ClCompile Include="swarm\c_asw_gun_smoke_emitter.cpp" />
13001303
<ClCompile Include="swarm\c_asw_hack.cpp" />
@@ -1314,6 +1317,7 @@ if exist ..\..\devtools\bin\postbuild.cmd ..\..\devtools\bin\postbuild.cmd clien
13141317
<ClCompile Include="swarm\c_asw_meatbug.cpp" />
13151318
<ClCompile Include="swarm\c_asw_mesh_emitter_entity.cpp" />
13161319
<ClCompile Include="swarm\c_asw_mine.cpp" />
1320+
<ClCompile Include="swarm\c_asw_mortar_round.cpp" />
13171321
<ClCompile Include="swarm\c_asw_objective.cpp" />
13181322
<ClCompile Include="swarm\c_asw_objective_countdown.cpp" />
13191323
<ClCompile Include="swarm\c_asw_objective_kill_aliens.cpp" />
@@ -3139,6 +3143,7 @@ if exist ..\..\devtools\bin\postbuild.cmd ..\..\devtools\bin\postbuild.cmd clien
31393143
<ClInclude Include="swarm\c_asw_ammo_drop.h" />
31403144
<ClInclude Include="swarm\c_asw_aoegrenade_projectile.h" />
31413145
<ClInclude Include="swarm\c_asw_boomer.h" />
3146+
<ClCompile Include="swarm\c_asw_boomer_blob.h" />
31423147
<ClInclude Include="swarm\c_asw_buffgrenade_projectile.h" />
31433148
<ClInclude Include="swarm\c_asw_button_area.h" />
31443149
<ClInclude Include="swarm\c_asw_buzzer.h" />
@@ -3167,6 +3172,8 @@ if exist ..\..\devtools\bin\postbuild.cmd ..\..\devtools\bin\postbuild.cmd clien
31673172
<ClInclude Include="swarm\c_asw_gas_grenade_projectile.h" />
31683173
<ClInclude Include="swarm\c_asw_generic_emitter.h" />
31693174
<ClInclude Include="swarm\c_asw_generic_emitter_entity.h" />
3175+
<ClInclude Include="swarm\c_asw_grenade_cluster.h" />
3176+
<ClInclude Include="swarm\c_asw_grenade_freeze.h" />
31703177
<ClInclude Include="swarm\c_asw_grenade_vindicator.h" />
31713178
<ClInclude Include="swarm\c_asw_gun_smoke_emitter.h" />
31723179
<ClInclude Include="swarm\c_asw_hack.h" />
@@ -3183,6 +3190,7 @@ if exist ..\..\devtools\bin\postbuild.cmd ..\..\devtools\bin\postbuild.cmd clien
31833190
<ClInclude Include="swarm\c_asw_meatbug.h" />
31843191
<ClInclude Include="swarm\c_asw_mesh_emitter_entity.h" />
31853192
<ClInclude Include="swarm\c_asw_mine.h" />
3193+
<ClCompile Include="swarm\c_asw_mortar_round.h" />
31863194
<ClInclude Include="swarm\c_asw_objective.h" />
31873195
<ClInclude Include="swarm\c_asw_objective_countdown.h" />
31883196
<ClInclude Include="swarm\c_asw_objective_kill_aliens.h" />

0 commit comments

Comments
 (0)