Renderer Presets and default graphics function

src/game/GameController.cpp

@@ -402,6 +402,14 @@ void GameController::Exit()
 	HasDone = true;
 }
 
+void GameController::LoadRenderPreset(RenderPreset preset)
+{
+	Renderer * renderer = gameModel->GetRenderer();
+	renderer->SetRenderMode(preset.RenderModes);
+	renderer->SetDisplayMode(preset.DisplayModes);
+	renderer->SetColourMode(preset.ColourMode);
+}
+
 void GameController::Update()
 {
 	ui::Point pos = gameView->GetMousePosition();

src/game/GameController.h

@@ -17,6 +17,7 @@
 #include "cat/LuaScriptInterface.h"
 #include "options/OptionsController.h"
 #include "client/ClientListener.h"
+#include "RenderPreset.h"
 #include "Menu.h"
 
 using namespace std;
@@ -63,6 +64,7 @@ public:
 	void Tick();
 	void Exit();
 
+	void LoadRenderPreset(RenderPreset preset);
 	void SetZoomEnabled(bool zoomEnable);
 	void SetZoomPosition(ui::Point position);
 	void AdjustBrushSize(int direction, bool logarithmic = false);

src/game/GameView.cpp

@@ -255,6 +255,59 @@ GameView::GameView():
 	tempButton->Appearance.Margin = ui::Border(0, 2, 3, 2);
 	tempButton->SetActionCallback(new ElementSearchAction(this));
 	AddComponent(tempButton);
+
+	//Render mode presets. Possibly load from config in future?
+	renderModePresets = new RenderPreset[10];
+
+	renderModePresets[0].Name = "Alternative Velocity Display";
+	renderModePresets[0].RenderModes.push_back(RENDER_EFFE);
+	renderModePresets[0].RenderModes.push_back(RENDER_BASC);
+	renderModePresets[0].DisplayModes.push_back(DISPLAY_AIRC);
+
+	renderModePresets[1].Name = "Velocity Display";
+	renderModePresets[1].RenderModes.push_back(RENDER_EFFE);
+	renderModePresets[1].RenderModes.push_back(RENDER_BASC);
+	renderModePresets[1].DisplayModes.push_back(DISPLAY_AIRV);
+
+	renderModePresets[2].Name = "Pressure Display";
+	renderModePresets[2].RenderModes.push_back(RENDER_EFFE);
+	renderModePresets[2].RenderModes.push_back(RENDER_BASC);
+	renderModePresets[2].DisplayModes.push_back(DISPLAY_AIRP);
+
+	renderModePresets[3].Name = "Persistent Display";
+	renderModePresets[3].RenderModes.push_back(RENDER_EFFE);
+	renderModePresets[3].RenderModes.push_back(RENDER_BASC);
+	renderModePresets[3].DisplayModes.push_back(DISPLAY_PERS);
+
+	renderModePresets[4].Name = "Fire Display";
+	renderModePresets[4].RenderModes.push_back(RENDER_FIRE);
+	renderModePresets[4].RenderModes.push_back(RENDER_EFFE);
+	renderModePresets[4].RenderModes.push_back(RENDER_BASC);
+
+	renderModePresets[5].Name = "Blob Display";
+	renderModePresets[5].RenderModes.push_back(RENDER_FIRE);
+	renderModePresets[5].RenderModes.push_back(RENDER_EFFE);
+	renderModePresets[5].RenderModes.push_back(RENDER_BLOB);
+
+	renderModePresets[6].Name = "Heat Display";
+	renderModePresets[6].RenderModes.push_back(RENDER_BASC);
+	renderModePresets[6].DisplayModes.push_back(DISPLAY_AIRH);
+	renderModePresets[6].ColourMode = COLOUR_HEAT;
+
+	renderModePresets[7].Name = "Fancy Display";
+	renderModePresets[7].RenderModes.push_back(RENDER_FIRE);
+	renderModePresets[7].RenderModes.push_back(RENDER_GLOW);
+	renderModePresets[7].RenderModes.push_back(RENDER_BLUR);
+	renderModePresets[7].RenderModes.push_back(RENDER_EFFE);
+	renderModePresets[7].RenderModes.push_back(RENDER_BASC);
+	renderModePresets[7].DisplayModes.push_back(DISPLAY_WARP);
+
+	renderModePresets[8].Name = "Nothing Display";
+	renderModePresets[8].RenderModes.push_back(RENDER_BASC);
+
+	renderModePresets[9].Name = "Heat Gradient Display";
+	renderModePresets[9].RenderModes.push_back(RENDER_BASC);
+	renderModePresets[9].ColourMode = COLOUR_GRAD;
 }
 
 class GameView::MenuAction: public ui::ButtonAction
@@ -819,6 +872,11 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 		c->AdjustBrushSize(-1, true);
 		break;
 	}
+
+	if(key >= '0' && key <= '9')
+	{
+		c->LoadRenderPreset(renderModePresets[key-'0']);
+	}
 }
 
 void GameView::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt)

src/game/GameView.h

@@ -12,6 +12,7 @@
 #include "interface/Button.h"
 #include "interface/Slider.h"
 #include "ToolButton.h"
+#include "RenderPreset.h"
 #include "Brush.h"
 
 using namespace std;
@@ -76,6 +77,8 @@ private:
 
 	ui::Point mousePosition;
 
+	RenderPreset * renderModePresets;
+
 	Thumbnail * placeSaveThumb;
 
 	Particle sample;

src/game/RenderPreset.h

@@ -0,0 +1,19 @@
+#ifndef RENDER_PRESET_H
+#define RENDER_PRESET_H
+class RenderPreset
+{
+public:
+	std::string Name;
+	std::vector<unsigned int> RenderModes;
+	std::vector<unsigned int> DisplayModes;
+	unsigned int ColourMode;
+
+	RenderPreset(): Name(""), ColourMode(0) {}
+	RenderPreset(std::string name, std::vector<unsigned int> renderModes, std::vector<unsigned int> displayModes, unsigned int colourMode):
+		Name(name),
+		RenderModes(renderModes),
+		DisplayModes(displayModes),
+		ColourMode(colourMode)
+	{}
+};
+#endif

src/graphics/Renderer.cpp

@@ -617,6 +617,8 @@ void Renderer::render_gravlensing()
 void Renderer::render_fire()
 {
 #ifndef OGLR
+	if(!(render_mode & FIREMODE))
+		return;
 	int i,j,x,y,r,g,b,nx,ny;
 	for (j=0; j<YRES/CELL; j++)
 		for (i=0; i<XRES/CELL; i++)
@@ -2093,9 +2095,18 @@ Renderer::Renderer(Graphics * g, Simulation * sim):
 
 void Renderer::CompileRenderMode()
 {
+	int old_render_mode = render_mode;
 	render_mode = 0;
 	for(int i = 0; i < render_modes.size(); i++)
 		render_mode |= render_modes[i];
+
+	//If firemode is removed, clear the fire display
+	if(!(render_mode & FIREMODE) && (old_render_mode & FIREMODE))
+	{
+		std::fill(fire_r[0]+0, fire_r[(YRES/CELL)-1]+((XRES/CELL)-1), 0);
+		std::fill(fire_g[0]+0, fire_g[(YRES/CELL)-1]+((XRES/CELL)-1), 0);
+		std::fill(fire_b[0]+0, fire_b[(YRES/CELL)-1]+((XRES/CELL)-1), 0);
+	}
 }
 
 void Renderer::AddRenderMode(unsigned int mode)

src/simulation/elements/116.cpp

@@ -43,7 +43,7 @@ Element_116::Element_116()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_116::~Element_116() {}

src/simulation/elements/146.cpp

@@ -43,7 +43,7 @@ Element_146::Element_146()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_146::~Element_146() {}

src/simulation/elements/147.cpp

@@ -43,7 +43,7 @@ Element_147::Element_147()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_147::~Element_147() {}

src/simulation/elements/AMTR.cpp

@@ -43,7 +43,7 @@ Element_AMTR::Element_AMTR()
     HighTemperatureTransition = NT;
     
     Update = &Element_AMTR::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_AMTR static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/ANAR.cpp

@@ -43,7 +43,7 @@ Element_ANAR::Element_ANAR()
     HighTemperatureTransition = NT;
     
     Update = &Element_ANAR::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_ANAR static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/ARAY.cpp

@@ -43,7 +43,7 @@ Element_ARAY::Element_ARAY()
     HighTemperatureTransition = NT;
     
     Update = &Element_ARAY::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_ARAY static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/BANG.cpp

@@ -43,7 +43,7 @@ Element_BANG::Element_BANG()
     HighTemperatureTransition = NT;
     
     Update = &Element_BANG::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_BANG static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/BCLN.cpp

@@ -43,7 +43,7 @@ Element_BCLN::Element_BCLN()
     HighTemperatureTransition = NT;
     
     Update = &Element_BCLN::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_BCLN static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/BGLA.cpp

@@ -43,7 +43,7 @@ Element_BGLA::Element_BGLA()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_BGLA::~Element_BGLA() {}

src/simulation/elements/BHOL.cpp

@@ -43,7 +43,7 @@ Element_BHOL::Element_BHOL()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_BHOL::~Element_BHOL() {}

src/simulation/elements/BMTL.cpp

@@ -43,7 +43,7 @@ Element_BMTL::Element_BMTL()
     HighTemperatureTransition = PT_LAVA;
     
     Update = &Element_BMTL::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_BMTL static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/BOYL.cpp

@@ -43,7 +43,7 @@ Element_BOYL::Element_BOYL()
     HighTemperatureTransition = NT;
     
     Update = &Element_BOYL::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_BOYL static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/BRCK.cpp

@@ -43,7 +43,7 @@ Element_BRCK::Element_BRCK()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_BRCK::~Element_BRCK() {}

src/simulation/elements/BREC.cpp

@@ -43,7 +43,7 @@ Element_BREC::Element_BREC()
     HighTemperatureTransition = NT;
     
     Update = &Element_BREC::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_BREC static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/BRMT.cpp

@@ -43,7 +43,7 @@ Element_BRMT::Element_BRMT()
     HighTemperatureTransition = PT_LAVA;
     
     Update = &Element_BRMT::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_BRMT static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/BTRY.cpp

@@ -43,7 +43,7 @@ Element_BTRY::Element_BTRY()
     HighTemperatureTransition = PT_PLSM;
     
     Update = &Element_BTRY::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_BTRY static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/C5.cpp

@@ -43,7 +43,7 @@ Element_C5::Element_C5()
     HighTemperatureTransition = NT;
     
     Update = &Element_C5::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_C5 static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/CAUS.cpp

@@ -43,7 +43,7 @@ Element_CAUS::Element_CAUS()
     HighTemperatureTransition = NT;
     
     Update = &Element_CAUS::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_CAUS static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/CLNE.cpp

@@ -43,7 +43,7 @@ Element_CLNE::Element_CLNE()
     HighTemperatureTransition = NT;
     
     Update = &Element_CLNE::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_CLNE static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/CNCT.cpp

@@ -43,7 +43,7 @@ Element_CNCT::Element_CNCT()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_CNCT::~Element_CNCT() {}

src/simulation/elements/CO2.cpp

@@ -43,7 +43,7 @@ Element_CO2::Element_CO2()
     HighTemperatureTransition = NT;
     
     Update = &Element_CO2::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_CO2 static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/CONV.cpp

@@ -43,7 +43,7 @@ Element_CONV::Element_CONV()
     HighTemperatureTransition = NT;
     
     Update = &Element_CONV::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_CONV static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/DESL.cpp

@@ -43,7 +43,7 @@ Element_DESL::Element_DESL()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_DESL::~Element_DESL() {}

src/simulation/elements/DMND.cpp

@@ -43,7 +43,7 @@ Element_DMND::Element_DMND()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_DMND::~Element_DMND() {}

src/simulation/elements/DRIC.cpp

@@ -43,7 +43,7 @@ Element_DRIC::Element_DRIC()
     HighTemperatureTransition = PT_CO2;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_DRIC::~Element_DRIC() {}

src/simulation/elements/DSTW.cpp

@@ -43,7 +43,7 @@ Element_DSTW::Element_DSTW()
     HighTemperatureTransition = PT_WTRV;
     
     Update = &Element_DSTW::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_DSTW static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/DYST.cpp

@@ -43,7 +43,7 @@ Element_DYST::Element_DYST()
     HighTemperatureTransition = PT_DUST;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_DYST::~Element_DYST() {}

src/simulation/elements/ETRD.cpp

@@ -43,7 +43,7 @@ Element_ETRD::Element_ETRD()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_ETRD::~Element_ETRD() {}

src/simulation/elements/FOG.cpp

@@ -43,7 +43,7 @@ Element_FOG::Element_FOG()
     HighTemperatureTransition = PT_WTRV;
     
     Update = &Element_FOG::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_FOG static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/FRAY.cpp

@@ -43,7 +43,7 @@ Element_FRAY::Element_FRAY()
     HighTemperatureTransition = NT;
     
     Update = &Element_FRAY::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_FRAY static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/FRZW.cpp

@@ -43,7 +43,7 @@ Element_FRZW::Element_FRZW()
     HighTemperatureTransition = PT_ICEI;
     
     Update = &Element_FRZW::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_FRZW static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/FRZZ.cpp

@@ -43,7 +43,7 @@ Element_FRZZ::Element_FRZZ()
     HighTemperatureTransition = NT;
     
     Update = &Element_FRZZ::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_FRZZ static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/FSEP.cpp

@@ -43,7 +43,7 @@ Element_FSEP::Element_FSEP()
     HighTemperatureTransition = NT;
     
     Update = &Element_FSEP::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_FSEP static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/FUSE.cpp

@@ -43,7 +43,7 @@ Element_FUSE::Element_FUSE()
     HighTemperatureTransition = NT;
     
     Update = &Element_FUSE::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_FUSE static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/FWRK.cpp

@@ -43,7 +43,7 @@ Element_FWRK::Element_FWRK()
     HighTemperatureTransition = NT;
     
     Update = &Element_FWRK::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_FWRK static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/GAS.cpp

@@ -43,7 +43,7 @@ Element_GAS::Element_GAS()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_GAS::~Element_GAS() {}

src/simulation/elements/GLAS.cpp

@@ -43,7 +43,7 @@ Element_GLAS::Element_GLAS()
     HighTemperatureTransition = PT_LAVA;
     
     Update = &Element_GLAS::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_GLAS static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/GOO.cpp

@@ -43,7 +43,7 @@ Element_GOO::Element_GOO()
     HighTemperatureTransition = NT;
     
     Update = &Element_GOO::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_GOO static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/GUNP.cpp

@@ -43,7 +43,7 @@ Element_GUNP::Element_GUNP()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_GUNP::~Element_GUNP() {}

src/simulation/elements/H2.cpp

@@ -43,7 +43,7 @@ Element_H2::Element_H2()
     HighTemperatureTransition = NT;
     
     Update = &Element_H2::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_H2 static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/ICEI.cpp

@@ -43,7 +43,7 @@ Element_ICEI::Element_ICEI()
     HighTemperatureTransition = ST;
     
     Update = &Element_ICEI::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_ICEI static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/IGNT.cpp

@@ -43,7 +43,7 @@ Element_IGNT::Element_IGNT()
     HighTemperatureTransition = PT_FIRE;
     
     Update = &Element_IGNT::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_IGNT static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/INSL.cpp

@@ -43,7 +43,7 @@ Element_INSL::Element_INSL()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_INSL::~Element_INSL() {}

src/simulation/elements/INST.cpp

@@ -43,7 +43,7 @@ Element_INST::Element_INST()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_INST::~Element_INST() {}

src/simulation/elements/INWR.cpp

@@ -43,7 +43,7 @@ Element_INWR::Element_INWR()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_INWR::~Element_INWR() {}

src/simulation/elements/IRON.cpp

@@ -43,7 +43,7 @@ Element_IRON::Element_IRON()
     HighTemperatureTransition = PT_LAVA;
     
     Update = &Element_IRON::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_IRON static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/ISOZ.cpp

@@ -43,7 +43,7 @@ Element_ISOZ::Element_ISOZ()
     HighTemperatureTransition = NT;
     
     Update = &Element_ISOZ::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_ISOZ static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/ISZS.cpp

@@ -43,7 +43,7 @@ Element_ISZS::Element_ISZS()
     HighTemperatureTransition = PT_ISOZ;
     
     Update = &Element_ISZS::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_ISZS static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/LNTG.cpp

@@ -43,7 +43,7 @@ Element_LNTG::Element_LNTG()
     HighTemperatureTransition = PT_NONE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_LNTG::~Element_LNTG() {}

src/simulation/elements/LO2.cpp

@@ -43,7 +43,7 @@ Element_LO2::Element_LO2()
     HighTemperatureTransition = PT_O2;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_LO2::~Element_LO2() {}

src/simulation/elements/LOLZ.cpp

@@ -43,7 +43,7 @@ Element_LOLZ::Element_LOLZ()
     HighTemperatureTransition = NT;
     
     Update = &Element_LOLZ::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_LOLZ static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/LOVE.cpp

@@ -43,7 +43,7 @@ Element_LOVE::Element_LOVE()
     HighTemperatureTransition = NT;
     
     Update = &Element_LOVE::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_LOVE static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/LRBD.cpp

@@ -43,7 +43,7 @@ Element_LRBD::Element_LRBD()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_LRBD::~Element_LRBD() {}

src/simulation/elements/MERC.cpp

@@ -43,7 +43,7 @@ Element_MERC::Element_MERC()
     HighTemperatureTransition = NT;
     
     Update = &Element_MERC::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_MERC static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/METL.cpp

@@ -43,7 +43,7 @@ Element_METL::Element_METL()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_METL::~Element_METL() {}

src/simulation/elements/MORT.cpp

@@ -43,7 +43,7 @@ Element_MORT::Element_MORT()
     HighTemperatureTransition = NT;
     
     Update = &Element_MORT::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_MORT static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/MWAX.cpp

@@ -43,7 +43,7 @@ Element_MWAX::Element_MWAX()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_MWAX::~Element_MWAX() {}

src/simulation/elements/NBHL.cpp

@@ -43,7 +43,7 @@ Element_NBHL::Element_NBHL()
     HighTemperatureTransition = NT;
     
     Update = &Element_NBHL::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_NBHL static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/NBLE.cpp

@@ -43,7 +43,7 @@ Element_NBLE::Element_NBLE()
     HighTemperatureTransition = NT;
     
     Update = &Element_NBLE::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_NBLE static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/NICE.cpp

@@ -43,7 +43,7 @@ Element_NICE::Element_NICE()
     HighTemperatureTransition = PT_LNTG;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_NICE::~Element_NICE() {}

src/simulation/elements/NITR.cpp

@@ -43,7 +43,7 @@ Element_NITR::Element_NITR()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_NITR::~Element_NITR() {}

src/simulation/elements/NONE.cpp

@@ -43,7 +43,7 @@ Element_NONE::Element_NONE()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_NONE::~Element_NONE() {}

src/simulation/elements/NSCN.cpp

@@ -43,7 +43,7 @@ Element_NSCN::Element_NSCN()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_NSCN::~Element_NSCN() {}

src/simulation/elements/NTCT.cpp

@@ -43,7 +43,7 @@ Element_NTCT::Element_NTCT()
     HighTemperatureTransition = PT_LAVA;
     
     Update = &Element_NTCT::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_NTCT static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/NWHL.cpp

@@ -43,7 +43,7 @@ Element_NWHL::Element_NWHL()
     HighTemperatureTransition = NT;
     
     Update = &Element_NWHL::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_NWHL static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/O2.cpp

@@ -43,7 +43,7 @@ Element_O2::Element_O2()
     HighTemperatureTransition = NT;
     
     Update = &Element_O2::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_O2 static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/OIL.cpp

@@ -43,7 +43,7 @@ Element_OIL::Element_OIL()
     HighTemperatureTransition = PT_GAS;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_OIL::~Element_OIL() {}

src/simulation/elements/PLEX.cpp

@@ -43,7 +43,7 @@ Element_PLEX::Element_PLEX()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_PLEX::~Element_PLEX() {}

src/simulation/elements/PLNT.cpp

@@ -43,7 +43,7 @@ Element_PLNT::Element_PLNT()
     HighTemperatureTransition = PT_FIRE;
     
     Update = &Element_PLNT::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_PLNT static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/PLUT.cpp

@@ -43,7 +43,7 @@ Element_PLUT::Element_PLUT()
     HighTemperatureTransition = NT;
     
     Update = &Element_PLUT::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_PLUT static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/PSCN.cpp

@@ -43,7 +43,7 @@ Element_PSCN::Element_PSCN()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_PSCN::~Element_PSCN() {}

src/simulation/elements/PSTE.cpp

@@ -43,7 +43,7 @@ Element_PSTE::Element_PSTE()
     HighTemperatureTransition = PT_BRCK;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_PSTE::~Element_PSTE() {}

src/simulation/elements/PSTS.cpp

@@ -43,7 +43,7 @@ Element_PSTS::Element_PSTS()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_PSTS::~Element_PSTS() {}

src/simulation/elements/PTCT.cpp

@@ -43,7 +43,7 @@ Element_PTCT::Element_PTCT()
     HighTemperatureTransition = PT_LAVA;
     
     Update = &Element_PTCT::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_PTCT static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/RBDM.cpp

@@ -43,7 +43,7 @@ Element_RBDM::Element_RBDM()
     HighTemperatureTransition = PT_LRBD;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_RBDM::~Element_RBDM() {}

src/simulation/elements/REPL.cpp

@@ -43,7 +43,7 @@ Element_REPL::Element_REPL()
     HighTemperatureTransition = NT;
     
     Update = &Element_REPL::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_REPL static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/RIME.cpp

@@ -43,7 +43,7 @@ Element_RIME::Element_RIME()
     HighTemperatureTransition = PT_WATR;
     
     Update = &Element_RIME::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_RIME static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/SALT.cpp

@@ -43,7 +43,7 @@ Element_SALT::Element_SALT()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_SALT::~Element_SALT() {}

src/simulation/elements/SAND.cpp

@@ -43,7 +43,7 @@ Element_SAND::Element_SAND()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_SAND::~Element_SAND() {}

src/simulation/elements/SHLD1.cpp

@@ -43,7 +43,7 @@ Element_SHLD1::Element_SHLD1()
     HighTemperatureTransition = NT;
     
     Update = &Element_SHLD1::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_SHLD1 static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/SHLD2.cpp

@@ -43,7 +43,7 @@ Element_SHLD2::Element_SHLD2()
     HighTemperatureTransition = NT;
     
     Update = &Element_SHLD2::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_SHLD2 static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/SHLD3.cpp

@@ -43,7 +43,7 @@ Element_SHLD3::Element_SHLD3()
     HighTemperatureTransition = NT;
     
     Update = &Element_SHLD3::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_SHLD3 static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/SHLD4.cpp

@@ -43,7 +43,7 @@ Element_SHLD4::Element_SHLD4()
     HighTemperatureTransition = NT;
     
     Update = &Element_SHLD4::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_SHLD4 static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/SING.cpp

@@ -43,7 +43,7 @@ Element_SING::Element_SING()
     HighTemperatureTransition = NT;
     
     Update = &Element_SING::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_SING static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/SLTW.cpp

@@ -43,7 +43,7 @@ Element_SLTW::Element_SLTW()
     HighTemperatureTransition = ST;
     
     Update = &Element_SLTW::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_SLTW static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/SNOW.cpp

@@ -43,7 +43,7 @@ Element_SNOW::Element_SNOW()
     HighTemperatureTransition = ST;
     
     Update = &Element_SNOW::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_SNOW static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/SOAP.cpp

@@ -43,7 +43,7 @@ Element_SOAP::Element_SOAP()
     HighTemperatureTransition = NT;
     
     Update = &Element_SOAP::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_SOAP static void attach(Particle * parts, int i1, int i2)

src/simulation/elements/SPAWN.cpp

@@ -43,7 +43,7 @@ Element_SPAWN::Element_SPAWN()
     HighTemperatureTransition = NT;
     
     Update = &Element_SPAWN::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_SPAWN static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/SPAWN2.cpp

@@ -43,7 +43,7 @@ Element_SPAWN2::Element_SPAWN2()
     HighTemperatureTransition = NT;
     
     Update = &Element_SPAWN2::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_SPAWN2 static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/STNE.cpp

@@ -43,7 +43,7 @@ Element_STNE::Element_STNE()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_STNE::~Element_STNE() {}

src/simulation/elements/TESC.cpp

@@ -43,7 +43,7 @@ Element_TESC::Element_TESC()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_TESC::~Element_TESC() {}

src/simulation/elements/THRM.cpp

@@ -43,7 +43,7 @@ Element_THRM::Element_THRM()
     HighTemperatureTransition = NT;
     
     Update = &Element_THRM::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_THRM static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/TTAN.cpp

@@ -44,7 +44,7 @@ Element_TTAN::Element_TTAN()
     HighTemperatureTransition = PT_LAVA;
 
     Update = &Element_TTAN::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_TTAN static int update(UPDATE_FUNC_ARGS)

src/simulation/elements/URAN.cpp

@@ -43,7 +43,7 @@ Element_URAN::Element_URAN()
     HighTemperatureTransition = NT;
     
     Update = &Element_URAN::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_URAN static int update(UPDATE_FUNC_ARGS)