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

Pass grs_main_bitmap to iff_read_animbrush

Browse source
This commit is contained in:
Kp 2015-01-25 05:32:44 +00:00
parent 2798ce8631
commit 922a7b7dc9
6 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/include/iff.h
View file

@ -55,7 +55,7 @@ int iff_read_into_bitmap(const char *ifilename,grs_bitmap *bm, palette_array_t *
//read in animator brush (.abm) file
//fills in array of pointers, and n_bitmaps.
//returns iff error codes. max_bitmaps is size of array.
int iff_read_animbrush(const char *ifilename,array<std::unique_ptr<grs_bitmap>, MAX_BITMAPS_PER_BRUSH> &bm,unsigned *n_bitmaps,palette_array_t &palette);
int iff_read_animbrush(const char *ifilename,array<std::unique_ptr<grs_main_bitmap>, MAX_BITMAPS_PER_BRUSH> &bm,unsigned *n_bitmaps,palette_array_t &palette);
// After a read
extern ubyte iff_transparent_color;

2
d1x-rebirth/main/bmread.cpp
View file

@ -232,7 +232,7 @@ static void ab_load(int skip, const char * filename, array<bitmap_index, MAX_BIT
return;
}
array<std::unique_ptr<grs_bitmap>, MAX_BITMAPS_PER_BRUSH> bm;
array<std::unique_ptr<grs_main_bitmap>, MAX_BITMAPS_PER_BRUSH> bm;
iff_error = iff_read_animbrush(filename,bm,nframes,newpal);
if (iff_error != IFF_NO_ERROR) {
Error("File %s - IFF error: %s",filename,iff_errormsg(iff_error));

2
d2x-rebirth/main/bmread.cpp
View file

@ -252,7 +252,7 @@ static void ab_load(int skip, const char * filename, bitmap_index bmp[], unsigne
// Note that last argument passes an address to the array newpal (which is a pointer).
// type mismatch found using lint, will substitute this line with an adjusted
// one. If fatal error, then it can be easily changed.
array<std::unique_ptr<grs_bitmap>, MAX_BITMAPS_PER_BRUSH> bm;
array<std::unique_ptr<grs_main_bitmap>, MAX_BITMAPS_PER_BRUSH> bm;
iff_error = iff_read_animbrush(filename,bm,nframes,newpal);
if (iff_error != IFF_NO_ERROR) {
Error("File <%s> - IFF error: %s, line %d",filename,iff_errormsg(iff_error),linenum);

17
similar/main/iff.cpp
View file

@ -490,11 +490,9 @@ static int convert_rgb15(grs_bitmap *bm,iff_bitmap_header *bmheader)
palette_array_t::iterator palptr = begin(bmheader->palette);
#if defined(DXX_BUILD_DESCENT_I)
gr_init_bitmap(*bm, bm->bm_type, 0, 0, bm->bm_w, bm->bm_h, bm->bm_rowsize, 0);
for (int y=0; y<bm->bm_h; y++) {
for (int x=0; x<bmheader->w; x++)
gr_bm_pixel(*bm, x, y, INDEX_TO_15BPP(bmheader->raw_data[y*bmheader->w+x]));
gr_bm_pixel(*bm, x, y, INDEX_TO_15BPP(bm->get_bitmap_data()[y*bmheader->w+x]));
}
#elif defined(DXX_BUILD_DESCENT_II)
ushort *new_data;
@ -506,7 +504,7 @@ static int convert_rgb15(grs_bitmap *bm,iff_bitmap_header *bmheader)
for (int y=0; y<bm->bm_h; y++) {
for (int x=0; x<bmheader->w; x++)
new_data[newptr++] = INDEX_TO_15BPP(bmheader->raw_data[y*bmheader->w+x]);
new_data[newptr++] = INDEX_TO_15BPP(bm->get_bitmap_data()[y*bmheader->w+x]);
}
@ -522,7 +520,7 @@ static int convert_rgb15(grs_bitmap *bm,iff_bitmap_header *bmheader)
//copy an iff header structure to a grs_bitmap structure
static void copy_iff_to_grs(grs_bitmap *bm,iff_bitmap_header *bmheader)
{
gr_init_bitmap(*bm, bmheader->type, 0, 0, bmheader->w, bmheader->h, bmheader->w, bmheader->raw_data);
gr_init_bitmap(*bm, bmheader->type, 0, 0, bmheader->w, bmheader->h, bmheader->w, bmheader->raw_data.release());
}
//if bm->bm_data is set, use it (making sure w & h are correct), else
@ -920,7 +918,7 @@ int iff_write_bitmap(const char *ofilename,grs_bitmap *bm,palette_array_t *palet
//read in many brushes. fills in array of pointers, and n_bitmaps.
//returns iff error codes
int iff_read_animbrush(const char *ifilename,array<std::unique_ptr<grs_bitmap>, MAX_BITMAPS_PER_BRUSH> &bm_list,unsigned *n_bitmaps,palette_array_t &palette)
int iff_read_animbrush(const char *ifilename,array<std::unique_ptr<grs_main_bitmap>, MAX_BITMAPS_PER_BRUSH> &bm_list,unsigned *n_bitmaps,palette_array_t &palette)
{
int ret = IFF_NO_ERROR; //return code
int sig,form_len;
@ -953,10 +951,11 @@ int iff_read_animbrush(const char *ifilename,array<std::unique_ptr<grs_bitmap>,
prev_bm = *n_bitmaps>0?bm_list[*n_bitmaps-1].get() : nullptr;
bm_list[*n_bitmaps] = make_unique<grs_bitmap>();
gr_init_bitmap_data(*bm_list[*n_bitmaps].get());
auto &n = bm_list[*n_bitmaps];
n = make_unique<grs_main_bitmap>();
gr_init_bitmap_data(*n.get());
ret = iff_parse_bitmap(ifile,bm_list[*n_bitmaps].get(),form_type,*n_bitmaps>0 ? nullptr : &palette,prev_bm);
ret = iff_parse_bitmap(ifile, n.get(), form_type, *n_bitmaps > 0 ? nullptr : &palette, prev_bm);
if (ret != IFF_NO_ERROR)
goto done;

2
similar/main/multi.cpp
View file

@ -5017,7 +5017,7 @@ void save_hoard_data(void)
auto ofile = PHYSFSX_openWriteBuffered("hoard.ham");
array<std::unique_ptr<grs_bitmap>, MAX_BITMAPS_PER_BRUSH> bm;
array<std::unique_ptr<grs_main_bitmap>, MAX_BITMAPS_PER_BRUSH> bm;
iff_error = iff_read_animbrush("orb.abm",bm,&nframes,palette);
Assert(iff_error == IFF_NO_ERROR);
PHYSFS_writeULE16(ofile, nframes);

2
similar/main/piggy.cpp
View file

@ -840,7 +840,7 @@ void piggy_new_pigfile(char *pigname)
sprintf( abmname, "%s.abm", basename );
array<std::unique_ptr<grs_bitmap>, MAX_BITMAPS_PER_BRUSH> bm;
array<std::unique_ptr<grs_main_bitmap>, MAX_BITMAPS_PER_BRUSH> bm;
iff_error = iff_read_animbrush(abmname,bm,&nframes,newpal);
if (iff_error != IFF_NO_ERROR) {