diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-12 01:47:13 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-12 01:47:13 (GMT) |
| commit | 51f27bfad72e7fbc72388f63c3b8a48162e509a1 (patch) | |
| tree | abd95cad4e12085fb8a67f63bce788db44f61f03 /src/graphics/Renderer.cpp | |
| parent | 9d89d4b79b26584490e55cfb992fc58d3e11ea2b (diff) | |
| parent | a0a0e305a92b41923f7634fca1d30b0e71ee12e0 (diff) | |
| download | powder-51f27bfad72e7fbc72388f63c3b8a48162e509a1.zip powder-51f27bfad72e7fbc72388f63c3b8a48162e509a1.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/graphics/Renderer.cpp')
| -rw-r--r-- | src/graphics/Renderer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp index a3ea66d..dfdd307 100644 --- a/src/graphics/Renderer.cpp +++ b/src/graphics/Renderer.cpp @@ -9,8 +9,10 @@ #include "simulation/Elements.h" #include "simulation/ElementGraphics.h" #include "simulation/Air.h" +#ifdef LUACONSOLE #include "cat/LuaScriptInterface.h" #include "cat/LuaScriptHelper.h" +#endif extern "C" { #include "hmap.h" @@ -1212,7 +1214,7 @@ void Renderer::render_parts() { if (elements[t].Graphics) { -#ifndef RENDERER +#if !defined(RENDERER) && defined(LUACONSOLE) if (lua_gr_func[t]) { luacon_graphicsReplacement(this, &(sim->parts[i]), nx, ny, &pixel_mode, &cola, &colr, &colg, &colb, &firea, &firer, &fireg, &fireb, i); |