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

Stuff

Browse Source
This commit is contained in:
momo5502 2016-10-23 17:13:44 +02:00
parent d2c5c45042
commit 2e6f0c1144
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,6 +132,7 @@ namespace Components
} }
} }
#if DEBUG
if (type == 9 && false) if (type == 9 && false)
{ {
static Game::MaterialTechniqueSet* technique = nullptr; static Game::MaterialTechniqueSet* technique = nullptr;
@ -154,12 +155,7 @@ namespace Components
for (int k = 0; k < (pass->argCount1 + pass->argCount2 + pass->argCount3); k++) for (int k = 0; k < (pass->argCount1 + pass->argCount2 + pass->argCount3); k++)
{ {
fprintf(fp, "\t\t%d.%d.%d:\n", i, j, k); fprintf(fp, "\t\t\t%d.%d.%d Para: %d\n", i, j, k, pass->argumentDef[k].paramID & 0xFFFF);
fprintf(fp, "\t\t\tDest: %d\n", pass->argumentDef[k].dest & 0xFFFF);
fprintf(fp, "\t\t\tMore: %d\n", pass->argumentDef[k].more & 0xFFFF);
fprintf(fp, "\t\t\tType: %d\n", pass->argumentDef[k].type & 0xFFFF);
fprintf(fp, "\t\t\tPara: %d\n", pass->argumentDef[k].paramID & 0xFFFF);
} }
} }
} }
@ -171,10 +167,10 @@ namespace Components
static std::map<std::string, Game::MaterialTechniqueSet*> techs; static std::map<std::string, Game::MaterialTechniqueSet*> techs;
if (FastFiles::Current() == "mp_firingrange") if (FastFiles::Current() == "mp_rust_long")
{ {
techs[name] = asset->materialTechset; techs[name] = asset->materialTechset;
printTechset(asset->materialTechset, "mp_firingrange"); printTechset(asset->materialTechset, "mp_rust_long");
} }
else else
{ {
@ -184,8 +180,9 @@ namespace Components
} }
} }
} }
#endif
if (type == 5 && name == "wc/codo_ui_viewer_black_decal3"s) if (type == Game::XAssetType::ASSET_TYPE_MATERIAL && name == "wc/codo_ui_viewer_black_decal3"s)
{ {
asset->material->sortKey = 0xE; asset->material->sortKey = 0xE;
} }

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

@ -416,6 +416,7 @@ namespace Components
Maps::AddDependency("mp_shipment_long", "iw4x_dependencies_mp"); Maps::AddDependency("mp_shipment_long", "iw4x_dependencies_mp");
Maps::AddDependency("mp_firingrange", "iw4x_dependencies_mp"); Maps::AddDependency("mp_firingrange", "iw4x_dependencies_mp");
Maps::AddDependency("mp_rust_long", "iw4x_dependencies_mp"); Maps::AddDependency("mp_rust_long", "iw4x_dependencies_mp");
Maps::AddDependency("mp_rust_long", "mp_rust");
#if defined(DEBUG) && defined(ENABLE_DXSDK) #if defined(DEBUG) && defined(ENABLE_DXSDK)
Command::Add("dumpmap", [] (Command::Params) Command::Add("dumpmap", [] (Command::Params)

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

@ -1006,7 +1006,7 @@ namespace Components
{ {
arg->paramID -= 3; arg->paramID -= 3;
if (Zones::Version() >= 359) if (Zones::Version() >= 359/* && arg->paramID <= 113*/)
{ {
arg->paramID -= 7; arg->paramID -= 7;
} }