diff --git a/bin/conf/PseuWoW.conf.default b/bin/conf/PseuWoW.conf.default index f56a938..fe0a162 100644 --- a/bin/conf/PseuWoW.conf.default +++ b/bin/conf/PseuWoW.conf.default @@ -74,8 +74,8 @@ charname=Pseuwow // Client emulation configuration -ClientVersion=3.0.8 -ClientBuild=9506 +ClientVersion=3.1.3 +ClientBuild=9947 ClientLanguage=enUS // or change to enGB, deDE, ... diff --git a/src/Client/GUI/SceneWorld.cpp b/src/Client/GUI/SceneWorld.cpp index 8494bd9..eb5560e 100644 --- a/src/Client/GUI/SceneWorld.cpp +++ b/src/Client/GUI/SceneWorld.cpp @@ -689,7 +689,7 @@ void SceneWorld::UpdateTerrain(void) // here: // doodad->setRotation(core::vector3df(-d->ox,0,-d->oz)); // rotated axes looks good // doodad->setRotation(core::vector3df(0,-d->oy,0)); // same here - //wmo_node->setRotation(core::vector3df(-wmo->ox,-wmo->oy,-wmo->oz)); // very ugly with some rotations, |ang|>360? + wmo_node->setRotation(core::vector3df(-wmo->oz,-wmo->oy,-wmo->ox)); // very ugly with some rotations, |ang|>360? //wmo_node->setScale(core::vector3df(5,5,5)); diff --git a/src/shared/ADTFileStructs.h b/src/shared/ADTFileStructs.h index 407cba2..ffde244 100644 --- a/src/shared/ADTFileStructs.h +++ b/src/shared/ADTFileStructs.h @@ -68,9 +68,9 @@ struct MODF_chunk float x; float y; float z; + float ox; float oy; float oz; - float ox; // unk floats (orientation?) float ou11; float ou12; @@ -157,13 +157,15 @@ struct MCLY_chunk struct MCSE_chunk { uint32 soundPointID; - uint32 soundNameID; float x; float y; - float z; + float z; + + // TODO: Find real structure, fields left for references in code + uint32 soundNameID; float minDistance; float maxDistance; - float cutoffDistance; + /*float cutoffDistance; uint16 startTime; uint16 endTime; uint16 groupSilenceMin; @@ -173,7 +175,7 @@ struct MCSE_chunk uint16 loopCountMin; uint16 loopCountMax; uint16 interSoundGapMin; - uint16 interSoundGapMax; + uint16 interSoundGapMax;*/ }; struct LiquidVertex diff --git a/src/shared/MapTile.cpp b/src/shared/MapTile.cpp index afeeb69..3fc7e02 100644 --- a/src/shared/MapTile.cpp +++ b/src/shared/MapTile.cpp @@ -91,7 +91,8 @@ void MapTile::ImportFromADT(ADTFile *adt) d.uniqueid = mddf.uniqueid; d.model = std::string("./data/model/") + NormalizeFilename(_PathToFileName(adt->_models[mddf.id])); // this .mdx -> .m2 transformation is annoying >.< - replace "mdx" and end of string with "m2" - d.model = d.model.substr(0, d.model.length() - 3) + "m2"; + // d.model = d.model.substr(0, d.model.length() - 3) + "m2"; + // 3.1.3 - no more .mdx in ADT d.scale = mddf.scale / 1024.0f; if(d.scale < 0.00001f) d.scale = 1;