Make sure correct palette is loaded for game, fixing swapping of black and white and cockpit/status bar not showing for ogl build, in multiplayer
This commit is contained in:
parent
ced670e54a
commit
d45e67c242
|
@ -7,6 +7,7 @@ main/gameseq.c, main/menu.c: Hide mission dialog before the level intro screens
|
||||||
main/game.c: Finally fix bug where if you start a single player game then a multiplayer game, time is stopped. Always start time if it's stopped and the game window is activated
|
main/game.c: Finally fix bug where if you start a single player game then a multiplayer game, time is stopped. Always start time if it's stopped and the game window is activated
|
||||||
main/menu.c: Check menus[0], not menus[i] in hide_menus - fixing possible crash
|
main/menu.c: Check menus[0], not menus[i] in hide_menus - fixing possible crash
|
||||||
main/gameseq.c: In AdvanceLevel only set Game_mode to GAME_OVER if current level is last level, fixing stupid mistake introduced in rev. 1080
|
main/gameseq.c: In AdvanceLevel only set Game_mode to GAME_OVER if current level is last level, fixing stupid mistake introduced in rev. 1080
|
||||||
|
main/gameseq.c: Make sure correct palette is loaded for game, fixing swapping of black and white and cockpit/status bar not showing for ogl build, in multiplayer
|
||||||
|
|
||||||
20100326
|
20100326
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -705,6 +705,7 @@ void LoadLevel(int level_num)
|
||||||
|
|
||||||
songs_play_level_song( Current_level_num );
|
songs_play_level_song( Current_level_num );
|
||||||
|
|
||||||
|
gr_palette_load(gr_palette); //actually load the palette
|
||||||
}
|
}
|
||||||
|
|
||||||
//sets up Player_num & ConsoleObject
|
//sets up Player_num & ConsoleObject
|
||||||
|
@ -1202,6 +1203,9 @@ void StartNewLevelSub(int level_num, int page_in_textures)
|
||||||
#endif
|
#endif
|
||||||
init_player_stats_level();
|
init_player_stats_level();
|
||||||
|
|
||||||
|
gr_use_palette_table( "palette.256" );
|
||||||
|
gr_palette_load(gr_palette);
|
||||||
|
|
||||||
#ifndef SHAREWARE
|
#ifndef SHAREWARE
|
||||||
#ifdef NETWORK
|
#ifdef NETWORK
|
||||||
if ((Game_mode & GM_MULTI_COOP) && Network_rejoined)
|
if ((Game_mode & GM_MULTI_COOP) && Network_rejoined)
|
||||||
|
|
Loading…
Reference in a new issue