Compare commits
No commits in common. "25e6ca6717b4baa49c77b2b761a90c5005f7bafd" and "a9bb035c0b8f095af290d40fe8d47bd37093a6ea" have entirely different histories.
25e6ca6717
...
a9bb035c0b
|
@ -58,7 +58,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="bottom-left">
|
<div class="bottom-left">
|
||||||
<label>v{{version_number}}</label>
|
<label>{{version_number}}</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 986881e4e1b19d39ad0efd5a301be7ed439434b1
|
Subproject commit 5699906f34fcc82905303092d081ad92aa74f926
|
|
@ -37,8 +37,6 @@
|
||||||
|
|
||||||
#include "../../lib/rt64/src/contrib/stb/stb_image.h"
|
#include "../../lib/rt64/src/contrib/stb/stb_image.h"
|
||||||
|
|
||||||
const std::string version_string = "1.2.0-dev";
|
|
||||||
|
|
||||||
template<typename... Ts>
|
template<typename... Ts>
|
||||||
void exit_error(const char* str, Ts ...args) {
|
void exit_error(const char* str, Ts ...args) {
|
||||||
// TODO pop up an error
|
// TODO pop up an error
|
||||||
|
@ -529,12 +527,6 @@ void release_preload(PreloadContext& context) {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
recomp::Version project_version{};
|
|
||||||
if (!recomp::Version::from_string(version_string, project_version)) {
|
|
||||||
ultramodern::error_handling::message_box(("Invalid version string: " + version_string).c_str());
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Map this executable into memory and lock it, which should keep it in physical memory. This ensures
|
// Map this executable into memory and lock it, which should keep it in physical memory. This ensures
|
||||||
// that there are no stutters from the OS having to load new pages of the executable whenever a new code page is run.
|
// that there are no stutters from the OS having to load new pages of the executable whenever a new code page is run.
|
||||||
PreloadContext preload_context;
|
PreloadContext preload_context;
|
||||||
|
@ -631,15 +623,8 @@ int main(int argc, char** argv) {
|
||||||
|
|
||||||
recomp::mods::scan_mods();
|
recomp::mods::scan_mods();
|
||||||
|
|
||||||
printf("Found mods:\n");
|
|
||||||
for (const auto& mod : recomp::mods::get_mod_details("mm")) {
|
|
||||||
printf(" %s(%s)\n", mod.mod_id.c_str(), mod.version.to_string().c_str());
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
|
|
||||||
recomp::start(
|
recomp::start(
|
||||||
64 * 1024 * 1024, // 64MB to have plenty of room for loading mods
|
64 * 1024 * 1024, // 64MB to have plenty of room for loading mods
|
||||||
project_version,
|
|
||||||
{},
|
{},
|
||||||
rsp_callbacks,
|
rsp_callbacks,
|
||||||
renderer_callbacks,
|
renderer_callbacks,
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "nfd.h"
|
#include "nfd.h"
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
|
||||||
static std::string version_string;
|
std::string version_number = "v1.1.1";
|
||||||
|
|
||||||
Rml::DataModelHandle model_handle;
|
Rml::DataModelHandle model_handle;
|
||||||
bool mm_rom_valid = false;
|
bool mm_rom_valid = false;
|
||||||
|
@ -103,9 +103,7 @@ public:
|
||||||
Rml::DataModelConstructor constructor = context->CreateDataModel("launcher_model");
|
Rml::DataModelConstructor constructor = context->CreateDataModel("launcher_model");
|
||||||
|
|
||||||
constructor.Bind("mm_rom_valid", &mm_rom_valid);
|
constructor.Bind("mm_rom_valid", &mm_rom_valid);
|
||||||
|
constructor.Bind("version_number", &version_number);
|
||||||
version_string = recomp::get_project_version().to_string();
|
|
||||||
constructor.Bind("version_number", &version_string);
|
|
||||||
|
|
||||||
model_handle = constructor.GetModelHandle();
|
model_handle = constructor.GetModelHandle();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue