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

move hoard data saving from main to save_hoard_data (d2x-cvs takeover)

Browse source
This commit is contained in:
zicodxx 2006-10-02 13:29:04 +00:00
parent 9e4e95de77
commit 53f6775376
3 changed files with 70 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
main/inferno.c
View file

@ -68,7 +68,6 @@ char copyright[] = "DESCENT II COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR
#include "polyobj.h"
#include "effects.h"
#include "digi.h"
#include "iff.h"
#include "pcx.h"
#include "palette.h"
#include "args.h"
@ -979,64 +978,7 @@ int main(int argc, char *argv[])
#ifdef EDITOR
if (FindArg("-hoarddata") != 0) {
#define MAX_BITMAPS_PER_BRUSH 30
grs_bitmap * bm[MAX_BITMAPS_PER_BRUSH];
grs_bitmap icon;
int nframes;
ubyte palette[256*3];
PHYSFS_file *ofile;
int iff_error,i;
char *sounds[] = {"selforb.raw","selforb.r22", //SOUND_YOU_GOT_ORB
"teamorb.raw","teamorb.r22", //SOUND_FRIEND_GOT_ORB
"enemyorb.raw","enemyorb.r22", //SOUND_OPPONENT_GOT_ORB
"OPSCORE1.raw","OPSCORE1.r22"}; //SOUND_OPPONENT_HAS_SCORED
ofile = PHYSFSX_openWriteBuffered("hoard.ham");
iff_error = iff_read_animbrush("orb.abm",bm,MAX_BITMAPS_PER_BRUSH,&nframes,palette);
Assert(iff_error == IFF_NO_ERROR);
PHYSFS_writeULE16(ofile, nframes);
PHYSFS_writeULE16(ofile, bm[0]->bm_w);
PHYSFS_writeULE16(ofile, bm[0]->bm_h);
PHYSFS_write(ofile, palette, 3, 256);
for (i=0;i<nframes;i++)
PHYSFS_write(ofile, bm[i]->bm_data, bm[i]->bm_w*bm[i]->bm_h, 1);
iff_error = iff_read_animbrush("orbgoal.abm",bm,MAX_BITMAPS_PER_BRUSH,&nframes,palette);
Assert(iff_error == IFF_NO_ERROR);
Assert(bm[0]->bm_w == 64 && bm[0]->bm_h == 64);
PHYSFS_writeULE16(ofile, nframes);
PHYSFS_write(ofile, palette, 3, 256);
for (i=0;i<nframes;i++)
PHYSFS_write(ofile, bm[i]->bm_data, bm[i]->bm_w*bm[i]->bm_h, 1);
for (i=0;i<2;i++) {
iff_error = iff_read_bitmap(i?"orbb.bbm":"orb.bbm",&icon,BM_LINEAR,palette);
Assert(iff_error == IFF_NO_ERROR);
PHYSFS_writeULE16(ofile, icon.bm_w);
PHYSFS_writeULE16(ofile, icon.bm_h);
PHYSFS_write(ofile, palette, 3, 256);
PHYSFS_write(ofile, icon.bm_data, icon.bm_w*icon.bm_h, 1);
}
for (i=0;i<sizeof(sounds)/sizeof(*sounds);i++) {
PHYSFS_file *ifile;
int size;
ubyte *buf;
ifile = PHYSFS_openRead(sounds[i]);
Assert(ifile != NULL);
size = PHYSFS_fileLength(ifile);
buf = d_malloc(size);
PHYSFS_read(ifile, buf, size, 1);
PHYSFS_writeULE32(ofile, size);
PHYSFS_write(ofile, buf, size, 1);
d_free(buf);
PHYSFS_close(ifile);
}
PHYSFS_close(ofile);
save_hoard_data();
exit(1);
}
#endif

65
main/multi.c
View file

@ -72,6 +72,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "args.h"
#include "cfile.h"
#include "effects.h"
#include "iff.h"
void multi_reset_player_object(object *objp);
void multi_reset_object_texture(object *objp);
@ -5233,6 +5234,70 @@ void init_hoard_data()
first_time = 0;
}
#ifdef EDITOR
void save_hoard_data(void)
{
#define MAX_BITMAPS_PER_BRUSH 30
grs_bitmap * bm[MAX_BITMAPS_PER_BRUSH];
grs_bitmap icon;
int nframes;
ubyte palette[256*3];
PHYSFS_file *ofile;
int iff_error,i;
char *sounds[] = {"selforb.raw","selforb.r22", //SOUND_YOU_GOT_ORB
"teamorb.raw","teamorb.r22", //SOUND_FRIEND_GOT_ORB
"enemyorb.raw","enemyorb.r22", //SOUND_OPPONENT_GOT_ORB
"OPSCORE1.raw","OPSCORE1.r22"}; //SOUND_OPPONENT_HAS_SCORED
ofile = PHYSFSX_openWriteBuffered("hoard.ham");
iff_error = iff_read_animbrush("orb.abm",bm,MAX_BITMAPS_PER_BRUSH,&nframes,palette);
Assert(iff_error == IFF_NO_ERROR);
PHYSFS_writeULE16(ofile, nframes);
PHYSFS_writeULE16(ofile, bm[0]->bm_w);
PHYSFS_writeULE16(ofile, bm[0]->bm_h);
PHYSFS_write(ofile, palette, 3, 256);
for (i=0;i<nframes;i++)
PHYSFS_write(ofile, bm[i]->bm_data, bm[i]->bm_w*bm[i]->bm_h, 1);
iff_error = iff_read_animbrush("orbgoal.abm",bm,MAX_BITMAPS_PER_BRUSH,&nframes,palette);
Assert(iff_error == IFF_NO_ERROR);
Assert(bm[0]->bm_w == 64 && bm[0]->bm_h == 64);
PHYSFS_writeULE16(ofile, nframes);
PHYSFS_write(ofile, palette, 3, 256);
for (i=0;i<nframes;i++)
PHYSFS_write(ofile, bm[i]->bm_data, bm[i]->bm_w*bm[i]->bm_h, 1);
for (i=0;i<2;i++)
{
iff_error = iff_read_bitmap(i?"orbb.bbm":"orb.bbm",&icon,BM_LINEAR,palette);
Assert(iff_error == IFF_NO_ERROR);
PHYSFS_writeULE16(ofile, icon.bm_w);
PHYSFS_writeULE16(ofile, icon.bm_h);
PHYSFS_write(ofile, palette, 3, 256);
PHYSFS_write(ofile, icon.bm_data, icon.bm_w*icon.bm_h, 1);
}
for (i=0;i<sizeof(sounds)/sizeof(*sounds);i++) {
PHYSFS_file *ifile;
int size;
ubyte *buf;
ifile = PHYSFS_openRead(sounds[i]);
Assert(ifile != NULL);
size = PHYSFS_fileLength(ifile);
buf = d_malloc(size);
PHYSFS_read(ifile, buf, size, 1);
PHYSFS_writeULE32(ofile, size);
PHYSFS_write(ofile, buf, size, 1);
d_free(buf);
PHYSFS_close(ifile);
}
PHYSFS_close(ofile);
}
#endif
void
multi_process_data(char *buf, int len)
{

4
main/multi.h
View file

@ -417,4 +417,8 @@ void change_playernum_to(int new_pnum);
#define MISSILE_ADJUST 100
#define FLARE_ADJUST 127
#ifdef EDITOR
void save_hoard_data(void);
#endif
#endif /* _MULTI_H */