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
This commit is contained in:
parent
0a4c6eef58
commit
3db4007d8a
|
@ -7,6 +7,7 @@ main/digiobj.c, main/piggy.c: Don't force AltSounds on PC-Shareware content but
|
|||
main/titles.c: Play SONG_BRIEFING and SONG_ENDGAME on all non-builtin missions if available
|
||||
main/endlevel.c: Correctly handle PC Shareware for start_endlevel_movie() again without the defines but via is_SHAREWARE
|
||||
main/digiobj.c: Just generally ignore missing sounds in digi_xlat_sound just like D1X-Rebirth - not limit to Shareware
|
||||
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
|
||||
--------
|
||||
|
|
|
@ -2481,7 +2481,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;i<N_PLAYER_SHIP_TEXTURES;i++)
|
||||
multi_player_textures[id-1][i] = ObjBitmaps[ObjBitmapPtrs[Polygon_models[objp->rtype.pobj_info.model_num].first_texture+i]];
|
||||
|
|
Loading…
Reference in a new issue