Remove watermark, updater, --dirty, console ver
This commit is contained in:
parent
b23d425e12
commit
03faf91437
@ -1,4 +1,4 @@
|
|||||||
gitVersioningCommand = "git describe --tags --dirty --always"
|
gitVersioningCommand = "git describe --tags --always"
|
||||||
gitCurrentBranchCommand = "git symbolic-ref -q --short HEAD"
|
gitCurrentBranchCommand = "git symbolic-ref -q --short HEAD"
|
||||||
|
|
||||||
-- Quote the given string input as a C string
|
-- Quote the given string input as a C string
|
||||||
|
@ -34,12 +34,12 @@ namespace branding
|
|||||||
if (font)
|
if (font)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
game::R_AddCmdDrawText("h1-mod: " VERSION " (" __DATE__ " " __TIME__ ")",
|
game::R_AddCmdDrawText("",
|
||||||
0x7FFFFFFF, font, 10.f,
|
0x7FFFFFFF, font, 10.f,
|
||||||
5.f + static_cast<float>(font->pixelHeight),
|
5.f + static_cast<float>(font->pixelHeight),
|
||||||
1.f, 1.f, 0.0f, color, 0);
|
1.f, 1.f, 0.0f, color, 0);
|
||||||
#else
|
#else
|
||||||
game::R_AddCmdDrawText("h1-mod",
|
game::R_AddCmdDrawText("",
|
||||||
0x7FFFFFFF, font, 10.f,
|
0x7FFFFFFF, font, 10.f,
|
||||||
5.f + static_cast<float>(font->pixelHeight),
|
5.f + static_cast<float>(font->pixelHeight),
|
||||||
1.f, 1.f, 0.0f, color, 0);
|
1.f, 1.f, 0.0f, color, 0);
|
||||||
|
@ -357,7 +357,7 @@ namespace console
|
|||||||
printf_hook.create(printf, printf_stub);
|
printf_hook.create(printf, printf_stub);
|
||||||
|
|
||||||
ShowWindow(GetConsoleWindow(), SW_SHOW);
|
ShowWindow(GetConsoleWindow(), SW_SHOW);
|
||||||
SetConsoleTitle("H1-Mod: " VERSION);
|
SetConsoleTitle("H1-Mod: ");
|
||||||
|
|
||||||
con.kill_event = CreateEvent(NULL, TRUE, FALSE, NULL);
|
con.kill_event = CreateEvent(NULL, TRUE, FALSE, NULL);
|
||||||
|
|
||||||
|
@ -20,7 +20,9 @@
|
|||||||
#include <utils/properties.hpp>
|
#include <utils/properties.hpp>
|
||||||
#include <utils/string.hpp>
|
#include <utils/string.hpp>
|
||||||
|
|
||||||
#define MASTER "https://master.fed0001.xyz/h1-mod/"
|
// Ahrimdon
|
||||||
|
#define MASTER ""
|
||||||
|
// #define MASTER "https://master.fed0001.xyz/h1-mod/"
|
||||||
|
|
||||||
#define FILES_PATH "files.json"
|
#define FILES_PATH "files.json"
|
||||||
#define FILES_PATH_DEV "files-dev.json"
|
#define FILES_PATH_DEV "files-dev.json"
|
||||||
@ -396,7 +398,8 @@ namespace updater
|
|||||||
data_.cancelled = true;
|
data_.cancelled = true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
// Ahrimdon
|
||||||
|
/*
|
||||||
void start_update_check()
|
void start_update_check()
|
||||||
{
|
{
|
||||||
cancel_update();
|
cancel_update();
|
||||||
@ -491,10 +494,27 @@ namespace updater
|
|||||||
notify("update_check_done");
|
notify("update_check_done");
|
||||||
}, scheduler::pipeline::async);
|
}, scheduler::pipeline::async);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
void start_update_check() // Ahrimdon
|
||||||
|
{
|
||||||
|
console::debug("[Updater] Skipping update check as master server is not defined.\n");
|
||||||
|
|
||||||
|
update_data.access([](update_data_t& data_)
|
||||||
|
{
|
||||||
|
data_.check.done = true;
|
||||||
|
data_.check.success = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
notify("update_check_done");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void start_update_download()
|
void start_update_download()
|
||||||
{
|
{
|
||||||
console::debug("[Updater] starting update download\n");
|
// console::debug("[Updater] starting update download\n"); - Ahrimdon
|
||||||
|
console::debug("[Updater] Skipping update download as master server is not defined.\n");
|
||||||
|
return;
|
||||||
|
|
||||||
if (!is_update_check_done() || !get_update_check_status() || is_update_cancelled())
|
if (!is_update_check_done() || !get_update_check_status() || is_update_cancelled())
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user