Merge 4a102c6ace into 04c3dac382

src/component/CCharacterComponent.cpp

@@ -121,6 +121,10 @@ bool ComponentCompressCallback(CVar* var, const char* oldValue, const char* valu
     return true;
 }
 
+void ReplaceParticleColor(CM2Model* model, int32_t particleColorID) {
+    // TODO
+}
+
 int32_t CCharacterComponent::AddHandItem(CM2Model* model, const ItemDisplayInfoRec* displayRec, INVENTORY_SLOTS invSlot, SHEATHE_TYPE sheatheType, bool sheathed, bool shield, bool a7, int32_t visualID) {
     if (!model || !displayRec || invSlot > INVSLOT_TABARD) {
         return -1;
@@ -247,6 +251,26 @@ CCharacterComponent* CCharacterComponent::AllocComponent() {
     return component;
 }
 
+void CCharacterComponent::ApplyMonsterGeosets(CM2Model* model, const CreatureDisplayInfoRec* displayInfoRec) {
+    if (!model || !displayInfoRec || !displayInfoRec->m_creatureGeosetData) {
+        return;
+    }
+
+    for (int32_t group = 100, dataOfs = 0; group < 900; group += 100, dataOfs += 4) {
+        auto section = (displayInfoRec->m_creatureGeosetData >> dataOfs) & 0xF;
+
+        if (section) {
+            // Hide all sections in group
+            model->SetGeometryVisible(group, group + 99, false);
+
+            // Show matching section
+            model->SetGeometryVisible(group + section, group + section, true);
+        }
+    }
+
+    model->OptimizeVisibleGeometry();
+}
+
 void CCharacterComponent::ComponentCloseFingers(CM2Model* model, COMP_HAND_SLOT handSlot) {
     uint32_t firstBone;
     uint32_t lastBone;
@@ -789,6 +813,54 @@ void CCharacterComponent::RemoveLinkpt(CM2Model* model, GEOCOMPONENTLINKS link)
     }
 }
 
+void CCharacterComponent::ReplaceMonsterSkin(CM2Model* model, const CreatureDisplayInfoRec* displayInfoRec, const CreatureModelDataRec* modelDataRec) {
+    if (!model || !displayInfoRec || !modelDataRec) {
+        return;
+    }
+
+    CStatus status;
+    char texturePath[STORM_MAX_PATH];
+
+    // Copy model path to use as base path for texture
+    auto src = modelDataRec->m_modelName;
+    auto dst = texturePath;
+    while (*src) {
+        *dst++ = *src++;
+    }
+    *dst = '\0';
+
+    // Locate start of model file name
+    auto lastSlash = strrchr(texturePath, '\\');
+    auto modelFileName = lastSlash ? lastSlash + 1 : texturePath;
+
+    auto textureFlags = CGxTexFlags(GxTex_LinearMipLinear, 1, 1, 0, 0, 0, 1);
+
+    for (uint32_t i = 0; i < 3; i++) {
+        auto textureName = displayInfoRec->m_textureVariation[i];
+
+        if (textureName[0] == '\0') {
+            continue;
+        }
+
+        // Replace model file name with texture name
+        src = textureName;
+        dst = modelFileName;
+        while (*src) {
+            *dst++ = *src++;
+        }
+        *dst = '\0';
+
+        auto texture = TextureCreate(texturePath, textureFlags, &status, 0);
+
+        if (texture) {
+            model->ReplaceTexture(11 + i, texture);
+            HandleClose(texture);
+        }
+    }
+
+    ReplaceParticleColor(model, displayInfoRec->m_particleColorID);
+}
+
 void CCharacterComponent::UpdateBaseTexture(EGxTexCommand cmd, uint32_t width, uint32_t height, uint32_t depth, uint32_t mipLevel, void* userArg, uint32_t& texelStrideInBytes, const void*& texels) {
     auto component = static_cast<CCharacterComponent*>(userArg);
 

src/component/CCharacterComponent.hpp

@@ -10,6 +10,8 @@
 class CACHEENTRY;
 class CCharacterComponent;
 class CharSectionsRec;
+class CreatureDisplayInfoRec;
+class CreatureModelDataRec;
 class ItemDisplayInfoRec;
 
 struct BlpPalPixel;
@@ -51,6 +53,7 @@ class CCharacterComponent {
         static int32_t AddHandItem(CM2Model* model, const ItemDisplayInfoRec* displayRec, INVENTORY_SLOTS invSlot, SHEATHE_TYPE sheatheType, bool sheathed, bool shield, bool a7, int32_t a8);
         static void AddLink(CM2Model* parent, GEOCOMPONENTLINKS link, char const* modelPath, char const* texturePath, int32_t visualID, const ItemDisplayInfoRec* displayRec);
         static CCharacterComponent* AllocComponent();
+        static void ApplyMonsterGeosets(CM2Model* model, const CreatureDisplayInfoRec* displayInfoRec);
         static void ComponentCloseFingers(CM2Model* model, COMP_HAND_SLOT handSlot);
         static void ComponentOpenFingers(CM2Model* model, COMP_HAND_SLOT handSlot);
         static HTEXTURE CreateTexture(const char* fileName, CStatus* status);
@@ -68,6 +71,7 @@ class CCharacterComponent {
         static void PasteTransparent4Bit(void* srcTexture, const BlpPalPixel* srcPal, MipBits* dstMips, const C2iVector& dstPos, uint32_t dstWidth, const C2iVector& srcPos, const C2iVector& srcSize, TCTEXTUREINFO& srcInfo, int32_t srcMipLevel, int32_t dstMipLevelOfs);
         static void PasteTransparent8Bit(void* srcTexture, const BlpPalPixel* srcPal, MipBits* dstMips, const C2iVector& dstPos, uint32_t dstWidth, const C2iVector& srcPos, const C2iVector& srcSize, TCTEXTUREINFO& srcInfo, int32_t srcMipLevel, int32_t dstMipLevelOfs);
         static void RemoveLinkpt(CM2Model* model, GEOCOMPONENTLINKS link);
+        static void ReplaceMonsterSkin(CM2Model* model, const CreatureDisplayInfoRec* displayInfoRec, const CreatureModelDataRec* modelDataRec);
         static void UpdateBaseTexture(EGxTexCommand cmd, uint32_t width, uint32_t height, uint32_t depth, uint32_t mipLevel, void* userArg, uint32_t& texelStrideInBytes, const void*& texels);
 
         // Member variables

src/glue/CGlueMgr.cpp

@@ -47,6 +47,7 @@ float CGlueMgr::m_aspect;
 bool CGlueMgr::m_authenticated;
 const CharacterSelectionDisplay* CGlueMgr::m_characterInfo;
 int32_t CGlueMgr::m_clientKickReason;
+int32_t CGlueMgr::m_contestAccepted = 1; // TODO
 char CGlueMgr::m_currentScreen[64];
 EffectDeath* CGlueMgr::m_deathEffect;
 int32_t CGlueMgr::m_disconnectPending;

src/glue/CGlueMgr.hpp

@@ -41,6 +41,7 @@ class CGlueMgr {
         static bool m_authenticated;
         static const CharacterSelectionDisplay* m_characterInfo;
         static int32_t m_clientKickReason;
+        static int32_t m_contestAccepted;
         static char m_currentScreen[];
         static EffectDeath* m_deathEffect;
         static int32_t m_disconnectPending;

src/glue/GlueScript.cpp

@@ -228,7 +228,14 @@ int32_t Script_ShowContestNotice(lua_State* L) {
 }
 
 int32_t Script_ContestAccepted(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    if (CGlueMgr::m_contestAccepted) {
+        lua_pushnumber(L, 1.0);
+    }
+    else {
+        lua_pushnil(L);
+    }
+
+    return 1;
 }
 
 int32_t Script_AcceptContest(lua_State* L) {

src/model/CM2Model.cpp

@@ -1604,6 +1604,10 @@ void CM2Model::LinkToCallbackListTail() {
     this->m_shared->m_callbackListTail = &this->m_callbackNext;
 }
 
+void CM2Model::OptimizeVisibleGeometry() {
+    // TODO
+}
+
 int32_t CM2Model::ProcessCallbacks() {
     // TODO
     return 1;

src/model/CM2Model.hpp

@@ -178,6 +178,7 @@ class CM2Model {
         int32_t IsDrawable(int32_t a2, int32_t a3);
         int32_t IsLoaded(int32_t a2, int32_t attachments);
         void LinkToCallbackListTail();
+        void OptimizeVisibleGeometry();
         int32_t ProcessCallbacks();
         void ProcessCallbacksRecursive();
         uint32_t Release();

src/object/client/CGUnit_C.cpp

@@ -1,4 +1,6 @@
 #include "object/client/CGUnit_C.hpp"
+#include "component/CCharacterComponent.hpp"
+#include "model/Model2.hpp"
 #include "object/client/ObjMgr.hpp"
 #include "db/Db.hpp"
 #include "ui/Game.hpp"
@@ -175,6 +177,17 @@ void CGUnit_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
     this->CGObject_C::PostInit(time, init, a4);
 
     // TODO
+
+    if (this->m_displayInfo) {
+        CCharacterComponent::ApplyMonsterGeosets(this->m_model, this->m_displayInfo);
+        CCharacterComponent::ReplaceMonsterSkin(this->m_model, this->m_displayInfo, this->m_modelData);
+
+        if (this->m_modelData) {
+            this->m_model->m_flag4 = (this->m_modelData->m_flags & 0x200) ? true : false;
+        }
+    }
+
+    // TODO
 }
 
 void CGUnit_C::PostMovementUpdate(const CClientMoveUpdate& move, int32_t activeMover) {