diff options
| author | aap <aap@papnet.eu> | 2020-06-25 15:12:57 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-06-25 15:13:33 +0200 |
| commit | 2b21f92347a9432d89f7ff53fd1a2bb0546123be (patch) | |
| tree | 3feb0d1a125198cd6d5869021be3deaf688e6569 | |
| parent | CPad fix (diff) | |
| download | re3-2b21f92347a9432d89f7ff53fd1a2bb0546123be.tar re3-2b21f92347a9432d89f7ff53fd1a2bb0546123be.tar.gz re3-2b21f92347a9432d89f7ff53fd1a2bb0546123be.tar.bz2 re3-2b21f92347a9432d89f7ff53fd1a2bb0546123be.tar.lz re3-2b21f92347a9432d89f7ff53fd1a2bb0546123be.tar.xz re3-2b21f92347a9432d89f7ff53fd1a2bb0546123be.tar.zst re3-2b21f92347a9432d89f7ff53fd1a2bb0546123be.zip | |
| -rw-r--r-- | src/core/FileLoader.cpp | 2 | ||||
| -rw-r--r-- | src/peds/Ped.cpp | 6 | ||||
| -rw-r--r-- | src/render/2dEffect.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index 1463b4a5..6d810cf0 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -1032,7 +1032,7 @@ CFileLoader::Load2dEffect(const char *line) &effect->attractor.dir.y, &effect->attractor.dir.z, &probability); - effect->attractor.flags = flags; + effect->attractor.type = flags; effect->attractor.probability = probability; break; case EFFECT_PED_ATTRACTOR: diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index c3c4f864..358dee95 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -9867,11 +9867,11 @@ CPed::LookForInterestingNodes(void) return false; } - switch (effect->attractor.flags) { - case ATTRACTORFLAG_ICECREAM: + switch (effect->attractor.type) { + case ATTRACTORTYPE_ICECREAM: SetInvestigateEvent(EVENT_ICECREAM, CVector2D(effectPos), 0.1f, 15000, angleToFace); break; - case ATTRACTORFLAG_STARE: + case ATTRACTORTYPE_STARE: SetInvestigateEvent(EVENT_SHOPSTALL, CVector2D(effectPos), 1.0f, CGeneral::GetRandomNumberInRange(8000, 10 * effect->attractor.probability + 8500), angleToFace); diff --git a/src/render/2dEffect.h b/src/render/2dEffect.h index 504824c5..022cabcc 100644 --- a/src/render/2dEffect.h +++ b/src/render/2dEffect.h @@ -27,8 +27,8 @@ enum { }; enum { - ATTRACTORFLAG_ICECREAM, - ATTRACTORFLAG_STARE + ATTRACTORTYPE_ICECREAM, + ATTRACTORTYPE_STARE }; enum { @@ -64,7 +64,7 @@ public: }; struct Attractor { CVector dir; - uint8 flags; + int8 type; uint8 probability; }; struct PedAttractor { |