mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-12-23 08:11:49 +01:00
rename attractor flag to type
This commit is contained in:
parent
fe77b2ac53
commit
cafe4d6f0c
@ -977,7 +977,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;
|
||||||
}
|
}
|
||||||
|
@ -8644,11 +8644,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);
|
||||||
|
@ -25,8 +25,8 @@ enum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
ATTRACTORFLAG_ICECREAM,
|
ATTRACTORTYPE_ICECREAM,
|
||||||
ATTRACTORFLAG_STARE
|
ATTRACTORTYPE_STARE
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
@ -60,7 +60,7 @@ public:
|
|||||||
};
|
};
|
||||||
struct Attractor {
|
struct Attractor {
|
||||||
CVector dir;
|
CVector dir;
|
||||||
uint8 flags;
|
int8 type;
|
||||||
uint8 probability;
|
uint8 probability;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user