Whitespace cleaning and pointer safety check

rehlds · Sep 11, 2023 · d4d3215 · d4d3215
1 parent 1f0a1e9
commit d4d3215
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/regamedll/dlls/client.cpp b/regamedll/dlls/client.cpp
@@ -4823,13 +4823,13 @@ int EXT_FUNC GetWeaponData(edict_t *pEdict, struct weapon_data_s *info)
 					item->fuser3 = weapon->m_flReleaseThrow;
 					item->iuser1 = weapon->m_iSwing;
 
-#ifdef REGAMEDLL_FIXES 
+#ifdef REGAMEDLL_FIXES
 					if (pPlayerItem == pPlayer->m_pActiveItem && weapon->m_iClip == II.iMaxClip)
 					{
 						const WeaponInfoStruct *wpnInfo = GetDefaultWeaponInfo(II.iId);
 
-						if (wpnInfo->gunClipSize != II.iMaxClip)
-							item->m_iClip = wpnInfo->gunClipSize;
+						if (wpnInfo && wpnInfo->gunClipSize != II.iMaxClip)
+							item->m_iClip = wpnInfo->gunClipSize; 
 					}
 #endif
 				}

diff --git a/regamedll/dlls/weapontype.cpp b/regamedll/dlls/weapontype.cpp
@@ -529,7 +529,6 @@ WeaponInfoStruct *GetWeaponInfo(const char *weaponName)
 	return nullptr;
 }
 
-
 WeaponInfoStruct *GetDefaultWeaponInfo(int weaponID)
 {
 	for (auto& info : g_weaponInfo_default) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -529,7 +529,6 @@ WeaponInfoStruct *GetWeaponInfo(const char *weaponName) @@
     	return nullptr;
     }
     WeaponInfoStruct *GetDefaultWeaponInfo(int weaponID)
     {
     	for (auto& info : g_weaponInfo_default) {
@@ Expand Down @@