Merge remote-tracking branch 'origin/master'

SConscript

@@ -44,6 +44,7 @@ AddOption('--sse2',dest="sse2",action='store_true',default=False,help="Enable SS
 AddOption('--sse3',dest="sse3",action='store_true',default=False,help="Enable SSE3 optimisations")
 AddOption('--x86',dest="x86",action='store_true',default=True,help="Target Intel x86 platform")
 AddOption('--nofft',dest="nofft", action='store_true',default=False,help="Do not use fftw3f for gravity.")
+AddOption('--nolua',dest="nolua", action='store_true',default=False,help="Disable all lua scripting features.")
 
 AddOption('--debugging', dest="debug", action="store_true", default=False, help="Enable debug options")
 AddOption('--beta',dest="beta",action='store_true',default=False,help="Beta build.")
@@ -90,15 +91,16 @@ if not GetOption("macosx"):
 				env.Append(CPPPATH=[GetOption("sdl-dir")])
 
 	#Find correct lua include dir
-	try:
-		env.ParseConfig('pkg-config --cflags lua5.1')
-	except:
-		if(GetOption("lua-dir")):
-			if not conf.CheckCHeader(GetOption("lua-dir") + '/lua.h'):
-				print "lua5.1 headers not found or not installed"
-				raise SystemExit(1)
-			else:
-				env.Append(CPPPATH=[GetOption("lua-dir")])
+	if not GetOption("nolua"):
+		try:
+			env.ParseConfig('pkg-config --cflags lua5.1')
+		except:
+			if(GetOption("lua-dir")):
+				if not conf.CheckCHeader(GetOption("lua-dir") + '/lua.h'):
+					print "lua5.1 headers not found or not installed"
+					raise SystemExit(1)
+				else:
+					env.Append(CPPPATH=[GetOption("lua-dir")])
 
 	if not GetOption('nofft'):
 		#Check for FFT lib
@@ -121,7 +123,7 @@ if not GetOption("macosx"):
 		raise SystemExit(1)
 
 	#Check for Lua lib
-	if not GetOption("macosx"):
+	if not GetOption("macosx") and not GetOption("nolua"):
 		if not conf.CheckLib('lua5.1') and not conf.CheckLib('lua-5.1') and not conf.CheckLib('lua51') and not conf.CheckLib('lua'):
 			print "liblua not found or not installed"
 			raise SystemExit(1)
@@ -135,9 +137,11 @@ else:
 env.Append(CPPPATH=['src/', 'data/', 'generated/'])
 env.Append(CCFLAGS=['-w', '-std=c++98', '-fkeep-inline-functions'])
 env.Append(LIBS=['pthread', 'm'])
-env.Append(CPPDEFINES=["LUACONSOLE", "_GNU_SOURCE", "USE_STDINT", "_POSIX_C_SOURCE=200112L"])
+env.Append(CPPDEFINES=["_GNU_SOURCE", "USE_STDINT", "_POSIX_C_SOURCE=200112L"])
 if not GetOption('nofft'):
 	env.Append(CPPDEFINES=["GRAVFFT"])
+if not GetOption('nolua'):
+	env.Append(CPPDEFINED=["LUACONSOLE"])
 if GetOption("ptw32-static"):
 	env.Append(CPPDEFINES=['PTW32_STATIC_LIB']);
 
@@ -267,7 +271,8 @@ sources+=Glob("src/gui/*/*.cpp")
 sources+=Glob("src/simulation/elements/*.cpp")
 sources+=Glob("src/simulation/tools/*.cpp")
 sources+=Glob("src/client/requestbroker/*.cpp")
-sources+=Glob("src/socket/*.c")
+if not GetOption('nolua'):
+	sources+=Glob("src/socket/*.c")
 
 #for source in sources:
 #	print str(source)

src/Activity.h

@@ -39,4 +39,4 @@ public:
 		}
 	}
 	virtual ~WindowActivity() {}
-};
+};

src/Format.cpp

@@ -433,4 +433,4 @@ unsigned long update_crc(unsigned long crc, unsigned char *buf, int len)
 unsigned long format::CalculateCRC(unsigned char * data, int len)
 {
 	return update_crc(0xffffffffL, data, len) ^ 0xffffffffL;
-}
+}

src/Format.h

@@ -35,4 +35,4 @@ namespace format
 	std::vector<char> VideoBufferToPTI(const VideoBuffer & vidBuf);
 	VideoBuffer * PTIToVideoBuffer(std::vector<char> & data);
 	unsigned long CalculateCRC(unsigned char * data, int length);
-}
+}

src/cajun/reader.h

@@ -145,4 +145,4 @@ private:
 } // End namespace
 
 
-//#include "reader.inl"
+//#include "reader.inl"

src/cajun/writer.h

@@ -75,4 +75,4 @@ private:
 } // End namespace
 
 
-//#include "writer.inl"
+//#include "writer.inl"

src/cat/LegacyLuaAPI.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 #include <string>
 #include <iomanip>
 #include <vector>
@@ -1739,7 +1740,7 @@ int luatpt_message_box(lua_State* l)
 {
 	std::string title = std::string(luaL_optstring(l, 1, "Title"));
 	std::string message = std::string(luaL_optstring(l, 2, "Message"));
-	int large = luaL_optint(l, 3, 0);
+	int large = lua_toboolean(l, 3);
 	new InformationMessage(title, message, large);
 	return 0;
 }
@@ -1983,4 +1984,4 @@ int luatpt_screenshot(lua_State* l)
 	Client::Ref().WriteFile(data, filename.str());
 	return 0;
 }
-
+#endif

src/cat/LuaBit.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 /*
 ** Lua BitOp -- a bit operations library for Lua 5.1/5.2.
 ** http://bitop.luajit.org/
@@ -189,4 +190,4 @@ int luaopen_bit(lua_State *L)
 #endif
   return 1;
 }
-
+#endif

src/cat/LuaButton.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -111,4 +112,5 @@ void LuaButton::triggerAction()
 
 LuaButton::~LuaButton()
 {
-}
+}
+#endif

src/cat/LuaButton.h

@@ -30,4 +30,4 @@ public:
 
 	LuaButton(lua_State * l);
 	~LuaButton();
-};
+};

src/cat/LuaCheckbox.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -109,4 +110,5 @@ void LuaCheckbox::triggerAction()
 
 LuaCheckbox::~LuaCheckbox()
 {
-}
+}
+#endif

src/cat/LuaCheckbox.h

@@ -30,4 +30,4 @@ public:
 
 	LuaCheckbox(lua_State * l);
 	~LuaCheckbox();
-};
+};

src/cat/LuaComponent.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -79,4 +80,5 @@ LuaComponent::~LuaComponent()
 	if(component->GetParentWindow())
 		component->GetParentWindow()->RemoveComponent(component);
 	delete component;
-}
+}
+#endif

src/cat/LuaComponent.h

@@ -30,4 +30,4 @@ public:
 	ui::Component * GetComponent() { return component; }
 	LuaComponent(lua_State * l);
 	~LuaComponent();
-};
+};

src/cat/LuaLabel.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -52,4 +53,5 @@ int LuaLabel::text(lua_State * l)
 
 LuaLabel::~LuaLabel()
 {
-}
+}
+#endif

src/cat/LuaLabel.h

@@ -26,4 +26,4 @@ public:
 
 	LuaLabel(lua_State * l);
 	~LuaLabel();
-};
+};

src/cat/LuaLuna.h

@@ -157,4 +157,4 @@ private:
 		lua_pushfstring(L, "%s (%s)", T::className, buff);
 		return 1;
 	}
-};
+};

src/cat/LuaProgressBar.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -68,4 +69,5 @@ int LuaProgressBar::status(lua_State * l)
 
 LuaProgressBar::~LuaProgressBar()
 {
-}
+}
+#endif

src/cat/LuaProgressBar.h

@@ -27,4 +27,4 @@ public:
 
 	LuaProgressBar(lua_State * l);
 	~LuaProgressBar();
-};
+};

src/cat/LuaScriptInterface.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 #include <string>
 #include <iomanip>
 #include <vector>
@@ -2201,3 +2202,4 @@ std::string LuaScriptInterface::FormatCommand(std::string command)
 LuaScriptInterface::~LuaScriptInterface() {
 	delete legacy;
 }
+#endif

src/cat/LuaSlider.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -109,4 +110,5 @@ void LuaSlider::triggerOnValueChanged()
 
 LuaSlider::~LuaSlider()
 {
-}
+}
+#endif

src/cat/LuaSlider.h

@@ -30,4 +30,4 @@ public:
 
 	LuaSlider(lua_State * l);
 	~LuaSlider();
-};
+};

src/cat/LuaTextbox.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -112,4 +113,5 @@ int LuaTextbox::text(lua_State * l)
 
 LuaTextbox::~LuaTextbox()
 {
-}
+}
+#endif

src/cat/LuaTextbox.h

@@ -30,4 +30,4 @@ public:
 
 	LuaTextbox(lua_State * l);
 	~LuaTextbox();
-};
+};

src/cat/LuaWindow.cpp

@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -590,4 +591,5 @@ LuaWindow::~LuaWindow()
 	if(ui::Engine::Ref().GetWindow() == window)
 		ui::Engine::Ref().CloseWindow();
 	delete window;
-}
+}
+#endif

src/cat/LuaWindow.h

@@ -79,4 +79,4 @@ public:
 	ui::Window * GetWindow() { return window; }
 	LuaWindow(lua_State * l);
 	~LuaWindow();
-};
+};

src/client/requestbroker/APIRequest.cpp

@@ -134,4 +134,4 @@ void APIRequest::Cleanup()
 		Parser->Cleanup(ResultObject);
 		ResultObject = NULL;
 	}
-}
+}

src/client/requestbroker/APIResultParser.h

@@ -13,4 +13,4 @@ public:
 	virtual ~APIResultParser() { }
 };
 
-#endif
+#endif

src/client/requestbroker/ImageRequest.cpp

@@ -147,4 +147,4 @@ void ImageRequest::Cleanup()
 		delete ((VideoBuffer*)ResultObject);
 		ResultObject = NULL;
 	}
-}
+}

src/client/requestbroker/ImageRequest.h

@@ -11,4 +11,4 @@ public:
 	virtual RequestBroker::ProcessResponse Process(RequestBroker & rb);
 	virtual ~ImageRequest();
 	virtual void Cleanup();
-};
+};

src/client/requestbroker/RequestBroker.cpp

@@ -309,4 +309,4 @@ void RequestBroker::Request::Cleanup()
 		(*iter)->Cleanup();
 		iter++;
 	}
-}
+}

src/client/requestbroker/RequestBroker.h

@@ -75,4 +75,4 @@ public:
 		virtual ~Request();
 		virtual void Cleanup();
 	};
-};
+};

src/client/requestbroker/ThumbRenderRequest.cpp

@@ -50,4 +50,4 @@ void ThumbRenderRequest::Cleanup()
 		delete ((VideoBuffer*)ResultObject);
 		ResultObject = NULL;
 	}
-}
+}

src/debug/DebugInfo.h

@@ -6,4 +6,4 @@ class DebugInfo
 {
 public:
 	virtual void Draw(ui::Point position) {}
-};
+};

src/debug/ElementPopulation.cpp

@@ -81,4 +81,4 @@ void ElementPopulationDebug::Draw(ui::Point position)
 ElementPopulationDebug::~ElementPopulationDebug()
 {
 
-}
+}

src/debug/ElementPopulation.h

@@ -11,4 +11,4 @@ public:
 	ElementPopulationDebug(Simulation * sim);
 	virtual void Draw(ui::Point position);
 	virtual ~ElementPopulationDebug();
-};
+};

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);

src/gui/dialogues/LegacyDialogues.h

@@ -8,4 +8,4 @@ void ErrorUI(std::string title, std::string message) {}
 
 void InformationUI(std::string title, std::string message) {}
 
-std::string MessagePromptUI(std::string title, std::string message, std::string text, std::string placeholder) {}
+std::string MessagePromptUI(std::string title, std::string message, std::string text, std::string placeholder) {}

src/gui/filebrowser/FileBrowserActivity.cpp

@@ -333,4 +333,4 @@ FileBrowserActivity::~FileBrowserActivity()
 {
 	if(callback)
 		delete callback;
-}
+}

src/gui/filebrowser/FileBrowserActivity.h

@@ -62,4 +62,4 @@ public:
 	virtual void NotifyError(Task * task);
 	virtual void NotifyProgress(Task * task);
 	virtual void NotifyStatus(Task * task);
-};
+};

src/gui/game/GameController.cpp

@@ -145,8 +145,12 @@ GameController::GameController():
 	gameView->AttachController(this);
 	gameModel->AddObserver(gameView);
 
-	commandInterface = new LuaScriptInterface(this, gameModel);//new TPTScriptInterface();
+#ifdef LUACONSOLE
+	commandInterface = new LuaScriptInterface(this, gameModel);
 	((LuaScriptInterface*)commandInterface)->SetWindow(gameView);
+#else
+	commandInterface = new TPTScriptInterface(this, gameModel);
+#endif
 
 	commandInterface->OnBrushChanged(gameModel->GetBrushID(), gameModel->GetBrush()->GetRadius().X, gameModel->GetBrush()->GetRadius().X);
 	ActiveToolChanged(0, gameModel->GetActiveTool(0));
@@ -706,7 +710,9 @@ void GameController::Tick()
 {
 	if(firstTick)
 	{
+#ifdef LUACONSOLE
 		((LuaScriptInterface*)commandInterface)->Init();
+#endif
 		if(!Client::Ref().GetPrefBool("InstallCheck", false))
 		{
 			Client::Ref().SetPref("InstallCheck", true);

src/gui/game/GameController.h

@@ -14,8 +14,11 @@
 #include "gui/console/ConsoleController.h"
 #include "gui/localbrowser/LocalBrowserController.h"
 #include "gui/options/OptionsController.h"
-//#include "cat/TPTScriptInterface.h"
+#ifdef LUACONSOLE
 #include "cat/LuaScriptInterface.h"
+#else
+#include "cat/TPTScriptInterface.h"
+#endif
 #include "client/ClientListener.h"
 #include "RenderPreset.h"
 #include "Menu.h"

src/gui/game/PropertyTool.cpp

@@ -232,4 +232,4 @@ void PropertyWindow::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl
 void PropertyTool::Click(Simulation * sim, Brush * brush, ui::Point position)
 {
 	new PropertyWindow(this, sim, position);
-}
+}

src/gui/game/RenderPreset.h

@@ -16,4 +16,4 @@ public:
 		ColourMode(colourMode)
 	{}
 };
-#endif
+#endif

src/gui/game/Tool.cpp

@@ -212,4 +212,4 @@ void Element_TESC_Tool::DrawFill(Simulation * sim, Brush * brush, ui::Point posi
 void PlopTool::Click(Simulation * sim, Brush * brush, ui::Point position)
 {
 	sim->create_part(-1, position.X, position.Y, toolID);
-}
+}

src/gui/interface/ContextMenu.cpp

@@ -96,4 +96,4 @@ void ContextMenu::OnDraw()
 	Graphics * g = ui::Engine::Ref().g;
 	g->fillrect(Position.X, Position.Y, Size.X, Size.Y, 100, 100, 100, 255);
 	g->drawrect(Position.X, Position.Y, Size.X, Size.Y, Appearance.BackgroundInactive.Red, Appearance.BackgroundInactive.Green, Appearance.BackgroundInactive.Blue, Appearance.BackgroundInactive.Alpha);
-}
+}

src/gui/interface/ContextMenu.h

@@ -37,4 +37,4 @@ public:
 };
 }
 
-#endif
+#endif

src/gui/interface/LuaProgressBar.h

@@ -27,4 +27,4 @@ public:
 
 	LuaProgressBar(lua_State * l);
 	~LuaProgressBar();
-};
+};

src/gui/interface/ProgressBar.cpp

@@ -78,4 +78,4 @@ void ProgressBar::Tick(float dt)
 	intermediatePos += 1.0f*dt;
 	if(intermediatePos>100.0f)
 		intermediatePos = 0.0f;
-}
+}

src/gui/interface/ScrollPanel.cpp

@@ -170,4 +170,4 @@ void ScrollPanel::XTick(float dt)
 		scrollBarWidth++;
 	else if(!mouseInside && scrollBarWidth > 0 && !scrollbarSelected)
 		scrollBarWidth--;
-}
+}

src/gui/interface/ScrollPanel.h

@@ -29,4 +29,4 @@ namespace ui
 		virtual void XOnMouseUp(int x, int y, unsigned int button);
 		virtual void XOnMouseMoved(int localx, int localy, int dx, int dy);
 	};
-}
+}

src/gui/save/LocalSaveActivity.cpp

@@ -142,4 +142,4 @@ LocalSaveActivity::~LocalSaveActivity()
 		delete thumbnail;
 	if(callback)
 		delete callback;
-}
+}

src/gui/save/LocalSaveActivity.h

@@ -36,4 +36,4 @@ public:
 	virtual void OnDraw();
 	virtual void OnResponseReady(void * imagePtr);
 	virtual ~LocalSaveActivity();
-};
+};

src/gui/save/ServerSaveActivity.h

@@ -49,4 +49,4 @@ protected:
 	friend class CancelAction;
 	friend class SaveAction;
 	friend class RulesAction;
-};
+};

src/pim/Generator.cpp

@@ -515,4 +515,4 @@ namespace pim
 		}
 
 	}
-}
+}

src/pim/Generator.h

@@ -175,4 +175,4 @@ namespace pim
 			void Return();
 		};
 	}
-}
+}

src/pim/Machine.h

@@ -117,4 +117,4 @@ namespace pim
 			return word;
 		} 
 	};
-}
+}

src/pim/Opcodes.h

@@ -9,4 +9,4 @@ namespace pim
 			#undef OPDEF
 		};
 	};
-}
+}

src/pim/Parser.cpp

@@ -650,4 +650,4 @@ namespace pim
 				throw ParserExpectException(token, symbol);
 		}
 	}
-}
+}

src/pim/Parser.h

@@ -76,4 +76,4 @@ namespace pim
 			std::vector<unsigned char> Compile();
 		};
 	}
-}
+}

src/pim/Scanner.cpp

@@ -196,4 +196,4 @@ namespace pim
 				cChar = 0;
 		}
 	}
-}
+}

src/pim/Scanner.h

@@ -19,4 +19,4 @@ namespace pim
 			Token NextToken();
 		};
 	}
-}
+}

src/pim/Token.cpp

@@ -48,4 +48,4 @@ namespace pim
 			"INVALID SYMBOL"
 		};
 	}
-}
+}

src/pim/Token.h

@@ -80,4 +80,4 @@ namespace pim
 			}
 		};
 	}
-}
+}

src/powdertoyjava/OpenGLCanvasMacOS.h

@@ -32,4 +32,4 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif
+#endif

src/resampler/resampler.cpp

@@ -1221,4 +1221,4 @@ char* Resampler::get_filter_name(int filter_num)
       return g_filters[filter_num].name;
 }
 
-#endif
+#endif

src/simulation/Sample.h

@@ -26,4 +26,4 @@ public:
 	SimulationSample() : PositionX(0), PositionY(0), ParticleID(0), particle(), AirPressure(0), AirVelocityX(0), AirVelocityY(0), WallType(0), Gravity(0), GravityVelocityX(0), GravityVelocityY(0), AirTemperature(0), NumParts(0) {}
 };
 
-#endif
+#endif

src/simulation/Simulation.cpp

@@ -24,8 +24,10 @@
 #include "Snapshot.h"
 //#include "StorageClasses.h"
 
+#ifdef LUACONSOLE
 #include "cat/LuaScriptInterface.h"
 #include "cat/LuaScriptHelper.h"
+#endif
 
 int Simulation::Load(GameSave * save)
 {
@@ -4196,7 +4198,11 @@ void Simulation::update_particles_i(int start, int inc)
 			}
 
 			//call the particle update function, if there is one
+#if !defined(RENDERER) && defined(LUACONSOLE)
 			if (elements[t].Update && lua_el_mode[t] != 2)
+#else
+			if (elements[t].Update)
+#endif
 			{
 				if ((*(elements[t].Update))(this, i, x, y, surround_space, nt, parts, pmap))
 					continue;
@@ -4207,6 +4213,7 @@ void Simulation::update_particles_i(int start, int inc)
 					y = (int)(parts[i].y+0.5f);
 				}
 			}
+#if !defined(RENDERER) && defined(LUACONSOLE)
 			if(lua_el_mode[t])
 			{
 				if(luacon_elementReplacement(this, i, x, y, surround_space, nt, parts, pmap))
@@ -4215,6 +4222,7 @@ void Simulation::update_particles_i(int start, int inc)
 				x = (int)(parts[i].x+0.5f);
 				y = (int)(parts[i].y+0.5f);
 			}
+#endif
 
 			if(legacy_enable)//if heat sim is off
 				Element::legacyUpdate(this, i,x,y,surround_space,nt, parts, pmap);

src/simulation/Snapshot.h

@@ -57,4 +57,4 @@ public:
 	{
 
 	}
-};
+};

src/simulation/StorageClasses.h

@@ -51,4 +51,4 @@ typedef struct part_type part_type;*/
 };
 typedef struct part_transition part_transition;*/
 
-#endif
+#endif

src/simulation/elements/116.cpp

@@ -46,4 +46,4 @@ Element_116::Element_116()
 	
 }
 
-Element_116::~Element_116() {}
+Element_116::~Element_116() {}

src/simulation/elements/146.cpp

@@ -46,4 +46,4 @@ Element_146::Element_146()
 	
 }
 
-Element_146::~Element_146() {}
+Element_146::~Element_146() {}

src/simulation/elements/BGLA.cpp

@@ -46,4 +46,4 @@ Element_BGLA::Element_BGLA()
 	
 }
 
-Element_BGLA::~Element_BGLA() {}
+Element_BGLA::~Element_BGLA() {}

src/simulation/elements/BHOL.cpp

@@ -46,4 +46,4 @@ Element_BHOL::Element_BHOL()
 	
 }
 
-Element_BHOL::~Element_BHOL() {}
+Element_BHOL::~Element_BHOL() {}

src/simulation/elements/BRAY.cpp

@@ -106,4 +106,4 @@ int Element_BRAY::graphics(GRAPHICS_FUNC_ARGS)
 }
 
 
-Element_BRAY::~Element_BRAY() {}
+Element_BRAY::~Element_BRAY() {}

src/simulation/elements/BRCK.cpp

@@ -62,4 +62,4 @@ int Element_BRCK::graphics(GRAPHICS_FUNC_ARGS)
 	return 0;  
 }
 
-Element_BRCK::~Element_BRCK() {}
+Element_BRCK::~Element_BRCK() {}

src/simulation/elements/BVBR.cpp

@@ -47,4 +47,4 @@ Element_BVBR::Element_BVBR()
 	
 }
 
-Element_BVBR::~Element_BVBR() {}
+Element_BVBR::~Element_BVBR() {}

src/simulation/elements/CAUS.cpp

@@ -83,4 +83,4 @@ int Element_CAUS::update(UPDATE_FUNC_ARGS)
 }
 
 
-Element_CAUS::~Element_CAUS() {}
+Element_CAUS::~Element_CAUS() {}

src/simulation/elements/CFLM.cpp

@@ -72,4 +72,4 @@ int Element_CFLM::graphics(GRAPHICS_FUNC_ARGS)
 }
 
 
-Element_CFLM::~Element_CFLM() {}
+Element_CFLM::~Element_CFLM() {}

src/simulation/elements/CNCT.cpp

@@ -46,4 +46,4 @@ Element_CNCT::Element_CNCT()
 	
 }
 
-Element_CNCT::~Element_CNCT() {}
+Element_CNCT::~Element_CNCT() {}

src/simulation/elements/DESL.cpp

@@ -46,4 +46,4 @@ Element_DESL::Element_DESL()
 	
 }
 
-Element_DESL::~Element_DESL() {}
+Element_DESL::~Element_DESL() {}

src/simulation/elements/DMND.cpp

@@ -46,4 +46,4 @@ Element_DMND::Element_DMND()
 	
 }
 
-Element_DMND::~Element_DMND() {}
+Element_DMND::~Element_DMND() {}

src/simulation/elements/DRIC.cpp

@@ -46,4 +46,4 @@ Element_DRIC::Element_DRIC()
 	
 }
 
-Element_DRIC::~Element_DRIC() {}
+Element_DRIC::~Element_DRIC() {}

src/simulation/elements/DUST.cpp

@@ -46,4 +46,4 @@ Element_DUST::Element_DUST()
 	Graphics = NULL;
 }
 
-Element_DUST::~Element_DUST() {}
+Element_DUST::~Element_DUST() {}

src/simulation/elements/DYST.cpp

@@ -46,4 +46,4 @@ Element_DYST::Element_DYST()
 	
 }
 
-Element_DYST::~Element_DYST() {}
+Element_DYST::~Element_DYST() {}

src/simulation/elements/ETRD.cpp

@@ -46,4 +46,4 @@ Element_ETRD::Element_ETRD()
 	
 }
 
-Element_ETRD::~Element_ETRD() {}
+Element_ETRD::~Element_ETRD() {}

src/simulation/elements/FRME.cpp

@@ -57,4 +57,4 @@ int Element_FRME::graphics(GRAPHICS_FUNC_ARGS)
 	return 0;
 }
 
-Element_FRME::~Element_FRME() {}
+Element_FRME::~Element_FRME() {}

src/simulation/elements/GLAS.cpp

@@ -59,4 +59,4 @@ int Element_GLAS::update(UPDATE_FUNC_ARGS)
 }
 
 
-Element_GLAS::~Element_GLAS() {}
+Element_GLAS::~Element_GLAS() {}

src/simulation/elements/GOO.cpp

@@ -61,4 +61,4 @@ int Element_GOO::update(UPDATE_FUNC_ARGS)
 }
 
 
-Element_GOO::~Element_GOO() {}
+Element_GOO::~Element_GOO() {}

src/simulation/elements/GUNP.cpp

@@ -46,4 +46,4 @@ Element_GUNP::Element_GUNP()
 	
 }
 
-Element_GUNP::~Element_GUNP() {}
+Element_GUNP::~Element_GUNP() {}

src/simulation/elements/INSL.cpp

@@ -46,4 +46,4 @@ Element_INSL::Element_INSL()
 	
 }
 
-Element_INSL::~Element_INSL() {}
+Element_INSL::~Element_INSL() {}

src/simulation/elements/INST.cpp

@@ -46,4 +46,4 @@ Element_INST::Element_INST()
 	
 }
 
-Element_INST::~Element_INST() {}
+Element_INST::~Element_INST() {}

src/simulation/elements/INWR.cpp

@@ -46,4 +46,4 @@ Element_INWR::Element_INWR()
 	
 }
 
-Element_INWR::~Element_INWR() {}
+Element_INWR::~Element_INWR() {}

src/simulation/elements/LIFE.cpp

@@ -128,4 +128,4 @@ int Element_LIFE::graphics(GRAPHICS_FUNC_ARGS)
 }
 
 
-Element_LIFE::~Element_LIFE() {}
+Element_LIFE::~Element_LIFE() {}

src/simulation/elements/LNTG.cpp

@@ -46,4 +46,4 @@ Element_LNTG::Element_LNTG()
 	
 }
 
-Element_LNTG::~Element_LNTG() {}
+Element_LNTG::~Element_LNTG() {}

src/simulation/elements/LO2.cpp

@@ -46,4 +46,4 @@ Element_LO2::Element_LO2()
 	
 }
 
-Element_LO2::~Element_LO2() {}
+Element_LO2::~Element_LO2() {}

src/simulation/elements/LOLZ.cpp

@@ -61,4 +61,4 @@ int Element_LOLZ::RuleTable[9][9] =
 //#TPT-Directive ElementHeader Element_LOLZ static int lolz[XRES/9][YRES/9];
 int Element_LOLZ::lolz[XRES/9][YRES/9];
 
-Element_LOLZ::~Element_LOLZ() {}
+Element_LOLZ::~Element_LOLZ() {}

src/simulation/elements/LOVE.cpp

@@ -61,4 +61,4 @@ int Element_LOVE::RuleTable[9][9] =
 //#TPT-Directive ElementHeader Element_LOVE static int love[XRES/9][YRES/9];
 int Element_LOVE::love[XRES/9][YRES/9];
 
-Element_LOVE::~Element_LOVE() {}
+Element_LOVE::~Element_LOVE() {}

src/simulation/elements/LRBD.cpp

@@ -46,4 +46,4 @@ Element_LRBD::Element_LRBD()
 	
 }
 
-Element_LRBD::~Element_LRBD() {}
+Element_LRBD::~Element_LRBD() {}

src/simulation/elements/METL.cpp

@@ -46,4 +46,4 @@ Element_METL::Element_METL()
 	
 }
 
-Element_METL::~Element_METL() {}
+Element_METL::~Element_METL() {}