mirrors/re3
1
0
Fork 0
Code Issues Pull Requests 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 fe77b2ac53
commit cafe4d6f0c
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

@ -977,7 +977,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;
}

6
src/peds/Ped.cpp
View File

@ -8644,11 +8644,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);

6
src/render/2dEffect.h
View File

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