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

Remove unused flag OF_HARMLESS

Browse source
This commit is contained in:
Kp 2013-11-24 04:20:22 +00:00
parent 706b458699
commit c3dd634cce
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/main/object.h
View file

@ -114,7 +114,6 @@ enum object_type_t
#define OF_DESTROYED 4 // this has been killed, and is showing the dead version
#define OF_SILENT 8 // this makes no sound when it hits a wall. Added by MK for weapons, if you extend it to other types, do it completely!
#define OF_ATTACHED 16 // this object is a fireball attached to another object
#define OF_HARMLESS 32 // this object does no damage. Added to make quad lasers do 1.5 damage as normal lasers.
#if defined(DXX_BUILD_DESCENT_II)
#define OF_PLAYER_DROPPED 64 // this object was dropped by the player...
#endif

3
similar/main/collide.cpp
View file

@ -1752,7 +1752,7 @@ static void collide_robot_and_weapon( object * robot, object * weapon, vms_vecto
if ( damage_flag && (robptr->exp1_sound_num > -1 ))
digi_link_sound_to_pos( robptr->exp1_sound_num, robot->segnum, 0, collision_point, 0, F1_0 );
if (!(weapon->flags & OF_HARMLESS)) {
{
fix damage = weapon->shields;
if (damage_flag)
@ -2251,7 +2251,6 @@ void collide_player_and_weapon( object * playerobj, object * weapon, vms_vector
// if (weapon->id == SMART_HOMING_ID)
// damage /= 4;
if (!(weapon->flags & OF_HARMLESS))
apply_damage_to_player( playerobj, killer, damage, 1);
}