OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into new_level_refactor

Browse source 
# Conflicts:
#	src/c_dispatch.cpp
This commit is contained in:
Christoph Oelckers 2019-01-27 10:26:23 +01:00
commit 22939aade7
9 changed files with 133 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/g_game.cpp
View file

@ -1021,9 +1021,8 @@ void G_Ticker ()
if (ToggleFullscreen)
{
static char toggle_fullscreen[] = "toggle fullscreen";
ToggleFullscreen = false;
AddCommandString (toggle_fullscreen);
AddCommandString ("toggle fullscreen");
}
// do things to change the game state
@ -1173,6 +1172,7 @@ void G_Ticker ()
// [ZZ] also tick the UI part of the events
E_UiTick();
C_RunDelayedCommands();
// do main actions
switch (gamestate)
@ -2058,12 +2058,12 @@ static void PutSaveWads (FSerializer &arc)
name = Wads.GetWadName (Wads.GetIwadNum());
arc.AddString("Game WAD", name);
// Name of wad the map resides in
// Name of wad the map resides in
if (Wads.GetLumpFile (level.lumpnum) > Wads.GetIwadNum())
{
{
name = Wads.GetWadName (Wads.GetLumpFile (level.lumpnum));
arc.AddString("Map WAD", name);
}
}
}
static void PutSaveComment (FSerializer &arc)
@ -2079,7 +2079,7 @@ static void PutSaveComment (FSerializer &arc)
arc.AddString("Creation Time", comment);
// Get level name
// Get level name
//strcpy (comment, level.level_name);
comment.Format("%s - %s\n", level.MapName.GetChars(), level.LevelName.GetChars());