zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-07 07:21:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changed C_ArchiveCVars()'s type parameter to a filter parameter, because using an arbitrary

Browse source 
number to represent a flag combination is stupid unreadable now that there's more than just
  the two possibilities it had when it was first written.

SVN r4278 (trunk)
This commit is contained in:
Randy Heit 2013-05-25 03:23:44 +00:00
parent 20b48b7c65
commit e271692dbb
3 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/c_cvars.cpp
View file

@ -1533,28 +1533,9 @@ void C_SetCVarsToDefaults (void)
} }
} }
void C_ArchiveCVars (FConfigFile *f, int type) void C_ArchiveCVars (FConfigFile *f, uint32 filter)
{ {
// type 0: Game-specific cvars
// type 1: Global cvars
// type 2: Unknown cvars
// type 3: Unknown global cvars
// type 4: User info cvars
// type 5: Server info cvars
static const DWORD filters[6] =
{
CVAR_ARCHIVE,
CVAR_ARCHIVE|CVAR_GLOBALCONFIG,
CVAR_ARCHIVE|CVAR_AUTO,
CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_AUTO,
CVAR_ARCHIVE|CVAR_USERINFO,
CVAR_ARCHIVE|CVAR_SERVERINFO
};
FBaseCVar *cvar = CVars; FBaseCVar *cvar = CVars;
DWORD filter;
filter = filters[type];
while (cvar) while (cvar)
{ {

4
src/c_cvars.h
View file

@ -157,7 +157,7 @@ private:
friend FBaseCVar *FindCVar (const char *var_name, FBaseCVar **prev); friend FBaseCVar *FindCVar (const char *var_name, FBaseCVar **prev);
friend FBaseCVar *FindCVarSub (const char *var_name, int namelen); friend FBaseCVar *FindCVarSub (const char *var_name, int namelen);
friend void UnlatchCVars (void); friend void UnlatchCVars (void);
friend void C_ArchiveCVars (FConfigFile *f, int type); friend void C_ArchiveCVars (FConfigFile *f, uint32 filter);
friend void C_SetCVarsToDefaults (void); friend void C_SetCVarsToDefaults (void);
friend void FilterCompactCVars (TArray<FBaseCVar *> &cvars, uint32 filter); friend void FilterCompactCVars (TArray<FBaseCVar *> &cvars, uint32 filter);
friend void C_DeinitConsole(); friend void C_DeinitConsole();
@ -189,7 +189,7 @@ FBaseCVar *C_CreateCVar(const char *var_name, ECVarType var_type, DWORD flags);
void UnlatchCVars (void); void UnlatchCVars (void);
// archive cvars to FILE f // archive cvars to FILE f
void C_ArchiveCVars (FConfigFile *f, int type); void C_ArchiveCVars (FConfigFile *f, uint32 filter);
// initialize cvars to default values after they are created // initialize cvars to default values after they are created
void C_SetCVarsToDefaults (void); void C_SetCVarsToDefaults (void);

12
src/gameconfigfile.cpp
View file

@ -483,12 +483,12 @@ void FGameConfigFile::ArchiveGameData (const char *gamename)
strncpy (subsection, "Player", sublen); strncpy (subsection, "Player", sublen);
SetSection (section, true); SetSection (section, true);
ClearCurrentSection (); ClearCurrentSection ();
C_ArchiveCVars (this, 4); C_ArchiveCVars (this, CVAR_ARCHIVE|CVAR_USERINFO);
strncpy (subsection, "ConsoleVariables", sublen); strncpy (subsection, "ConsoleVariables", sublen);
SetSection (section, true); SetSection (section, true);
ClearCurrentSection (); ClearCurrentSection ();
C_ArchiveCVars (this, 0); C_ArchiveCVars (this, CVAR_ARCHIVE);
strncpy (subsection, netgame ? "NetServerInfo" : "LocalServerInfo", sublen); strncpy (subsection, netgame ? "NetServerInfo" : "LocalServerInfo", sublen);
if (!netgame || consoleplayer == 0) if (!netgame || consoleplayer == 0)
@ -496,13 +496,13 @@ void FGameConfigFile::ArchiveGameData (const char *gamename)
// this machine was not the initial host. // this machine was not the initial host.
SetSection (section, true); SetSection (section, true);
ClearCurrentSection (); ClearCurrentSection ();
C_ArchiveCVars (this, 5); C_ArchiveCVars (this, CVAR_ARCHIVE|CVAR_SERVERINFO);
} }
strncpy (subsection, "UnknownConsoleVariables", sublen); strncpy (subsection, "UnknownConsoleVariables", sublen);
SetSection (section, true); SetSection (section, true);
ClearCurrentSection (); ClearCurrentSection ();
C_ArchiveCVars (this, 2); C_ArchiveCVars (this, CVAR_ARCHIVE|CVAR_AUTO);
strncpy (subsection, "ConsoleAliases", sublen); strncpy (subsection, "ConsoleAliases", sublen);
SetSection (section, true); SetSection (section, true);
@ -532,11 +532,11 @@ void FGameConfigFile::ArchiveGlobalData ()
SetSection ("GlobalSettings", true); SetSection ("GlobalSettings", true);
ClearCurrentSection (); ClearCurrentSection ();
C_ArchiveCVars (this, 1); C_ArchiveCVars (this, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
SetSection ("GlobalSettings.Unknown", true); SetSection ("GlobalSettings.Unknown", true);
ClearCurrentSection (); ClearCurrentSection ();
C_ArchiveCVars (this, 3); C_ArchiveCVars (this, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_AUTO);
} }
FString FGameConfigFile::GetConfigPath (bool tryProg) FString FGameConfigFile::GetConfigPath (bool tryProg)