mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-27 08:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

VS2005 compatibility fixes and warning adjustments:

Browse Source 
Updated DLLs.
Added DirectX headers/libraries, since they're not in the platform SDK.
Fixed invalid STL iterator usage.
Disabled STL in stack trace, since it breaks.
Added comments for some reported warnings.
Corrected some apparent off-by-one errors.
Defined strlen_s to strnlen.
Probably broke pre-beta2 versions of VC2005.

This was SVN commit r2454.
This commit is contained in:
Ykkrosh
2005-07-02 21:42:55 +00:00
parent f3b5e08030
commit 2ea40a23a3
24 changed files with 112 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ObjectManager.cpp
+2 -2
View File
@@ -105,7 +105,7 @@ CObjectEntry* CObjectManager::FindObject(const char* objname)
return FindObjectVariation(base, var, vars_it);
}
CObjectEntry* CObjectManager::FindObjectVariation(const char* objname, CObjectBase::variation_key vars, CObjectBase::variation_key::iterator& vars_it)
CObjectEntry* CObjectManager::FindObjectVariation(const char* objname, const CObjectBase::variation_key& vars, CObjectBase::variation_key::const_iterator vars_it)
{
CObjectBase* base = FindObjectBase(objname);
@@ -115,7 +115,7 @@ CObjectEntry* CObjectManager::FindObjectVariation(const char* objname, CObjectBa
return FindObjectVariation(base, vars, vars_it);
}
CObjectEntry* CObjectManager::FindObjectVariation(CObjectBase* base, CObjectBase::variation_key vars, CObjectBase::variation_key::iterator& vars_it)
CObjectEntry* CObjectManager::FindObjectVariation(CObjectBase* base, const CObjectBase::variation_key& vars, CObjectBase::variation_key::const_iterator vars_it)
{
// Look to see whether this particular variation has already been loaded