From 856ac49a7b7c79750bdcfa324510ad5d7abbeef1 Mon Sep 17 00:00:00 2001 From: zicodxx Date: Sat, 4 Jun 2011 22:50:35 +0200 Subject: [PATCH] for flexibility in terms of modding, allow player ship textures in Multiplayer be <= N_PLAYER_SHIP_TEXTURES and not hit Assert but pull out Eroor if there are more --- CHANGELOG.txt | 1 + main/multi.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d7d74aa25..87c2578e4 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,7 @@ D1X-Rebirth Changelog -------- main/lighting.c: Since set_dynamic_light() is not necessarily processed each frame, added own counter for delayed precession of vertex-clight calculation; Added possibility to page in a bitmap in case an object which has never been rendered before is supposed to cast light visible by the player main/sounds.h, main/weapon.c: Fix weapon selection sounds fpr pc shareware and do not allow selecting weapons not available in this content (i.e. if obtained by cheat) +main/multi.c: for flexibility in terms of modding, allow player ship textures in Multiplayer be <= N_PLAYER_SHIP_TEXTURES and not hit Assert but pull out Eroor if there are more 20110601 -------- diff --git a/main/multi.c b/main/multi.c index d470ebc30..54582d716 100644 --- a/main/multi.c +++ b/main/multi.c @@ -2245,7 +2245,8 @@ void multi_reset_object_texture (object *objp) if (id == 0) objp->rtype.pobj_info.alt_textures=0; else { - Assert(N_PLAYER_SHIP_TEXTURES == Polygon_models[objp->rtype.pobj_info.model_num].n_textures); + if (N_PLAYER_SHIP_TEXTURES < Polygon_models[objp->rtype.pobj_info.model_num].n_textures) + Error("Too many player ship textures!\n"); for (i=0;irtype.pobj_info.model_num].first_texture+i]];