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

don't corrupt model_data, so it can be freed properly

Browse source
This commit is contained in:
Martin Schaffner 2004-11-19 18:29:20 +00:00
parent da2ec855b8
commit 3713cd8de5
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -1,6 +1,7 @@
2004-11-19 Chris Taylor <c.taylor@student.curtin.edu.au>
* main/gamemine.c, main/piggy.c: compile again on older C compilers
* main/polyobj.c: don't corrupt model_data, so it can be freed properly
2004-11-16 Chris Taylor <c.taylor@student.curtin.edu.au>

10
main/polyobj.c
View file

@ -1,4 +1,4 @@
/* $Id: polyobj.c,v 1.18 2004-08-28 23:17:45 schaffner Exp $ */
/* $Id: polyobj.c,v 1.19 2004-11-19 18:29:20 schaffner Exp $ */
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#endif
#ifdef RCS
static char rcsid[] = "$Id: polyobj.c,v 1.18 2004-08-28 23:17:45 schaffner Exp $";
static char rcsid[] = "$Id: polyobj.c,v 1.19 2004-11-19 18:29:20 schaffner Exp $";
#endif
#include <stdio.h>
@ -906,7 +906,8 @@ extern void polymodel_read(polymodel *pm, CFILE *fp)
pm->n_models = cfile_read_int(fp);
pm->model_data_size = cfile_read_int(fp);
pm->model_data = (ubyte *) cfile_read_int(fp);
// pm->model_data = (ubyte *) // this is malloced later
cfile_read_int(fp);
for (i = 0; i < MAX_SUBMODELS; i++)
pm->submodel_ptrs[i] = cfile_read_int(fp);
for (i = 0; i < MAX_SUBMODELS; i++)
@ -940,7 +941,8 @@ extern int polymodel_read_n(polymodel *pm, int n, CFILE *fp)
for (i = 0; i < n; i++) {
pm[i].n_models = cfile_read_int(fp);
pm[i].model_data_size = cfile_read_int(fp);
pm[i].model_data = (ubyte *) cfile_read_int(fp);
// pm->model_data = (ubyte *) // this is malloced later
cfile_read_int(fp);
for (j = 0; j < MAX_SUBMODELS; j++)
pm[i].submodel_ptrs[j] = cfile_read_int(fp);
for (j = 0; j < MAX_SUBMODELS; j++)