matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preprocessor purge round 6: intro text and user agent

Browse Source
This commit is contained in:
Tamás Bálint Misius 2023-01-04 12:42:10 +01:00
parent fdfa206a3c
commit e97fd74503
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
3 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/http/RequestManager.cpp
View File

@ -52,13 +52,14 @@ namespace http
cafile = newCafile;
capath = newCapath;
user_agent =
"PowderToy/" MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " ("
user_agent = ByteString::Build(
"PowderToy/", SAVE_VERSION, ".", MINOR_VERSION, " ("
IDENT_PLATFORM
"; " IDENT_BUILD
"; M" MTOS(MOD_ID)
"; M", MOD_ID,
"; " IDENT
") TPTPP/" MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) "." MTOS(BUILD_NUM) IDENT_RELTYPE "." MTOS(SNAPSHOT_ID);
") TPTPP/", SAVE_VERSION, ".", MINOR_VERSION, ".", BUILD_NUM, IDENT_RELTYPE ".", SNAPSHOT_ID
);
worker_thread = std::thread([this]() { Worker(); });
initialized = true;

2
src/gui/game/GameView.cpp
View File

@ -191,7 +191,7 @@ GameView::GameView():
buttonTip(""),
isButtonTipFadingIn(false),
introText(2048),
introTextMessage(ByteString(introTextData).FromUtf8()),
introTextMessage(IntroText().FromUtf8()),
doScreenshot(false),
screenshotIndex(1),

40
src/gui/game/IntroText.h
View File

@ -1,8 +1,11 @@
#pragma once
#include "Config.h"
#include "common/String.h"
const char *const introTextData =
"\bl\bU" APPNAME "\bU - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - https://powdertoy.co.uk, irc.libera.chat #powder, https://tpt.io/discord\n"
inline ByteString IntroText()
{
ByteStringBuilder sb;
sb << "\bl\bU" APPNAME "\bU - Version " << SAVE_VERSION << "." << MINOR_VERSION << " - https://powdertoy.co.uk, irc.libera.chat #powder, https://tpt.io/discord\n"
"\n"
"\n"
"\bgControl+C/V/X are Copy, Paste and cut respectively.\n"
@ -24,39 +27,40 @@ const char *const introTextData =
"Contributors: \bgStanislaw K Skowronek (Designed the original Powder Toy),\n"
"\bgSimon Robertshaw, Skresanov Savely, cracker64, Catelite, Bryan Hoyle, Nathan Cousins, jacksonmj,\n"
"\bgFelix Wallin, Lieuwe Mosch, Anthony Boot, Me4502, MaksProg, jacob1, mniip, LBPHacker\n"
"\n"
"\n";
#ifndef BETA
"\bgTo use online features such as saving, you need to register at: \brhttps://powdertoy.co.uk/Register.html\n"
sb << "\bgTo use online features such as saving, you need to register at: \brhttps://powdertoy.co.uk/Register.html\n";
#else
"\brThis is a BETA, you cannot save things publicly, nor open local saves and stamps made with it in older versions.\n"
"\brIf you are planning on publishing any saves, use the release version.\n"
sb << "\brThis is a BETA, you cannot save things publicly, nor open local saves and stamps made with it in older versions.\n"
"\brIf you are planning on publishing any saves, use the release version.\n";
#endif
"\n"
"\bt" MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) "." MTOS(BUILD_NUM) " " IDENT
sb << "\n"
<< "\bt" << SAVE_VERSION << "." << MINOR_VERSION << "." << BUILD_NUM << " " IDENT;
#ifdef SNAPSHOT
" SNAPSHOT " MTOS(SNAPSHOT_ID)
sb << " SNAPSHOT " << SNAPSHOT_ID;
#elif MOD_ID > 0
" MODVER " MTOS(SNAPSHOT_ID)
sb << " MODVER " << SNAPSHOT_ID;
#endif
#if defined(X86_SSE) || defined(X86_SSE2) || defined(X86_SSE3)
" " IDENT_BUILD
sb << " " IDENT_BUILD;
#endif
#ifdef LUACONSOLE
" LUACONSOLE"
sb << " LUACONSOLE";
#endif
#ifdef GRAVFFT
" GRAVFFT"
sb << " GRAVFFT";
#endif
#ifdef REALISTIC
" REALISTIC"
sb << " REALISTIC";
#endif
#ifdef NOHTTP
" NOHTTP"
sb << " NOHTTP";
#endif
#ifdef DEBUG
" DEBUG"
sb << " DEBUG";
#endif
#ifdef ENFORCE_HTTPS
" HTTPS"
sb << " HTTPS";
#endif
;
return sb.Build();
}