1.1 --- a/extensions/sdktools/vglobals.cpp	Fri Nov 23 23:21:19 2007 +0000
     1.2 +++ b/extensions/sdktools/vglobals.cpp	Fri Nov 23 23:24:40 2007 +0000
     1.3 @@ -40,17 +40,6 @@
     1.4  	char *addr = NULL;
     1.5  	int offset;
     1.6  
     1.7 -	/* g_pGameRules */
     1.8 -	if (!g_pGameConf->GetMemSig("CreateGameRulesObject", (void **)&addr) || !addr)
     1.9 -	{
    1.10 -		return;
    1.11 -	}
    1.12 -	if (!g_pGameConf->GetOffset("g_pGameRules", &offset) || !offset)
    1.13 -	{
    1.14 -		return;
    1.15 -	}
    1.16 -	g_pGameRules = *reinterpret_cast<void ***>(addr + offset);
    1.17 -
    1.18  	/* gEntList and/or g_pEntityList */
    1.19  	if (!g_pGameConf->GetMemSig("LevelShutdown", (void **)&addr) || !addr)
    1.20  	{
    1.21 @@ -61,24 +50,35 @@
    1.22  		return;
    1.23  	}
    1.24  	g_EntList = *reinterpret_cast<void **>(addr + offset);
    1.25 +
    1.26 +	/* g_pGameRules */
    1.27 +	if (!g_pGameConf->GetMemSig("CreateGameRulesObject", (void **)&addr) || !addr)
    1.28 +	{
    1.29 +		return;
    1.30 +	}
    1.31 +	if (!g_pGameConf->GetOffset("g_pGameRules", &offset) || !offset)
    1.32 +	{
    1.33 +		return;
    1.34 +	}
    1.35 +	g_pGameRules = *reinterpret_cast<void ***>(addr + offset);
    1.36  }
    1.37  #elif defined PLATFORM_LINUX
    1.38  void InitializeValveGlobals()
    1.39  {
    1.40  	char *addr = NULL;
    1.41  
    1.42 +	/* gEntList and/or g_pEntityList */
    1.43 +	if (!g_pGameConf->GetMemSig("gEntList", (void **)&addr) || !addr)
    1.44 +	{
    1.45 +		return;
    1.46 +	}
    1.47 +	g_EntList = reinterpret_cast<void *>(addr);
    1.48 +
    1.49  	/* g_pGameRules */
    1.50  	if (!g_pGameConf->GetMemSig("g_pGameRules", (void **)&addr) || !addr)
    1.51  	{
    1.52  		return;
    1.53  	}
    1.54  	g_pGameRules = reinterpret_cast<void **>(addr);
    1.55 -
    1.56 -	/* gEntList and/or g_pEntityList */
    1.57 -	if (!g_pGameConf->GetMemSig("gEntList", (void **)&addr) || !addr)
    1.58 -	{
    1.59 -		return;
    1.60 -	}
    1.61 -	g_EntList = reinterpret_cast<void *>(addr);
    1.62  }
    1.63  #endif