summaryrefslogtreecommitdiff
path: root/src/Renderer.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-11 22:59:45 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-11 22:59:45 (GMT)
commitfc2f52099c0bbb2412046252bf7b5e4113bbe8e4 (patch)
treeaa820daf182a845758c3ba2c649df54a228748d4 /src/Renderer.cpp
parent2eb09c1daac8199532694167f418146fa57e7735 (diff)
downloadpowder-fc2f52099c0bbb2412046252bf7b5e4113bbe8e4.zip
powder-fc2f52099c0bbb2412046252bf7b5e4113bbe8e4.tar.gz
More stuff, started console
Diffstat (limited to 'src/Renderer.cpp')
-rw-r--r--src/Renderer.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/Renderer.cpp b/src/Renderer.cpp
index c1bbf3c..67f9348 100644
--- a/src/Renderer.cpp
+++ b/src/Renderer.cpp
@@ -489,9 +489,14 @@ void Renderer::render_parts()
int deca, decr, decg, decb, cola, colr, colg, colb, firea, firer, fireg, fireb, pixel_mode, q, i, t, nx, ny, x, y, caddress;
int orbd[4] = {0, 0, 0, 0}, orbl[4] = {0, 0, 0, 0};
float gradv, flicker, fnx, fny;
- Particle * parts = sim->parts;
- part_transition *ptransitions = sim->ptransitions;
- part_type *ptypes = sim->ptypes;
+ Particle * parts;
+ part_transition *ptransitions;
+ part_type *ptypes;
+ if(!sim)
+ return;
+ parts = sim->parts;
+ ptransitions = sim->ptransitions;
+ ptypes = sim->ptypes;
#ifdef OGLR
int cfireV = 0, cfireC = 0, cfire = 0;
int csmokeV = 0, csmokeC = 0, csmoke = 0;
@@ -1670,7 +1675,9 @@ void Renderer::init_display_modes()
}
}
-Renderer::Renderer(Graphics * g, Simulation * sim)
+Renderer::Renderer(Graphics * g, Simulation * sim):
+ sim(NULL),
+ g(NULL)
{
this->g = g;
this->sim = sim;