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

Moved fixes into Zones.cpp

Browse Source 
Fixes that were previously being done through compiling with zonebuilder are now done when the map dumps.  No longer dealing with the heroOnlyLights, only mp_abandon_sh_mk seems to have that problem and that map is done.
This commit is contained in:
Michael Maurer II 2023-08-30 03:59:21 +00:00 committed by GitHub
parent 896fd49cf7
commit 585074d033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1930,8 +1930,11 @@ namespace Components
AssetHandler::Relocate(buffer + 0x51, buffer + 0x48, 5); AssetHandler::Relocate(buffer + 0x51, buffer + 0x48, 5);
AssetHandler::Relocate(buffer + 0x58, buffer + 0x50, 0x10); AssetHandler::Relocate(buffer + 0x58, buffer + 0x50, 0x10);
Game::Material* material = reinterpret_cast<Game::Material*>(buffer);
// fix statebit // fix statebit
reinterpret_cast<Game::Material*>(buffer)->stateBitsEntry[47] = codol_material[0x50]; material->stateBitsEntry[47] = codol_material[0x50];
//check to fix distortion
if (material->info.sortKey == 44) material->info.sortKey = 43;
} }
else if (Zones::ZoneVersion >= 359) else if (Zones::ZoneVersion >= 359)
{ {
@ -1975,6 +1978,9 @@ namespace Components
// yes it was lol // yes it was lol
memcpy(&material->info.drawSurf.packed, material359.drawSurfBegin, 8); memcpy(&material->info.drawSurf.packed, material359.drawSurfBegin, 8);
//adding this here, situation as with later ff versions
if (material->info.sortKey == 44) material->info.sortKey = 43;
memcpy(&material->info.surfaceTypeBits, &material359.drawSurf[0], 6); // copies both surfaceTypeBits and hashIndex memcpy(&material->info.surfaceTypeBits, &material359.drawSurf[0], 6); // copies both surfaceTypeBits and hashIndex
//material->drawSurf[8] = material359.drawSurf[0]; //material->drawSurf[8] = material359.drawSurf[0];
//material->drawSurf[9] = material359.drawSurf[1]; //material->drawSurf[9] = material359.drawSurf[1];
@ -2025,6 +2031,9 @@ namespace Components
int sunDiff = 8; // Stuff that is part of the sunflare we would overwrite int sunDiff = 8; // Stuff that is part of the sunflare we would overwrite
std::memmove(buffer + 348 + sunDiff, buffer + 1316 + sunDiff, 280 - sunDiff); std::memmove(buffer + 348 + sunDiff, buffer + 1316 + sunDiff, 280 - sunDiff);
AssetHandler::Relocate(buffer + 1316, buffer + 348, 280); AssetHandler::Relocate(buffer + 1316, buffer + 348, 280);
//all codol zones are like this pretty certain
reinterpret_cast<Game::GfxWorld*>(buffer)->sortKeyDistortion = 43;
} }
return result; return result;