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

Merge branch 'ziplantil/custom-sxx' into master

Browse source
This commit is contained in:
Kp 2019-08-15 01:34:22 +00:00
parent 38fabd7c49 d9c113c315
commit 0d66e531a0
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/piggy.h
View file

@ -165,6 +165,7 @@ extern void remove_char( char * s, char c ); // in piggy.c
#define REMOVE_COMMENTS(s) remove_char((s),';') #define REMOVE_COMMENTS(s) remove_char((s),';')
#define REMOVE_DOTS(s) remove_char((s),'.') #define REMOVE_DOTS(s) remove_char((s),'.')
extern int Piggy_hamfile_version;
extern unsigned Num_bitmap_files; extern unsigned Num_bitmap_files;
extern int Num_sound_files; extern int Num_sound_files;
extern ubyte bogus_bitmap_initialized; extern ubyte bogus_bitmap_initialized;
@ -183,6 +184,7 @@ extern array<BitmapFile, MAX_BITMAP_FILES> AllBitmaps;
#endif #endif
void piggy_init_pigfile(const char *filename); void piggy_init_pigfile(const char *filename);
int read_hamfile(); int read_hamfile();
int read_sndfile();
void swap_0_255(grs_bitmap &bmp); void swap_0_255(grs_bitmap &bmp);
#endif #endif

11
similar/main/mission.cpp
View file

@ -753,7 +753,16 @@ static mission_list_type build_mission_list(int anarchy_mode)
int load_mission_ham() int load_mission_ham()
{ {
read_hamfile(); read_hamfile(); // intentionally can also read from the HOG
if (Piggy_hamfile_version >= 3)
{
// re-read sounds in case mission has custom .sXX
Num_sound_files = 0;
read_sndfile();
piggy_read_sounds();
}
if (Current_mission->descent_version == Mission::descent_version_type::descent2a && if (Current_mission->descent_version == Mission::descent_version_type::descent2a &&
Current_mission->alternate_ham_file) Current_mission->alternate_ham_file)
{ {

2
similar/main/piggy.cpp
View file

@ -1045,7 +1045,7 @@ int read_hamfile()
return 1; return 1;
} }
static int read_sndfile() int read_sndfile()
{ {
int snd_id,snd_version; int snd_id,snd_version;
int N_sounds; int N_sounds;