From b1b5de4297df44735697bec09dde7e84db9ee701 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 16 Jan 2017 15:39:10 +0800 Subject: [PATCH] Additional safeguard for bug #306 This is where a client in a multiplayer game hitting a wall fails an assert. Initialise obj->mtype.phys_info.flags in multi_reset_player_object() instead of adding flags. (Tested and still works OK without specifying PF_THRUST.) --- similar/main/multi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index 0fc29654e..0f33f4b97 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -2415,7 +2415,7 @@ void multi_reset_player_object(const vobjptr_t objp) objp->mtype.phys_info.mass = Player_ship->mass; objp->mtype.phys_info.drag = Player_ship->drag; if (objp->type == OBJ_PLAYER) - objp->mtype.phys_info.flags |= PF_TURNROLL | PF_WIGGLE; + objp->mtype.phys_info.flags = PF_TURNROLL | PF_WIGGLE; else objp->mtype.phys_info.flags &= ~(PF_TURNROLL | PF_LEVELLING | PF_WIGGLE);