From 80044bb0f06b4186bcc2f07e1c5ddc4e195f2426 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Wed, 18 Jul 2012 17:22:35 +0100
Subject: [PATCH] Renderer Presets and default graphics function

---
 src/game/GameController.cpp        |  8 +++++
 src/game/GameController.h          |  2 ++
 src/game/GameView.cpp              | 58 ++++++++++++++++++++++++++++++
 src/game/GameView.h                |  3 ++
 src/game/RenderPreset.h            | 19 ++++++++++
 src/graphics/Renderer.cpp          | 11 ++++++
 src/simulation/elements/116.cpp    |  2 +-
 src/simulation/elements/146.cpp    |  2 +-
 src/simulation/elements/147.cpp    |  2 +-
 src/simulation/elements/AMTR.cpp   |  2 +-
 src/simulation/elements/ANAR.cpp   |  2 +-
 src/simulation/elements/ARAY.cpp   |  2 +-
 src/simulation/elements/BANG.cpp   |  2 +-
 src/simulation/elements/BCLN.cpp   |  2 +-
 src/simulation/elements/BGLA.cpp   |  2 +-
 src/simulation/elements/BHOL.cpp   |  2 +-
 src/simulation/elements/BMTL.cpp   |  2 +-
 src/simulation/elements/BOYL.cpp   |  2 +-
 src/simulation/elements/BRCK.cpp   |  2 +-
 src/simulation/elements/BREC.cpp   |  2 +-
 src/simulation/elements/BRMT.cpp   |  2 +-
 src/simulation/elements/BTRY.cpp   |  2 +-
 src/simulation/elements/C5.cpp     |  2 +-
 src/simulation/elements/CAUS.cpp   |  2 +-
 src/simulation/elements/CLNE.cpp   |  2 +-
 src/simulation/elements/CNCT.cpp   |  2 +-
 src/simulation/elements/CO2.cpp    |  2 +-
 src/simulation/elements/CONV.cpp   |  2 +-
 src/simulation/elements/DESL.cpp   |  2 +-
 src/simulation/elements/DMND.cpp   |  2 +-
 src/simulation/elements/DRIC.cpp   |  2 +-
 src/simulation/elements/DSTW.cpp   |  2 +-
 src/simulation/elements/DYST.cpp   |  2 +-
 src/simulation/elements/ETRD.cpp   |  2 +-
 src/simulation/elements/FOG.cpp    |  2 +-
 src/simulation/elements/FRAY.cpp   |  2 +-
 src/simulation/elements/FRZW.cpp   |  2 +-
 src/simulation/elements/FRZZ.cpp   |  2 +-
 src/simulation/elements/FSEP.cpp   |  2 +-
 src/simulation/elements/FUSE.cpp   |  2 +-
 src/simulation/elements/FWRK.cpp   |  2 +-
 src/simulation/elements/GAS.cpp    |  2 +-
 src/simulation/elements/GLAS.cpp   |  2 +-
 src/simulation/elements/GOO.cpp    |  2 +-
 src/simulation/elements/GUNP.cpp   |  2 +-
 src/simulation/elements/H2.cpp     |  2 +-
 src/simulation/elements/ICEI.cpp   |  2 +-
 src/simulation/elements/IGNT.cpp   |  2 +-
 src/simulation/elements/INSL.cpp   |  2 +-
 src/simulation/elements/INST.cpp   |  2 +-
 src/simulation/elements/INWR.cpp   |  2 +-
 src/simulation/elements/IRON.cpp   |  2 +-
 src/simulation/elements/ISOZ.cpp   |  2 +-
 src/simulation/elements/ISZS.cpp   |  2 +-
 src/simulation/elements/LNTG.cpp   |  2 +-
 src/simulation/elements/LO2.cpp    |  2 +-
 src/simulation/elements/LOLZ.cpp   |  2 +-
 src/simulation/elements/LOVE.cpp   |  2 +-
 src/simulation/elements/LRBD.cpp   |  2 +-
 src/simulation/elements/MERC.cpp   |  2 +-
 src/simulation/elements/METL.cpp   |  2 +-
 src/simulation/elements/MORT.cpp   |  2 +-
 src/simulation/elements/MWAX.cpp   |  2 +-
 src/simulation/elements/NBHL.cpp   |  2 +-
 src/simulation/elements/NBLE.cpp   |  2 +-
 src/simulation/elements/NICE.cpp   |  2 +-
 src/simulation/elements/NITR.cpp   |  2 +-
 src/simulation/elements/NONE.cpp   |  2 +-
 src/simulation/elements/NSCN.cpp   |  2 +-
 src/simulation/elements/NTCT.cpp   |  2 +-
 src/simulation/elements/NWHL.cpp   |  2 +-
 src/simulation/elements/O2.cpp     |  2 +-
 src/simulation/elements/OIL.cpp    |  2 +-
 src/simulation/elements/PLEX.cpp   |  2 +-
 src/simulation/elements/PLNT.cpp   |  2 +-
 src/simulation/elements/PLUT.cpp   |  2 +-
 src/simulation/elements/PSCN.cpp   |  2 +-
 src/simulation/elements/PSTE.cpp   |  2 +-
 src/simulation/elements/PSTS.cpp   |  2 +-
 src/simulation/elements/PTCT.cpp   |  2 +-
 src/simulation/elements/RBDM.cpp   |  2 +-
 src/simulation/elements/REPL.cpp   |  2 +-
 src/simulation/elements/RIME.cpp   |  2 +-
 src/simulation/elements/SALT.cpp   |  2 +-
 src/simulation/elements/SAND.cpp   |  2 +-
 src/simulation/elements/SHLD1.cpp  |  2 +-
 src/simulation/elements/SHLD2.cpp  |  2 +-
 src/simulation/elements/SHLD3.cpp  |  2 +-
 src/simulation/elements/SHLD4.cpp  |  2 +-
 src/simulation/elements/SING.cpp   |  2 +-
 src/simulation/elements/SLTW.cpp   |  2 +-
 src/simulation/elements/SNOW.cpp   |  2 +-
 src/simulation/elements/SOAP.cpp   |  2 +-
 src/simulation/elements/SPAWN.cpp  |  2 +-
 src/simulation/elements/SPAWN2.cpp |  2 +-
 src/simulation/elements/STNE.cpp   |  2 +-
 src/simulation/elements/TESC.cpp   |  2 +-
 src/simulation/elements/THRM.cpp   |  2 +-
 src/simulation/elements/TTAN.cpp   |  2 +-
 src/simulation/elements/URAN.cpp   |  2 +-
 src/simulation/elements/VINE.cpp   |  2 +-
 src/simulation/elements/VOID.cpp   |  2 +-
 src/simulation/elements/WARP.cpp   |  2 +-
 src/simulation/elements/WATR.cpp   |  2 +-
 src/simulation/elements/WAX.cpp    |  2 +-
 src/simulation/elements/WHOL.cpp   |  2 +-
 src/simulation/elements/WOOD.cpp   |  2 +-
 src/simulation/elements/WTRV.cpp   |  2 +-
 src/simulation/elements/YEST.cpp   |  2 +-
 109 files changed, 204 insertions(+), 103 deletions(-)
 create mode 100644 src/game/RenderPreset.h

diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 260d99a9c..074055405 100644
--- a/src/game/GameController.cpp
+++ b/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();
diff --git a/src/game/GameController.h b/src/game/GameController.h
index 4e2b43adc..2388c5da8 100644
--- a/src/game/GameController.h
+++ b/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);
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 8adb9e124..62fd6a95c 100644
--- a/src/game/GameView.cpp
+++ b/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)
diff --git a/src/game/GameView.h b/src/game/GameView.h
index 4576b1328..324f71646 100644
--- a/src/game/GameView.h
+++ b/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;
diff --git a/src/game/RenderPreset.h b/src/game/RenderPreset.h
new file mode 100644
index 000000000..9cc9f4cdb
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp
index ef3b8aaa2..5bf8eeff9 100644
--- a/src/graphics/Renderer.cpp
+++ b/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)
diff --git a/src/simulation/elements/116.cpp b/src/simulation/elements/116.cpp
index 9b939ffcd..9697c9705 100644
--- a/src/simulation/elements/116.cpp
+++ b/src/simulation/elements/116.cpp
@@ -43,7 +43,7 @@ Element_116::Element_116()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_116::~Element_116() {}
\ No newline at end of file
diff --git a/src/simulation/elements/146.cpp b/src/simulation/elements/146.cpp
index 8afb8e45b..51f4d3b3d 100644
--- a/src/simulation/elements/146.cpp
+++ b/src/simulation/elements/146.cpp
@@ -43,7 +43,7 @@ Element_146::Element_146()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_146::~Element_146() {}
\ No newline at end of file
diff --git a/src/simulation/elements/147.cpp b/src/simulation/elements/147.cpp
index 868c766e6..902db2d72 100644
--- a/src/simulation/elements/147.cpp
+++ b/src/simulation/elements/147.cpp
@@ -43,7 +43,7 @@ Element_147::Element_147()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_147::~Element_147() {}
\ No newline at end of file
diff --git a/src/simulation/elements/AMTR.cpp b/src/simulation/elements/AMTR.cpp
index a93d1cd17..ff25bb62a 100644
--- a/src/simulation/elements/AMTR.cpp
+++ b/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)
diff --git a/src/simulation/elements/ANAR.cpp b/src/simulation/elements/ANAR.cpp
index c35c58cf0..f8bcd499a 100644
--- a/src/simulation/elements/ANAR.cpp
+++ b/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)
diff --git a/src/simulation/elements/ARAY.cpp b/src/simulation/elements/ARAY.cpp
index c455f072e..29d3b9593 100644
--- a/src/simulation/elements/ARAY.cpp
+++ b/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)
diff --git a/src/simulation/elements/BANG.cpp b/src/simulation/elements/BANG.cpp
index 264b4f1ea..d2441caa3 100644
--- a/src/simulation/elements/BANG.cpp
+++ b/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)
diff --git a/src/simulation/elements/BCLN.cpp b/src/simulation/elements/BCLN.cpp
index 281ecb24e..0e93011a2 100644
--- a/src/simulation/elements/BCLN.cpp
+++ b/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)
diff --git a/src/simulation/elements/BGLA.cpp b/src/simulation/elements/BGLA.cpp
index 756842a92..e85b95d9a 100644
--- a/src/simulation/elements/BGLA.cpp
+++ b/src/simulation/elements/BGLA.cpp
@@ -43,7 +43,7 @@ Element_BGLA::Element_BGLA()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_BGLA::~Element_BGLA() {}
\ No newline at end of file
diff --git a/src/simulation/elements/BHOL.cpp b/src/simulation/elements/BHOL.cpp
index 7a119855d..35eda8c60 100644
--- a/src/simulation/elements/BHOL.cpp
+++ b/src/simulation/elements/BHOL.cpp
@@ -43,7 +43,7 @@ Element_BHOL::Element_BHOL()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_BHOL::~Element_BHOL() {}
\ No newline at end of file
diff --git a/src/simulation/elements/BMTL.cpp b/src/simulation/elements/BMTL.cpp
index 66a9af2e2..adc5289bc 100644
--- a/src/simulation/elements/BMTL.cpp
+++ b/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)
diff --git a/src/simulation/elements/BOYL.cpp b/src/simulation/elements/BOYL.cpp
index 3fd36c960..18ebee814 100644
--- a/src/simulation/elements/BOYL.cpp
+++ b/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)
diff --git a/src/simulation/elements/BRCK.cpp b/src/simulation/elements/BRCK.cpp
index 0a1bba7ee..b7304189f 100644
--- a/src/simulation/elements/BRCK.cpp
+++ b/src/simulation/elements/BRCK.cpp
@@ -43,7 +43,7 @@ Element_BRCK::Element_BRCK()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_BRCK::~Element_BRCK() {}
\ No newline at end of file
diff --git a/src/simulation/elements/BREC.cpp b/src/simulation/elements/BREC.cpp
index 807d650c7..e260a7cf4 100644
--- a/src/simulation/elements/BREC.cpp
+++ b/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)
diff --git a/src/simulation/elements/BRMT.cpp b/src/simulation/elements/BRMT.cpp
index 11773e223..55eb24377 100644
--- a/src/simulation/elements/BRMT.cpp
+++ b/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)
diff --git a/src/simulation/elements/BTRY.cpp b/src/simulation/elements/BTRY.cpp
index 6aa00ecbf..42c8e5388 100644
--- a/src/simulation/elements/BTRY.cpp
+++ b/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)
diff --git a/src/simulation/elements/C5.cpp b/src/simulation/elements/C5.cpp
index 8524f9bd0..e7d8f22bb 100644
--- a/src/simulation/elements/C5.cpp
+++ b/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)
diff --git a/src/simulation/elements/CAUS.cpp b/src/simulation/elements/CAUS.cpp
index b336f9ef9..a8fc0da8e 100644
--- a/src/simulation/elements/CAUS.cpp
+++ b/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)
diff --git a/src/simulation/elements/CLNE.cpp b/src/simulation/elements/CLNE.cpp
index 939feb0f8..f76ed7541 100644
--- a/src/simulation/elements/CLNE.cpp
+++ b/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)
diff --git a/src/simulation/elements/CNCT.cpp b/src/simulation/elements/CNCT.cpp
index 3ef01369f..77f70be97 100644
--- a/src/simulation/elements/CNCT.cpp
+++ b/src/simulation/elements/CNCT.cpp
@@ -43,7 +43,7 @@ Element_CNCT::Element_CNCT()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_CNCT::~Element_CNCT() {}
\ No newline at end of file
diff --git a/src/simulation/elements/CO2.cpp b/src/simulation/elements/CO2.cpp
index 3e1f4d97c..e17093835 100644
--- a/src/simulation/elements/CO2.cpp
+++ b/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)
diff --git a/src/simulation/elements/CONV.cpp b/src/simulation/elements/CONV.cpp
index 82e0594b0..4ee4682fd 100644
--- a/src/simulation/elements/CONV.cpp
+++ b/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)
diff --git a/src/simulation/elements/DESL.cpp b/src/simulation/elements/DESL.cpp
index 6401b3cf5..a79086d0f 100644
--- a/src/simulation/elements/DESL.cpp
+++ b/src/simulation/elements/DESL.cpp
@@ -43,7 +43,7 @@ Element_DESL::Element_DESL()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_DESL::~Element_DESL() {}
\ No newline at end of file
diff --git a/src/simulation/elements/DMND.cpp b/src/simulation/elements/DMND.cpp
index fe158f865..3c6d24ab8 100644
--- a/src/simulation/elements/DMND.cpp
+++ b/src/simulation/elements/DMND.cpp
@@ -43,7 +43,7 @@ Element_DMND::Element_DMND()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_DMND::~Element_DMND() {}
\ No newline at end of file
diff --git a/src/simulation/elements/DRIC.cpp b/src/simulation/elements/DRIC.cpp
index 7112bbc69..ea2a3c8f3 100644
--- a/src/simulation/elements/DRIC.cpp
+++ b/src/simulation/elements/DRIC.cpp
@@ -43,7 +43,7 @@ Element_DRIC::Element_DRIC()
     HighTemperatureTransition = PT_CO2;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_DRIC::~Element_DRIC() {}
\ No newline at end of file
diff --git a/src/simulation/elements/DSTW.cpp b/src/simulation/elements/DSTW.cpp
index c04bf5bfb..c2197869f 100644
--- a/src/simulation/elements/DSTW.cpp
+++ b/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)
diff --git a/src/simulation/elements/DYST.cpp b/src/simulation/elements/DYST.cpp
index 5db167fa9..fdf16bb90 100644
--- a/src/simulation/elements/DYST.cpp
+++ b/src/simulation/elements/DYST.cpp
@@ -43,7 +43,7 @@ Element_DYST::Element_DYST()
     HighTemperatureTransition = PT_DUST;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_DYST::~Element_DYST() {}
\ No newline at end of file
diff --git a/src/simulation/elements/ETRD.cpp b/src/simulation/elements/ETRD.cpp
index b3eacfb3f..39b658142 100644
--- a/src/simulation/elements/ETRD.cpp
+++ b/src/simulation/elements/ETRD.cpp
@@ -43,7 +43,7 @@ Element_ETRD::Element_ETRD()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_ETRD::~Element_ETRD() {}
\ No newline at end of file
diff --git a/src/simulation/elements/FOG.cpp b/src/simulation/elements/FOG.cpp
index ca2beb4ef..9cfbe62f0 100644
--- a/src/simulation/elements/FOG.cpp
+++ b/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)
diff --git a/src/simulation/elements/FRAY.cpp b/src/simulation/elements/FRAY.cpp
index b81db073d..6e85783be 100644
--- a/src/simulation/elements/FRAY.cpp
+++ b/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)
diff --git a/src/simulation/elements/FRZW.cpp b/src/simulation/elements/FRZW.cpp
index 5c124b44f..8ba954a14 100644
--- a/src/simulation/elements/FRZW.cpp
+++ b/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)
diff --git a/src/simulation/elements/FRZZ.cpp b/src/simulation/elements/FRZZ.cpp
index 14d2f1a6f..816267286 100644
--- a/src/simulation/elements/FRZZ.cpp
+++ b/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)
diff --git a/src/simulation/elements/FSEP.cpp b/src/simulation/elements/FSEP.cpp
index 80b10f4f5..52e4a6713 100644
--- a/src/simulation/elements/FSEP.cpp
+++ b/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)
diff --git a/src/simulation/elements/FUSE.cpp b/src/simulation/elements/FUSE.cpp
index e066afa05..946e86b72 100644
--- a/src/simulation/elements/FUSE.cpp
+++ b/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)
diff --git a/src/simulation/elements/FWRK.cpp b/src/simulation/elements/FWRK.cpp
index 6876447f0..66109f5ab 100644
--- a/src/simulation/elements/FWRK.cpp
+++ b/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)
diff --git a/src/simulation/elements/GAS.cpp b/src/simulation/elements/GAS.cpp
index 3c406a9d4..4e87b7625 100644
--- a/src/simulation/elements/GAS.cpp
+++ b/src/simulation/elements/GAS.cpp
@@ -43,7 +43,7 @@ Element_GAS::Element_GAS()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_GAS::~Element_GAS() {}
\ No newline at end of file
diff --git a/src/simulation/elements/GLAS.cpp b/src/simulation/elements/GLAS.cpp
index 58fc55dce..b752a0bd7 100644
--- a/src/simulation/elements/GLAS.cpp
+++ b/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)
diff --git a/src/simulation/elements/GOO.cpp b/src/simulation/elements/GOO.cpp
index c0ea21be6..3dcef314e 100644
--- a/src/simulation/elements/GOO.cpp
+++ b/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)
diff --git a/src/simulation/elements/GUNP.cpp b/src/simulation/elements/GUNP.cpp
index fd5334c7f..798e0f714 100644
--- a/src/simulation/elements/GUNP.cpp
+++ b/src/simulation/elements/GUNP.cpp
@@ -43,7 +43,7 @@ Element_GUNP::Element_GUNP()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_GUNP::~Element_GUNP() {}
\ No newline at end of file
diff --git a/src/simulation/elements/H2.cpp b/src/simulation/elements/H2.cpp
index 1e84502f2..8d5bf0d68 100644
--- a/src/simulation/elements/H2.cpp
+++ b/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)
diff --git a/src/simulation/elements/ICEI.cpp b/src/simulation/elements/ICEI.cpp
index 7352d6083..852b646a6 100644
--- a/src/simulation/elements/ICEI.cpp
+++ b/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)
diff --git a/src/simulation/elements/IGNT.cpp b/src/simulation/elements/IGNT.cpp
index 8e2af19e6..206b92b68 100644
--- a/src/simulation/elements/IGNT.cpp
+++ b/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)
diff --git a/src/simulation/elements/INSL.cpp b/src/simulation/elements/INSL.cpp
index a7d1ce110..868577556 100644
--- a/src/simulation/elements/INSL.cpp
+++ b/src/simulation/elements/INSL.cpp
@@ -43,7 +43,7 @@ Element_INSL::Element_INSL()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_INSL::~Element_INSL() {}
\ No newline at end of file
diff --git a/src/simulation/elements/INST.cpp b/src/simulation/elements/INST.cpp
index 78990ef00..a8a8d3e84 100644
--- a/src/simulation/elements/INST.cpp
+++ b/src/simulation/elements/INST.cpp
@@ -43,7 +43,7 @@ Element_INST::Element_INST()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_INST::~Element_INST() {}
\ No newline at end of file
diff --git a/src/simulation/elements/INWR.cpp b/src/simulation/elements/INWR.cpp
index 0368f06ee..35d57ec10 100644
--- a/src/simulation/elements/INWR.cpp
+++ b/src/simulation/elements/INWR.cpp
@@ -43,7 +43,7 @@ Element_INWR::Element_INWR()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_INWR::~Element_INWR() {}
\ No newline at end of file
diff --git a/src/simulation/elements/IRON.cpp b/src/simulation/elements/IRON.cpp
index a447a299c..1542da9e2 100644
--- a/src/simulation/elements/IRON.cpp
+++ b/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)
diff --git a/src/simulation/elements/ISOZ.cpp b/src/simulation/elements/ISOZ.cpp
index f98cb2548..05df48918 100644
--- a/src/simulation/elements/ISOZ.cpp
+++ b/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)
diff --git a/src/simulation/elements/ISZS.cpp b/src/simulation/elements/ISZS.cpp
index 650ef1b82..b12f34ce5 100644
--- a/src/simulation/elements/ISZS.cpp
+++ b/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)
diff --git a/src/simulation/elements/LNTG.cpp b/src/simulation/elements/LNTG.cpp
index ce776c801..ac9719136 100644
--- a/src/simulation/elements/LNTG.cpp
+++ b/src/simulation/elements/LNTG.cpp
@@ -43,7 +43,7 @@ Element_LNTG::Element_LNTG()
     HighTemperatureTransition = PT_NONE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_LNTG::~Element_LNTG() {}
\ No newline at end of file
diff --git a/src/simulation/elements/LO2.cpp b/src/simulation/elements/LO2.cpp
index cc0c55757..e032b9ea5 100644
--- a/src/simulation/elements/LO2.cpp
+++ b/src/simulation/elements/LO2.cpp
@@ -43,7 +43,7 @@ Element_LO2::Element_LO2()
     HighTemperatureTransition = PT_O2;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_LO2::~Element_LO2() {}
\ No newline at end of file
diff --git a/src/simulation/elements/LOLZ.cpp b/src/simulation/elements/LOLZ.cpp
index 14c575771..6feae3f8c 100644
--- a/src/simulation/elements/LOLZ.cpp
+++ b/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)
diff --git a/src/simulation/elements/LOVE.cpp b/src/simulation/elements/LOVE.cpp
index 977633603..28a20b7f5 100644
--- a/src/simulation/elements/LOVE.cpp
+++ b/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)
diff --git a/src/simulation/elements/LRBD.cpp b/src/simulation/elements/LRBD.cpp
index 445541fe4..f609cce59 100644
--- a/src/simulation/elements/LRBD.cpp
+++ b/src/simulation/elements/LRBD.cpp
@@ -43,7 +43,7 @@ Element_LRBD::Element_LRBD()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_LRBD::~Element_LRBD() {}
\ No newline at end of file
diff --git a/src/simulation/elements/MERC.cpp b/src/simulation/elements/MERC.cpp
index 9e7ee3856..1fec32a99 100644
--- a/src/simulation/elements/MERC.cpp
+++ b/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)
diff --git a/src/simulation/elements/METL.cpp b/src/simulation/elements/METL.cpp
index a0137089e..17b09d017 100644
--- a/src/simulation/elements/METL.cpp
+++ b/src/simulation/elements/METL.cpp
@@ -43,7 +43,7 @@ Element_METL::Element_METL()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_METL::~Element_METL() {}
\ No newline at end of file
diff --git a/src/simulation/elements/MORT.cpp b/src/simulation/elements/MORT.cpp
index 3acaf0ce9..f8f1d8c02 100644
--- a/src/simulation/elements/MORT.cpp
+++ b/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)
diff --git a/src/simulation/elements/MWAX.cpp b/src/simulation/elements/MWAX.cpp
index d9428eba9..4153893bb 100644
--- a/src/simulation/elements/MWAX.cpp
+++ b/src/simulation/elements/MWAX.cpp
@@ -43,7 +43,7 @@ Element_MWAX::Element_MWAX()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_MWAX::~Element_MWAX() {}
\ No newline at end of file
diff --git a/src/simulation/elements/NBHL.cpp b/src/simulation/elements/NBHL.cpp
index feb42ef4a..2ccb86406 100644
--- a/src/simulation/elements/NBHL.cpp
+++ b/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)
diff --git a/src/simulation/elements/NBLE.cpp b/src/simulation/elements/NBLE.cpp
index 3cd02591b..d08710227 100644
--- a/src/simulation/elements/NBLE.cpp
+++ b/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)
diff --git a/src/simulation/elements/NICE.cpp b/src/simulation/elements/NICE.cpp
index 8c01ea40c..8a6086e71 100644
--- a/src/simulation/elements/NICE.cpp
+++ b/src/simulation/elements/NICE.cpp
@@ -43,7 +43,7 @@ Element_NICE::Element_NICE()
     HighTemperatureTransition = PT_LNTG;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_NICE::~Element_NICE() {}
\ No newline at end of file
diff --git a/src/simulation/elements/NITR.cpp b/src/simulation/elements/NITR.cpp
index 45877f29b..bf0feeeee 100644
--- a/src/simulation/elements/NITR.cpp
+++ b/src/simulation/elements/NITR.cpp
@@ -43,7 +43,7 @@ Element_NITR::Element_NITR()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_NITR::~Element_NITR() {}
\ No newline at end of file
diff --git a/src/simulation/elements/NONE.cpp b/src/simulation/elements/NONE.cpp
index 8029bee77..d271c902e 100644
--- a/src/simulation/elements/NONE.cpp
+++ b/src/simulation/elements/NONE.cpp
@@ -43,7 +43,7 @@ Element_NONE::Element_NONE()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_NONE::~Element_NONE() {}
\ No newline at end of file
diff --git a/src/simulation/elements/NSCN.cpp b/src/simulation/elements/NSCN.cpp
index 3d9364561..c16e9c428 100644
--- a/src/simulation/elements/NSCN.cpp
+++ b/src/simulation/elements/NSCN.cpp
@@ -43,7 +43,7 @@ Element_NSCN::Element_NSCN()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_NSCN::~Element_NSCN() {}
\ No newline at end of file
diff --git a/src/simulation/elements/NTCT.cpp b/src/simulation/elements/NTCT.cpp
index 0e4d67b38..224146809 100644
--- a/src/simulation/elements/NTCT.cpp
+++ b/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)
diff --git a/src/simulation/elements/NWHL.cpp b/src/simulation/elements/NWHL.cpp
index aadce99aa..7fcda4a55 100644
--- a/src/simulation/elements/NWHL.cpp
+++ b/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)
diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp
index 285fb3fcd..1167e76d8 100644
--- a/src/simulation/elements/O2.cpp
+++ b/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)
diff --git a/src/simulation/elements/OIL.cpp b/src/simulation/elements/OIL.cpp
index 3504a1f73..5dd7595f9 100644
--- a/src/simulation/elements/OIL.cpp
+++ b/src/simulation/elements/OIL.cpp
@@ -43,7 +43,7 @@ Element_OIL::Element_OIL()
     HighTemperatureTransition = PT_GAS;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_OIL::~Element_OIL() {}
\ No newline at end of file
diff --git a/src/simulation/elements/PLEX.cpp b/src/simulation/elements/PLEX.cpp
index ec5ad1779..c2f157b18 100644
--- a/src/simulation/elements/PLEX.cpp
+++ b/src/simulation/elements/PLEX.cpp
@@ -43,7 +43,7 @@ Element_PLEX::Element_PLEX()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_PLEX::~Element_PLEX() {}
\ No newline at end of file
diff --git a/src/simulation/elements/PLNT.cpp b/src/simulation/elements/PLNT.cpp
index 17feda798..91d29d0c8 100644
--- a/src/simulation/elements/PLNT.cpp
+++ b/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)
diff --git a/src/simulation/elements/PLUT.cpp b/src/simulation/elements/PLUT.cpp
index 688ea35a3..c9b759acc 100644
--- a/src/simulation/elements/PLUT.cpp
+++ b/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)
diff --git a/src/simulation/elements/PSCN.cpp b/src/simulation/elements/PSCN.cpp
index 54d64a15c..b074f7b33 100644
--- a/src/simulation/elements/PSCN.cpp
+++ b/src/simulation/elements/PSCN.cpp
@@ -43,7 +43,7 @@ Element_PSCN::Element_PSCN()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_PSCN::~Element_PSCN() {}
\ No newline at end of file
diff --git a/src/simulation/elements/PSTE.cpp b/src/simulation/elements/PSTE.cpp
index 50ff1d2f0..6efea5138 100644
--- a/src/simulation/elements/PSTE.cpp
+++ b/src/simulation/elements/PSTE.cpp
@@ -43,7 +43,7 @@ Element_PSTE::Element_PSTE()
     HighTemperatureTransition = PT_BRCK;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_PSTE::~Element_PSTE() {}
\ No newline at end of file
diff --git a/src/simulation/elements/PSTS.cpp b/src/simulation/elements/PSTS.cpp
index cdd5cad40..5dd331c65 100644
--- a/src/simulation/elements/PSTS.cpp
+++ b/src/simulation/elements/PSTS.cpp
@@ -43,7 +43,7 @@ Element_PSTS::Element_PSTS()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_PSTS::~Element_PSTS() {}
\ No newline at end of file
diff --git a/src/simulation/elements/PTCT.cpp b/src/simulation/elements/PTCT.cpp
index 9119e1a3c..bda58c7f5 100644
--- a/src/simulation/elements/PTCT.cpp
+++ b/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)
diff --git a/src/simulation/elements/RBDM.cpp b/src/simulation/elements/RBDM.cpp
index 1b85a1526..90a332b4b 100644
--- a/src/simulation/elements/RBDM.cpp
+++ b/src/simulation/elements/RBDM.cpp
@@ -43,7 +43,7 @@ Element_RBDM::Element_RBDM()
     HighTemperatureTransition = PT_LRBD;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_RBDM::~Element_RBDM() {}
\ No newline at end of file
diff --git a/src/simulation/elements/REPL.cpp b/src/simulation/elements/REPL.cpp
index e7eae1470..b2deaee57 100644
--- a/src/simulation/elements/REPL.cpp
+++ b/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)
diff --git a/src/simulation/elements/RIME.cpp b/src/simulation/elements/RIME.cpp
index e9938628f..1ff2fade1 100644
--- a/src/simulation/elements/RIME.cpp
+++ b/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)
diff --git a/src/simulation/elements/SALT.cpp b/src/simulation/elements/SALT.cpp
index 5042c6597..a2e6274dd 100644
--- a/src/simulation/elements/SALT.cpp
+++ b/src/simulation/elements/SALT.cpp
@@ -43,7 +43,7 @@ Element_SALT::Element_SALT()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_SALT::~Element_SALT() {}
\ No newline at end of file
diff --git a/src/simulation/elements/SAND.cpp b/src/simulation/elements/SAND.cpp
index c791a0ada..a1d9c0067 100644
--- a/src/simulation/elements/SAND.cpp
+++ b/src/simulation/elements/SAND.cpp
@@ -43,7 +43,7 @@ Element_SAND::Element_SAND()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_SAND::~Element_SAND() {}
\ No newline at end of file
diff --git a/src/simulation/elements/SHLD1.cpp b/src/simulation/elements/SHLD1.cpp
index 2d48f9d09..605180a6f 100644
--- a/src/simulation/elements/SHLD1.cpp
+++ b/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)
diff --git a/src/simulation/elements/SHLD2.cpp b/src/simulation/elements/SHLD2.cpp
index cdb72e930..c00e4c9c0 100644
--- a/src/simulation/elements/SHLD2.cpp
+++ b/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)
diff --git a/src/simulation/elements/SHLD3.cpp b/src/simulation/elements/SHLD3.cpp
index c90a1d8e4..633a8c42b 100644
--- a/src/simulation/elements/SHLD3.cpp
+++ b/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)
diff --git a/src/simulation/elements/SHLD4.cpp b/src/simulation/elements/SHLD4.cpp
index 0aa38e852..95c8ae4a3 100644
--- a/src/simulation/elements/SHLD4.cpp
+++ b/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)
diff --git a/src/simulation/elements/SING.cpp b/src/simulation/elements/SING.cpp
index 8bd3f24e9..78641a85a 100644
--- a/src/simulation/elements/SING.cpp
+++ b/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)
diff --git a/src/simulation/elements/SLTW.cpp b/src/simulation/elements/SLTW.cpp
index 1b3c4b463..3dad33c7c 100644
--- a/src/simulation/elements/SLTW.cpp
+++ b/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)
diff --git a/src/simulation/elements/SNOW.cpp b/src/simulation/elements/SNOW.cpp
index 9d8a6a5be..4e592f77c 100644
--- a/src/simulation/elements/SNOW.cpp
+++ b/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)
diff --git a/src/simulation/elements/SOAP.cpp b/src/simulation/elements/SOAP.cpp
index 031c0d135..d4ed39d43 100644
--- a/src/simulation/elements/SOAP.cpp
+++ b/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)
diff --git a/src/simulation/elements/SPAWN.cpp b/src/simulation/elements/SPAWN.cpp
index 092be1cc4..85295f28b 100644
--- a/src/simulation/elements/SPAWN.cpp
+++ b/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)
diff --git a/src/simulation/elements/SPAWN2.cpp b/src/simulation/elements/SPAWN2.cpp
index be2088369..3cc048b03 100644
--- a/src/simulation/elements/SPAWN2.cpp
+++ b/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)
diff --git a/src/simulation/elements/STNE.cpp b/src/simulation/elements/STNE.cpp
index 2a2a2fdcd..ff5251de7 100644
--- a/src/simulation/elements/STNE.cpp
+++ b/src/simulation/elements/STNE.cpp
@@ -43,7 +43,7 @@ Element_STNE::Element_STNE()
     HighTemperatureTransition = PT_LAVA;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_STNE::~Element_STNE() {}
\ No newline at end of file
diff --git a/src/simulation/elements/TESC.cpp b/src/simulation/elements/TESC.cpp
index 7c3cce6a3..025cd75dd 100644
--- a/src/simulation/elements/TESC.cpp
+++ b/src/simulation/elements/TESC.cpp
@@ -43,7 +43,7 @@ Element_TESC::Element_TESC()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_TESC::~Element_TESC() {}
\ No newline at end of file
diff --git a/src/simulation/elements/THRM.cpp b/src/simulation/elements/THRM.cpp
index e87a37912..e7d1dde8e 100644
--- a/src/simulation/elements/THRM.cpp
+++ b/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)
diff --git a/src/simulation/elements/TTAN.cpp b/src/simulation/elements/TTAN.cpp
index 66fc76be9..c51319dd5 100644
--- a/src/simulation/elements/TTAN.cpp
+++ b/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)
diff --git a/src/simulation/elements/URAN.cpp b/src/simulation/elements/URAN.cpp
index 0a5fb798a..a988bf3e1 100644
--- a/src/simulation/elements/URAN.cpp
+++ b/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)
diff --git a/src/simulation/elements/VINE.cpp b/src/simulation/elements/VINE.cpp
index 142e235a6..991dfc444 100644
--- a/src/simulation/elements/VINE.cpp
+++ b/src/simulation/elements/VINE.cpp
@@ -43,7 +43,7 @@ Element_VINE::Element_VINE()
     HighTemperatureTransition = PT_FIRE;
     
     Update = &Element_VINE::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_VINE static int update(UPDATE_FUNC_ARGS)
diff --git a/src/simulation/elements/VOID.cpp b/src/simulation/elements/VOID.cpp
index 1627ad266..05eb87224 100644
--- a/src/simulation/elements/VOID.cpp
+++ b/src/simulation/elements/VOID.cpp
@@ -43,7 +43,7 @@ Element_VOID::Element_VOID()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_VOID::~Element_VOID() {}
\ No newline at end of file
diff --git a/src/simulation/elements/WARP.cpp b/src/simulation/elements/WARP.cpp
index bc19aa0e3..bcd71a38f 100644
--- a/src/simulation/elements/WARP.cpp
+++ b/src/simulation/elements/WARP.cpp
@@ -43,7 +43,7 @@ Element_WARP::Element_WARP()
     HighTemperatureTransition = NT;
     
     Update = &Element_WARP::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_WARP static int update(UPDATE_FUNC_ARGS)
diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp
index 037c8c927..3c546e67b 100644
--- a/src/simulation/elements/WATR.cpp
+++ b/src/simulation/elements/WATR.cpp
@@ -43,7 +43,7 @@ Element_WATR::Element_WATR()
     HighTemperatureTransition = PT_WTRV;
     
     Update = &Element_WATR::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_WATR static int update(UPDATE_FUNC_ARGS)
diff --git a/src/simulation/elements/WAX.cpp b/src/simulation/elements/WAX.cpp
index 2ab705b13..5f9a113d1 100644
--- a/src/simulation/elements/WAX.cpp
+++ b/src/simulation/elements/WAX.cpp
@@ -43,7 +43,7 @@ Element_WAX::Element_WAX()
     HighTemperatureTransition = PT_MWAX;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_WAX::~Element_WAX() {}
\ No newline at end of file
diff --git a/src/simulation/elements/WHOL.cpp b/src/simulation/elements/WHOL.cpp
index 572fca095..300796026 100644
--- a/src/simulation/elements/WHOL.cpp
+++ b/src/simulation/elements/WHOL.cpp
@@ -43,7 +43,7 @@ Element_WHOL::Element_WHOL()
     HighTemperatureTransition = NT;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_WHOL::~Element_WHOL() {}
\ No newline at end of file
diff --git a/src/simulation/elements/WOOD.cpp b/src/simulation/elements/WOOD.cpp
index c53be8e57..398c657ad 100644
--- a/src/simulation/elements/WOOD.cpp
+++ b/src/simulation/elements/WOOD.cpp
@@ -43,7 +43,7 @@ Element_WOOD::Element_WOOD()
     HighTemperatureTransition = PT_FIRE;
     
     Update = NULL;
-    Graphics = NULL;
+    
 }
 
 Element_WOOD::~Element_WOOD() {}
\ No newline at end of file
diff --git a/src/simulation/elements/WTRV.cpp b/src/simulation/elements/WTRV.cpp
index 8850cff98..fb72db8dc 100644
--- a/src/simulation/elements/WTRV.cpp
+++ b/src/simulation/elements/WTRV.cpp
@@ -43,7 +43,7 @@ Element_WTRV::Element_WTRV()
     HighTemperatureTransition = NT;
     
     Update = &Element_WTRV::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_WTRV static int update(UPDATE_FUNC_ARGS)
diff --git a/src/simulation/elements/YEST.cpp b/src/simulation/elements/YEST.cpp
index 1b1b8fed7..99df265f0 100644
--- a/src/simulation/elements/YEST.cpp
+++ b/src/simulation/elements/YEST.cpp
@@ -43,7 +43,7 @@ Element_YEST::Element_YEST()
     HighTemperatureTransition = PT_DYST;
     
     Update = &Element_YEST::update;
-    Graphics = NULL;
+    
 }
 
 //#TPT-Directive ElementHeader Element_YEST static int update(UPDATE_FUNC_ARGS)