- Fix broken loading of pre-r4253 savegames.

SVN r4272 (trunk)
This commit is contained in:
Randy Heit 2013-05-18 15:38:10 +00:00
parent 6ada6158ef
commit 8af465189a
2 changed files with 2 additions and 4 deletions

View file

@ -398,7 +398,6 @@ void D_SetupUserInfo ()
{ {
FBaseCVar **newcvar; FBaseCVar **newcvar;
FName cvarname(cvar->GetName()); FName cvarname(cvar->GetName());
ECVarType type;
switch (cvarname.GetIndex()) switch (cvarname.GetIndex())
{ {
@ -900,7 +899,7 @@ void D_ReadUserInfoStrings (int pnum, BYTE **stream, bool update)
void ReadCompatibleUserInfo(FArchive &arc, userinfo_t &info) void ReadCompatibleUserInfo(FArchive &arc, userinfo_t &info)
{ {
char netname[MAXPLAYERNAME]; char netname[MAXPLAYERNAME + 1];
BYTE team; BYTE team;
int aimdist, color, colorset, skin, gender; int aimdist, color, colorset, skin, gender;
bool neverswitch; bool neverswitch;
@ -914,7 +913,7 @@ void ReadCompatibleUserInfo(FArchive &arc, userinfo_t &info)
*static_cast<FStringCVar *>(info[NAME_Name]) = netname; *static_cast<FStringCVar *>(info[NAME_Name]) = netname;
*static_cast<FIntCVar *>(info[NAME_Team]) = team; *static_cast<FIntCVar *>(info[NAME_Team]) = team;
*static_cast<FFloatCVar *>(info[NAME_AutoAim]) = (float)aimdist / ANGLE_1; *static_cast<FFloatCVar *>(info[NAME_Autoaim]) = (float)aimdist / ANGLE_1;
*static_cast<FIntCVar *>(info[NAME_Skin]) = skin; *static_cast<FIntCVar *>(info[NAME_Skin]) = skin;
*static_cast<FIntCVar *>(info[NAME_Gender]) = gender; *static_cast<FIntCVar *>(info[NAME_Gender]) = gender;
*static_cast<FBoolCVar *>(info[NAME_NeverSwitchOnPickup]) = neverswitch; *static_cast<FBoolCVar *>(info[NAME_NeverSwitchOnPickup]) = neverswitch;

View file

@ -566,4 +566,3 @@ xx(NeverSwitchOnPickup)
xx(MoveBob) xx(MoveBob)
xx(StillBob) xx(StillBob)
xx(PlayerClass) xx(PlayerClass)
xx(AutoAim)