Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Minor changes

Browse source
This commit is contained in:
kervala 2015-11-15 13:29:34 +01:00
parent fb8eb7db70
commit 397be6cfbb
9 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
View file

@ -1793,8 +1793,15 @@ void registerGlExtensions(CGlExtensions &ext)
if (ext.NVXGPUMemoryInfo)
{
// GPU_MEMORY_INFO_EVICTION_COUNT_NVX;
// GPU_MEMORY_INFO_EVICTED_MEMORY_NVX;
GLint nEvictionCount = 0;
#ifdef GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX
glGetIntegerv(GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX, &nEvictionCount);
#endif
GLint nEvictionMemory = 0;
#ifdef GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX
glGetIntegerv(GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX, &nEvictionMemory);
#endif
GLint nDedicatedMemoryInKB = 0;
#ifdef GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX

2
code/nel/tools/3d/ig_elevation/main.cpp
View file

@ -53,7 +53,7 @@ using namespace NL3D;
// ---------------------------------------------------------------------------
// Out a string to the stdout and log.log
void outString (string &sText)
void outString (const string &sText)
{
createDebug ();
InfoLog->displayRaw(sText.c_str());

2
code/ryzom/client/client_default.cfg.in
View file

@ -483,7 +483,7 @@ XMLR2EDInterfaceFiles =
{
"r2ed.xml",
"r2_triggers.xml",
"r2_logic_entities.xml",
"r2_logic_entities.xml",
"r2ed_acts.xml",
"r2ed_scenario.xml",
"r2ed_connect.xml"

2
code/ryzom/client/src/interface_v3/music_player.cpp
View file

@ -258,7 +258,7 @@ public:
for(uint i = 0; i < filters.size(); ++i)
{
strcpy(szFilters + offset, filters[i].c_str());
strcpy(szFilter + offset, filters[i].c_str());
// move offset to string length + 1 for \0
offset += filters[i].length() + 1;

2
code/ryzom/client/src/r2/dmc/client_edition_module.cpp
View file

@ -2475,7 +2475,7 @@ void CClientEditionModule::loadScenarioSucceded(const std::string& filename, con
}
if (CFile::fileExists(filename))
{
CFile::copyFile("save/r2_buffer.dat", filename.c_str());
CFile::copyFile("save/r2_buffer.dat", filename);
}
}

2
code/ryzom/server/src/frontend_service/client_id_lookup.h
View file

@ -116,7 +116,7 @@ private:
struct CIdHash
{
enum { bucket_size = 4, min_buckets = 8, };
enum { bucket_size = 4, min_buckets = 8 };
size_t operator () (NLMISC::CEntityId id) const { return (uint32)id.getShortId(); }
bool operator() (const NLMISC::CEntityId& left, const NLMISC::CEntityId& right) { return left < right; }
};

2
code/ryzom/server/src/frontend_service/fe_types.h
View file

@ -71,7 +71,7 @@ typedef uint32 TUid;
*/
struct CInetAddressHashMapTraits
{
enum { bucket_size = 4, min_buckets = 8, };
enum { bucket_size = 4, min_buckets = 8 };
inline size_t operator() ( const NLNET::CInetAddress& x ) const
{
//return x.port();

2
code/ryzom/server/src/gpm_service/world_position_manager.h
View file

@ -139,7 +139,7 @@ public:
struct CEntityIdHash
{
enum { bucket_size = 4, min_buckets = 8, };
enum { bucket_size = 4, min_buckets = 8 };
size_t operator () (const NLMISC::CEntityId &id) const { return (uint32)id.getShortId(); }
size_t operator () (const NLMISC::CEntityId &left, const NLMISC::CEntityId &right) const { return left < right; }
};

2
code/ryzom/server/src/pd_lib/pd_utils.h
View file

@ -490,7 +490,7 @@ typedef std::vector<CObjectIndex> TIndexList;
struct CColumnIndexHashMapTraits
{
enum { bucket_size = 4, min_buckets = 8, };
enum { bucket_size = 4, min_buckets = 8 };
CColumnIndexHashMapTraits() { }
size_t operator() (const CColumnIndex &id) const
{