From efd2b4198061be371c0da40e8f142aaaa5962a37 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Tue, 15 Sep 2020 15:23:05 -0400 Subject: [PATCH] Fix default render modes not being the same as Fire display mode Special effects like EMBR sparks weren't included, this only affected the renderer, causing those special effects to not render. --- src/PowderToyRenderer.cpp | 4 ++++ src/graphics/Renderer.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/PowderToyRenderer.cpp b/src/PowderToyRenderer.cpp index ad9c2d4f4..e5714ea40 100644 --- a/src/PowderToyRenderer.cpp +++ b/src/PowderToyRenderer.cpp @@ -64,6 +64,10 @@ int main(int argc, char *argv[]) ByteString ppmFilename, ptiFilename, ptiSmallFilename, pngFilename, pngSmallFilename; std::vector ppmFile, ptiFile, ptiSmallFile, pngFile, pngSmallFile; + if (!argv[1] || !argv[2]) { + std::cout << "Usage: " << argv[0] << " " << std::endl; + return 1; + } inputFilename = argv[1]; outputPrefix = argv[2]; diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp index 1b79994ce..dd59c3139 100644 --- a/src/graphics/Renderer.cpp +++ b/src/graphics/Renderer.cpp @@ -2940,7 +2940,7 @@ unsigned int Renderer::GetColourMode() void Renderer::ResetModes() { - SetRenderMode({ RENDER_BASC, RENDER_FIRE, RENDER_SPRK }); + SetRenderMode({ RENDER_BASC, RENDER_FIRE, RENDER_SPRK, RENDER_EFFE }); SetDisplayMode({ }); SetColourMode(COLOUR_DEFAULT); }