dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: use string/fmt instead of print for strgen warnings/errors/fatals

Browse Source
This commit is contained in:
Rubidium
2023-04-18 20:24:21 +02:00
committed by rubidium42
parent 1fd17148e1
commit dfe52da1ea
5 changed files with 60 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/game_text.cpp
View File

@@ -26,36 +26,21 @@
#include "../safeguards.h"
void CDECL strgen_warning(const char *s, ...)
void CDECL StrgenWarningI(const std::string &msg)
{
char buf[1024];
va_list va;
va_start(va, s);
vseprintf(buf, lastof(buf), s, va);
va_end(va);
Debug(script, 0, "{}:{}: warning: {}", _file, _cur_line, buf);
Debug(script, 0, "{}:{}: warning: {}", _file, _cur_line, msg);
_warnings++;
}
void CDECL strgen_error(const char *s, ...)
void CDECL StrgenErrorI(const std::string &msg)
{
char buf[1024];
va_list va;
va_start(va, s);
vseprintf(buf, lastof(buf), s, va);
va_end(va);
Debug(script, 0, "{}:{}: error: {}", _file, _cur_line, buf);
Debug(script, 0, "{}:{}: error: {}", _file, _cur_line, msg);
_errors++;
}
void NORETURN CDECL strgen_fatal(const char *s, ...)
void CDECL StrgenFatalI(const std::string &msg)
{
char buf[1024];
va_list va;
va_start(va, s);
vseprintf(buf, lastof(buf), s, va);
va_end(va);
Debug(script, 0, "{}:{}: FATAL: {}", _file, _cur_line, buf);
Debug(script, 0, "{}:{}: FATAL: {}", _file, _cur_line, msg);
throw std::exception();
}