OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/actor.h
	src/g_hexen/a_hexenspecialdecs.cpp
	src/g_strife/a_thingstoblowup.cpp
	src/thingdef/thingdef_codeptr.cpp
This commit is contained in:
Christoph Oelckers 2016-01-20 11:45:57 +01:00
commit 4b9647e539
23 changed files with 484 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/g_game.cpp
View file

@ -1933,9 +1933,6 @@ void G_DoLoadGame ()
}
G_ReadSnapshots (png);
STAT_Read(png);
FRandom::StaticReadRNGState (png);
P_ReadACSDefereds (png);
// load a base level
savegamerestore = true; // Use the player actors in the savegame
@ -1945,6 +1942,9 @@ void G_DoLoadGame ()
delete[] map;
savegamerestore = false;
STAT_Read(png);
FRandom::StaticReadRNGState(png);
P_ReadACSDefereds(png);
P_ReadACSVars(png);
NextSkill = -1;