Merge commit '6c40a36577'
This commit is contained in:
commit
f3ceb09e9d
62 changed files with 83 additions and 18 deletions
|
|
@ -33,10 +33,12 @@ char g_moduleBaseName[260] = {};
|
|||
char g_crashString[8096] = {};
|
||||
|
||||
namespace {
|
||||
// INLINED
|
||||
int ReadPlayerJob() {
|
||||
return g_session.m_job;
|
||||
}
|
||||
|
||||
// INLINED
|
||||
const char* ReadPlayerJobName(int jobId) {
|
||||
const char* const* namesBegin = g_session.m_jobNamesBegin;
|
||||
const char* const* namesEnd = g_session.m_jobNamesEnd;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
#include <utility>
|
||||
|
||||
namespace {
|
||||
// INLINED
|
||||
BrowserWindowSizing Sizing(CWebBrowser& owner) {
|
||||
return {owner.browser, owner.screenWidth, owner.screenHeight, owner.rebar, owner.auxiliaryVisible, owner.width, owner.height};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ const char* InputCharset::Prefix(bool alternate) const {
|
|||
return prefix;
|
||||
}
|
||||
|
||||
// INLINED
|
||||
unsigned InputCharset::CodePage(unsigned fallback) const {
|
||||
return this->enabled ? LanguageCodePage(this->language) : fallback;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue