Decompile 3 functions in Source/Contents/Effects/Particles/SpriteParticle.cpp, Source/Contents/Effects/Core/EffectLists.cpp, ...
Batch #17007 by eAthena: 2 byte-identical, 1 confirmed by peer review. - fn_18861 CSpriteParticle::CSpriteParticle: byte-identical - fn_18784 EffectLists::Find: byte-identical - fn_19008 CEmitterEffect::CEmitterEffect: logic confirmed by peer review (already on main) Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes).
This commit is contained in:
parent
bb092bbc02
commit
ff7af22bde
3 changed files with 5 additions and 4 deletions
|
|
@ -191,8 +191,9 @@ __declspec(noinline) std::string EffectFunctionName(std::string name) {
|
|||
CEffect* EffectLists::Find(int actor, int instance, int id) const {
|
||||
const auto found = this->active.find(actor);
|
||||
|
||||
if (found != this->active.end()) {
|
||||
for (CEffect* effect : found->second) {
|
||||
if (this->active.end() != found) {
|
||||
for (auto it = found->second.begin(); found->second.end() != it; ++it) {
|
||||
CEffect* effect = *it;
|
||||
if (effect->id == id && effect->instanceId == instance) {
|
||||
return effect;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ CEmitterEffect::CEmitterEffect()
|
|||
: CEffect(974), velocityMin{-2.0f, 2.0f, -2.0f}, velocityMax{2.0f, -1.0f, 2.0f}, acceleration{0.7f, -2.0f, 1.0f}, spread{-1.0f, 2.0f, -1.0f},
|
||||
emitCarry(0.0f), timeScale(1.0f / 60.0f), scaleMin(3.0f), scaleMax(8.0f), lifeMin(5.0f), lifeMax(10.0f), rateMin(20.0f), rateMax(100.0f),
|
||||
width(1.0f), height(1.0f), red(255), green(255), blue(255), alpha(255), texture("smoke2.bmp"), sourceBlend(5), destinationBlend(2), count(40),
|
||||
particleSpeed(1.0f), depth(1), billboard(0), rotation{}, fixedAlpha(0), particles(), pool(), duration(-1) {
|
||||
particleSpeed(1.0f), depth(1), billboard(0), rotation{0.0f, 0.0f, 0.0f}, fixedAlpha(0), particles(), pool(), duration(-1) {
|
||||
}
|
||||
|
||||
// OFFSET: 0x00B4FD90
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ static __forceinline bool IsParticleActive(const CSpriteParticle* particle) {
|
|||
// OFFSET: 0x00B40B60
|
||||
// FUNCTION: fn_18861
|
||||
CSpriteParticle::CSpriteParticle(vector3d position, int flags)
|
||||
: CParticle(position, flags), applyActorExtent(0), applyActorLift(0), velocity(), sprite(nullptr), action(nullptr) {
|
||||
: CParticle(position, flags), applyActorExtent(0), applyActorLift(0), velocity({0.0f, 0.0f, 0.0f}), sprite(nullptr), action(nullptr) {
|
||||
this->Reset();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue