zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source 
Conflicts:
	src/g_hexen/a_wraith.cpp
This commit is contained in:
Christoph Oelckers 2016-01-20 11:41:27 +01:00
commit 83cbf6cae5
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/g_game.cpp
View file

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

2
src/wi_stuff.cpp
View file

@ -1228,7 +1228,7 @@ void WI_initDeathmatchStats (void)
acceleratestage = 0; acceleratestage = 0;
memset(playerready, 0, sizeof(playerready)); memset(playerready, 0, sizeof(playerready));
memset(cnt_frags, 0, sizeof(cnt_frags)); memset(cnt_frags, 0, sizeof(cnt_frags));
memset(cnt_deaths, 0, sizeof(cnt_frags)); memset(cnt_deaths, 0, sizeof(cnt_deaths));
memset(player_deaths, 0, sizeof(player_deaths)); memset(player_deaths, 0, sizeof(player_deaths));
total_frags = 0; total_frags = 0;
total_deaths = 0; total_deaths = 0;

11
src/wi_stuff.h
View file

@ -33,7 +33,7 @@ class FTexture;
struct wbplayerstruct_t struct wbplayerstruct_t
{ {
bool in; // whether the player is in game bool in; // whether the player is in game
// Player stats, kills, collected items etc. // Player stats, kills, collected items etc.
int skills; int skills;
int sitems; int sitems;
@ -41,7 +41,6 @@ struct wbplayerstruct_t
int stime; int stime;
int frags[MAXPLAYERS]; int frags[MAXPLAYERS];
int fragcount; // [RH] Cumulative frags for this player int fragcount; // [RH] Cumulative frags for this player
}; };
struct wbstartstruct_t struct wbstartstruct_t
@ -54,7 +53,7 @@ struct wbstartstruct_t
FTexture *LName0; FTexture *LName0;
FTexture *LName1; FTexture *LName1;
int maxkills; int maxkills;
int maxitems; int maxitems;
int maxsecret; int maxsecret;
@ -63,19 +62,19 @@ struct wbstartstruct_t
// the par time and sucktime // the par time and sucktime
int partime; // in tics int partime; // in tics
int sucktime; // in minutes int sucktime; // in minutes
// total time for the entire current game // total time for the entire current game
int totaltime; int totaltime;
// index of this player in game // index of this player in game
int pnum; int pnum;
wbplayerstruct_t plyr[MAXPLAYERS]; wbplayerstruct_t plyr[MAXPLAYERS];
}; };
// Intermission stats. // Intermission stats.
// Parameters for world map / intermission. // Parameters for world map / intermission.
extern wbstartstruct_t wminfo; extern wbstartstruct_t wminfo;
// Called by main loop, animate the intermission. // Called by main loop, animate the intermission.