Finished support for custom textures and robots, fixed some bugs, reformatted code and placed function calls to properly work for designated mission/level

This commit is contained in:
zicodxx 2010-10-16 11:13:11 +02:00
parent 4c7879b740
commit 940eaeb3db
3 changed files with 494 additions and 356 deletions

View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20101016
--------
main/custom.c, main/gameseq.c: Finished support for custom textures and robots, fixed some bugs, reformatted code and placed function calls to properly work for designated mission/level
20101014
--------
main/menu.c: Fixed compilation of menu.c when USE_SDLMIXER is not defined

View file

@ -1,8 +1,8 @@
/*
* Load custom textures & robot data
*/
#include <string.h>
#include <string.h>
#include "gr.h"
#include "cfile.h"
#include "pstypes.h"
@ -19,32 +19,19 @@
#endif
#include "custom.h"
//#define D2TMAP_CONV // used for testing
extern hashtable AllBitmapsNames;
extern hashtable AllDigiSndNames;
#if 0 // removed memory saving extra bitmap structure hack
struct bm_info {
short bm_w,bm_h;
ubyte bm_flags;
ubyte avg_color;
ubyte *bm_data;
};
#endif
struct snd_info {
unsigned int length;
ubyte *data;
struct snd_info
{
unsigned int length;
ubyte *data;
};
grs_bitmap BitmapOriginal[MAX_BITMAP_FILES];
struct snd_info SoundOriginal[MAX_SOUND_FILES];
extern void gr_bm_bitblt(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest);
//#define D2TMAP_CONV // used for testing
typedef struct DiskBitmapHeader2 {
typedef struct DiskBitmapHeader2
{
char name[8];
ubyte dflags;
ubyte width;
@ -55,7 +42,8 @@ typedef struct DiskBitmapHeader2 {
int offset;
} __pack__ DiskBitmapHeader2;
typedef struct DiskBitmapHeader {
typedef struct DiskBitmapHeader
{
char name[8];
ubyte dflags;
ubyte width;
@ -65,264 +53,355 @@ typedef struct DiskBitmapHeader {
int offset;
} __pack__ DiskBitmapHeader;
typedef struct DiskSoundHeader {
typedef struct DiskSoundHeader
{
char name[8];
int length;
int data_length;
int offset;
} __pack__ DiskSoundHeader;
static void change_ext(char *filename, const char *newext, int filename_size) {
char *p;
int len, extlen;
len = strlen(filename);
extlen = strlen(newext);
if ((p = strrchr(filename, '.'))) {
len = p - filename;
*p = 0;
}
if (len + extlen + 1 < filename_size) {
strcat(filename, ".");
strcat(filename, newext);
}
}
struct custom_info {
int offset;
int repl_idx; // 0x80000000 -> sound, -1 -> n/a
unsigned int flags;
short width, height;
struct custom_info
{
int offset;
int repl_idx; // 0x80000000 -> sound, -1 -> n/a
unsigned int flags;
int width, height;
};
int load_pig1(CFILE *f, int num_bitmaps, int num_sounds, int *num_custom, struct custom_info **ci) {
int data_ofs;
int i;
struct custom_info *cip;
DiskBitmapHeader bmh;
DiskSoundHeader sndh;
char name[15];
grs_bitmap BitmapOriginal[MAX_BITMAP_FILES];
struct snd_info SoundOriginal[MAX_SOUND_FILES];
*num_custom = 0;
if ((unsigned int)num_bitmaps <= MAX_BITMAP_FILES) { // <v1.4 pig?
cfseek(f, 8, SEEK_SET);
data_ofs = 8;
} else if (num_bitmaps > 0 && num_bitmaps < cfilelength(f)) { // >=v1.4 pig?
cfseek(f, num_bitmaps, SEEK_SET);
data_ofs = num_bitmaps + 8;
num_bitmaps = cfile_read_int(f);
num_sounds = cfile_read_int(f);
} else
return -1; // invalid pig file
if ((unsigned int)num_bitmaps >= MAX_BITMAP_FILES ||
(unsigned int)num_sounds >= MAX_SOUND_FILES)
return -1; // invalid pig file
if (!(*ci = cip = d_malloc((num_bitmaps + num_sounds) * sizeof(struct custom_info))))
return -1; // out of memory
data_ofs += num_bitmaps * sizeof(DiskBitmapHeader) + num_sounds * sizeof(DiskSoundHeader);
i = num_bitmaps;
while (i--) {
if (cfread(&bmh, sizeof(DiskBitmapHeader), 1, f) < 1) {
d_free(*ci);
return -1;
static void change_ext(char *filename, const char *newext, int filename_size)
{
char *p;
int len, extlen;
len = strlen(filename);
extlen = strlen(newext);
if ((p = strrchr(filename, '.')))
{
len = p - filename;
*p = 0;
}
memcpy( name, bmh.name, 8 );
name[8] = 0;
if (bmh.dflags & DBM_FLAG_ABM)
sprintf(strchr(name, 0), "#%d", bmh.dflags & 63);
cip->offset = bmh.offset + data_ofs;
cip->repl_idx = hashtable_search(&AllBitmapsNames, name);
cip->flags = bmh.flags & (BM_FLAG_TRANSPARENT |
BM_FLAG_SUPER_TRANSPARENT | BM_FLAG_NO_LIGHTING | BM_FLAG_RLE);
cip->width = bmh.width + ((bmh.dflags & DBM_FLAG_LARGE) ? 256 : 0);
cip->height = bmh.height;
cip++;
}
i = num_sounds;
while (i--) {
if (cfread(&sndh, sizeof(DiskSoundHeader), 1, f) < 1) {
d_free(*ci);
return -1;
if (len + extlen + 1 < filename_size)
{
strcat(filename, ".");
strcat(filename, newext);
}
memcpy(name, sndh.name, 8);
name[8] = 0;
cip->offset = sndh.offset + data_ofs;
cip->repl_idx = hashtable_search(&AllDigiSndNames, name) | 0x80000000;
cip->width = sndh.length;
cip++;
}
*num_custom = num_bitmaps + num_sounds;
return 0;
}
int load_pog(CFILE *f, int pog_sig, int pog_ver, int *num_custom, struct custom_info **ci) {
int data_ofs;
int num_bitmaps;
int no_repl = 0;
int i;
struct custom_info *cip;
DiskBitmapHeader2 bmh;
int load_pig1(CFILE *f, int num_bitmaps, int num_sounds, int *num_custom, struct custom_info **ci)
{
int data_ofs;
int i;
struct custom_info *cip;
DiskBitmapHeader bmh;
DiskSoundHeader sndh;
char name[15];
#ifdef D2TMAP_CONV
int x, j, N_d2tmap;
int *d2tmap = NULL;
CFILE *f2 = NULL;
if ((f2 = cfopen("d2tmap.bin", "rb"))) {
N_d2tmap = cfile_read_int(f2);
if ((d2tmap = d_malloc(N_d2tmap * sizeof(d2tmap[0]))))
for (i = 0; i < N_d2tmap; i++)
d2tmap[i] = cfile_read_short(f2);
cfclose(f2);
}
#endif
*num_custom = 0;
*num_custom = 0;
if (pog_sig == 0x47495050 && pog_ver == 2) /* PPIG */
no_repl = 1;
else if (pog_sig != 0x474f5044 || pog_ver != 1) /* DPOG */
return -1; // no pig2/pog file/unknown version
num_bitmaps = cfile_read_int(f);
if (!(*ci = cip = d_malloc(num_bitmaps * sizeof(struct custom_info))))
return -1; // out of memory
data_ofs = 12 + num_bitmaps * sizeof(DiskBitmapHeader2);
if (!no_repl) {
if ((unsigned int)num_bitmaps <= MAX_BITMAP_FILES) // <v1.4 pig?
{
cfseek(f, 8, SEEK_SET);
data_ofs = 8;
}
else if (num_bitmaps > 0 && num_bitmaps < cfilelength(f)) // >=v1.4 pig?
{
cfseek(f, num_bitmaps, SEEK_SET);
data_ofs = num_bitmaps + 8;
num_bitmaps = cfile_read_int(f);
num_sounds = cfile_read_int(f);
}
else
return -1; // invalid pig file
if ((unsigned int)num_bitmaps >= MAX_BITMAP_FILES || (unsigned int)num_sounds >= MAX_SOUND_FILES)
return -1; // invalid pig file
if (!(*ci = cip = d_malloc((num_bitmaps + num_sounds) * sizeof(struct custom_info))))
return -1; // out of memory
data_ofs += num_bitmaps * sizeof(DiskBitmapHeader) + num_sounds * sizeof(DiskSoundHeader);
i = num_bitmaps;
while (i--)
(cip++)->repl_idx = cfile_read_short(f);
cip = *ci;
data_ofs += num_bitmaps * 2;
}
#ifdef D2TMAP_CONV
if (d2tmap)
for (i = 0; i < num_bitmaps; i++) {
x = cip[i].repl_idx;
cip[i].repl_idx = -1;
for (j = 0; j < N_d2tmap; j++)
if (x == d2tmap[j]) {
cip[i].repl_idx = Textures[j % NumTextures].index;
break;
{
if (cfread(&bmh, sizeof(DiskBitmapHeader), 1, f) < 1)
{
d_free(*ci);
return -1;
}
memcpy( name, bmh.name, 8 );
name[8] = 0;
if (bmh.dflags & DBM_FLAG_ABM)
sprintf(strchr(name, 0), "#%d", bmh.dflags & 63);
cip->offset = bmh.offset + data_ofs;
cip->repl_idx = hashtable_search(&AllBitmapsNames, name);
cip->flags = bmh.flags & (BM_FLAG_TRANSPARENT | BM_FLAG_SUPER_TRANSPARENT | BM_FLAG_NO_LIGHTING | BM_FLAG_RLE);
cip->width = bmh.width + ((bmh.dflags & DBM_FLAG_LARGE) ? 256 : 0);
cip->height = bmh.height;
cip++;
}
#endif
i = num_bitmaps;
while (i--) {
if (cfread(&bmh, sizeof(DiskBitmapHeader2), 1, f) < 1) {
d_free(*ci);
return -1;
i = num_sounds;
while (i--)
{
if (cfread(&sndh, sizeof(DiskSoundHeader), 1, f) < 1)
{
d_free(*ci);
return -1;
}
memcpy(name, sndh.name, 8);
name[8] = 0;
cip->offset = sndh.offset + data_ofs;
cip->repl_idx = hashtable_search(&AllDigiSndNames, name) | 0x80000000;
cip->width = sndh.length;
cip++;
}
cip->offset = bmh.offset + data_ofs;
cip->flags = bmh.flags & (BM_FLAG_TRANSPARENT |
BM_FLAG_SUPER_TRANSPARENT | BM_FLAG_NO_LIGHTING | BM_FLAG_RLE);
cip->width = bmh.width + ((bmh.hi_wh & 15) << 8);
cip->height = bmh.height + ((bmh.hi_wh >> 4) << 8);
cip++;
}
*num_custom = num_bitmaps;
return 0;
*num_custom = num_bitmaps + num_sounds;
return 0;
}
int load_pog(CFILE *f, int pog_sig, int pog_ver, int *num_custom, struct custom_info **ci)
{
int data_ofs;
int num_bitmaps;
int no_repl = 0;
int i;
struct custom_info *cip;
DiskBitmapHeader2 bmh;
#ifdef D2TMAP_CONV
int x, j, N_d2tmap;
int *d2tmap = NULL;
CFILE *f2 = NULL;
if ((f2 = cfopen("d2tmap.bin", "rb")))
{
N_d2tmap = cfile_read_int(f2);
if ((d2tmap = d_malloc(N_d2tmap * sizeof(d2tmap[0]))))
for (i = 0; i < N_d2tmap; i++)
d2tmap[i] = cfile_read_short(f2);
cfclose(f2);
}
#endif
*num_custom = 0;
if (pog_sig == 0x47495050 && pog_ver == 2) /* PPIG */
no_repl = 1;
else if (pog_sig != 0x474f5044 || pog_ver != 1) /* DPOG */
return -1; // no pig2/pog file/unknown version
num_bitmaps = cfile_read_int(f);
if (!(*ci = cip = d_malloc(num_bitmaps * sizeof(struct custom_info))))
return -1; // out of memory
data_ofs = 12 + num_bitmaps * sizeof(DiskBitmapHeader2);
if (!no_repl)
{
i = num_bitmaps;
while (i--)
(cip++)->repl_idx = cfile_read_short(f);
cip = *ci;
data_ofs += num_bitmaps * 2;
}
#ifdef D2TMAP_CONV
if (d2tmap)
for (i = 0; i < num_bitmaps; i++)
{
x = cip[i].repl_idx;
cip[i].repl_idx = -1;
for (j = 0; j < N_d2tmap; j++)
if (x == d2tmap[j])
{
cip[i].repl_idx = Textures[j % NumTextures].index;
break;
}
}
#endif
i = num_bitmaps;
while (i--)
{
if (cfread(&bmh, sizeof(DiskBitmapHeader2), 1, f) < 1)
{
d_free(*ci);
return -1;
}
cip->offset = bmh.offset + data_ofs;
cip->flags = bmh.flags & (BM_FLAG_TRANSPARENT | BM_FLAG_SUPER_TRANSPARENT | BM_FLAG_NO_LIGHTING | BM_FLAG_RLE);
cip->width = bmh.width + ((bmh.hi_wh & 15) << 8);
cip->height = bmh.height + ((bmh.hi_wh >> 4) << 8);
cip++;
}
*num_custom = num_bitmaps;
return 0;
}
// load custom textures/sounds from pog/pig file
// returns 0 if ok, <0 on error
int load_pigpog(char *pogname) {
int num_custom;
grs_bitmap *bmp;
digi_sound *snd;
ubyte *p;
CFILE *f;
struct custom_info *custom_info, *cip;
int i, j, rc = -1;
unsigned int x = 0;
int load_pigpog(char *pogname)
{
int num_custom;
grs_bitmap *bmp;
digi_sound *snd;
ubyte *p;
CFILE *f;
struct custom_info *custom_info, *cip;
int i, j, rc = -1;
unsigned int x = 0;
if (!(f = cfopen((char *)pogname, "rb")))
return -1; // pog file doesn't exist
i = cfile_read_int(f);
x = cfile_read_int(f);
if (load_pog(f, i, x, &num_custom, &custom_info) &&
load_pig1(f, i, x, &num_custom, &custom_info))
goto err; // unknown format/read error
if (!(f = cfopen((char *)pogname, "rb")))
return -1; // pog file doesn't exist
cip = custom_info;
i = num_custom;
while (i--) {
if ((x = cip->repl_idx) >= 0) {
cfseek( f, cip->offset, SEEK_SET );
if ( cip->flags & BM_FLAG_RLE )
j = cfile_read_int(f);
else
j = cip->width * cip->height;
if (!(p = d_malloc(j)))
goto err;
bmp = &GameBitmaps[x];
if (BitmapOriginal[x].bm_flags & 0x80) // already customized?
i = cfile_read_int(f);
x = cfile_read_int(f);
if (load_pog(f, i, x, &num_custom, &custom_info) && load_pig1(f, i, x, &num_custom, &custom_info))
{
if (num_custom)
d_free(custom_info);
cfclose(f);
return rc;
}
cip = custom_info;
i = num_custom;
while (i--)
{
x = cip->repl_idx;
if (cip->repl_idx >= 0)
{
cfseek( f, cip->offset, SEEK_SET );
if ( cip->flags & BM_FLAG_RLE )
j = cfile_read_int(f);
else
j = cip->width * cip->height;
if (!(p = d_malloc(j)))
{
if (num_custom)
d_free(custom_info);
cfclose(f);
return rc;
}
bmp = &GameBitmaps[x];
if (BitmapOriginal[x].bm_flags & 0x80) // already customized?
gr_free_bitmap_data(bmp);
// free(bmp->bm_data);
else {
else
{
// save original bitmap info
BitmapOriginal[x] = *bmp;
BitmapOriginal[x].bm_flags |= 0x80;
if (GameBitmapOffset[x]) { // from pig?
BitmapOriginal[x].bm_flags |= BM_FLAG_PAGED_OUT;
if (GameBitmapOffset[x]) // from pig?
{
BitmapOriginal[x].bm_flags |= BM_FLAG_PAGED_OUT;
BitmapOriginal[x].bm_data = (ubyte *)(size_t)GameBitmapOffset[x];
}
}
GameBitmapOffset[x] = 0; // not in pig
#ifndef NDEBUG
}
}
GameBitmapOffset[x] = 0; // not in pig
memset(bmp, 0, sizeof(*bmp));
#endif
gr_init_bitmap (bmp, 0, 0, 0, cip->width, cip->height,
cip->width, p);
gr_set_bitmap_flags(bmp, cip->flags & 255);
bmp->avg_color = cip->flags >> 8;
gr_init_bitmap (bmp, 0, 0, 0, cip->width, cip->height, cip->width, p);
gr_set_bitmap_flags(bmp, cip->flags & 255);
bmp->avg_color = cip->flags >> 8;
#ifdef BITMAP_SELECTOR
if ( bmp->bm_selector )
if (!dpmi_modify_selector_base( bmp->bm_selector, bmp->bm_data ))
Error( "Error modifying selector base in custom.c\n" );
#endif
if ( cip->flags & BM_FLAG_RLE ) {
int *ip = (int *)p;
*ip = j;
p += 4;
j -= 4;
}
if (cfread(p, 1, j, f) < 1)
goto err;
#ifdef D1XD3D
// needed to store rle flag
gr_set_bitmap_data(bmp, bmp->bm_data);
#endif
} else if ((x + 1) < 0) {
cfseek( f, cip->offset, SEEK_SET );
snd = &GameSounds[x & 0x7fffffff];
if (!(p = d_malloc(j = cip->width)))
goto err;
if (SoundOriginal[x].length & 0x80000000) // already customized?
d_free(snd->data);
else {
#ifdef ALLEGRO
SoundOriginal[x].length = snd->len | 0x80000000;
#else
SoundOriginal[x].length = snd->length | 0x80000000;
#ifdef BITMAP_SELECTOR
if ( bmp->bm_selector )
if (!dpmi_modify_selector_base( bmp->bm_selector, bmp->bm_data ))
Error( "Error modifying selector base in custom.c\n" );
#endif
SoundOriginal[x].data = snd->data;
}
if ( cip->flags & BM_FLAG_RLE )
{
int *ip = (int *)p;
*ip = j;
p += 4;
j -= 4;
}
if (cfread(p, 1, j, f) < 1)
{
if (num_custom)
d_free(custom_info);
cfclose(f);
return rc;
}
}
else if ((cip->repl_idx + 1) < 0)
{
cfseek( f, cip->offset, SEEK_SET );
snd = &GameSounds[x & 0x7fffffff];
if (!(p = d_malloc(j = cip->width)))
{
if (num_custom)
d_free(custom_info);
cfclose(f);
return rc;
}
if (SoundOriginal[x & 0x7fffffff].length & 0x80000000) // already customized?
d_free(snd->data);
else
{
#ifdef ALLEGRO
SoundOriginal[x & 0x7fffffff].length = snd->len | 0x80000000;
#else
SoundOriginal[x & 0x7fffffff].length = snd->length | 0x80000000;
#endif
SoundOriginal[x & 0x7fffffff].data = snd->data;
}
#ifdef ALLEGRO
snd->loop_end = snd->len = j;
snd->loop_end = snd->len = j;
#else
snd->length = j;
snd->length = j;
#endif
snd->data = p;
if (cfread(p, j, 1, f) < 1)
goto err;
snd->data = p;
if (cfread(p, j, 1, f) < 1)
{
if (num_custom)
d_free(custom_info);
cfclose(f);
return rc;
}
}
cip++;
}
cip++;
}
rc = 0;
err:
if (num_custom) d_free(custom_info);
cfclose(f);
return rc;
rc = 0;
if (num_custom)
d_free(custom_info);
cfclose(f);
return rc;
}
int read_d2_robot_info(CFILE *fp, robot_info *ri)
@ -330,6 +409,7 @@ int read_d2_robot_info(CFILE *fp, robot_info *ri)
int j, k;
ri->model_num = cfile_read_int(fp);
for (j = 0; j < MAX_GUNS; j++)
cfile_read_vector(&ri->gun_points[j], fp);
for (j = 0; j < MAX_GUNS; j++)
@ -400,151 +480,205 @@ int read_d2_robot_info(CFILE *fp, robot_info *ri)
/*ri->behavior =*/ cfile_read_byte(fp);
/*ri->aim =*/ cfile_read_byte(fp);
for (j = 0; j < MAX_GUNS + 1; j++) {
for (k = 0; k < N_ANIM_STATES; k++) {
for (j = 0; j < MAX_GUNS + 1; j++)
{
for (k = 0; k < N_ANIM_STATES; k++)
{
ri->anim_states[j][k].n_joints = cfile_read_short(fp);
ri->anim_states[j][k].offset = cfile_read_short(fp);
}
}
ri->always_0xabcd = cfile_read_int(fp);
return 1;
}
void load_hxm(char *hxmname) {
unsigned int repl_num;
int i;
CFILE *f;
int n_items;
void load_hxm(char *hxmname)
{
unsigned int repl_num;
int i;
CFILE *f;
int n_items;
if (!(f = cfopen((char *)hxmname, "rb")))
return; // hxm file doesn't exist
if (cfile_read_int(f) != 0x21584d48) /* HMX! */
goto err; // invalid hxm file
if (cfile_read_int(f) != 1)
goto err; // unknown version
if (!(f = cfopen((char *)hxmname, "rb")))
return; // hxm file doesn't exist
// read robot info
if ((n_items = cfile_read_int(f)) != 0) {
for (i = 0; i < n_items; i++) {
repl_num = cfile_read_int(f);
if (repl_num >= MAX_ROBOT_TYPES)
cfseek(f, 480, SEEK_CUR); /* sizeof d2_robot_info */
else
if (!(read_d2_robot_info(f, &Robot_info[repl_num])))
goto err;
if (cfile_read_int(f) != 0x21584d48) /* HMX! */
{
cfclose(f); // invalid hxm file
return;
}
}
// read joint positions
if ((n_items = cfile_read_int(f)) != 0) {
for (i = 0; i < n_items; i++) {
repl_num = cfile_read_int(f);
if (repl_num >= MAX_ROBOT_JOINTS)
cfseek(f, sizeof(jointpos), SEEK_CUR);
else
if (cfread(&Robot_joints[repl_num], sizeof(jointpos), 1, f) < 1)
goto err;
if (cfile_read_int(f) != 1)
{
cfclose(f); // unknown version
return;
}
}
// read polygon models
if ((n_items = cfile_read_int(f)) != 0) {
for (i = 0; i < n_items; i++) {
polymodel *pm;
// read robot info
if ((n_items = cfile_read_int(f)) != 0)
{
for (i = 0; i < n_items; i++)
{
repl_num = cfile_read_int(f);
repl_num = cfile_read_int(f);
if (repl_num >= MAX_POLYGON_MODELS) {
cfile_read_int(f); // skip n_models
cfseek(f, 734 - 8 + cfile_read_int(f) + 8, SEEK_CUR);
} else {
pm = &Polygon_models[repl_num];
if (pm->model_data)
d_free(pm->model_data);
if (cfread(pm, sizeof(polymodel), 1, f) < 1) {
pm->model_data = NULL;
goto err;
if (repl_num >= MAX_ROBOT_TYPES)
{
cfseek(f, 480, SEEK_CUR); /* sizeof d2_robot_info */
}
else
{
if (!(read_d2_robot_info(f, &Robot_info[repl_num])))
{
cfclose(f);
return;
}
}
}
if (!(pm->model_data = d_malloc(pm->model_data_size)))
goto err;
if (cfread(pm->model_data, pm->model_data_size, 1, f) < 1) {
pm->model_data = NULL;
goto err;
}
Dying_modelnums[repl_num] = cfile_read_int(f);
Dead_modelnums[repl_num] = cfile_read_int(f);
}
}
}
// read object bitmaps
if ((n_items = cfile_read_int(f)) != 0) {
for (i = 0; i < n_items; i++) {
repl_num = cfile_read_int(f);
if (repl_num >= MAX_OBJ_BITMAPS)
cfseek(f, 2, SEEK_CUR);
else {
ObjBitmaps[repl_num].index = cfile_read_short(f);
}
// read joint positions
if ((n_items = cfile_read_int(f)) != 0)
{
for (i = 0; i < n_items; i++)
{
repl_num = cfile_read_int(f);
if (repl_num >= MAX_ROBOT_JOINTS)
cfseek(f, sizeof(jointpos), SEEK_CUR);
else
{
if (cfread(&Robot_joints[repl_num], sizeof(jointpos), 1, f) < 1)
{
cfclose(f);
return;
}
}
}
}
}
err:
cfclose(f);
// read polygon models
if ((n_items = cfile_read_int(f)) != 0)
{
for (i = 0; i < n_items; i++)
{
polymodel *pm;
repl_num = cfile_read_int(f);
if (repl_num >= MAX_POLYGON_MODELS)
{
cfile_read_int(f); // skip n_models
cfseek(f, 734 - 8 + cfile_read_int(f) + 8, SEEK_CUR);
}
else
{
pm = &Polygon_models[repl_num];
if (pm->model_data)
d_free(pm->model_data);
if (cfread(pm, sizeof(polymodel), 1, f) < 1)
{
pm->model_data = NULL;
cfclose(f);
return;
}
if (!(pm->model_data = d_malloc(pm->model_data_size)))
{
cfclose(f);
return;
}
if (cfread(pm->model_data, pm->model_data_size, 1, f) < 1)
{
pm->model_data = NULL;
cfclose(f);
return;
}
Dying_modelnums[repl_num] = cfile_read_int(f);
Dead_modelnums[repl_num] = cfile_read_int(f);
}
}
}
// read object bitmaps
if ((n_items = cfile_read_int(f)) != 0)
{
for (i = 0; i < n_items; i++)
{
repl_num = cfile_read_int(f);
if (repl_num >= MAX_OBJ_BITMAPS)
cfseek(f, 2, SEEK_CUR);
else
ObjBitmaps[repl_num].index = cfile_read_short(f);
}
}
cfclose(f);
}
// undo customized items
void custom_remove() {
int i;
void custom_remove()
{
int i;
grs_bitmap *bmo = BitmapOriginal;
grs_bitmap *bmp = GameBitmaps;
grs_bitmap *bmp = GameBitmaps;
for (i = 0; i < MAX_BITMAP_FILES; bmo++, bmp++, i++)
if (bmo->bm_flags & 0x80) {
for (i = 0; i < MAX_BITMAP_FILES; bmo++, bmp++, i++)
if (bmo->bm_flags & 0x80)
{
gr_free_bitmap_data(bmp);
*bmp = *bmo;
if (bmo->bm_flags & BM_FLAG_PAGED_OUT) {
GameBitmapOffset[i] = (int)(size_t)BitmapOriginal[i].bm_data;
if (bmo->bm_flags & BM_FLAG_PAGED_OUT)
{
GameBitmapOffset[i] = (int)(size_t)BitmapOriginal[i].bm_data;
gr_set_bitmap_flags(bmp, BM_FLAG_PAGED_OUT);
gr_set_bitmap_data(bmp, Piggy_bitmap_cache_data);
} else {
}
else
{
gr_set_bitmap_flags(bmp, bmo->bm_flags & 0x7f);
#ifdef BITMAP_SELECTOR
if ( bmp->bm_selector )
if (!dpmi_modify_selector_base( bmp->bm_selector, bmp->bm_data ))
Error( "Error modifying selector base in custom.c\n" );
#endif
#ifdef D1XD3D
gr_set_bitmap_data(bmp, bmp->bm_data);
#endif
}
bmo->bm_flags = 0;
}
for (i = 0; i < MAX_SOUND_FILES; i++)
if (SoundOriginal[i].length & 0x80000000) {
d_free(GameSounds[i].data);
GameSounds[i].data = SoundOriginal[i].data;
#ifdef ALLEGRO
GameSounds[i].len = SoundOriginal[i].length & 0x7fffffff;
#else
GameSounds[i].length = SoundOriginal[i].length & 0x7fffffff;
#ifdef BITMAP_SELECTOR
if ( bmp->bm_selector )
if (!dpmi_modify_selector_base( bmp->bm_selector, bmp->bm_data ))
Error( "Error modifying selector base in custom.c\n" );
#endif
SoundOriginal[i].length = 0;
}
}
bmo->bm_flags = 0;
}
for (i = 0; i < MAX_SOUND_FILES; i++)
if (SoundOriginal[i].length & 0x80000000)
{
d_free(GameSounds[i].data);
GameSounds[i].data = SoundOriginal[i].data;
#ifdef ALLEGRO
GameSounds[i].len = SoundOriginal[i].length & 0x7fffffff;
#else
GameSounds[i].length = SoundOriginal[i].length & 0x7fffffff;
#endif
SoundOriginal[i].length = 0;
}
}
void load_custom_data(char *level_name) {
char custom_file[64];
void load_custom_data(char *level_name)
{
char custom_file[64];
custom_remove();
strncpy(custom_file, level_name, 63);
custom_file[63] = 0;
change_ext(custom_file, "pg1", sizeof(custom_file));
load_pigpog(custom_file);
change_ext(custom_file, "dtx", sizeof(custom_file));
load_pigpog(custom_file);
change_ext(custom_file, "hx1", sizeof(custom_file));
load_hxm(custom_file);
custom_remove();
strncpy(custom_file, level_name, 63);
custom_file[63] = 0;
change_ext(custom_file, "pg1", sizeof(custom_file));
load_pigpog(custom_file);
change_ext(custom_file, "dtx", sizeof(custom_file));
load_pigpog(custom_file);
change_ext(custom_file, "hx1", sizeof(custom_file));
load_hxm(custom_file);
}
void custom_close() {
custom_remove();
void custom_close()
{
custom_remove();
}

View file

@ -696,6 +696,8 @@ void LoadLevel(int level_num)
#endif
load_endlevel_data(level_num);
load_custom_data(level_name);
#ifdef NETWORK
reset_network_objects();
@ -1294,8 +1296,6 @@ void StartNewLevel(int level_num)
GameTime = 0;
load_custom_data(get_level_file(level_num));
if (!(Game_mode & GM_MULTI)) {
do_briefing_screens(Briefing_text_filename, level_num);
}