iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some warnings and use the damn FORCE_INLINE macro otherwise what's it there for

Browse Source
This commit is contained in:
SimoneN64
2023-06-05 20:54:34 +02:00
parent 776634a293
commit 32c66fdf5f
25 changed files with 139 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/App.hpp
View File

@@ -6,7 +6,7 @@ struct App {
App();
~App() { Util::ClearRPC(); }
void Run();
inline void LoadROM(const std::string& path) {
FORCE_INLINE void LoadROM(const std::string& path) {
window.LoadROM(core, path);
}
private:

6
src/frontend/imgui/Settings.hpp
View File

@@ -8,9 +8,9 @@ struct Settings {
Settings(n64::Core&);
~Settings();
inline float GetVolumeL() const { return volumeL; };
inline float GetVolumeR() const { return volumeR; };
inline bool GetLockChannels() const { return lockChannels; }
FORCE_INLINE float GetVolumeL() const { return volumeL; };
FORCE_INLINE float GetVolumeR() const { return volumeR; };
FORCE_INLINE bool GetLockChannels() const { return lockChannels; }
void RenderWidget(bool& show);
private:

2
src/frontend/imgui/Widgets.hpp
View File

@@ -1,7 +1,7 @@
#pragma once
#include <imgui.h>
inline bool CreateComboList(const char* label, int* index, const char** items, int items_count) {
FORCE_INLINE bool CreateComboList(const char* label, int* index, const char** items, int items_count) {
if (ImGui::BeginCombo(label, items[*index])) {
for (int n = 0; n < items_count; n++) {
const bool is_selected = (*index == n);