Preprocessor purge round 6: intro text and user agent
This commit is contained in:
Tamás Bálint Misius
parent
fdfa206a3c
commit
e97fd74503
@ -52,13 +52,14 @@ namespace http
|
|||||||
cafile = newCafile;
|
cafile = newCafile;
|
||||||
capath = newCapath;
|
capath = newCapath;
|
||||||
|
|
||||||
user_agent =
|
user_agent = ByteString::Build(
|
||||||
"PowderToy/" MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " ("
|
"PowderToy/", SAVE_VERSION, ".", MINOR_VERSION, " ("
|
||||||
IDENT_PLATFORM
|
IDENT_PLATFORM
|
||||||
"; " IDENT_BUILD
|
"; " IDENT_BUILD
|
||||||
"; M" MTOS(MOD_ID)
|
"; M", MOD_ID,
|
||||||
"; " IDENT
|
"; " 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(); });
|
worker_thread = std::thread([this]() { Worker(); });
|
||||||
initialized = true;
|
initialized = true;
|
||||||
|
|||||||
@ -191,7 +191,7 @@ GameView::GameView():
|
|||||||
buttonTip(""),
|
buttonTip(""),
|
||||||
isButtonTipFadingIn(false),
|
isButtonTipFadingIn(false),
|
||||||
introText(2048),
|
introText(2048),
|
||||||
introTextMessage(ByteString(introTextData).FromUtf8()),
|
introTextMessage(IntroText().FromUtf8()),
|
||||||
|
|
||||||
doScreenshot(false),
|
doScreenshot(false),
|
||||||
screenshotIndex(1),
|
screenshotIndex(1),
|
||||||
|
|||||||
@ -1,62 +1,66 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "Config.h"
|
#include "Config.h"
|
||||||
|
#include "common/String.h"
|
||||||
|
|
||||||
const char *const introTextData =
|
inline ByteString IntroText()
|
||||||
"\bl\bU" APPNAME "\bU - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - https://powdertoy.co.uk, irc.libera.chat #powder, https://tpt.io/discord\n"
|
{
|
||||||
"\n"
|
ByteStringBuilder sb;
|
||||||
"\n"
|
sb << "\bl\bU" APPNAME "\bU - Version " << SAVE_VERSION << "." << MINOR_VERSION << " - https://powdertoy.co.uk, irc.libera.chat #powder, https://tpt.io/discord\n"
|
||||||
"\bgControl+C/V/X are Copy, Paste and cut respectively.\n"
|
"\n"
|
||||||
"\bgTo choose a material, hover over one of the icons on the right, it will show a selection of elements in that group.\n"
|
"\n"
|
||||||
"\bgPick your material from the menu using mouse left/right buttons.\n"
|
"\bgControl+C/V/X are Copy, Paste and cut respectively.\n"
|
||||||
"Draw freeform lines by dragging your mouse left/right button across the drawing area.\n"
|
"\bgTo choose a material, hover over one of the icons on the right, it will show a selection of elements in that group.\n"
|
||||||
"Shift+drag will create straight lines of particles.\n"
|
"\bgPick your material from the menu using mouse left/right buttons.\n"
|
||||||
"Ctrl+drag will result in filled rectangles.\n"
|
"Draw freeform lines by dragging your mouse left/right button across the drawing area.\n"
|
||||||
"Ctrl+Shift+click will flood-fill a closed area.\n"
|
"Shift+drag will create straight lines of particles.\n"
|
||||||
"Use the mouse scroll wheel, or '[' and ']', to change the tool size for particles.\n"
|
"Ctrl+drag will result in filled rectangles.\n"
|
||||||
"Middle click or Alt+Click to \"sample\" the particles.\n"
|
"Ctrl+Shift+click will flood-fill a closed area.\n"
|
||||||
"Ctrl+Z will act as Undo.\n"
|
"Use the mouse scroll wheel, or '[' and ']', to change the tool size for particles.\n"
|
||||||
"\n\boUse 'Z' for a zoom tool. Click to make the drawable zoom window stay around. Use the wheel to change the zoom strength.\n"
|
"Middle click or Alt+Click to \"sample\" the particles.\n"
|
||||||
"The spacebar can be used to pause physics. Use 'F' to step ahead by one frame.\n"
|
"Ctrl+Z will act as Undo.\n"
|
||||||
"Use 'S' to save parts of the window as 'stamps'. 'L' loads the most recent stamp, 'K' shows a library of stamps you saved.\n"
|
"\n\boUse 'Z' for a zoom tool. Click to make the drawable zoom window stay around. Use the wheel to change the zoom strength.\n"
|
||||||
"Use 'P' to take a screenshot and save it into the current directory.\n"
|
"The spacebar can be used to pause physics. Use 'F' to step ahead by one frame.\n"
|
||||||
"Use 'H' to toggle the HUD. Use 'D' to toggle debug mode in the HUD.\n"
|
"Use 'S' to save parts of the window as 'stamps'. 'L' loads the most recent stamp, 'K' shows a library of stamps you saved.\n"
|
||||||
"\n"
|
"Use 'P' to take a screenshot and save it into the current directory.\n"
|
||||||
"Contributors: \bgStanislaw K Skowronek (Designed the original Powder Toy),\n"
|
"Use 'H' to toggle the HUD. Use 'D' to toggle debug mode in the HUD.\n"
|
||||||
"\bgSimon Robertshaw, Skresanov Savely, cracker64, Catelite, Bryan Hoyle, Nathan Cousins, jacksonmj,\n"
|
"\n"
|
||||||
"\bgFelix Wallin, Lieuwe Mosch, Anthony Boot, Me4502, MaksProg, jacob1, mniip, LBPHacker\n"
|
"Contributors: \bgStanislaw K Skowronek (Designed the original Powder Toy),\n"
|
||||||
"\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";
|
||||||
#ifndef BETA
|
#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
|
#else
|
||||||
"\brThis is a BETA, you cannot save things publicly, nor open local saves and stamps made with it in older versions.\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"
|
"\brIf you are planning on publishing any saves, use the release version.\n";
|
||||||
#endif
|
#endif
|
||||||
"\n"
|
sb << "\n"
|
||||||
"\bt" MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) "." MTOS(BUILD_NUM) " " IDENT
|
<< "\bt" << SAVE_VERSION << "." << MINOR_VERSION << "." << BUILD_NUM << " " IDENT;
|
||||||
#ifdef SNAPSHOT
|
#ifdef SNAPSHOT
|
||||||
" SNAPSHOT " MTOS(SNAPSHOT_ID)
|
sb << " SNAPSHOT " << SNAPSHOT_ID;
|
||||||
#elif MOD_ID > 0
|
#elif MOD_ID > 0
|
||||||
" MODVER " MTOS(SNAPSHOT_ID)
|
sb << " MODVER " << SNAPSHOT_ID;
|
||||||
#endif
|
#endif
|
||||||
#if defined(X86_SSE) || defined(X86_SSE2) || defined(X86_SSE3)
|
#if defined(X86_SSE) || defined(X86_SSE2) || defined(X86_SSE3)
|
||||||
" " IDENT_BUILD
|
sb << " " IDENT_BUILD;
|
||||||
#endif
|
#endif
|
||||||
#ifdef LUACONSOLE
|
#ifdef LUACONSOLE
|
||||||
" LUACONSOLE"
|
sb << " LUACONSOLE";
|
||||||
#endif
|
#endif
|
||||||
#ifdef GRAVFFT
|
#ifdef GRAVFFT
|
||||||
" GRAVFFT"
|
sb << " GRAVFFT";
|
||||||
#endif
|
#endif
|
||||||
#ifdef REALISTIC
|
#ifdef REALISTIC
|
||||||
" REALISTIC"
|
sb << " REALISTIC";
|
||||||
#endif
|
#endif
|
||||||
#ifdef NOHTTP
|
#ifdef NOHTTP
|
||||||
" NOHTTP"
|
sb << " NOHTTP";
|
||||||
#endif
|
#endif
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
" DEBUG"
|
sb << " DEBUG";
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENFORCE_HTTPS
|
#ifdef ENFORCE_HTTPS
|
||||||
" HTTPS"
|
sb << " HTTPS";
|
||||||
#endif
|
#endif
|
||||||
;
|
return sb.Build();
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user