q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-25 19:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from RocketersAlex/fixstuff

Browse Source 
Update MSLegacy.h Network.cpp GameAgent.cpp
This commit is contained in:
SLAwww 2016-03-31 23:47:26 +03:00
commit 664b20bad2
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Engine/Engine.vcxproj
View File

@ -734,6 +734,7 @@ copy Release\$(TargetName).lib $(SolutionDir)..\Bin\ &gt;nul</Command>
<ClInclude Include="Base\Updateable.h" /> <ClInclude Include="Base\Updateable.h" />
<ClInclude Include="Base\UpdateableRT.h" /> <ClInclude Include="Base\UpdateableRT.h" />
<ClInclude Include="GameAgent\GameAgent.h" /> <ClInclude Include="GameAgent\GameAgent.h" />
<ClInclude Include="GameAgent\MSLegacy.h" />
<ClInclude Include="Math\AABBox.h" /> <ClInclude Include="Math\AABBox.h" />
<ClInclude Include="Math\FixInt.h" /> <ClInclude Include="Math\FixInt.h" />
<ClInclude Include="Math\Float.h" /> <ClInclude Include="Math\Float.h" />

3
Sources/Engine/Engine.vcxproj.filters
View File

@ -1365,6 +1365,9 @@
<ClInclude Include="GameAgent\GameAgent.h"> <ClInclude Include="GameAgent\GameAgent.h">
<Filter>Header Files\GameAgent Headers</Filter> <Filter>Header Files\GameAgent Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="GameAgent\MSLegacy.h">
<Filter>Header Files\GameAgent Headers</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="Base\CTString.inl"> <CustomBuild Include="Base\CTString.inl">

6
Sources/Engine/GameAgent/GameAgent.cpp
View File

@ -128,11 +128,11 @@ TIME _tmLastHeartbeat = 0;
CDynamicStackArray<CServerRequest> ga_asrRequests; CDynamicStackArray<CServerRequest> ga_asrRequests;
//extern CTString ga_strServer = "master1.croteam.org"; //extern CTString ga_strServer = "master1.croteam.org";
CTString ga_strServer = "master1.42amsterdam.net"; extern CTString ga_strServer = "master1.42amsterdam.net";
//extern CTString ga_strMSLegacy = "master1.croteam.org"; //extern CTString ga_strMSLegacy = "master1.croteam.org";
CTString ga_strMSLegacy = "42amsterdam.net"; extern CTString ga_strMSLegacy = "42amsterdam.net";
BOOL ga_bMSLegacy = TRUE; extern BOOL ga_bMSLegacy = TRUE;
//BOOL ga_bMSLegacy = FALSE; //BOOL ga_bMSLegacy = FALSE;
void _uninitWinsock(); void _uninitWinsock();

5
Sources/Engine/GameAgent/MSLegacy.h
View File

@ -73,7 +73,8 @@ LICENSE
http://www.gnu.org/licenses/gpl.txt http://www.gnu.org/licenses/gpl.txt
*/ */
#ifndef SE_INCL_MSLEGACY_H
#define SE_INCL_MSLEGACY_H
#ifdef PRAGMA_ONCE #ifdef PRAGMA_ONCE
#pragma once #pragma once
#endif #endif
@ -182,4 +183,4 @@ u_int resolv(char *host) {
/* end functions */ /* end functions */
#endif // include once check

6
Sources/Engine/Network/Network.cpp
View File

@ -886,9 +886,9 @@ void CNetworkLibrary::Init(const CTString &strGameID)
_pShell->DeclareSymbol("persistent user INDEX wed_bUseGenericTextureReplacement;", &wed_bUseGenericTextureReplacement); _pShell->DeclareSymbol("persistent user INDEX wed_bUseGenericTextureReplacement;", &wed_bUseGenericTextureReplacement);
_pShell->DeclareSymbol("user CTString ga_strServer;", &ga_strServer); _pShell->DeclareSymbol("persistent user CTString ga_strServer;", &ga_strServer);
_pShell->DeclareSymbol("user CTString ga_strMSLegacy;", &ga_strMSLegacy); _pShell->DeclareSymbol("persistent user CTString ga_strMSLegacy;", &ga_strMSLegacy);
_pShell->DeclareSymbol("user INDEX ga_bMSLegacy;", &ga_bMSLegacy); _pShell->DeclareSymbol("persistent user INDEX ga_bMSLegacy;", &ga_bMSLegacy);
_pShell->DeclareSymbol("INDEX pwoCurrentWorld;", &_pwoCurrentWorld); _pShell->DeclareSymbol("INDEX pwoCurrentWorld;", &_pwoCurrentWorld);
} }