From 1b743b435941cc67d34bbfc0638904b22425f706 Mon Sep 17 00:00:00 2001 From: CocoSimone Date: Mon, 12 Dec 2022 02:48:07 +0100 Subject: [PATCH] minor fixes --- src/frontend/imgui/Window.cpp | 1 - src/frontend/imgui/Window.hpp | 2 +- src/n64/Scheduler.cpp | 2 +- src/util.hpp | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/frontend/imgui/Window.cpp b/src/frontend/imgui/Window.cpp index f837a909..cf2d711b 100644 --- a/src/frontend/imgui/Window.cpp +++ b/src/frontend/imgui/Window.cpp @@ -5,7 +5,6 @@ #include #include #include -#include VkInstance instance{}; using json = nlohmann::json; diff --git a/src/frontend/imgui/Window.hpp b/src/frontend/imgui/Window.hpp index 8c031048..3d2c2074 100644 --- a/src/frontend/imgui/Window.hpp +++ b/src/frontend/imgui/Window.hpp @@ -15,7 +15,7 @@ struct Window { [[nodiscard]] bool gotClosed(SDL_Event event); ImFont *uiFont{}, *codeFont{}; u32 windowID{}; - float volumeL = 0.1, volumeR = 0.1; + float volumeL = 0.01, volumeR = 0.01; void LoadROM(n64::Core& core, const std::string& path); private: bool lockVolume = true; diff --git a/src/n64/Scheduler.cpp b/src/n64/Scheduler.cpp index 8ace3658..376604fc 100644 --- a/src/n64/Scheduler.cpp +++ b/src/n64/Scheduler.cpp @@ -20,7 +20,7 @@ void Scheduler::enqueueAbsolute(const Event& event) { void Scheduler::tick(u64 t, n64::Mem& mem, n64::Registers& regs) { ticks += t; - if(ticks >= events.top().time) { + while(ticks >= events.top().time) { events.top().event_cb(mem, regs); events.pop(); } diff --git a/src/util.hpp b/src/util.hpp index a321caa5..9ba1018e 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -21,7 +21,7 @@ enum MessageType : u8 { template constexpr void print(const std::string& fmt, Args... args) { -#ifndef __WIN32 +#ifndef _WIN32 if constexpr(messageType == Error) { fmt::print(fmt::emphasis::bold | fg(fmt::color::red), fmt, args...); exit(-1);