comeback item_security, item_suit for custom mods/maps

FWGS · May 22, 2018 · 8c2dd77 · 8c2dd77
1 parent 0022272
commit 8c2dd77
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/regamedll/dlls/items.cpp b/regamedll/dlls/items.cpp
@@ -42,8 +42,6 @@ ItemInfo itemInfo[] = {
 	DEFINE_ITEMINFO(ITEM_BATTERY,       "item_battery"),
 };
 
-// NOTE: useless thing
-#ifndef REGAMEDLL_FIXES
 LINK_ENTITY_TO_CLASS(world_items, CWorldItem, CCSWorldItem)
 
 void CWorldItem::KeyValue(KeyValueData *pkvd)
@@ -90,7 +88,6 @@ void CWorldItem::Spawn()
 
 	REMOVE_ENTITY(edict());
 }
-#endif
 
 void CItem::Spawn()
 {
@@ -165,8 +162,6 @@ void CItem::Materialize()
 	SetTouch(&CItem::ItemTouch);
 }
 
-// NOTE: useless thing
-#ifndef REGAMEDLL_FIXES
 void CItemSuit::Spawn()
 {
 	Precache();
@@ -194,7 +189,6 @@ BOOL CItemSuit::MyTouch(CBasePlayer *pPlayer)
 }
 
 LINK_ENTITY_TO_CLASS(item_suit, CItemSuit, CCSItemSuit)
-#endif
 
 void CItemBattery::Spawn()
 {
@@ -285,8 +279,6 @@ BOOL CItemAntidote::MyTouch(CBasePlayer *pPlayer)
 
 LINK_ENTITY_TO_CLASS(item_antidote, CItemAntidote, CCSItemAntidote)
 
-// NOTE: useless thing
-#ifndef REGAMEDLL_FIXES
 void CItemSecurity::Spawn()
 {
 	Precache();
@@ -306,7 +298,6 @@ BOOL CItemSecurity::MyTouch(CBasePlayer *pPlayer)
 }
 
 LINK_ENTITY_TO_CLASS(item_security, CItemSecurity, CCSItemSecurity)
-#endif
 
 void CItemLongJump::Spawn()
 {

diff --git a/regamedll/dlls/weapons.cpp b/regamedll/dlls/weapons.cpp
@@ -270,14 +270,10 @@ void WeaponsPrecache()
 	// custom items...
 
 	// common world objects
-#ifndef REGAMEDLL_FIXES
 	UTIL_PrecacheOther("item_suit");
-#endif
 	UTIL_PrecacheOther("item_battery");
 	UTIL_PrecacheOther("item_antidote");
-#ifndef REGAMEDLL_FIXES
 	UTIL_PrecacheOther("item_security");
-#endif
 	UTIL_PrecacheOther("item_longjump");
 	UTIL_PrecacheOther("item_kevlar");
 	UTIL_PrecacheOther("item_assaultsuit");