zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #484 from ChillyDoom/wi_stuff-sizeof-fix 

Minor Intermission Fix
This commit is contained in:
coelckers 2016-01-19 16:39:32 +01:00
parent c02d922014 119c2f36b2
commit 9282eda306
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.