mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-26 08:15:44 +00:00
Code Issues Projects Releases Wiki Activity

rename attractor flag to type

Browse source
This commit is contained in:
aap 2020-06-25 15:12:57 +02:00
parent 077bcf1c82
commit 2b21f92347
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/FileLoader.cpp
View file

@ -1032,7 +1032,7 @@ CFileLoader::Load2dEffect(const char *line)
&effect->attractor.dir.y, &effect->attractor.dir.y,
&effect->attractor.dir.z, &effect->attractor.dir.z,
&probability); &probability);
effect->attractor.flags = flags; effect->attractor.type = flags;
effect->attractor.probability = probability; effect->attractor.probability = probability;
break; break;
case EFFECT_PED_ATTRACTOR: case EFFECT_PED_ATTRACTOR:

6
src/peds/Ped.cpp
View file

@ -9867,11 +9867,11 @@ CPed::LookForInterestingNodes(void)
return false; return false;
} }
switch (effect->attractor.flags) { switch (effect->attractor.type) {
case ATTRACTORFLAG_ICECREAM: case ATTRACTORTYPE_ICECREAM:
SetInvestigateEvent(EVENT_ICECREAM, CVector2D(effectPos), 0.1f, 15000, angleToFace); SetInvestigateEvent(EVENT_ICECREAM, CVector2D(effectPos), 0.1f, 15000, angleToFace);
break; break;
case ATTRACTORFLAG_STARE: case ATTRACTORTYPE_STARE:
SetInvestigateEvent(EVENT_SHOPSTALL, CVector2D(effectPos), 1.0f, SetInvestigateEvent(EVENT_SHOPSTALL, CVector2D(effectPos), 1.0f,
CGeneral::GetRandomNumberInRange(8000, 10 * effect->attractor.probability + 8500), CGeneral::GetRandomNumberInRange(8000, 10 * effect->attractor.probability + 8500),
angleToFace); angleToFace);

6
src/render/2dEffect.h
View file

@ -27,8 +27,8 @@ enum {
}; };
enum { enum {
ATTRACTORFLAG_ICECREAM, ATTRACTORTYPE_ICECREAM,
ATTRACTORFLAG_STARE ATTRACTORTYPE_STARE
}; };
enum { enum {
@ -64,7 +64,7 @@ public:
}; };
struct Attractor { struct Attractor {
CVector dir; CVector dir;
uint8 flags; int8 type;
uint8 probability; uint8 probability;
}; };
struct PedAttractor { struct PedAttractor {