From 13c7a15d5b6da712398d497edc4cf4be214934a5 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Sun, 3 Feb 2019 01:30:24 +0100 Subject: [PATCH] Removed obsolete option --- source/game/graphics/renderer.cpp | 12 +--- .../game/menu/menu_state_options_graphics.cpp | 61 ------------------- .../game/menu/menu_state_options_graphics.h | 6 -- 3 files changed, 2 insertions(+), 77 deletions(-) diff --git a/source/game/graphics/renderer.cpp b/source/game/graphics/renderer.cpp index 8722ae824..576e59faa 100644 --- a/source/game/graphics/renderer.cpp +++ b/source/game/graphics/renderer.cpp @@ -4748,8 +4748,7 @@ namespace Game { const World *world = game->getWorld(); //const Map *map= world->getMap(); - Config &config = Config::getInstance(); - int tilesetObjectsToAnimate = config.getInt("AnimatedTilesetObjects", "-1"); + //Config &config = Config::getInstance(); assertGl(); @@ -4817,14 +4816,7 @@ namespace Game { //if(this->gameCamera->getPos().dist(o->getPos()) <= SKIP_INTERPOLATION_DISTANCE) { - if (tilesetObjectsToAnimate == -1) { - objModel->updateInterpolationData(o->getAnimProgress(), true); - } else if (tilesetObjectsToAnimate > 0 && o->isAnimated()) { - tilesetObjectsToAnimate--; - objModel->updateInterpolationData(o->getAnimProgress(), true); - } else { - objModel->updateInterpolationData(0, true); - } + objModel->updateInterpolationData(o->getAnimProgress(), true); // objModel->updateInterpolationData(o->getAnimProgress(), true); //} diff --git a/source/game/menu/menu_state_options_graphics.cpp b/source/game/menu/menu_state_options_graphics.cpp index 1d391f341..6a02ca5ec 100644 --- a/source/game/menu/menu_state_options_graphics.cpp +++ b/source/game/menu/menu_state_options_graphics.cpp @@ -72,10 +72,6 @@ namespace Game { checkBoxUnitParticles("Options_Graphics", "checkBoxUnitParticles"), labelTilesetParticles("Options_Graphics", "labelTilesetParticles"), checkBoxTilesetParticles("Options_Graphics", "checkBoxTilesetParticles"), - labelAnimatedTilesetObjects("Options_Graphics", - "labelAnimatedTilesetObjects"), - listBoxAnimatedTilesetObjects("Options_Graphics", - "listBoxAnimatedTilesetObjects"), labelScreenModes("Options_Graphics", "labelScreenModes"), listBoxScreenModes("Options_Graphics", "listBoxScreenModes"), labelFullscreenWindowed("Options_Graphics", "labelFullscreenWindowed"), @@ -98,8 +94,6 @@ namespace Game { listBoxShadowIntensity("Options_Graphics", "listBoxShadowIntensity"), labelShadowTextureSize("Options_Graphics", "labelShadowTextureSize"), listBoxShadowTextureSize("Options_Graphics", "listBoxShadowTextureSize"), - labelVideos("Options_Graphics", "labelVideos"), - checkBoxVideos("Options_Graphics", "checkBoxVideos"), labelSelectionType("Options_Graphics", "labelSelectionType"), listBoxSelectionType("Options_Graphics", "listBoxSelectionType") { try { @@ -391,29 +385,6 @@ namespace Game { "true")); currentLine -= lineOffset; - //animated tileset objects - labelAnimatedTilesetObjects.init(currentLabelStart, currentLine); - labelAnimatedTilesetObjects.setText(lang. - getString - ("AnimatedTilesetObjects")); - - listBoxAnimatedTilesetObjects.init(currentColumnStart, currentLine, - 80); - listBoxAnimatedTilesetObjects.pushBackItem("0"); - listBoxAnimatedTilesetObjects.pushBackItem("10"); - listBoxAnimatedTilesetObjects.pushBackItem("25"); - listBoxAnimatedTilesetObjects.pushBackItem("50"); - listBoxAnimatedTilesetObjects.pushBackItem("100"); - listBoxAnimatedTilesetObjects.pushBackItem("300"); - listBoxAnimatedTilesetObjects.pushBackItem("500"); - listBoxAnimatedTilesetObjects.pushBackItem("???"); - listBoxAnimatedTilesetObjects.setSelectedItem("???", true); - listBoxAnimatedTilesetObjects.setSelectedItem(config. - getString - ("AnimatedTilesetObjects", - "-1"), false); - currentLine -= lineOffset; - //unit particles labelMapPreview.init(currentLabelStart, currentLine); labelMapPreview.setText(lang.getString("ShowMapPreview")); @@ -450,12 +421,6 @@ namespace Game { checkBoxRainEffect.setValue(config.getBool("RainEffect", "true")); currentLine -= lineOffset; - labelVideos.init(currentLabelStart, currentLine); - labelVideos.setText(lang.getString("EnableVideos")); - - checkBoxVideos.init(currentColumnStart, currentLine); - checkBoxVideos.setValue(config.getBool("EnableVideos", "true")); - // end // external server port @@ -554,15 +519,11 @@ namespace Game { labelLights.setText(lang.getString("MaxLights")); labelUnitParticles.setText(lang.getString("ShowUnitParticles")); labelTilesetParticles.setText(lang.getString("ShowTilesetParticles")); - labelAnimatedTilesetObjects.setText(lang. - getString - ("AnimatedTilesetObjects")); labelMapPreview.setText(lang.getString("ShowMapPreview")); labelEnableTextureCompression.setText(lang. getString ("EnableTextureCompression")); labelRainEffect.setText(lang.getString("RainEffectMenuGame")); - labelVideos.setText(lang.getString("EnableVideos")); buttonOk.setText(lang.getString("Save")); buttonReturn.setText(lang.getString("Return")); @@ -843,7 +804,6 @@ namespace Game { } else { listBoxSelectionType.mouseClick(x, y); listBoxShadows.mouseClick(x, y); - listBoxAnimatedTilesetObjects.mouseClick(x, y); listBoxShadowTextureSize.mouseClick(x, y); listBoxShadowIntensity.mouseClick(x, y); listBoxFilter.mouseClick(x, y); @@ -866,8 +826,6 @@ namespace Game { checkBoxEnableTextureCompression.mouseClick(x, y); checkBoxRainEffect.mouseClick(x, y); checkBoxRainEffectMenu.mouseClick(x, y); - - checkBoxVideos.mouseClick(x, y); } } @@ -895,8 +853,6 @@ namespace Game { checkBoxTextures3D.mouseMove(x, y); checkBoxUnitParticles.mouseMove(x, y); checkBoxTilesetParticles.mouseMove(x, y); - labelAnimatedTilesetObjects.mouseMove(x, y); - listBoxAnimatedTilesetObjects.mouseMove(x, y); checkBoxTilesetParticles.mouseMove(x, y); checkBoxMapPreview.mouseMove(x, y); listBoxLights.mouseMove(x, y); @@ -906,8 +862,6 @@ namespace Game { checkBoxRainEffect.mouseMove(x, y); checkBoxRainEffectMenu.mouseMove(x, y); - - checkBoxVideos.mouseMove(x, y); } //bool MenuStateOptionsGraphics::isInSpecialKeyCaptureEvent() { @@ -973,8 +927,6 @@ namespace Game { renderer.renderLabel(&labelTextures3D); renderer.renderLabel(&labelUnitParticles); renderer.renderLabel(&labelTilesetParticles); - renderer.renderListBox(&listBoxAnimatedTilesetObjects); - renderer.renderLabel(&labelAnimatedTilesetObjects); renderer.renderLabel(&labelMapPreview); renderer.renderLabel(&labelLights); renderer.renderLabel(&labelFilter); @@ -999,9 +951,6 @@ namespace Game { renderer.renderLabel(&labelSelectionType); renderer.renderListBox(&listBoxSelectionType); - - renderer.renderLabel(&labelVideos); - renderer.renderCheckBox(&checkBoxVideos); } renderer.renderConsole(&console); @@ -1053,22 +1002,12 @@ namespace Game { config.setBool("MapPreview", checkBoxMapPreview.getValue()); config.setInt("MaxLights", listBoxLights.getSelectedItemIndex() + 1); - if (listBoxAnimatedTilesetObjects.getSelectedItem() == "???") { - config.setInt("AnimatedTilesetObjects", -1); - } else { - config.setInt("AnimatedTilesetObjects", - atoi(listBoxAnimatedTilesetObjects.getSelectedItem(). - c_str())); - } - config.setBool("RainEffect", checkBoxRainEffect.getValue()); config.setBool("RainEffectMenu", checkBoxRainEffectMenu.getValue()); config.setBool("EnableTextureCompression", checkBoxEnableTextureCompression.getValue()); - config.setBool("EnableVideos", checkBoxVideos.getValue()); - string currentResolution = config.getString("ScreenWidth") + "x" + diff --git a/source/game/menu/menu_state_options_graphics.h b/source/game/menu/menu_state_options_graphics.h index 9c194e507..b9d0a76b0 100644 --- a/source/game/menu/menu_state_options_graphics.h +++ b/source/game/menu/menu_state_options_graphics.h @@ -57,9 +57,6 @@ namespace Game { GraphicLabel labelTilesetParticles; GraphicCheckBox checkBoxTilesetParticles; - GraphicLabel labelAnimatedTilesetObjects; - GraphicListBox listBoxAnimatedTilesetObjects; - GraphicLabel labelScreenModes; GraphicListBox listBoxScreenModes; @@ -92,9 +89,6 @@ namespace Game { GraphicLabel labelShadowTextureSize; GraphicListBox listBoxShadowTextureSize; - GraphicLabel labelVideos; - GraphicCheckBox checkBoxVideos; - GraphicLabel labelSelectionType; GraphicListBox listBoxSelectionType;