Skip to content

Commit ca29c4e

Browse files
committed
Add Cyborg's multi suggestions
1 parent d4cb4d6 commit ca29c4e

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

code/object/collideshipweapon.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -865,10 +865,9 @@ int collide_prop_weapon(obj_pair* pair)
865865
Assert(weapon_obj->type == OBJ_WEAPON);
866866

867867
// Cyborg17 - no ship-ship collisions when doing multiplayer rollback
868-
//Asteroth - should this be kept?
869-
/*if ((Game_mode & GM_MULTIPLAYER) && multi_ship_record_get_rollback_wep_mode() && (weapon_obj->parent_sig == OBJ_INDEX(ship))) {
868+
if ((Game_mode & GM_MULTIPLAYER) && multi_ship_record_get_rollback_wep_mode() && (weapon_obj->parent_sig == OBJ_INDEX(prop))) {
870869
return 0;
871-
}*/
870+
}
872871

873872
if (reject_due_collision_groups(prop, weapon_obj))
874873
return 0;

code/ship/shiphit.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,9 @@ static void shiphit_record_player_killer(const object *killer_objp, player *p)
11851185
break;
11861186

11871187
case OBJ_PROP:
1188-
// handle this
1188+
strcpy_s(p->killer_parent_name, "");
1189+
p->killer_species = -1;
1190+
p->killer_parent_name[0] = '\0';
11891191
break;
11901192

11911193
case OBJ_NONE:
@@ -1594,6 +1596,7 @@ static void player_died_start(const object *killer_objp)
15941596
case OBJ_SHIP:
15951597
case OBJ_DEBRIS:
15961598
case OBJ_ASTEROID:
1599+
case OBJ_PROP:
15971600
case OBJ_NONE: // Something that just got deleted due to also dying -- it happened to me! --MK.
15981601
other_objp = killer_objp;
15991602
break;
@@ -1607,9 +1610,6 @@ static void player_died_start(const object *killer_objp)
16071610
other_objp = &Objects[beam_obj_parent];
16081611
}
16091612
break;
1610-
case OBJ_PROP:
1611-
//hmmmmmm
1612-
break;
16131613

16141614
default:
16151615
UNREACHABLE("Unhandled object type %d in player_died_start()", killer_objp->type); // Killed by an object of a peculiar type. What is it?

0 commit comments

Comments
 (0)