Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Small fixes, remove debug stuff, increment node version

Browse Source
This commit is contained in:
momo5502 2016-10-09 17:27:37 +02:00
parent c2c38539ec
commit 2c70084962
4 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Components/Modules/AssetHandler.cpp
View File

@ -132,32 +132,6 @@ namespace Components
} }
} }
if (type == 21)
{
//asset->gfxMap->dpvs.staticSurfaceCount = 0;
//
// for (unsigned int i = 0; i < asset->gfxMap->dpvs.staticSurfaceCount; ++i)
// {
// //OutputDebugStringA(Utils::String::VA("%i\n", asset->gfxMap->dpvs.sortedSurfIndex[i] & 0xFFFF));
// asset->gfxMap->dpvs.sortedSurfIndex[i] = i;
// }
// OutputDebugStringA("\n");
// for (int i = 0; i < asset->gfxMap->unknown2; ++i)
// {
// if (i < (asset->gfxMap->unknown2 - 1))
// {
// asset->gfxMap->dpvs.surfaceMaterials[i].packed = 0;
// }
// }
}
if (type == 5 && Utils::String::StartsWith(name, "wc/"))
{
//asset->material->sortKey = rand() & 0xFF;
OutputDebugStringA(Utils::String::VA("%s: %X %s", FastFiles::Current().data(), asset->material->sortKey & 0xFF, asset->material->name));
}
if (type == 5 && name == "wc/codo_ui_viewer_black_decal3"s) if (type == 5 && name == "wc/codo_ui_viewer_black_decal3"s)
{ {
asset->material->sortKey = 0xE; asset->material->sortKey = 0xE;

2
src/Components/Modules/Maps.cpp
View File

@ -206,7 +206,7 @@ namespace Components
float y = world->worldDraw.vd.vertices[i].xyz[2]; float y = world->worldDraw.vd.vertices[i].xyz[2];
float z = world->worldDraw.vd.vertices[i].xyz[0]; float z = world->worldDraw.vd.vertices[i].xyz[0];
map.append(fmt::sprintf("v %.6f %.6f %.6f\n", x,y, z)); map.append(fmt::sprintf("v %.6f %.6f %.6f\n", x, y, z));
} }
map.append("\n"); map.append("\n");

14
src/Components/Modules/Node.cpp
View File

@ -734,13 +734,15 @@ namespace Components
entry->state = Node::STATE_VALID; entry->state = Node::STATE_VALID;
entry->lastTime = Game::Sys_Milliseconds(); entry->lastTime = Game::Sys_Milliseconds();
#ifndef DEBUG
// Block old versions // Block old versions
// if (entry->version < NODE_VERSION) if (entry->version < NODE_VERSION)
// { {
// entry->state = Node::STATE_INVALID; entry->state = Node::STATE_INVALID;
// Node::NodeMutex.unlock(); Node::NodeMutex.unlock();
// return; return;
// } }
#endif
if (!Dedicated::IsEnabled() && entry->isDedi && ServerList::IsOnlineList() && entry->protocol == PROTOCOL) if (!Dedicated::IsEnabled() && entry->isDedi && ServerList::IsOnlineList() && entry->protocol == PROTOCOL)
{ {

2
src/Components/Modules/Node.hpp
View File

@ -7,7 +7,7 @@
#define NODE_STORE_INTERVAL 1000 * 60* 1 // Store nodes every minute #define NODE_STORE_INTERVAL 1000 * 60* 1 // Store nodes every minute
#define SESSION_TIMEOUT 1000 * 10 // 10 seconds session timeout #define SESSION_TIMEOUT 1000 * 10 // 10 seconds session timeout
#define NODE_VERSION 2 #define NODE_VERSION 3
namespace Components namespace Components
{ {