Docs, is-named bool functions and MSVC utf-8
This commit is contained in:
1 parent
1a0db1abbd
commit
1cf4d1ea85
18 files changed
+443
-586
No files matched your search
+3
-3
@@ -268,7 +268,7 @@ void Play::values_clamp()
|
||||
|
||||
// Swaps a layer's region for the one a source layer shows at a time, while active. Turns itself off (and returns
|
||||
// false) when the animation lacks the source or the time runs past it.
|
||||
static bool region_swap(Actor& actor, int source, float& time, Override& swap, bool isActive)
|
||||
static bool is_region_swapped(Actor& actor, int source, float& time, Override& swap, bool isActive)
|
||||
{
|
||||
Anm2Animation* animation = actor.animation_get();
|
||||
swap.isRegion = false;
|
||||
@@ -373,14 +373,14 @@ void Play::body_update()
|
||||
actor.overrides[OVERRIDE_EXPAND + i * 2 + 1].scale = {add, add};
|
||||
}
|
||||
|
||||
isTalking = region_swap(actor, data.talkSource, talkTime, actor.overrides[OVERRIDE_TALK], isTalking);
|
||||
isTalking = is_region_swapped(actor, data.talkSource, talkTime, actor.overrides[OVERRIDE_TALK], isTalking);
|
||||
if (talkTime > source_length_get(actor, data.talkSource))
|
||||
talkTime = 0;
|
||||
int blinkLength = source_length_get(actor, data.blinkSource);
|
||||
if (blinkLength != 1)
|
||||
{
|
||||
isBlinking |= is_chance(data.blinkChance);
|
||||
isBlinking = region_swap(actor, data.blinkSource, blinkTime, actor.overrides[OVERRIDE_BLINK], isBlinking);
|
||||
isBlinking = is_region_swapped(actor, data.blinkSource, blinkTime, actor.overrides[OVERRIDE_BLINK], isBlinking);
|
||||
if (blinkTime >= blinkLength)
|
||||
{
|
||||
isBlinking = false;
|
||||
|
||||
Reference in new issue
Block a user