TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added complex error output if illegal segnum passed to get_seg_masks(); Fixed warning about set but unused variables

Browse source
This commit is contained in:
zicodxx 2011-07-10 01:09:43 +02:00
parent 6f0567041a
commit fbc6112d44
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog
20110710
--------
main/gameseg.c: Added complex error output if illegal segnum passed to get_seg_masks(); Fixed warning about set but unused variables
20110709
--------
main/gamerend.c, main/gauges.h: In Multiplayer games show player names in big guided window as well

10
main/gameseg.c
View file

@ -311,8 +311,8 @@ segmasks get_seg_masks(vms_vector *checkp, int segnum, fix rad, char *calling_fi
int vertex_list[6];
segment *seg;
if (segnum==-1)
Error("segnum == -1 in get_seg_masks()");
if (segnum < 0 || segnum > Highest_segment_index)
Error("segnum == %i (%i) in get_seg_masks()\ncheckp: %i,%i,%i, rad: %i\nfrom file: %s, line: %iPlease report this bug.\n",segnum,Highest_segment_index,checkp->x,checkp->y,checkp->z,rad,calling_file,calling_linenum);
Assert((segnum <= Highest_segment_index) && (segnum >= 0));
@ -618,14 +618,10 @@ int check_segment_connections(void)
seg = &Segments[segnum];
for (sidenum=0;sidenum<6;sidenum++) {
side *s;
segment *cseg;
side *cs;
int num_faces,csegnum,csidenum,con_num_faces;
int vertex_list[6],con_vertex_list[6];
s = &seg->sides[sidenum];
create_abs_vertex_lists(&num_faces, vertex_list, segnum, sidenum, __FILE__, __LINE__);
csegnum = seg->children[sidenum];
@ -639,8 +635,6 @@ int check_segment_connections(void)
continue;
}
cs = &cseg->sides[csidenum];
create_abs_vertex_lists(&con_num_faces, con_vertex_list, csegnum, csidenum, __FILE__, __LINE__);
if (con_num_faces != num_faces) {