diff --git a/data/IntroText.h b/data/IntroText.h new file mode 100644 index 000000000..59e7e1953 --- /dev/null +++ b/data/IntroText.h @@ -0,0 +1,62 @@ +static const char *introTextData = + "\blThe Powder Toy - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - http://powdertoy.co.uk, irc.freenode.net #powder\n" + "\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\n" + "\n" + "\bgControl+C/V/X are Copy, Paste and cut respectively.\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" + "\bgPick your material from the menu using mouse left/right buttons.\n" + "Draw freeform lines by dragging your mouse left/right button across the drawing area.\n" + "Shift+drag will create straight lines of particles.\n" + "Ctrl+drag will result in filled rectangles.\n" + "Ctrl+Shift+click will flood-fill a closed area.\n" + "Ctrl+Z will act as Undo.\n" + "Middle click or Alt+Click to \"sample\" the 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" + "Use 'S' to save parts of the window as 'stamps'.\n" + "'L' will load the most recent stamp, 'K' shows a library of stamps you saved.\n" + "'C' will cycle the display mode (Fire, Blob, Velocity, etc.). The numbers on the keyboard do the same\n" + "Use the mouse scroll wheel to change the tool size for particles.\n" + "The spacebar can be used to pause physics.\n" + "'P' will take a screenshot and save it into the current directory.\n" + "\n" + "Contributors: \bgStanislaw K Skowronek (\brhttp://powder.unaligned.org\bg, \bbirc.unaligned.org #wtf\bg),\n" + "\bgSimon Robertshaw, Skresanov Savely, cracker64, Catelite, Bryan Hoyle, Nathan Cousins, jacksonmj,\n" + "\bgLieuwe Mosch, Anthony Boot, Matthew \"me4502\", MaksProg, jacob1\n" + "\n" + "\bgTo use online features such as saving, you need to register at: \brhttp://powdertoy.co.uk/Register.html\n" + "\n" + "\bt" MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) "." MTOS(BUILD_NUM) " " +#ifdef X86 + "X86 " +#endif +#ifdef X86_SSE + "X86_SSE " +#endif +#ifdef X86_SSE2 + "X86_SSE2 " +#endif +#ifdef X86_SSE3 + "X86_SSE3 " +#endif +#ifdef LIN32 + "LIN32 " +#endif +#ifdef LIN64 + "LIN64 " +#endif +#ifdef WIN32 + "WIN32 " +#endif +#ifdef MACOSX + "MACOSX " +#endif +#ifdef LUACONSOLE + "LUACONSOLE " +#endif +#ifdef GRAVFFT + "GRAVFFT " +#endif +#ifdef REALISTIC + "REALISTIC" +#endif + ; \ No newline at end of file diff --git a/src/game/GameView.h b/src/game/GameView.h index 7cb8d6b88..9fedb1ca7 100644 --- a/src/game/GameView.h +++ b/src/game/GameView.h @@ -42,6 +42,8 @@ private: bool ctrlBehaviour; bool altBehaviour; bool showHud; + int introText; + std::string introTextMessage; int toolIndex; int infoTipPresence; diff --git a/src/interface/Keys.h b/src/interface/Keys.h index 685f24059..b18a4c337 100644 --- a/src/interface/Keys.h +++ b/src/interface/Keys.h @@ -27,6 +27,8 @@ #define KEY_s SDLK_s #define KEY_w SDLK_w +#define KEY_F1 SDLK_F1 + #define BUTTON_LEFT SDL_BUTTON_LEFT #define BUTTON_MIDDLE SDL_BUTTON_MIDDLE #define BUTTON_RIGHT SDL_BUTTON_RIGHT