From 4c2ecac0e0f0831c396c5ff777e58df417112863 Mon Sep 17 00:00:00 2001 From: Misa Date: Thu, 2 Apr 2020 17:59:08 -0700 Subject: [PATCH] Remove outdated comments from Input.cpp There's a commented-out recording input option, which sounds interesting. --- desktop_version/src/Input.cpp | 318 ++-------------------------------- 1 file changed, 15 insertions(+), 303 deletions(-) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index cca72d32..9a243042 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -125,7 +125,6 @@ void titleinput() if (graphics.flipmode) { - //GAMEPAD TODO if (key.isDown(KEYBOARD_LEFT) || key.isDown(KEYBOARD_DOWN) || key.isDown(KEYBOARD_a) || key.isDown(KEYBOARD_s) || key.controllerWantsRight(true)) game.press_left = true; if (key.isDown(KEYBOARD_RIGHT) || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_d) || key.isDown(KEYBOARD_w) || key.controllerWantsLeft(true)) game.press_right = true; } @@ -155,42 +154,6 @@ void titleinput() game.jumpheld = true; } - /* - if (game.press_left) { - game.mainmenu--; - }else if (game.press_right) { - game.mainmenu++; - } - - if (game.mainmenu < 0) game.mainmenu = 2; - if (game.mainmenu > 2 ) game.mainmenu = 0; - */ - - - /* - if (game.press_action) { - if (!game.menustart) { - game.menustart = true; - music.play(6); - music.playef(18); - game.screenshake = 10; - game.flashlight = 5; - }else{ - if(game.mainmenu==0){ - graphics.fademode = 2; - }else if (game.mainmenu == 1) { - if (game.telesummary != "") { - graphics.fademode = 2; - } - }else if (game.mainmenu == 2) { - if (game.quicksummary != "") { - graphics.fademode = 2; - } - } - } - } - */ - if (key.isDown(27) && game.currentmenuname != "youwannaquit" && game.menustart) { music.playef(11); @@ -552,122 +515,6 @@ void titleinput() game.createmenu("mainmenu"); map.nexttowercolour(); } - - /* //Old stuff - if (game.advanced_mode) - { - if (game.currentmenuoption == 0) - { - //toggle fullscreen - graphics.screenbuffer->toggleFullScreen(); - music.playef(11); - if (game.fullscreen) - { - game.fullscreen = false; - } - else - { - game.fullscreen = true; - } - updategraphicsmode(); - game.savestats(); - game.createmenu("graphicoptions"); - } - else if (game.currentmenuoption == 1) - { - //enable acceleration: if in fullscreen, go back to window first - music.playef(11); - game.advanced_mode = false; - if (game.fullscreen) - { - game.fullscreen = false; - updategraphicsmode(); - game.fullscreen = true; - } - updategraphicsmode(); - - game.savestats(); - game.createmenu("graphicoptions"); - game.currentmenuoption = 1; - } - else if (game.currentmenuoption == 2) - { - //change scaling mode - music.playef(11); - game.advanced_scaling = (game.advanced_scaling + 1) % 5; - graphics.screenbuffer->ResizeScreen(320 *game.advanced_scaling,240*game.advanced_scaling ); - graphics.screenbuffer->SetScale(game.advanced_scaling); - updategraphicsmode(); - - game.savestats(); - game.createmenu("graphicoptions"); - game.currentmenuoption = 2; - } - else if (game.currentmenuoption == 3) - { - //change smoothing - music.playef(11); - game.advanced_smoothing = !game.advanced_smoothing; - updategraphicsmode(); - - game.savestats(); - game.createmenu("graphicoptions"); - game.currentmenuoption = 3; - } - else - { - //back - music.playef(11); - game.createmenu("mainmenu"); - map.nexttowercolour(); - } - } - else - { - if (game.currentmenuoption == 0) - { - graphics.screenbuffer->toggleFullScreen(); - //toggle fullscreen - music.playef(11); - if (game.fullscreen) - { - game.fullscreen = false; - } - else - { - game.fullscreen = true; - } - updategraphicsmode(); - - game.savestats(); - game.createmenu("graphicoptions"); - } - else if (game.currentmenuoption == 1) - { - //disable acceleration: if in fullscreen, go back to window first - music.playef(11); - game.advanced_mode = true; - if (game.fullscreen) - { - game.fullscreen = false; - updategraphicsmode(); - game.fullscreen = true; - } - updategraphicsmode(); - - game.savestats(); - game.createmenu("graphicoptions"); - game.currentmenuoption = 1; - } - else - { - //back - music.playef(11); - game.createmenu("mainmenu"); - map.nexttowercolour(); - } - } - */ } else if (game.currentmenuname == "youwannaquit") { @@ -698,8 +545,6 @@ void titleinput() else { map.invincibility = !map.invincibility; - //game.deletequick(); - //game.deletetele(); game.savestats(); music.playef(11); game.createmenu("accessibility"); @@ -1803,87 +1648,25 @@ void gameinput() game.press_right = false; game.press_action = false; game.press_map = false; - } -/* - if (game.recording == 2 && !game.playbackfinished) - { - //playback! - //record your input and add it to the record string - //Keys are: - //0 - nothing - //1 - left - //2 - right - //3 - left+right - //4 - flip - //5 - left+flip - //6 - right+flip - //7 - left+right+flip - //8 - Map/teleport - if (!game.recordinit) - { - //Init recording - game.recordinit = true; - game.combomode = false; - game.playmove = game.playback[game.playbackpos+1]; - game.playcombo = game.playback[game.playbackpos]; - } - if (game.playcombo <= 0) + if (key.isDown(KEYBOARD_LEFT) || key.isDown(KEYBOARD_a) || key.controllerWantsLeft(false)) { - //move on to the next action - game.playbackpos += 2; - game.playmove = game.playback[game.playbackpos + 1]; - game.playcombo = game.playback[game.playbackpos]; - if (game.playcombo > 1) game.playcombo--; + game.press_left = true; } - - if (game.playcombo >= 1) + if (key.isDown(KEYBOARD_RIGHT) || key.isDown(KEYBOARD_d) || key.controllerWantsRight(false)) { - game.playcombo--; - if (game.playmove == 1 || game.playmove == 3 || game.playmove == 5 || game.playmove == 7) - { - game.press_left = true; - } - if (game.playmove == 2 || game.playmove == 3 || game.playmove == 6 || game.playmove == 7) - { - game.press_right = true; - } - if (game.playmove == 4 || game.playmove == 5 || game.playmove == 6 || game.playmove == 7) - { - game.press_action = true; - } - if (game.playmove == 8) - { - game.press_map = true; - //game.playbackfinished = true; - //TODO WTF is trace - //trace("finished!"); - } + game.press_right = true; + } + if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) + || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || key.isDown(KEYBOARD_w) || key.isDown(KEYBOARD_s)|| key.isDown(game.controllerButton_flip)) + { + game.press_action = true; + }; + if (key.isDown(KEYBOARD_ENTER) || key.isDown(SDLK_KP_ENTER) || key.isDown(game.controllerButton_map) ) + { + game.press_map = true; } } - else - { */ - if(!script.running) - { - if (key.isDown(KEYBOARD_LEFT) || key.isDown(KEYBOARD_a) || key.controllerWantsLeft(false)) - { - game.press_left = true; - } - if (key.isDown(KEYBOARD_RIGHT) || key.isDown(KEYBOARD_d) || key.controllerWantsRight(false)) - { - game.press_right = true; - } - if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) - || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || key.isDown(KEYBOARD_w) || key.isDown(KEYBOARD_s)|| key.isDown(game.controllerButton_flip)) - { - game.press_action = true; - }; - if (key.isDown(KEYBOARD_ENTER) || key.isDown(SDLK_KP_ENTER) || key.isDown(game.controllerButton_map) ) - { - game.press_map = true; - } - } - //} if (game.advancetext) { @@ -1914,36 +1697,6 @@ void gameinput() if (!game.press_map) game.mapheld = false; - /* - if (key.isDown("1".charCodeAt(0))) { - graphics.screen.width = 640; - graphics.screen.height = 480; - setstage(640,480); - } - if (key.isDown("2".charCodeAt(0))) { - graphics.screen.width = 960; - graphics.screen.height = 720; - setstage(960,720); - } - if (key.isDown("3".charCodeAt(0))) { - graphics.screen.width = 1280; - graphics.screen.height = 960; - setstage(1280,960); - } - */ - /*game.test = true; - game.teststring = String(game.inertia); - if (key.isDown("1".charCodeAt(0))) game.inertia = 0.5; - if (key.isDown("2".charCodeAt(0))) game.inertia = 0.6; - if (key.isDown("3".charCodeAt(0))) game.inertia = 0.7; - if (key.isDown("4".charCodeAt(0))) game.inertia = 0.8; - if (key.isDown("5".charCodeAt(0))) game.inertia = 0.9; - if (key.isDown("6".charCodeAt(0))) game.inertia = 1; - if (key.isDown("7".charCodeAt(0))) game.inertia = 1.1; - if (key.isDown("8".charCodeAt(0))) game.inertia = 1.2; - if (key.isDown("9".charCodeAt(0))) game.inertia = 1.3; - if (key.isDown("0".charCodeAt(0))) game.inertia = 1.4;*/ - if (game.intimetrial && graphics.fademode == 1 && game.quickrestartkludge) { //restart the time trial @@ -1995,27 +1748,8 @@ void gameinput() { if (obj.entities[ie].rule == 0) { - //game.test = true; - //game.teststring = "player(" + String(int(obj.entities[i])) + "," + String(int(obj.entities[i].yp)) + ")" - // + ", mouse(" + String(int(game.mx)) + "," + String(int(game.my)) + ")"; if (game.hascontrol && game.deathseq == -1 && game.lifeseq <= 5) { - /* - if (key.isDown(8)) { - script.load("returntohub"); - } - */ - /* - if (key.isDown(27)) { - game.state = 0; - graphics.textboxremove(); - - map.tdrawback = true; - music.haltdasmusik(); - game.gamestate = TITLEMODE; - } - */ - if (game.press_map && !game.mapheld) { game.mapheld = true; @@ -2036,7 +1770,7 @@ void gameinput() //We're teleporting! Yey! game.activetele = false; game.hascontrol = false; - music.fadeout(); //Uncomment this when it's working! + music.fadeout(); int player = obj.getplayer(); obj.entities[player].colour = 102; @@ -2054,10 +1788,7 @@ void gameinput() game.gamestate = 5; graphics.menuoffset = 240; //actually this should count the roomname if (map.extrarow) graphics.menuoffset -= 10; - //graphics.menubuffer.copyPixels(graphics.screenbuffer, graphics.screenbuffer.rect, graphics.tl, null, null, false); - //TODO TESTHIS - //graphics.screenbuffer->UpdateScreen(graphics.menubuffer, NULL); BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL); graphics.resumegamemode = false; @@ -2067,11 +1798,10 @@ void gameinput() } else { - //trace(game.recordstring); //We're teleporting! Yey! game.activetele = false; game.hascontrol = false; - music.fadeout(); //Uncomment this when it's working! + music.fadeout(); int player = obj.getplayer(); obj.entities[player].colour = 102; @@ -2104,8 +1834,6 @@ void gameinput() game.gamesaved = false; graphics.resumegamemode = false; game.menupage = 20; // The Map Page - //graphics.menubuffer.copyPixels(graphics.screenbuffer, graphics.screenbuffer.rect, graphics.tl, null, null, false); - //graphics.screenbuffer->UpdateScreen(graphics.menubuffer, NULL); BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL); graphics.menuoffset = 240; //actually this should count the roomname if (map.extrarow) graphics.menuoffset -= 10; @@ -2131,7 +1859,6 @@ void gameinput() graphics.resumegamemode = false; game.menupage = 0; // The Map Page BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL); - //graphics.screenbuffer->UpdateScreen(graphics.menubuffer, NULL); graphics.menuoffset = 240; //actually this should count the roomname if (map.extrarow) graphics.menuoffset -= 10; } @@ -2146,9 +1873,6 @@ void gameinput() graphics.resumegamemode = false; game.menupage = 10; // The Map Page - //graphics.menubuffer.copyPixels(graphics.screenbuffer, graphics.screenbuffer.rect, graphics.tl, NULL, NULL, false); - - //graphics.screenbuffer->UpdateScreen(graphics.menubuffer, NULL); BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL); graphics.menuoffset = 240; //actually this should count the roomname if (map.extrarow) graphics.menuoffset -= 10; @@ -2193,13 +1917,11 @@ void gameinput() if(game.press_left) { - //obj.entities[i].vx = -4; obj.entities[ie].ax = -3; obj.entities[ie].dir = 0; } else if (game.press_right) { - //obj.entities[i].vx = 4; obj.entities[ie].ax = 3; obj.entities[ie].dir = 1; } @@ -2566,9 +2288,6 @@ void teleporterinput() void gamecompleteinput() { - //game.mx = (mouseX / 2); - //game.my = (mouseY / 2); - game.press_left = false; game.press_right = false; game.press_action = false; @@ -2593,7 +2312,6 @@ void gamecompleteinput() game.press_action = true; } if (key.isDown(KEYBOARD_ENTER)|| key.isDown(game.controllerButton_map)) game.press_map = true; - //if (key.isDown(27)) { game.mapheld = true; game.menupage = 10; } if (!game.mapheld) { @@ -2610,11 +2328,6 @@ void gamecompleteinput() void gamecompleteinput2() { - //TODO Mouse Input! - //game.mx = (mouseX / 2); - //game.my = (mouseY / 2); - - game.press_left = false; game.press_right = false; game.press_action = false; @@ -2635,7 +2348,6 @@ void gamecompleteinput2() game.press_action = true; } if (key.isDown(KEYBOARD_ENTER) || key.isDown(game.controllerButton_map)) game.press_map = true; - //if (key.isDown(27)) { game.mapheld = true; game.menupage = 10; } if (!game.mapheld) {