TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass object_base &to object_allowed_in_anarchy

Browse source
This commit is contained in:
Kp 2016-04-23 17:59:47 +00:00
parent 56f1729742
commit 377effa46d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
similar/main/multi.cpp
View file

@ -3459,16 +3459,16 @@ tmap_info &find_required_goal_texture(ubyte t)
} }
#endif #endif
static inline int object_allowed_in_anarchy(const vobjptr_t objp) static int object_allowed_in_anarchy(const object_base &objp)
{ {
if ((objp->type==OBJ_NONE) || if (objp.type == OBJ_NONE ||
(objp->type==OBJ_PLAYER) || objp.type == OBJ_PLAYER ||
(objp->type==OBJ_POWERUP) || objp.type == OBJ_POWERUP ||
(objp->type==OBJ_CNTRLCEN) || objp.type == OBJ_CNTRLCEN ||
(objp->type==OBJ_HOSTAGE)) objp.type == OBJ_HOSTAGE)
return 1; return 1;
#if defined(DXX_BUILD_DESCENT_II) #if defined(DXX_BUILD_DESCENT_II)
if (objp->type==OBJ_WEAPON && get_weapon_id(objp)==weapon_id_type::PMINE_ID) if (objp.type == OBJ_WEAPON && get_weapon_id(objp) == weapon_id_type::PMINE_ID)
return 1; return 1;
#endif #endif
return 0; return 0;