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

Add LoadLevel parameter page_in_textures to match D2X

Browse source
This commit is contained in:
Kp 2013-03-23 22:57:04 +00:00
parent d0d718cdcb
commit 82e23a6cf6
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
main/gameseq.c
View file

@ -603,7 +603,7 @@ ushort netmisc_calc_checksum()
}
//load a level off disk. level numbers start at 1. Secret levels are -1,-2,-3
void LoadLevel(int level_num)
void LoadLevel(int level_num,int page_in_textures)
{
char *level_name;
player save_player;
@ -643,6 +643,9 @@ void LoadLevel(int level_num)
songs_play_level_song( Current_level_num, 0 );
gr_palette_load(gr_palette); //actually load the palette
if ( page_in_textures )
piggy_load_level_data();
}
//sets up Player_num & ConsoleObject
@ -1097,11 +1100,7 @@ void StartNewLevelSub(int level_num, int page_in_textures, int secret_flag)
newdemo_record_start_frame(FrameTime );
}
LoadLevel(level_num);
if ( page_in_textures ) {
piggy_load_level_data();
}
LoadLevel(level_num, page_in_textures);
Assert(Current_level_num == level_num); //make sure level set right

2
main/gameseq.h
View file

@ -77,7 +77,7 @@ void DoPlayerDead(void);
// load a level off disk. level numbers start at 1.
// Secret levels are -1,-2,-3
void LoadLevel(int level_num);
void LoadLevel(int level_num,int page_in_textures);
extern void gameseq_remove_unused_players();

6
main/newdemo.c
View file

@ -2587,8 +2587,7 @@ int newdemo_read_frame_information(int rewrite)
return -1;
}
#endif
LoadLevel((int)loaded_level);
piggy_load_level_data();
LoadLevel((int)loaded_level,1);
nd_playback_v_cntrlcen_destroyed = 0;
reset_palette_add(); // get palette back to normal
@ -2675,8 +2674,7 @@ void newdemo_goto_end(int to_rewrite)
}
if (level != Current_level_num)
{
LoadLevel(level);
piggy_load_level_data();
LoadLevel(level,1);
}
}
else