From 04a121066c6a7a8223bd86b94d25c901274a7423 Mon Sep 17 00:00:00 2001 From: Jannik Vogel Date: Sun, 12 Jan 2020 10:24:05 +0100 Subject: [PATCH] Add credits for Xbox version --- desktop_version/CONTRIBUTORS.txt | 1 + desktop_version/src/Game.cpp | 12 ++++++++++++ desktop_version/src/Input.cpp | 23 +++++++++++++++++++++++ desktop_version/src/titlerender.cpp | 11 +++++++++++ 4 files changed, 47 insertions(+) diff --git a/desktop_version/CONTRIBUTORS.txt b/desktop_version/CONTRIBUTORS.txt index 285eb357332..b15d4df9a6e 100644 --- a/desktop_version/CONTRIBUTORS.txt +++ b/desktop_version/CONTRIBUTORS.txt @@ -16,4 +16,5 @@ Contributors * Emmanuel Vadot (@evadot) * RĂ©mi Verschelde (@akien-mga) * viri (viri.me) +* Jannik Vogel (@JayFoxRox) * Wouter (Xesxen) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 5c1dce11dd9..f4116ba0f8d 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -7050,6 +7050,18 @@ void Game::createmenu( std::string t ) menuxoff = 20; menuyoff = 64; } +#ifdef XBOX + else if (t == "credits2X") + { + menuoptions[0] = "next page"; + menuoptionsactive[0] = true; + menuoptions[1] = "return"; + menuoptionsactive[1] = true; + nummenuoptions = 2; + menuxoff = 20; + menuyoff = 64; + } +#endif else if (t == "credits25") { menuoptions[0] = "next page"; diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 1042a00cc70..d7cb89104d3 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -1041,6 +1041,28 @@ SDL_assert(0 && "Remove open level dir"); { //next page music.playef(11, 10); +#ifndef XBOX + game.createmenu("credits2"); +#else + game.createmenu("credits2X"); +#endif + map.nexttowercolour(); + } + else + { + //back + music.playef(11, 10); + game.createmenu("mainmenu"); + map.nexttowercolour(); + } + } +#ifdef XBOX + else if (game.currentmenuname == "credits2X") + { + if (game.currentmenuoption == 0) + { + //next page + music.playef(11, 10); game.createmenu("credits25"); map.nexttowercolour(); } @@ -1052,6 +1074,7 @@ SDL_assert(0 && "Remove open level dir"); map.nexttowercolour(); } } +#endif else if (game.currentmenuname == "credits25") { if (game.currentmenuoption == 0) diff --git a/desktop_version/src/titlerender.cpp b/desktop_version/src/titlerender.cpp index c2fbf133fcb..829dc077fb7 100644 --- a/desktop_version/src/titlerender.cpp +++ b/desktop_version/src/titlerender.cpp @@ -255,6 +255,17 @@ void titlerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, U dwgfx.bigprint( 40, 145, "Ethan Lee", tr, tg, tb, true); //dwgfx.drawimagecol(11, -1, 156, tr*0.75, tg *0.75, tb *0.75, true); } +#ifdef XBOX + else if (game.currentmenuname == "credits2X") + { + dwgfx.Print( -1, 40+10, "Original Xbox version by", tr, tg, tb, true); + dwgfx.bigprint( 40, 55+10, "Jannik Vogel", tr, tg, tb, true); + //dwgfx.Print( 40, 75+10, "http://www.jannikvogel.de", tr, tg, tb, true); + dwgfx.Print( -1, 130-10, "Original Xbox tools by", tr, tg, tb, true); + dwgfx.bigprint( 40, 145-10, "XboxDev Community", tr, tg, tb, true); + //dwgfx.Print( 40, 165-10, "http://www.xboxdev.org", tr, tg, tb, true); + } +#endif else if (game.currentmenuname == "credits25") { dwgfx.Print( -1, 40, "Beta Testing by", tr, tg, tb, true);