Skip to content

Commit e44097f

Browse files
skuzzisskuzzis
committed
update(SDK): Methods
1 parent 724da5b commit e44097f

File tree

2 files changed

+48
-54
lines changed

2 files changed

+48
-54
lines changed

‎src/plugins/core/scripting/weapons.cpp‎

Lines changed: 47 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,49 +8,49 @@ PluginWeaponManager::PluginWeaponManager(int playerId)
88

99
void PluginWeaponManager::GiveWeapon(std::string weapon_name)
1010
{
11-
Player *player = g_playerManager->GetPlayer(m_playerId);
11+
Player* player = g_playerManager->GetPlayer(m_playerId);
1212
if (!player)
1313
return;
1414

15-
CCSPlayerPawn *pawn = player->GetPlayerPawn();
15+
CCSPlayerPawn* pawn = player->GetPlayerPawn();
1616
if (!pawn)
1717
return;
1818

19-
CCSPlayer_ItemServices *itemServices = pawn->m_pItemServices();
19+
CCSPlayer_ItemServices* itemServices = pawn->m_pItemServices();
2020
if (!itemServices)
2121
return;
2222

2323
pawn->GiveNamedItem(weapon_name.c_str());
2424
}
2525
void PluginWeaponManager::RemoveWeapons()
2626
{
27-
Player *player = g_playerManager->GetPlayer(m_playerId);
27+
Player* player = g_playerManager->GetPlayer(m_playerId);
2828
if (!player)
2929
return;
3030

31-
CCSPlayerPawn *pawn = player->GetPlayerPawn();
31+
CCSPlayerPawn* pawn = player->GetPlayerPawn();
3232
if (!pawn)
3333
return;
3434

35-
CPlayer_WeaponServices *weaponServices = pawn->m_pWeaponServices();
35+
CPlayer_WeaponServices* weaponServices = pawn->m_pWeaponServices();
3636
if (!weaponServices)
3737
return;
3838

39-
CCSPlayer_ItemServices *itemServices = pawn->m_pItemServices();
39+
CCSPlayer_ItemServices* itemServices = pawn->m_pItemServices();
4040
if (!itemServices)
4141
return;
4242

43-
CUtlVector<CHandle<CBasePlayerWeapon>> *weapons = weaponServices->m_hMyWeapons();
43+
CUtlVector<CHandle<CBasePlayerWeapon>>* weapons = weaponServices->m_hMyWeapons();
4444
if (!weapons)
4545
return;
4646

4747
FOR_EACH_VEC(*weapons, i)
4848
{
49-
CHandle<CBasePlayerWeapon> &weaponHandle = (*weapons)[i];
49+
CHandle<CBasePlayerWeapon>& weaponHandle = (*weapons)[i];
5050
if (!weaponHandle.IsValid())
5151
continue;
5252

53-
CBasePlayerWeapon *weapon = weaponHandle.Get();
53+
CBasePlayerWeapon* weapon = weaponHandle.Get();
5454
if (!weapon)
5555
continue;
5656

@@ -62,33 +62,33 @@ void PluginWeaponManager::RemoveWeapons()
6262
}
6363
void PluginWeaponManager::DropWeapons()
6464
{
65-
Player *player = g_playerManager->GetPlayer(m_playerId);
65+
Player* player = g_playerManager->GetPlayer(m_playerId);
6666
if (!player)
6767
return;
6868

69-
CCSPlayerPawn *pawn = player->GetPlayerPawn();
69+
CCSPlayerPawn* pawn = player->GetPlayerPawn();
7070
if (!pawn)
7171
return;
7272

73-
CPlayer_WeaponServices *weaponServices = pawn->m_pWeaponServices();
73+
CPlayer_WeaponServices* weaponServices = pawn->m_pWeaponServices();
7474
if (!weaponServices)
7575
return;
7676

77-
CCSPlayer_ItemServices *itemServices = pawn->m_pItemServices();
77+
CCSPlayer_ItemServices* itemServices = pawn->m_pItemServices();
7878
if (!itemServices)
7979
return;
8080

81-
CUtlVector<CHandle<CBasePlayerWeapon>> *weapons = weaponServices->m_hMyWeapons();
81+
CUtlVector<CHandle<CBasePlayerWeapon>>* weapons = weaponServices->m_hMyWeapons();
8282
if (!weapons)
8383
return;
8484

8585
FOR_EACH_VEC(*weapons, i)
8686
{
87-
CHandle<CBasePlayerWeapon> &weaponHandle = (*weapons)[i];
87+
CHandle<CBasePlayerWeapon>& weaponHandle = (*weapons)[i];
8888
if (!weaponHandle.IsValid())
8989
continue;
9090

91-
CBasePlayerWeapon *weapon = weaponHandle.Get();
91+
CBasePlayerWeapon* weapon = weaponHandle.Get();
9292
if (!weapon)
9393
continue;
9494

@@ -101,29 +101,29 @@ std::vector<PluginWeapon> PluginWeaponManager::GetWeapons()
101101
{
102102
std::vector<PluginWeapon> vec;
103103

104-
Player *player = g_playerManager->GetPlayer(m_playerId);
104+
Player* player = g_playerManager->GetPlayer(m_playerId);
105105
if (!player)
106106
return vec;
107107

108-
CCSPlayerPawn *pawn = player->GetPlayerPawn();
108+
CCSPlayerPawn* pawn = player->GetPlayerPawn();
109109
if (!pawn)
110110
return vec;
111111

112-
CPlayer_WeaponServices *weaponServices = pawn->m_pWeaponServices();
112+
CPlayer_WeaponServices* weaponServices = pawn->m_pWeaponServices();
113113
if (!weaponServices)
114114
return vec;
115115

116-
CUtlVector<CHandle<CBasePlayerWeapon>> *weapons = weaponServices->m_hMyWeapons();
116+
CUtlVector<CHandle<CBasePlayerWeapon>>* weapons = weaponServices->m_hMyWeapons();
117117
if (!weapons)
118118
return vec;
119119

120120
FOR_EACH_VEC(*weapons, i)
121121
{
122-
CHandle<CBasePlayerWeapon> &weaponHandle = (*weapons)[i];
122+
CHandle<CBasePlayerWeapon>& weaponHandle = (*weapons)[i];
123123
if (!weaponHandle.IsValid())
124124
continue;
125125

126-
CBasePlayerWeapon *weapon = weaponHandle.Get();
126+
CBasePlayerWeapon* weapon = weaponHandle.Get();
127127
if (!weapon)
128128
continue;
129129

@@ -133,7 +133,7 @@ std::vector<PluginWeapon> PluginWeaponManager::GetWeapons()
133133
return vec;
134134
}
135135

136-
PluginWeapon::PluginWeapon(int playerId, CBasePlayerWeapon *ptr)
136+
PluginWeapon::PluginWeapon(int playerId, CBasePlayerWeapon* ptr)
137137
{
138138
this->m_playerId = playerId;
139139
this->m_ptr = ptr;
@@ -153,31 +153,31 @@ GCBasePlayerWeaponVData PluginWeapon::GetCBasePlayerWeaponVData()
153153
if (!this->m_ptr)
154154
return GCBasePlayerWeaponVData(nullptr);
155155

156-
return GCBasePlayerWeaponVData((void *)(this->m_ptr->GetWeaponVData()));
156+
return GCBasePlayerWeaponVData((void*)(this->m_ptr->GetWeaponVData()));
157157
}
158158
GCCSWeaponBaseVData PluginWeapon::GetCCSWeaponBaseVData()
159159
{
160160
if (!this->m_ptr)
161161
return GCCSWeaponBaseVData(nullptr);
162162

163-
return GCCSWeaponBaseVData((void *)(this->m_ptr->GetWeaponVData()));
163+
return GCCSWeaponBaseVData((void*)(this->m_ptr->GetWeaponVData()));
164164
}
165165

166166
void PluginWeapon::Drop()
167167
{
168-
Player *player = g_playerManager->GetPlayer(m_playerId);
168+
Player* player = g_playerManager->GetPlayer(m_playerId);
169169
if (!player)
170170
return;
171171

172-
CCSPlayerPawn *pawn = player->GetPlayerPawn();
172+
CCSPlayerPawn* pawn = player->GetPlayerPawn();
173173
if (!pawn)
174174
return;
175175

176-
CPlayer_WeaponServices *weaponServices = pawn->m_pWeaponServices();
176+
CPlayer_WeaponServices* weaponServices = pawn->m_pWeaponServices();
177177
if (!weaponServices)
178178
return;
179179

180-
CCSPlayer_ItemServices *itemServices = pawn->m_pItemServices();
180+
CCSPlayer_ItemServices* itemServices = pawn->m_pItemServices();
181181
if (!itemServices)
182182
return;
183183

@@ -189,19 +189,19 @@ void PluginWeapon::Drop()
189189
}
190190
void PluginWeapon::Remove()
191191
{
192-
Player *player = g_playerManager->GetPlayer(m_playerId);
192+
Player* player = g_playerManager->GetPlayer(m_playerId);
193193
if (!player)
194194
return;
195195

196-
CCSPlayerPawn *pawn = player->GetPlayerPawn();
196+
CCSPlayerPawn* pawn = player->GetPlayerPawn();
197197
if (!pawn)
198198
return;
199199

200-
CPlayer_WeaponServices *weaponServices = pawn->m_pWeaponServices();
200+
CPlayer_WeaponServices* weaponServices = pawn->m_pWeaponServices();
201201
if (!weaponServices)
202202
return;
203203

204-
CCSPlayer_ItemServices *itemServices = pawn->m_pItemServices();
204+
CCSPlayer_ItemServices* itemServices = pawn->m_pItemServices();
205205
if (!itemServices)
206206
return;
207207

@@ -214,18 +214,18 @@ void PluginWeapon::Remove()
214214
this->m_ptr->Despawn();
215215
}
216216

217-
std::vector<uint16_t> paintkitsFallbackCheck = {1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173};
217+
std::vector<uint16_t> paintkitsFallbackCheck = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
218218

219219
void PluginWeapon::SetDefaultAttributes()
220220
{
221221
if (!this->m_ptr)
222222
return;
223223

224-
Player *player = g_playerManager->GetPlayer(m_playerId);
224+
Player* player = g_playerManager->GetPlayer(m_playerId);
225225
if (!player)
226226
return;
227227

228-
CCSPlayerPawn *pawn = player->GetPlayerPawn();
228+
CCSPlayerPawn* pawn = player->GetPlayerPawn();
229229
if (!pawn)
230230
return;
231231

@@ -241,43 +241,37 @@ void PluginWeapon::SetDefaultAttributes()
241241

242242
if (this->m_ptr->m_CBodyComponent() && this->m_ptr->m_CBodyComponent()->m_pSceneNode())
243243
{
244-
CSkeletonInstance *skeleton = this->m_ptr->m_CBodyComponent()->m_pSceneNode()->GetSkeletonInstance();
244+
CSkeletonInstance* skeleton = this->m_ptr->m_CBodyComponent()->m_pSceneNode()->GetSkeletonInstance();
245245
if (skeleton)
246246
{
247-
if (skeleton->m_modelState().m_MeshGroupMask() != (legacy == true ? 2 : 1))
247+
if (skeleton->m_modelState->m_MeshGroupMask() != (legacy == true ? 2 : 1))
248248
{
249-
skeleton->m_modelState().m_MeshGroupMask = (legacy == true ? 2 : 1);
249+
skeleton->m_modelState->m_MeshGroupMask = (legacy == true ? 2 : 1);
250250
}
251251
}
252252
}
253253

254-
CCSPlayer_ViewModelServices *viewmodelServices = pawn->m_pViewModelServices();
254+
CCSPlayer_ViewModelServices* viewmodelServices = pawn->m_pViewModelServices();
255255
if (!viewmodelServices)
256256
return;
257257

258-
CHandle<CBaseViewModel> *viewmodelHandles = viewmodelServices->m_hViewModel();
258+
CHandle<CBaseViewModel>* viewmodelHandles = viewmodelServices->m_hViewModel();
259259
if (!viewmodelHandles)
260260
return;
261-
if (!viewmodelHandles[0])
262-
return;
263-
if (!viewmodelHandles[0].IsValid())
264-
return;
265261

266-
CBaseViewModel *viewmodel = viewmodelHandles[0].Get();
262+
CBaseViewModel* viewmodel = viewmodelHandles[0];
267263

268264
if (!viewmodel)
269265
return;
270266

271267
if (viewmodel->m_CBodyComponent() && viewmodel->m_CBodyComponent()->m_pSceneNode())
272268
{
273-
CSkeletonInstance *viewmodelskeleton = viewmodel->m_CBodyComponent()->m_pSceneNode()->GetSkeletonInstance();
274-
if (viewmodelskeleton)
275-
{
276-
if (viewmodelskeleton->m_modelState().m_MeshGroupMask() != (legacy == true ? 2 : 1))
269+
CSkeletonInstance* viewmodelskeleton = viewmodel->m_CBodyComponent()->m_pSceneNode()->GetSkeletonInstance();
270+
if (viewmodelskeleton && viewmodelskeleton->m_modelState())
271+
if (viewmodelskeleton->m_modelState->m_MeshGroupMask() != (legacy == true ? 2 : 1))
277272
{
278-
viewmodelskeleton->m_modelState().m_MeshGroupMask = (legacy == true ? 2 : 1);
273+
viewmodelskeleton->m_modelState->m_MeshGroupMask = (legacy == true ? 2 : 1);
279274
}
280-
}
281275
}
282276

283277
viewmodel->m_CBodyComponent.StateUpdate();

‎src/sdk/entity/CBaseEntity.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class CSkeletonInstance
4747
public:
4848
DECLARE_SCHEMA_CLASS_BASE(CSkeletonInstance, false)
4949

50-
SCHEMA_FIELD_OFFSET(CModelState, m_modelState, 0)
50+
SCHEMA_FIELD_POINTER_OFFSET(CModelState, m_modelState, 0)
5151
};
5252

5353
class CGameSceneNode

0 commit comments

Comments
 (0)