id-software/quake2-rerelease-dll
1
0
Fork 0
mirror of https://github.com/id-Software/quake2-rerelease-dll.git synced 2026-03-19 16:39:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update 1 changes

Browse Source
This commit is contained in:
Mike Rubits
2023-10-03 14:43:06 -04:00
parent 60f29560f3
commit 8dc1fc9794
67 changed files with 1806 additions and 1479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rerelease/rogue/g_rogue_newdm.cpp
View File

@@ -91,26 +91,26 @@ inline item_id_t FindSubstituteItem(edict_t *ent)
if (!itflags || (itflags & (IF_NOT_GIVEABLE | IF_TECH | IF_NOT_RANDOM)) || !it->pickup || !it->world_model)
continue;
itflags = GetSubstituteItemFlags(i);
// don't respawn spheres if they're dmflag disabled.
if (g_no_spheres->integer)
{
if (ent->item->id == IT_ITEM_SPHERE_VENGEANCE ||
ent->item->id == IT_ITEM_SPHERE_HUNTER ||
ent->item->id == IT_ITEM_SPHERE_DEFENDER)
if (i == IT_ITEM_SPHERE_VENGEANCE ||
i == IT_ITEM_SPHERE_HUNTER ||
i == IT_ITEM_SPHERE_DEFENDER)
{
continue;
}
}
if (g_no_nukes->integer && ent->item->id == IT_AMMO_NUKE)
if (g_no_nukes->integer && i == IT_AMMO_NUKE)
continue;
if (g_no_mines->integer &&
(ent->item->id == IT_AMMO_PROX || ent->item->id == IT_AMMO_TESLA || ent->item->id == IT_AMMO_TRAP))
(i == IT_AMMO_PROX || i == IT_AMMO_TESLA || i == IT_AMMO_TRAP || i == IT_WEAPON_PROXLAUNCHER))
continue;
itflags = GetSubstituteItemFlags(i);
if ((itflags & IF_TYPE_MASK) == (myflags & IF_TYPE_MASK))
possible_items[possible_item_count++] = i;
}