diff --git a/Source/Contents/Actors/GameObject.cpp b/Source/Contents/Actors/GameObject.cpp index c0e337717..d87431a42 100644 --- a/Source/Contents/Actors/GameObject.cpp +++ b/Source/Contents/Actors/GameObject.cpp @@ -416,7 +416,7 @@ void CGameActor::RenderMercenary(const float* matrix, int job) { int accessoryOffsetX; int accessoryOffsetY; - for (unsigned char layer = 0; layer < 8; ++layer) { + for (char layer = 0; layer < 8; ++layer) { int offsetX = 0; int offsetY = 0; @@ -437,22 +437,18 @@ void CGameActor::RenderMercenary(const float* matrix, int job) { } bodyFrame = frame; } else if (layer == 1) { - const int head = job % 23 + 1; - const char* actionName; - const char* spriteName; if (job >= 0x1781 && job <= 0x178A) { - spriteName = "인간족\\머리통\\여\\%d_여.spr"; - actionName = "인간족\\머리통\\여\\%d_여.act"; + std::sprintf(path, "인간족\\머리통\\여\\%d_여.act", job % 23 + 1); + action = static_cast(ResourceMgr::Instance().Load(path)); + std::sprintf(path, "인간족\\머리통\\여\\%d_여.spr", job % 23 + 1); + sprite = static_cast(ResourceMgr::Instance().Load(path)); } else { - spriteName = "인간족\\머리통\\남\\%d_남.spr"; - actionName = "인간족\\머리통\\남\\%d_남.act"; + std::sprintf(path, "인간족\\머리통\\남\\%d_남.act", job % 23 + 1); + action = static_cast(ResourceMgr::Instance().Load(path)); + std::sprintf(path, "인간족\\머리통\\남\\%d_남.spr", job % 23 + 1); + sprite = static_cast(ResourceMgr::Instance().Load(path)); } - std::sprintf(path, actionName, head); - action = static_cast(ResourceMgr::Instance().Load(path)); - std::sprintf(path, spriteName, head); - sprite = static_cast(ResourceMgr::Instance().Load(path)); - frame = &action->Frame(this->render.previousAnimation, this->render.curMotion); if (this->render.previousAnimation < 8) { frame = &action->Frame(this->render.previousAnimation, 0); @@ -466,160 +462,167 @@ void CGameActor::RenderMercenary(const float* matrix, int job) { offsetX = headOffsetX; offsetY = headOffsetY; } else if (layer == 2) { - const char* actionName; - const char* spriteName; if (job >= 0x1781 && job <= 0x178A) { - spriteName = "인간족\\용병\\활용병_활.spr"; - actionName = "인간족\\용병\\활용병_활.act"; + std::sprintf(path, "인간족\\용병\\활용병_활.act"); + action = static_cast(ResourceMgr::Instance().Load(path)); + std::sprintf(path, "인간족\\용병\\활용병_활.spr"); + sprite = static_cast(ResourceMgr::Instance().Load(path)); } else if (job >= 0x178B && job <= 0x1794) { - spriteName = "인간족\\용병\\창용병_창.spr"; - actionName = "인간족\\용병\\창용병_창.act"; + std::sprintf(path, "인간족\\용병\\창용병_창.act"); + action = static_cast(ResourceMgr::Instance().Load(path)); + std::sprintf(path, "인간족\\용병\\창용병_창.spr"); + sprite = static_cast(ResourceMgr::Instance().Load(path)); } else { - spriteName = "인간족\\용병\\검용병_검.spr"; - actionName = "인간족\\용병\\검용병_검.act"; + std::sprintf(path, "인간족\\용병\\검용병_검.act"); + action = static_cast(ResourceMgr::Instance().Load(path)); + std::sprintf(path, "인간족\\용병\\검용병_검.spr"); + sprite = static_cast(ResourceMgr::Instance().Load(path)); } - - std::sprintf(path, actionName); - action = static_cast(ResourceMgr::Instance().Load(path)); - std::sprintf(path, spriteName); - sprite = static_cast(ResourceMgr::Instance().Load(path)); frame = &action->Frame(this->render.previousAnimation, this->render.curMotion); } else if (layer == 3) { if (job >= 0x1781 && job <= 0x178A) { continue; } - const char* actionName; - const char* spriteName; if (job >= 0x178B && job <= 0x1794) { - spriteName = "인간족\\용병\\창용병_창_검광.spr"; - actionName = "인간족\\용병\\창용병_창_검광.act"; + std::sprintf(path, "인간족\\용병\\창용병_창_검광.act"); + action = static_cast(ResourceMgr::Instance().Load(path)); + std::sprintf(path, "인간족\\용병\\창용병_창_검광.spr"); + sprite = static_cast(ResourceMgr::Instance().Load(path)); } else { - spriteName = "인간족\\용병\\검용병_검_검광.spr"; - actionName = "인간족\\용병\\검용병_검_검광.act"; + std::sprintf(path, "인간족\\용병\\검용병_검_검광.act"); + action = static_cast(ResourceMgr::Instance().Load(path)); + std::sprintf(path, "인간족\\용병\\검용병_검_검광.spr"); + sprite = static_cast(ResourceMgr::Instance().Load(path)); } - - std::sprintf(path, actionName); - action = static_cast(ResourceMgr::Instance().Load(path)); - std::sprintf(path, spriteName); - sprite = static_cast(ResourceMgr::Instance().Load(path)); frame = &action->Frame(this->render.previousAnimation, this->render.curMotion); - } else { - if (layer == 4) { - switch (job) { - case 0x1781: - std::sprintf(accessory, "여\\여_털모자"); - break; - case 0x1782: - std::sprintf(accessory, "여\\여_골든헤드기어"); - break; - case 0x1783: - std::sprintf(accessory, "여\\여_대형금방울"); - break; - case 0x1784: - std::sprintf(accessory, "여\\여_엘리스모자"); - break; - case 0x1785: - std::sprintf(accessory, "여\\여_가부키가면"); - break; - case 0x1786: - std::sprintf(accessory, "여\\여_여왕의투구"); - break; - case 0x1787: - std::sprintf(accessory, "여\\여_지르타스가면"); - break; - case 0x1788: - std::sprintf(accessory, "여\\여_실버티아라"); - break; - case 0x1789: - std::sprintf(accessory, "여\\여_고양이모자"); - break; - case 0x178A: - std::sprintf(accessory, "여\\여_예쁜리본"); - break; - case 0x178B: - std::sprintf(accessory, "남\\남_간호모"); - break; - case 0x178C: - std::sprintf(accessory, "남\\남_검은눈가리개"); - break; - case 0x178D: - std::sprintf(accessory, "남\\남_고블린가면4호"); - break; - case 0x178E: - std::sprintf(accessory, "남\\남_양모자"); - break; - case 0x178F: - std::sprintf(accessory, "남\\남_귀찮은너구리"); - break; - case 0x1790: - std::sprintf(accessory, "남\\남_돈잃은자의마음"); - break; - case 0x1791: - std::sprintf(accessory, "남\\남_마리오넷모자"); - break; - case 0x1792: - std::sprintf(accessory, "남\\남_라이온마스크"); - break; - case 0x1793: - std::sprintf(accessory, "남\\남_클로스헬멧"); - break; - case 0x1794: - std::sprintf(accessory, "남\\남_로드카호의뿔"); - break; - case 0x1795: - std::sprintf(accessory, "남\\남_반창고"); - break; - case 0x1796: - std::sprintf(accessory, "남\\남_분노입"); - break; - case 0x1797: - std::sprintf(accessory, "남\\남_코끼리모자"); - break; - case 0x1798: - std::sprintf(accessory, "남\\남_야구모자"); - break; - case 0x1799: - std::sprintf(accessory, "남\\남_장례건"); - break; - case 0x179A: - std::sprintf(accessory, "남\\남_부용"); - break; - case 0x179B: - std::sprintf(accessory, "남\\남_타이거마스크"); - break; - case 0x179C: - std::sprintf(accessory, "남\\남_초승달투구"); - break; - case 0x179D: - std::sprintf(accessory, "남\\남_엔젤링모자"); - break; - case 0x179E: - std::sprintf(accessory, "남\\남_태양신의모자"); - break; - } - } else if (layer == 5) { - if (job == 0x178A) { - std::sprintf(accessory, "여\\여_꽃잎"); - } else if (job == 0x1794) { - std::sprintf(accessory, "남\\남_토스트"); - } - } else if (layer == 6) { - if (job == 0x178A) { - std::sprintf(accessory, "여\\여_요정의귀"); - } else if (job == 0x1794 || job == 0x179E) { - std::sprintf(accessory, "남\\남_요정의귀"); - } - } else if (layer == 7) { - if (job == 0x178A) { - std::sprintf(accessory, "여\\여_미스틱로즈"); - } else if (job == 0x1794) { - std::sprintf(accessory, "남\\남_타키우스눈가리개"); - } else if (job == 0x179E) { - std::sprintf(accessory, "남\\남_사이클롭스아이"); - } + } else if (layer == 4) { + switch (job) { + case 0x1781: + std::sprintf(accessory, "여\\여_털모자"); + break; + case 0x1782: + std::sprintf(accessory, "여\\여_골든헤드기어"); + break; + case 0x1783: + std::sprintf(accessory, "여\\여_대형금방울"); + break; + case 0x1784: + std::sprintf(accessory, "여\\여_엘리스모자"); + break; + case 0x1785: + std::sprintf(accessory, "여\\여_가부키가면"); + break; + case 0x1786: + std::sprintf(accessory, "여\\여_여왕의투구"); + break; + case 0x1787: + std::sprintf(accessory, "여\\여_지르타스가면"); + break; + case 0x1788: + std::sprintf(accessory, "여\\여_실버티아라"); + break; + case 0x1789: + std::sprintf(accessory, "여\\여_고양이모자"); + break; + case 0x178A: + std::sprintf(accessory, "여\\여_예쁜리본"); + break; + case 0x178B: + std::sprintf(accessory, "남\\남_간호모"); + break; + case 0x178C: + std::sprintf(accessory, "남\\남_검은눈가리개"); + break; + case 0x178D: + std::sprintf(accessory, "남\\남_고블린가면4호"); + break; + case 0x178E: + std::sprintf(accessory, "남\\남_양모자"); + break; + case 0x178F: + std::sprintf(accessory, "남\\남_귀찮은너구리"); + break; + case 0x1790: + std::sprintf(accessory, "남\\남_돈잃은자의마음"); + break; + case 0x1791: + std::sprintf(accessory, "남\\남_마리오넷모자"); + break; + case 0x1792: + std::sprintf(accessory, "남\\남_라이온마스크"); + break; + case 0x1793: + std::sprintf(accessory, "남\\남_클로스헬멧"); + break; + case 0x1794: + std::sprintf(accessory, "남\\남_로드카호의뿔"); + break; + case 0x1795: + std::sprintf(accessory, "남\\남_반창고"); + break; + case 0x1796: + std::sprintf(accessory, "남\\남_분노입"); + break; + case 0x1797: + std::sprintf(accessory, "남\\남_코끼리모자"); + break; + case 0x1798: + std::sprintf(accessory, "남\\남_야구모자"); + break; + case 0x1799: + std::sprintf(accessory, "남\\남_장례건"); + break; + case 0x179A: + std::sprintf(accessory, "남\\남_부용"); + break; + case 0x179B: + std::sprintf(accessory, "남\\남_타이거마스크"); + break; + case 0x179C: + std::sprintf(accessory, "남\\남_초승달투구"); + break; + case 0x179D: + std::sprintf(accessory, "남\\남_엔젤링모자"); + break; + case 0x179E: + std::sprintf(accessory, "남\\남_태양신의모자"); + break; } + } else if (layer == 5) { + switch (job) { + case 0x178A: + std::sprintf(accessory, "여\\여_꽃잎"); + break; + case 0x1794: + std::sprintf(accessory, "남\\남_토스트"); + break; + } + } else if (layer == 6) { + switch (job) { + case 0x178A: + std::sprintf(accessory, "여\\여_요정의귀"); + break; + case 0x1794: + case 0x179E: + std::sprintf(accessory, "남\\남_요정의귀"); + break; + } + } else if (layer == 7) { + switch (job) { + case 0x178A: + std::sprintf(accessory, "여\\여_미스틱로즈"); + break; + case 0x1794: + std::sprintf(accessory, "남\\남_타키우스눈가리개"); + break; + case 0x179E: + std::sprintf(accessory, "남\\남_사이클롭스아이"); + break; + } + } + if (layer >= 4) { std::sprintf(path, "악세사리\\%s.act", accessory); action = static_cast(ResourceMgr::Instance().Load(path)); std::sprintf(path, "악세사리\\%s.spr", accessory); @@ -639,12 +642,12 @@ void CGameActor::RenderMercenary(const float* matrix, int job) { } bool drawn = false; - RenderBounds bounds; - bounds.left = static_cast(g_renderer->viewport.width); - bounds.top = static_cast(g_renderer->viewport.height); - bounds.right = 0.0f; - bounds.bottom = 0.0f; - bounds.offset = reciprocalDepth; + float bounds[5]; + bounds[0] = static_cast(g_renderer->viewport.width); + bounds[1] = static_cast(g_renderer->viewport.height); + bounds[2] = 0.0f; + bounds[3] = 0.0f; + bounds[4] = reciprocalDepth; for (int index = 0; index < frame->cellCount; ++index) { const SpriteFrameCell& cell = frame->Cell(index); @@ -662,7 +665,11 @@ void CGameActor::RenderMercenary(const float* matrix, int job) { continue; } - int blend = (color >> 24) < 0xFF ? 1 : 257; + const unsigned char* argb = reinterpret_cast(&color); + int blend = 0x101; + if (argb[3] < 0xFF) { + blend = 1; + } drawn = true; quad.image = image; @@ -676,17 +683,17 @@ void CGameActor::RenderMercenary(const float* matrix, int job) { if (this->render.unknown_00A4Bytes[1] != 0) { const float minX = quad.left < quad.right ? quad.left : quad.right; const float maxX = quad.left > quad.right ? quad.left : quad.right; - if (bounds.left > minX) { - bounds.left = minX; + if (bounds[0] > minX) { + bounds[0] = minX; } - if (bounds.top > quad.top) { - bounds.top = quad.top; + if (bounds[1] > quad.top) { + bounds[1] = quad.top; } - if (maxX > bounds.right) { - bounds.right = maxX; + if (maxX > bounds[2]) { + bounds[2] = maxX; } - if (quad.bottom > bounds.bottom) { - bounds.bottom = quad.bottom; + if (quad.bottom > bounds[3]) { + bounds[3] = quad.bottom; } } @@ -707,7 +714,7 @@ void CGameActor::RenderMercenary(const float* matrix, int job) { } if (drawn) { - this->SetRenderInfo(&bounds.left, x, y); + this->SetRenderInfo(bounds, x, y); } else { this->SetTlvert(x, y); } diff --git a/Source/Contents/SpriteShadow.cpp b/Source/Contents/SpriteShadow.cpp index 9200983b9..d974a90e5 100644 --- a/Source/Contents/SpriteShadow.cpp +++ b/Source/Contents/SpriteShadow.cpp @@ -16,7 +16,7 @@ // OFFSET: 0x00811C10 // FUNCTION: fn_10109 -RenderPrimitive* CCharacterRender::DrawShadow(const float* matrix, float scale) const { +__declspec(safebuffers) RenderPrimitive* CCharacterRender::DrawShadow(const float* matrix, float scale) const { if (scale == 0.0f || !g_modeMgr.GetGameMode() || !static_cast(g_modeMgr.GetGameMode())->scene) { return nullptr; } diff --git a/Source/Render/SpriteQuad.h b/Source/Render/SpriteQuad.h index fe4686eef..59def284a 100644 --- a/Source/Render/SpriteQuad.h +++ b/Source/Render/SpriteQuad.h @@ -17,7 +17,9 @@ struct SpriteQuad { /* 0014 */ float topRhw; /* 0018 */ std::uint32_t color; /* 001C */ float angle; - /* 0020 */ std::int32_t unknown_0020[3]; + /* 0020 */ std::int32_t unknown_0020; + /* 0024 */ std::int32_t unknown_0024; + /* 0028 */ std::int32_t unknown_0028; /* 002C */ const SpriteRleImage* image; };