diff options
Diffstat (limited to 'src/graphics/Renderer.cpp')
| -rw-r--r-- | src/graphics/Renderer.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp index 98b94b1..50c9ba4 100644 --- a/src/graphics/Renderer.cpp +++ b/src/graphics/Renderer.cpp @@ -15,6 +15,8 @@ #include "simulation/Elements.h" #include "simulation/ElementGraphics.h" #include "simulation/Air.h" +#include "cat/LuaScriptInterface.h" +#include "cat/LuaScriptHelper.h" extern "C" { #include "hmap.h" @@ -1158,7 +1160,11 @@ void Renderer::render_parts() { if (elements[t].Graphics) { - if ((*(elements[t].Graphics))(this, &(sim->parts[i]), nx, ny, &pixel_mode, &cola, &colr, &colg, &colb, &firea, &firer, &fireg, &fireb)) //That's a lot of args, a struct might be better + if (lua_gr_func[t]) + { + luacon_graphicsReplacement(this, &(sim->parts[i]), nx, ny, &pixel_mode, &cola, &colr, &colg, &colb, &firea, &firer, &fireg, &fireb, i); + } + else if ((*(elements[t].Graphics))(this, &(sim->parts[i]), nx, ny, &pixel_mode, &cola, &colr, &colg, &colb, &firea, &firer, &fireg, &fireb)) //That's a lot of args, a struct might be better { graphicscache[t].isready = 1; graphicscache[t].pixel_mode = pixel_mode; @@ -2624,9 +2630,14 @@ std::vector<unsigned int> Renderer::GetRenderMode() void Renderer::CompileDisplayMode() { + int old_display_mode = display_mode; display_mode = 0; for(int i = 0; i < display_modes.size(); i++) display_mode |= display_modes[i]; + if(!(display_mode & DISPLAY_PERS) && (old_display_mode & DISPLAY_PERS)) + { + ClearAccumulation(); + } } void Renderer::AddDisplayMode(unsigned int mode) |