isledecomp/LEGOIslandRebuilder
1
0
Fork 0
mirror of https://github.com/isledecomp/LEGOIslandRebuilder.git synced 2024-11-27 01:25:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

app: use official names for transitions

Browse source
This commit is contained in:
Ramen2X 2024-03-18 19:49:57 -04:00
parent 1f1e7e824f
commit b5ac7d5db3
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/hooks.cpp
View file

@ -750,17 +750,17 @@ MxResult MxTransitionManager::InterceptStartTransition(TransitionType animationT
animationType = NO_ANIMATION; animationType = NO_ANIMATION;
} else if (animation_type == "Dissolve") { } else if (animation_type == "Dissolve") {
animationType = DISSOLVE; animationType = DISSOLVE;
} else if (animation_type == "Pixelation") { } else if (animation_type == "Mosaic") {
animationType = PIXELATION; animationType = MOSAIC;
} else if (animation_type == "Vertical Wipe") { } else if (animation_type == "Wipe Down") {
animationType = VERTICAL_WIPE; animationType = WIPE_DOWN;
} else if (animation_type == "Window") { } else if (animation_type == "Window") {
animationType = WINDOW; animationType = WINDOW;
} else if (animation_type == "Random") { } else if (animation_type == "Random") {
animationType = (TransitionType)(rand() % 4 + 2); animationType = (TransitionType)(rand() % 4 + 2);
// The Pixelation animation runs much faster by nature than the other animations, // The Mosaic animation runs much faster by nature than the other animations,
// this magic is to make the speed inconsistency feel less jarring // this magic is to make the speed inconsistency feel less jarring
if (animationType == PIXELATION && speed < 30) { if (animationType == MOSAIC && speed < 30) {
speed += 25; speed += 25;
} }
} }

4
lib/hooks.h
View file

@ -80,8 +80,8 @@ enum TransitionType
NOT_TRANSITIONING = 0, NOT_TRANSITIONING = 0,
NO_ANIMATION = 1, NO_ANIMATION = 1,
DISSOLVE = 2, DISSOLVE = 2,
PIXELATION = 3, MOSAIC = 3,
VERTICAL_WIPE = 4, WIPE_DOWN = 4,
WINDOW = 5, WINDOW = 5,
BROKEN = 6 BROKEN = 6
}; };

4
src/patchgrid.cpp
View file

@ -185,8 +185,8 @@ PatchGrid::PatchGrid()
vector<string> animationList; vector<string> animationList;
animationList.push_back("No Animation"); animationList.push_back("No Animation");
animationList.push_back("Dissolve"); animationList.push_back("Dissolve");
animationList.push_back("Pixelation"); animationList.push_back("Mosaic");
animationList.push_back("Vertical Wipe"); animationList.push_back("Wipe Down");
animationList.push_back("Window"); animationList.push_back("Window");
animationList.push_back("Random"); animationList.push_back("Random");
AddPatch("TransitionType", AddPatch("TransitionType",