mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-11 05:04:40 -04:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3eeb9a19a1 | |||
| 060f0eb419 | |||
| e491d254f8 |
Vendored
+1
-1
Submodule extern/aurora updated: 9087a409da...e6c3a4409c
+1
-1
@@ -118,7 +118,7 @@ static int dKyeff_Create(kankyo_class* i_this) {
|
|||||||
|
|
||||||
if (strcmp(dComIfGp_getStartStageName(), "Name") == 0) {
|
if (strcmp(dComIfGp_getStartStageName(), "Name") == 0) {
|
||||||
camera_process_class* camera = dComIfGp_getCamera(0);
|
camera_process_class* camera = dComIfGp_getCamera(0);
|
||||||
OSTime time = OSGetTime();
|
OSTime time = DUSK_IF_ELSE(OSGetSystemTime(), OSGetTime());
|
||||||
OSTicksToCalendarTime(time, &calendar);
|
OSTicksToCalendarTime(time, &calendar);
|
||||||
|
|
||||||
g_env_light.global_wind_influence.vec.x = 1.0f;
|
g_env_light.global_wind_influence.vec.x = 1.0f;
|
||||||
|
|||||||
+1
-1
@@ -1823,7 +1823,7 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) {
|
|||||||
savedata->getPlayer().getPlayerInfo().setTotalTime(play_time);
|
savedata->getPlayer().getPlayerInfo().setTotalTime(play_time);
|
||||||
}
|
}
|
||||||
|
|
||||||
savedata->getPlayer().getPlayerStatusB().setDateIpl(OSGetTime());
|
savedata->getPlayer().getPlayerStatusB().setDateIpl(DUSK_IF_ELSE(OSGetSystemTime(), OSGetTime()));
|
||||||
|
|
||||||
memcpy(card_ptr, savedata, sizeof(dSv_save_c));
|
memcpy(card_ptr, savedata, sizeof(dSv_save_c));
|
||||||
card_ptr += 0x958;
|
card_ptr += 0x958;
|
||||||
|
|||||||
+15
-6
@@ -197,10 +197,19 @@ void remove_element(Rml::Element*& elem) noexcept {
|
|||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
static std::string FormatTime(OSTime ticks) {
|
static std::string FormatElapsedTime(OSTime ticksElapsed) {
|
||||||
OSCalendarTime t;
|
using namespace std::chrono;
|
||||||
OSTicksToCalendarTime(ticks, &t);
|
|
||||||
return fmt::format("{0:02}:{1:02}:{2:02}.{3:03}", t.hour, t.min, t.sec, t.msec);
|
milliseconds ms{OSTicksToMilliseconds(ticksElapsed)};
|
||||||
|
|
||||||
|
const hours hr = duration_cast<hours>(ms);
|
||||||
|
ms -= hr;
|
||||||
|
const minutes min = duration_cast<minutes>(ms);
|
||||||
|
ms -= min;
|
||||||
|
const seconds sec = duration_cast<seconds>(ms);
|
||||||
|
ms -= sec;
|
||||||
|
|
||||||
|
return fmt::format("{0:02}:{1:02}:{2:02}.{3:03}", hr.count(), min.count(), sec.count(), ms.count());
|
||||||
}
|
}
|
||||||
|
|
||||||
Overlay::Overlay() : Document(kDocumentSource, true) {
|
Overlay::Overlay() : Document(kDocumentSource, true) {
|
||||||
@@ -317,13 +326,13 @@ void Overlay::update() {
|
|||||||
|
|
||||||
if (getSettings().game.showSpeedrunRTATimer) {
|
if (getSettings().game.showSpeedrunRTATimer) {
|
||||||
mSpeedrunRta->SetAttribute("open", "");
|
mSpeedrunRta->SetAttribute("open", "");
|
||||||
mSpeedrunRta->SetInnerRML(escape(fmt::format("RTA {}", FormatTime(elapsedTime))));
|
mSpeedrunRta->SetInnerRML(escape(fmt::format("RTA {}", FormatElapsedTime(elapsedTime))));
|
||||||
} else {
|
} else {
|
||||||
mSpeedrunRta->RemoveAttribute("open");
|
mSpeedrunRta->RemoveAttribute("open");
|
||||||
}
|
}
|
||||||
|
|
||||||
mSpeedrunIgt->SetInnerRML(
|
mSpeedrunIgt->SetInnerRML(
|
||||||
escape(fmt::format("IGT {}", FormatTime(m_speedrunInfo.m_igtTimer))));
|
escape(fmt::format("IGT {}", FormatElapsedTime(m_speedrunInfo.m_igtTimer))));
|
||||||
} else {
|
} else {
|
||||||
mSpeedrunTimer->RemoveAttribute("open");
|
mSpeedrunTimer->RemoveAttribute("open");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1052,7 +1052,7 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) {
|
|||||||
mDoAud_seStartMenu(kSoundItemChange);
|
mDoAud_seStartMenu(kSoundItemChange);
|
||||||
getSettings().game.touchTargeting.setValue(
|
getSettings().game.touchTargeting.setValue(
|
||||||
static_cast<TouchTargeting>(i));
|
static_cast<TouchTargeting>(i));
|
||||||
config::Save();
|
config::save();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
pane.add_rml(fmt::format("<br/>Hybrid: {}<br/>Hold: {}<br/>Switch: {}",
|
pane.add_rml(fmt::format("<br/>Hybrid: {}<br/>Hold: {}<br/>Switch: {}",
|
||||||
|
|||||||
@@ -320,7 +320,7 @@ static void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData* header) {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
OSCalendarTime time;
|
OSCalendarTime time;
|
||||||
OSTicksToCalendarTime(OSGetTime(), &time);
|
OSTicksToCalendarTime(DUSK_IF_ELSE(OSGetSystemTime(), OSGetTime()), &time);
|
||||||
|
|
||||||
#if TARGET_PC
|
#if TARGET_PC
|
||||||
if (dusk::version::isRegionPal()) {
|
if (dusk::version::isRegionPal()) {
|
||||||
|
|||||||
@@ -527,7 +527,7 @@ void myExceptionCallback(u16, OSContext*, u32, u32) {
|
|||||||
u32 btnHold;
|
u32 btnHold;
|
||||||
u32 btnTrig;
|
u32 btnTrig;
|
||||||
|
|
||||||
mDoMain::sHungUpTime = OSGetTime();
|
mDoMain::sHungUpTime = DUSK_IF_ELSE(OSGetSystemTime(), OSGetTime());
|
||||||
OSReportEnable();
|
OSReportEnable();
|
||||||
cAPICPad_recalibrate();
|
cAPICPad_recalibrate();
|
||||||
// "Vibration stopping & resetting to default\n"
|
// "Vibration stopping & resetting to default\n"
|
||||||
|
|||||||
@@ -770,7 +770,7 @@ int game_main(int argc, char* argv[]) {
|
|||||||
|
|
||||||
OSInit();
|
OSInit();
|
||||||
|
|
||||||
mDoMain::sPowerOnTime = OSGetTime();
|
mDoMain::sPowerOnTime = DUSK_IF_ELSE(OSGetSystemTime(), OSGetTime());
|
||||||
|
|
||||||
// Reset Data
|
// Reset Data
|
||||||
static mDoRstData sResetData = {0};
|
static mDoRstData sResetData = {0};
|
||||||
|
|||||||
Reference in New Issue
Block a user