diff --git a/common/main/object.h b/common/main/object.h index a047fec86..169965b64 100644 --- a/common/main/object.h +++ b/common/main/object.h @@ -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 diff --git a/similar/main/collide.cpp b/similar/main/collide.cpp index d61ab5f1d..7339fd6f9 100644 --- a/similar/main/collide.cpp +++ b/similar/main/collide.cpp @@ -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); }