reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2025-01-28 22:48:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reworked collision with armoury_entity

Browse Source
This commit is contained in:
s1lentq 2016-08-24 21:21:54 +07:00
parent 1e89c4fa60
commit fc0064c9bb
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
regamedll/dlls/weapons.cpp
View File

@ -1768,7 +1768,7 @@ void CWeaponBox::__MAKE_VHOOK(Touch)(CBaseEntity *pOther)
pPlayer->pev->body = 1; pPlayer->pev->body = 1;
CBaseEntity *pEntity = nullptr; CBaseEntity *pEntity = nullptr;
while ((pEntity = UTIL_FindEntityByClassname(pEntity, "player")) != NULL) while ((pEntity = UTIL_FindEntityByClassname(pEntity, "player")))
{ {
if (FNullEnt(pEntity->edict())) if (FNullEnt(pEntity->edict()))
break; break;
@ -1967,7 +1967,7 @@ BOOL CWeaponBox::PackWeapon(CBasePlayerItem *pWeapon)
pWeapon->pev->solid = SOLID_NOT; pWeapon->pev->solid = SOLID_NOT;
pWeapon->pev->effects = EF_NODRAW; pWeapon->pev->effects = EF_NODRAW;
pWeapon->pev->modelindex = 0; pWeapon->pev->modelindex = 0;
pWeapon->pev->model = NULL; pWeapon->pev->model = 0;
pWeapon->pev->owner = ENT(pev); pWeapon->pev->owner = ENT(pev);
pWeapon->SetThink(NULL); pWeapon->SetThink(NULL);
pWeapon->SetTouch(NULL); pWeapon->SetTouch(NULL);
@ -2109,11 +2109,6 @@ void CArmoury::__MAKE_VHOOK(Spawn)()
{ {
Precache(); Precache();
#ifdef REGAMEDLL_FIXES
// do it earlier than set UTIL_SetSize to avoid resetting mins/maxs.
SET_MODEL(ENT(pev), armouryItemModels[m_iItem]);
#endif
pev->movetype = MOVETYPE_TOSS; pev->movetype = MOVETYPE_TOSS;
pev->solid = SOLID_TRIGGER; pev->solid = SOLID_TRIGGER;
@ -2121,10 +2116,7 @@ void CArmoury::__MAKE_VHOOK(Spawn)()
UTIL_SetOrigin(pev, pev->origin); UTIL_SetOrigin(pev, pev->origin);
SetTouch(&CArmoury::ArmouryTouch); SetTouch(&CArmoury::ArmouryTouch);
#ifndef REGAMEDLL_FIXES
SET_MODEL(ENT(pev), armouryItemModels[m_iItem]); SET_MODEL(ENT(pev), armouryItemModels[m_iItem]);
#endif
if (m_iCount <= 0) if (m_iCount <= 0)
{ {
@ -2205,9 +2197,7 @@ void CArmoury::__MAKE_VHOOK(Restart)()
#ifdef REGAMEDLL_ADD #ifdef REGAMEDLL_ADD
// Restored origin from the cache // Restored origin from the cache
UTIL_SetSize(pev, Vector(-16, -16, 0), Vector(16, 16, 16));
UTIL_SetOrigin(pev, pev->oldorigin); UTIL_SetOrigin(pev, pev->oldorigin);
DROP_TO_FLOOR(edict()); DROP_TO_FLOOR(edict());
#endif #endif
} }
@ -2359,6 +2349,14 @@ void CArmoury::__MAKE_VHOOK(KeyValue)(KeyValueData *pkvd)
CBaseEntity::KeyValue(pkvd); CBaseEntity::KeyValue(pkvd);
} }
#ifdef REGAMEDLL_ADD
void CArmoury::__MAKE_VHOOK(SetObjectCollisionBox)()
{
pev->absmin = pev->origin + Vector(-16, -16, 0);
pev->absmax = pev->origin + Vector(16, 16, 16);
}
#endif
LINK_ENTITY_TO_CLASS(armoury_entity, CArmoury, CCSArmoury); LINK_ENTITY_TO_CLASS(armoury_entity, CArmoury, CCSArmoury);
// true - keep the amount of bpammo // true - keep the amount of bpammo

3
regamedll/dlls/weapons.h
View File

@ -135,6 +135,9 @@ public:
virtual void Precache(); virtual void Precache();
virtual void Restart(); virtual void Restart();
virtual void KeyValue(KeyValueData *pkvd); virtual void KeyValue(KeyValueData *pkvd);
#ifdef REGAMEDLL_ADD
virtual void SetObjectCollisionBox();
#endif
#ifdef HOOK_GAMEDLL #ifdef HOOK_GAMEDLL