Skip to content

Commit d7e2a4c

Browse files
committed
Add Cyborg's multi suggestions
1 parent f22e58a commit d7e2a4c

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
@@ -1172,7 +1172,9 @@ static void shiphit_record_player_killer(const object *killer_objp, player *p)
11721172
break;
11731173

11741174
case OBJ_PROP:
1175-
// handle this
1175+
strcpy_s(p->killer_parent_name, "");
1176+
p->killer_species = -1;
1177+
p->killer_parent_name[0] = '\0';
11761178
break;
11771179

11781180
case OBJ_NONE:
@@ -1581,6 +1583,7 @@ static void player_died_start(const object *killer_objp)
15811583
case OBJ_SHIP:
15821584
case OBJ_DEBRIS:
15831585
case OBJ_ASTEROID:
1586+
case OBJ_PROP:
15841587
case OBJ_NONE: // Something that just got deleted due to also dying -- it happened to me! --MK.
15851588
other_objp = killer_objp;
15861589
break;
@@ -1594,9 +1597,6 @@ static void player_died_start(const object *killer_objp)
15941597
other_objp = &Objects[beam_obj_parent];
15951598
}
15961599
break;
1597-
case OBJ_PROP:
1598-
//hmmmmmm
1599-
break;
16001600

16011601
default:
16021602
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)