7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-15 03:25:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

merge main into new-index-but-better

Browse source
This commit is contained in:
dankmeme01 2024-05-30 15:19:28 +02:00
commit cea58a87f1
5 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
loader/include/Geode/c++stl/msvc/umap.hpp
View file

@ -553,7 +553,8 @@ _NODISCARD bool operator!=(const unordered_map<_Kty, _Ty, _Hasher, _Keyeq, _Allo
}
#endif // !_HAS_CXX20
_STD_END
} // namespace geode::stl
#pragma pop_macro("new")
_STL_RESTORE_CLANG_WARNINGS
#pragma warning(pop)

3
loader/include/Geode/c++stl/msvc/uset.hpp
View file

@ -408,7 +408,8 @@ _NODISCARD bool operator!=(const unordered_set<_Kty, _Hasher, _Keyeq, _Alloc>& _
}
#endif // !_HAS_CXX20
_STD_END
} // namespace geode::stl
#pragma pop_macro("new")
_STL_RESTORE_CLANG_WARNINGS
#pragma warning(pop)

3
loader/include/Geode/c++stl/msvc/xhash.hpp
View file

@ -1796,7 +1796,8 @@ _NODISCARD bool _Hash_equal(const _Hash<_Traits>& _Left, const _Hash<_Traits>& _
return true;
}
_STD_END
} // namespace geode::stl
#pragma pop_macro("new")
_STL_RESTORE_CLANG_WARNINGS

6
loader/include/Geode/loader/Loader.hpp
View file

@ -142,6 +142,12 @@ namespace geode {
void queueInMainThread(ScheduledFunction func);
/**
* Returns the current game version.
* @return The game version
*/
std::string getGameVersion();
friend class LoaderImpl;
friend Mod* takeNextLoaderMod();

4
loader/src/loader/Loader.cpp
View file

@ -97,6 +97,10 @@ void Loader::queueInMainThread(ScheduledFunction func) {
return m_impl->queueInMainThread(std::move(func));
}
std::string Loader::getGameVersion() {
return m_impl->getGameVersion();
}
Mod* Loader::takeNextMod() {
return m_impl->takeNextMod();
}