vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed animations on transitions and pause menu

This commit is contained in:
KiritoDev 2021-06-01 21:26:10 -05:00
parent 75d1bb3488
commit a4e1e1b032
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/game/ingame_menu.h
View File

@ -33,6 +33,7 @@
extern s8 gDialogCourseActNum; extern s8 gDialogCourseActNum;
extern s8 gHudFlash; extern s8 gHudFlash;
extern s16 gMenuMode;
struct DialogEntry struct DialogEntry
{ {

11
src/moon/achievements/achievements.cpp
View File

@ -15,6 +15,7 @@ extern "C" {
#include "game/level_update.h" #include "game/level_update.h"
#include "audio/external.h" #include "audio/external.h"
#include "audio_defines.h" #include "audio_defines.h"
#include "game/area.h"
} }
std::map<std::string, Achievement*> registeredAchievements; std::map<std::string, Achievement*> registeredAchievements;
@ -132,12 +133,14 @@ namespace MoonInternal{
} }
} }
aEntry->width = MathUtil::Lerp(aEntry->width, !shouldClose ? achievementWidth : 0, !shouldClose ? 0.2f : 0.35f); if(gMenuMode == -1 && !gWarpTransition.isActive){
aEntry->dead = shouldClose && aEntry->width <= 0; aEntry->width = MathUtil::Lerp(aEntry->width, !shouldClose ? achievementWidth : 0, !shouldClose ? 0.2f : 0.35f);
aEntry->dead = shouldClose && aEntry->width <= 0;
aEntry->y = MathUtil::Lerp(aEntry->y, !shouldClose ? aEntry->height + 20 : 0, !shouldClose ? 0.4f : 0.35f); aEntry->y = MathUtil::Lerp(aEntry->y, !shouldClose ? aEntry->height + 20 : 0, !shouldClose ? 0.4f : 0.35f);
aEntry->launchTime++; aEntry->launchTime++;
}
return; return;
} }
} }

3
src/moon/config/saves/saves.cpp
View File

@ -126,6 +126,8 @@ namespace MoonInternal {
obtainedAchievements.push_back(rAchievements->achievement->id); obtainedAchievements.push_back(rAchievements->achievement->id);
} }
if(cheatsGotEnabled) obtainedAchievements.clear();
cfg->setArray<string>("game.achievements", obtainedAchievements); cfg->setArray<string>("game.achievements", obtainedAchievements);
cfg->setBool("game.updated", cheatsGotEnabled); cfg->setBool("game.updated", cheatsGotEnabled);
@ -187,6 +189,7 @@ namespace MoonInternal {
entries.push_back(entry); entries.push_back(entry);
} }
if(cheatsGotEnabled) entries.clear();
gSaveBuffer.files[fileIndex][0].flags |= (1 << 0); gSaveBuffer.files[fileIndex][0].flags |= (1 << 0);
// Backup is nessecary for saving recent progress after gameover // Backup is nessecary for saving recent progress after gameover

3
src/moon/mod-engine/textures/modifiers/animated.cpp
View File

@ -7,6 +7,7 @@
extern "C" { extern "C" {
#include "moon/utils/moon-gfx.h" #include "moon/utils/moon-gfx.h"
#include "game/ingame_menu.h"
} }
using json = nlohmann::json; using json = nlohmann::json;
@ -22,7 +23,7 @@ void AnimatedModifier::onInit(){
AnimatedEntry* entry = textures[texName]; AnimatedEntry* entry = textures[texName];
Frame *frame = entry->frames[entry->lastFrame]; Frame *frame = entry->frames[entry->lastFrame];
if(moon_get_milliseconds() >= entry->lastTime + frame->delay){ if(moon_get_milliseconds() >= entry->lastTime + frame->delay && gMenuMode == -1){
int maxFrames = entry->frames.size() - 1; int maxFrames = entry->frames.size() - 1;
bool reachMax = (entry->lastFrame < maxFrames); bool reachMax = (entry->lastFrame < maxFrames);
if(entry->bounce){ if(entry->bounce){