Some folder changes, started search and client

Makefile

@@ -5,8 +5,8 @@ OBJS += $(patsubst src/%.cpp,build/obj/powder.exe/%.o,$(SOURCES))
 
 FOLDERS := $(sort $(dir $(OBJS)))
 
-CFLAGS := -Wno-deprecated -Wno-deprecated-declarations -Isrc/ -Idata/ -DWIN32 -DWINCONSOLE
-OFLAGS := -O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations -msse2 -fkeep-inline-functions
+CFLAGS := -w -Isrc/ -Idata/ -DWIN32 -DWINCONSOLE
+OFLAGS := -fkeep-inline-functions #-O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations -msse2
 LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 # -mwindows
 
 CFLAGS += $(OFLAGS)

PowderToy++.files

@@ -140,7 +140,6 @@ includes/Console.h
 includes/interface/Engine.h
 includes/interface/Platform.h
 src/interface/State.cpp
-src/interface/Sandbox.cpp
 src/interface/Panel.cpp
 src/interface/Engine.cpp
 src/interface/ControlFactory.cpp
@@ -290,7 +289,6 @@ src/elements/acid.cpp
 src/elements/acel.cpp
 src/interface/Window.h
 src/interface/State.h
-src/interface/Sandbox.h
 src/interface/Point.h
 src/interface/Platform.h
 src/interface/Panel.h
@@ -308,3 +306,23 @@ src/interface/Engine.cpp
 src/interface/ControlFactory.cpp
 src/interface/Component.cpp
 src/interface/Button.cpp
+src/interface/SaveButton.h
+src/interface/SaveButton.cpp
+src/client/Client.h
+src/client/Client.cpp
+src/client/HTTP.h
+src/client/HTTP.c
+src/client/HTTP.cpp
+src/client/MD5.cpp
+src/client/MD5.h
+src/search/Thumbnail.h
+src/simulation/Simulation.h
+src/simulation/Gravity.h
+src/simulation/Elements.h
+src/simulation/ElementGraphics.h
+src/simulation/ElementFunctions.h
+src/simulation/Element.h
+src/simulation/Air.h
+src/simulation/Simulation.cpp
+src/simulation/Gravity.cpp
+src/simulation/Air.cpp

src/Console.h

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "interface/Sandbox.h"
-#include "Simulation.h"
+#include "simulation/Simulation.h"
 
 class ConsoleCommand
 {

src/Graphics.cpp

@@ -19,13 +19,13 @@
 #endif
 
 #include "Config.h"
-#include "air.h"
-#include "gravity.h"
+//#include "simulation/Air.h"
+//#include "simulation/Gravity.h"
 //#include "powder.h"
-#define INCLUDE_PSTRUCT
-#include "Simulation.h"
-#include "Graphics.h"
-#include "ElementGraphics.h"
+//#define INCLUDE_PSTRUCT
+//#include "Simulation.h"
+//#include "Graphics.h"
+//#include "ElementGraphics.h"
 #define INCLUDE_FONTDATA
 #include "font.h"
 #include "misc.h"
@@ -1501,6 +1501,15 @@ void Graphics::draw_image(pixel *img, int x, int y, int w, int h, int a)
 {
 	int i, j, r, g, b;
 	if (!img) return;
+	if(y + h > YRES+MENUSIZE) h = (YRES+MENUSIZE)-y; //Adjust height to prevent drawing off the bottom
+	if(a >= 255)
+		for (j=0; j<h; j++)
+			for (i=0; i<w; i++)
+			{
+				vid[(y+j)*(XRES+BARSIZE)+(x+i)] = *img;
+				img++;
+			}
+	else
 		for (j=0; j<h; j++)
 			for (i=0; i<w; i++)
 			{

src/Misc.h

@@ -3,6 +3,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+enum HorizontalAlignment
+{
+	AlignLeft, AlignCentre, AlignRight
+};
+
+enum VerticalAlignment
+{
+	AlignTop, AlignMiddle, AlignBottom
+};
+
 #if defined(WIN32) && !defined(__GNUC__)
 #define x86_cpuid(func,af,bf,cf,df) \
 	do {\

src/PowderToy.cpp

@@ -6,10 +6,7 @@
 #include <string>
 #include "Config.h"
 #include "Global.h"
-#include "Simulation.h"
-#include "Renderer.h"
 #include "Graphics.h"
-#include "Air.h"
 
 #include "interface/Engine.h"
 #include "interface/Button.h"
@@ -22,6 +19,8 @@
 #include "game/GameController.h"
 #include "game/GameView.h"
 
+#include "client/HTTP.h"
+
 using namespace std;
 
 SDL_Surface * SDLOpen()

src/Renderer.cpp

@@ -9,10 +9,10 @@
 #include "Config.h"
 #include "Renderer.h"
 #include "Graphics.h"
-#include "Elements.h"
-#include "ElementFunctions.h"
-#include "ElementGraphics.h"
-#include "Air.h"
+#include "simulation/Elements.h"
+#include "simulation/ElementFunctions.h"
+#include "simulation/ElementGraphics.h"
+#include "simulation/Air.h"
 extern "C"
 {
 #include "hmap.h"

src/Renderer.h

@@ -2,7 +2,7 @@
 #define RENDERER_H
 
 #include "Config.h"
-#include "Simulation.h"
+#include "simulation/Simulation.h"
 #include "Graphics.h"
 
 class Simulation;

src/client/Client.cpp

@@ -0,0 +1,133 @@
+#include <stdlib.h>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include "Config.h"
+#include "Client.h"
+#include "interface/Point.h"
+#include "Graphics.h"
+
+/*
+ static Thumbnail* thumbnailCache[120];
+ static void * activeThumbRequests[5];
+ static int activeThumbRequestTimes[5];
+ static std::string activeThumbRequestIDs[5];
+*/
+
+Client::Client()
+{
+	int i = 0;
+	http_init(NULL);
+	for(i = 0; i < 120; i++)
+	{
+		thumbnailCache[i] = NULL;
+	}
+	for(i = 0; i < 5; i++)
+	{
+		activeThumbRequests[i] = NULL;
+		activeThumbRequestTimes[i] = 0;
+	}
+}
+
+Client::~Client()
+{
+	http_done();
+}
+
+void Client::ClearThumbnailRequests()
+{
+	for(int i = 0; i < 5; i++)
+	{
+		if(activeThumbRequests[i])
+		{
+			http_async_req_close(activeThumbRequests[i]);
+			activeThumbRequests[i] = NULL;
+		}
+	}
+}
+
+Thumbnail * Client::GetThumbnail(int saveID, int saveDate)
+{
+	std::stringstream urlStream;
+	std::stringstream idStream;
+	int i = 0;
+	for(i = 0; i < 120; i++)
+	{
+		if(thumbnailCache[i] && thumbnailCache[i]->ID == saveID && thumbnailCache[i]->Datestamp == saveDate)
+			return thumbnailCache[i];
+	}
+	urlStream << "http://" << SERVER  << "/Get.api?Op=thumbsmall&ID=" << saveID;
+	if(saveDate)
+	{
+		urlStream << "&Date=" << saveDate;
+	}
+	idStream << saveID << ":" << saveDate;
+	std::string idString = idStream.str();
+	bool found = false;
+	for(i = 0; i < 5; i++)
+	{
+		if(activeThumbRequests[i] && activeThumbRequestIDs[i] == idString)
+		{
+			found = true;
+			if(http_async_req_status(activeThumbRequests[i]))
+			{
+				pixel * thumbData;
+				char * data;
+				int status, data_size, imgw, imgh;
+				data = http_async_req_stop(activeThumbRequests[i], &status, &data_size);
+				activeThumbRequests[i] = NULL;
+				if (status == 200 && data)
+				{
+					thumbData = Graphics::ptif_unpack(data, data_size, &imgw, &imgh);
+					if(data)
+					{
+						free(data);
+					}
+					thumbnailCacheNextID %= 120;
+					if(thumbnailCache[thumbnailCacheNextID])
+					{
+						delete thumbnailCache[thumbnailCacheNextID];
+					}
+					if(thumbData)
+					{
+						thumbnailCache[thumbnailCacheNextID] = new Thumbnail(saveID, saveDate, thumbData, ui::Point(imgw, imgh));
+					}
+					else
+					{
+						thumbnailCache[thumbnailCacheNextID] = new Thumbnail(saveID, saveDate, (pixel *)malloc((128*128) * PIXELSIZE), ui::Point(128, 128));
+					}
+					return thumbnailCache[thumbnailCacheNextID++];
+				}
+				else
+				{
+					if(data)
+					{
+						free(data);
+					}
+					thumbnailCacheNextID %= 120;
+					if(thumbnailCache[thumbnailCacheNextID])
+					{
+						delete thumbnailCache[thumbnailCacheNextID];
+					}
+					thumbnailCache[thumbnailCacheNextID] = new Thumbnail(saveID, saveDate, (pixel *)malloc((128*128) * PIXELSIZE), ui::Point(128, 128));
+					return thumbnailCache[thumbnailCacheNextID++];
+				}
+			}
+		}
+	}
+	if(!found)
+	{
+		for(i = 0; i < 5; i++)
+		{
+			if(!activeThumbRequests[i])
+			{
+				activeThumbRequests[i] = http_async_req_start(NULL, (char *)urlStream.str().c_str(), NULL, 0, 1);
+				std::cout << "ThumbCache: Requesting " << urlStream.str() << " : " << idString << std::endl;
+				activeThumbRequestIDs[i] = idString;
+				return NULL;
+			}
+		}
+	}
+	//http_async_req_start(http, urlStream.str().c_str(), NULL, 0, 1);
+	return NULL;
+}

src/client/Client.h

@@ -0,0 +1,24 @@
+#ifndef CLIENT_H
+#define CLIENT_H
+
+#include <queue>
+#include "HTTP.h"
+#include "search/Thumbnail.h"
+#include "Singleton.h"
+
+class Client: public Singleton<Client>
+{
+private:
+	int thumbnailCacheNextID;
+	Thumbnail * thumbnailCache[120];
+	void * activeThumbRequests[5];
+	int activeThumbRequestTimes[5];
+	std::string activeThumbRequestIDs[5];
+public:
+	Client();
+	~Client();
+	void ClearThumbnailRequests();
+	Thumbnail * GetThumbnail(int saveID, int saveDate);
+};
+
+#endif // CLIENT_H

src/client/HTTP.h

@@ -0,0 +1,43 @@
+/**
+ * Powder Toy - HTTP Library (Header)
+ *
+ * Copyright (c) 2008 - 2010 Stanislaw Skowronek.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#ifndef HTTP_H
+#define HTTP_H
+
+void http_init(char *proxy);
+void http_done(void);
+
+char *http_simple_get(char *uri, int *ret, int *len);
+char *http_auth_get(char *uri, char *user, char *pass, char * session_id, int *ret, int *len);
+char *http_simple_post(char *uri, char *data, int dlen, int *ret, int *len);
+
+void http_auth_headers(void *ctx, char *user, char *pass, char * session_id);
+
+void *http_async_req_start(void *ctx, char *uri, char *data, int dlen, int keep);
+void http_async_add_header(void *ctx, char *name, char *data);
+int http_async_req_status(void *ctx);
+void http_async_get_length(void *ctx, int *total, int *done);
+char *http_async_req_stop(void *ctx, int *ret, int *len);
+void http_async_req_close(void *ctx);
+
+char *http_multipart_post(char *uri, char **names, char **parts, int *plens, char *user, char *pass, char * session_id, int *ret, int *len);
+
+char *http_ret_text(int ret);
+
+#endif

src/client/MD5.cpp

@@ -0,0 +1,231 @@
+// based on public-domain code from Colin Plumb (1993)
+#include <string.h>
+#include "MD5.h"
+
+static unsigned getu32(const unsigned char *addr)
+{
+	return (((((unsigned long)addr[3] << 8) | addr[2]) << 8) | addr[1]) << 8 | addr[0];
+}
+
+static void putu32(unsigned data, unsigned char *addr)
+{
+	addr[0] = (unsigned char)data;
+	addr[1] = (unsigned char)(data >> 8);
+	addr[2] = (unsigned char)(data >> 16);
+	addr[3] = (unsigned char)(data >> 24);
+}
+
+void md5_init(struct md5_context *ctx)
+{
+	ctx->buf[0] = 0x67452301;
+	ctx->buf[1] = 0xefcdab89;
+	ctx->buf[2] = 0x98badcfe;
+	ctx->buf[3] = 0x10325476;
+
+	ctx->bits[0] = 0;
+	ctx->bits[1] = 0;
+}
+
+void md5_update(struct md5_context *ctx, unsigned char const *buf, unsigned len)
+{
+	unsigned t;
+
+	// update bit count
+	t = ctx->bits[0];
+	if ((ctx->bits[0] = (t + ((unsigned)len << 3)) & 0xffffffff) < t)
+		ctx->bits[1]++; // carry
+	ctx->bits[1] += len >> 29;
+
+	t = (t >> 3) & 0x3f;
+
+	// use leading data to top up the buffer
+
+	if (t)
+	{
+		unsigned char *p = ctx->in + t;
+
+		t = 64-t;
+		if (len < t)
+		{
+			memcpy(p, buf, len);
+			return;
+		}
+		memcpy(p, buf, t);
+		md5_transform(ctx->buf, ctx->in);
+		buf += t;
+		len -= t;
+	}
+
+	// following 64-byte chunks
+
+	while (len >= 64)
+	{
+		memcpy(ctx->in, buf, 64);
+		md5_transform(ctx->buf, ctx->in);
+		buf += 64;
+		len -= 64;
+	}
+
+	// save rest of bytes for later
+
+	memcpy(ctx->in, buf, len);
+}
+
+void md5_final(unsigned char digest[16], struct md5_context *ctx)
+{
+	unsigned count;
+	unsigned char *p;
+
+	// #bytes mod64
+	count = (ctx->bits[0] >> 3) & 0x3F;
+
+	// first char of padding = 0x80
+	p = ctx->in + count;
+	*p++ = 0x80;
+
+	// calculate # of bytes to pad
+	count = 64 - 1 - count;
+
+	// Pad out to 56 mod 64
+	if (count < 8)
+	{
+		// we need to finish a whole block before padding
+		memset(p, 0, count);
+		md5_transform(ctx->buf, ctx->in);
+		memset(ctx->in, 0, 56);
+	}
+	else
+	{
+		// just pad to 56 bytes
+		memset(p, 0, count-8);
+	}
+
+	// append length & final transform
+	putu32(ctx->bits[0], ctx->in + 56);
+	putu32(ctx->bits[1], ctx->in + 60);
+
+	md5_transform(ctx->buf, ctx->in);
+	putu32(ctx->buf[0], digest);
+	putu32(ctx->buf[1], digest + 4);
+	putu32(ctx->buf[2], digest + 8);
+	putu32(ctx->buf[3], digest + 12);
+	memset(ctx, 0, sizeof(ctx));
+}
+
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+#define MD5STEP(f, w, x, y, z, data, s) \
+	( w += f(x, y, z) + data, w &= 0xffffffff, w = w<<s | w>>(32-s), w += x )
+
+void md5_transform(unsigned buf[4], const unsigned char inraw[64])
+{
+	unsigned a, b, c, d;
+	unsigned in[16];
+	int i;
+
+	for (i = 0; i < 16; ++i)
+		in[i] = getu32 (inraw + 4 * i);
+
+	a = buf[0];
+	b = buf[1];
+	c = buf[2];
+	d = buf[3];
+
+	MD5STEP(F1, a, b, c, d, in[ 0]+0xd76aa478,  7);
+	MD5STEP(F1, d, a, b, c, in[ 1]+0xe8c7b756, 12);
+	MD5STEP(F1, c, d, a, b, in[ 2]+0x242070db, 17);
+	MD5STEP(F1, b, c, d, a, in[ 3]+0xc1bdceee, 22);
+	MD5STEP(F1, a, b, c, d, in[ 4]+0xf57c0faf,  7);
+	MD5STEP(F1, d, a, b, c, in[ 5]+0x4787c62a, 12);
+	MD5STEP(F1, c, d, a, b, in[ 6]+0xa8304613, 17);
+	MD5STEP(F1, b, c, d, a, in[ 7]+0xfd469501, 22);
+	MD5STEP(F1, a, b, c, d, in[ 8]+0x698098d8,  7);
+	MD5STEP(F1, d, a, b, c, in[ 9]+0x8b44f7af, 12);
+	MD5STEP(F1, c, d, a, b, in[10]+0xffff5bb1, 17);
+	MD5STEP(F1, b, c, d, a, in[11]+0x895cd7be, 22);
+	MD5STEP(F1, a, b, c, d, in[12]+0x6b901122,  7);
+	MD5STEP(F1, d, a, b, c, in[13]+0xfd987193, 12);
+	MD5STEP(F1, c, d, a, b, in[14]+0xa679438e, 17);
+	MD5STEP(F1, b, c, d, a, in[15]+0x49b40821, 22);
+
+	MD5STEP(F2, a, b, c, d, in[ 1]+0xf61e2562,  5);
+	MD5STEP(F2, d, a, b, c, in[ 6]+0xc040b340,  9);
+	MD5STEP(F2, c, d, a, b, in[11]+0x265e5a51, 14);
+	MD5STEP(F2, b, c, d, a, in[ 0]+0xe9b6c7aa, 20);
+	MD5STEP(F2, a, b, c, d, in[ 5]+0xd62f105d,  5);
+	MD5STEP(F2, d, a, b, c, in[10]+0x02441453,  9);
+	MD5STEP(F2, c, d, a, b, in[15]+0xd8a1e681, 14);
+	MD5STEP(F2, b, c, d, a, in[ 4]+0xe7d3fbc8, 20);
+	MD5STEP(F2, a, b, c, d, in[ 9]+0x21e1cde6,  5);
+	MD5STEP(F2, d, a, b, c, in[14]+0xc33707d6,  9);
+	MD5STEP(F2, c, d, a, b, in[ 3]+0xf4d50d87, 14);
+	MD5STEP(F2, b, c, d, a, in[ 8]+0x455a14ed, 20);
+	MD5STEP(F2, a, b, c, d, in[13]+0xa9e3e905,  5);
+	MD5STEP(F2, d, a, b, c, in[ 2]+0xfcefa3f8,  9);
+	MD5STEP(F2, c, d, a, b, in[ 7]+0x676f02d9, 14);
+	MD5STEP(F2, b, c, d, a, in[12]+0x8d2a4c8a, 20);
+
+	MD5STEP(F3, a, b, c, d, in[ 5]+0xfffa3942,  4);
+	MD5STEP(F3, d, a, b, c, in[ 8]+0x8771f681, 11);
+	MD5STEP(F3, c, d, a, b, in[11]+0x6d9d6122, 16);
+	MD5STEP(F3, b, c, d, a, in[14]+0xfde5380c, 23);
+	MD5STEP(F3, a, b, c, d, in[ 1]+0xa4beea44,  4);
+	MD5STEP(F3, d, a, b, c, in[ 4]+0x4bdecfa9, 11);
+	MD5STEP(F3, c, d, a, b, in[ 7]+0xf6bb4b60, 16);
+	MD5STEP(F3, b, c, d, a, in[10]+0xbebfbc70, 23);
+	MD5STEP(F3, a, b, c, d, in[13]+0x289b7ec6,  4);
+	MD5STEP(F3, d, a, b, c, in[ 0]+0xeaa127fa, 11);
+	MD5STEP(F3, c, d, a, b, in[ 3]+0xd4ef3085, 16);
+	MD5STEP(F3, b, c, d, a, in[ 6]+0x04881d05, 23);
+	MD5STEP(F3, a, b, c, d, in[ 9]+0xd9d4d039,  4);
+	MD5STEP(F3, d, a, b, c, in[12]+0xe6db99e5, 11);
+	MD5STEP(F3, c, d, a, b, in[15]+0x1fa27cf8, 16);
+	MD5STEP(F3, b, c, d, a, in[ 2]+0xc4ac5665, 23);
+
+	MD5STEP(F4, a, b, c, d, in[ 0]+0xf4292244,  6);
+	MD5STEP(F4, d, a, b, c, in[ 7]+0x432aff97, 10);
+	MD5STEP(F4, c, d, a, b, in[14]+0xab9423a7, 15);
+	MD5STEP(F4, b, c, d, a, in[ 5]+0xfc93a039, 21);
+	MD5STEP(F4, a, b, c, d, in[12]+0x655b59c3,  6);
+	MD5STEP(F4, d, a, b, c, in[ 3]+0x8f0ccc92, 10);
+	MD5STEP(F4, c, d, a, b, in[10]+0xffeff47d, 15);
+	MD5STEP(F4, b, c, d, a, in[ 1]+0x85845dd1, 21);
+	MD5STEP(F4, a, b, c, d, in[ 8]+0x6fa87e4f,  6);
+	MD5STEP(F4, d, a, b, c, in[15]+0xfe2ce6e0, 10);
+	MD5STEP(F4, c, d, a, b, in[ 6]+0xa3014314, 15);
+	MD5STEP(F4, b, c, d, a, in[13]+0x4e0811a1, 21);
+	MD5STEP(F4, a, b, c, d, in[ 4]+0xf7537e82,  6);
+	MD5STEP(F4, d, a, b, c, in[11]+0xbd3af235, 10);
+	MD5STEP(F4, c, d, a, b, in[ 2]+0x2ad7d2bb, 15);
+	MD5STEP(F4, b, c, d, a, in[ 9]+0xeb86d391, 21);
+
+	buf[0] += a;
+	buf[1] += b;
+	buf[2] += c;
+	buf[3] += d;
+}
+
+static char hex[] = "0123456789abcdef";
+void md5_ascii(char *result, unsigned char const *buf, unsigned len)
+{
+	struct md5_context md5;
+	unsigned char hash[16];
+	int i;
+
+	if (len==0)
+		len = strlen((char *)buf);
+
+	md5_init(&md5);
+	md5_update(&md5, buf, len);
+	md5_final(hash, &md5);
+
+	for (i=0; i<16; i++)
+	{
+		result[i*2] = hex[(hash[i]>>4)&0xF];
+		result[i*2+1] = hex[hash[i]&0x0F];
+	}
+	result[32] = 0;
+}

src/client/MD5.h

@@ -0,0 +1,18 @@
+#ifndef MD5_H
+#define MD5_H
+
+struct md5_context
+{
+	unsigned buf[4];
+	unsigned bits[2];
+	unsigned char in[64];
+};
+
+void md5_init(struct md5_context *context);
+void md5_update(struct md5_context *context, unsigned char const *buf, unsigned len);
+void md5_final(unsigned char digest[16], struct md5_context *context);
+void md5_transform(unsigned buf[4], const unsigned char in[64]);
+
+void md5_ascii(char *result, unsigned char const *buf, unsigned len);
+
+#endif

src/elements/O2.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_O2(UPDATE_FUNC_ARGS)
 {

src/elements/acel.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ACEL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/acid.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ACID(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, np;

src/elements/amtr.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_AMTR(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/anar.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
  
 int update_ANAR(UPDATE_FUNC_ARGS) {
         int r, rx, ry;

src/elements/aray.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ARAY(UPDATE_FUNC_ARGS) {
 	int r, nxx, nyy, docontinue, nxi, nyi, rx, ry, nr, ry1, rx1;

src/elements/bang.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BANG(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, nb;

src/elements/bcln.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BCLN(UPDATE_FUNC_ARGS) {
 	if (!parts[i].life && sim->pv[y/CELL][x/CELL]>4.0f)

src/elements/bcol.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BCOL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, temp;

src/elements/bizr.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 //Used by ALL 3 BIZR states
 int update_BIZR(UPDATE_FUNC_ARGS) {

src/elements/bmtl.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BMTL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, tempFactor;

src/elements/bomb.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BOMB(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, nb;

src/elements/boyl.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BOYL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/brmt.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BRMT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, tempFactor;

src/elements/btry.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_BTRY(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt;

src/elements/c5.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_C5(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/caus.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CAUS(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, np;

src/elements/cbnw.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CBNW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, oldt;

src/elements/clne.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CLNE(UPDATE_FUNC_ARGS) {
 	if (parts[i].ctype<=0 || parts[i].ctype>=PT_NUM || (parts[i].ctype==PT_LIFE && (parts[i].tmp<0 || parts[i].tmp>=NGOLALT)))

src/elements/clst.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CLST(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/co2.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CO2(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/coal.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_COAL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, temp;

src/elements/conv.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_CONV(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/dest.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_DEST(UPDATE_FUNC_ARGS) {
 	int r,rx,ry,topv;

src/elements/deut.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_DEUT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, np;

src/elements/dlay.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_DLAY(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, oldl;

src/elements/dstw.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_DSTW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/elec.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ELEC(UPDATE_FUNC_ARGS) {
 	int r, rt, rx, ry, nb, rrx, rry;

src/elements/elementmisc.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_MISC(UPDATE_FUNC_ARGS) {
 	/*int t = parts[i].type;

src/elements/emp.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_EMP(UPDATE_FUNC_ARGS) {
 	int r,rx,ry,ok=0,t,n,nx,ny;

src/elements/figh.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FIGH(UPDATE_FUNC_ARGS)
 {

src/elements/fire.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int graphics_FIRE(GRAPHICS_FUNC_ARGS)
 {

src/elements/firw.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FIRW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, np;

src/elements/fog.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FOG(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/frzw.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FRZW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/frzz.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FRZZ(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/fsep.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FSEP(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/fuse.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FUSE(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/fwrk.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_FWRK(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, np;

src/elements/gbmb.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 int update_GBMB(UPDATE_FUNC_ARGS) {
 	int rx,ry,r;
 	if (parts[i].life<=0)

src/elements/glas.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_GLAS(UPDATE_FUNC_ARGS) {
 	parts[i].pavg[0] = parts[i].pavg[1];

src/elements/glow.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_GLOW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/goo.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_GOO(UPDATE_FUNC_ARGS) {
 	if (!parts[i].life && sim->pv[y/CELL][x/CELL]>1.0f)

src/elements/gpmp.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_GPMP(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/graphics_default.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int graphics_DEFAULT(GRAPHICS_FUNC_ARGS)
 {	

src/elements/h2.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_H2(UPDATE_FUNC_ARGS)
 {

src/elements/hswc.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_HSWC(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/ice.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ICEI(UPDATE_FUNC_ARGS) { //currently used for snow as well
 	int r, rx, ry;

src/elements/ignt.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_IGNT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/iron.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_IRON(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/isz.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_ISZ(UPDATE_FUNC_ARGS) { // for both ISZS and ISOZ
 	float rr, rrr;

src/elements/lava.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int graphics_LAVA(GRAPHICS_FUNC_ARGS)
 {

src/elements/lcry.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_LCRY(UPDATE_FUNC_ARGS)
 {

src/elements/legacy.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 // Interactions which only occur when legacy_enable is on
 int update_legacy_all(UPDATE_FUNC_ARGS) {

src/elements/ligh.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 #define LIGHTING_POWER 0.65
 

src/elements/merc.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_MERC(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, np;

src/elements/mort.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_MORT(UPDATE_FUNC_ARGS) {
 	sim->create_part(-1, x, y-1, PT_SMKE);

src/elements/nbhl.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_NBHL(UPDATE_FUNC_ARGS) {
 	sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] += 0.1f;

src/elements/neut.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 
 int create_n_parts(Simulation * sim, int n, int x, int y, float vx, float vy, float temp, int t)//testing a new deut create part

src/elements/newgraphics.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 #include "hmap.h"
 
 int graphics_QRTZ(GRAPHICS_FUNC_ARGS) //QRTZ and PQRT

src/elements/none.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_(UPDATE_FUNC_ARGS) {
 

src/elements/nptct.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_NPTCT(UPDATE_FUNC_ARGS) {
 	if (parts[i].temp>295.0f)

src/elements/nwhl.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_NWHL(UPDATE_FUNC_ARGS) {
 	sim->gravmap[(y/CELL)*(XRES/CELL)+(x/CELL)] -= 0.1f;

src/elements/pbcn.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PBCN(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/pcln.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PCLN(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/phot.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PHOT(UPDATE_FUNC_ARGS) {
 	int r, rt, rx, ry;

src/elements/pipe.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 signed char pos_1_rx[] = {-1,-1,-1, 0, 0, 1, 1, 1};
 signed char pos_1_ry[] = {-1, 0, 1,-1, 1,-1, 0, 1};

src/elements/plnt.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PLNT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, np;

src/elements/plsm.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 #include "hmap.h"
 
 int graphics_PLSM(GRAPHICS_FUNC_ARGS)

src/elements/plut.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PLUT(UPDATE_FUNC_ARGS) {
 	if (1>rand()%100 && ((int)(5.0f*sim->pv[y/CELL][x/CELL]))>(rand()%1000))

src/elements/prti.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 /*these are the count values of where the particle gets stored, depending on where it came from
    0 1 2
    7 . 3

src/elements/prto.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 /*these are the count values of where the particle gets stored, depending on where it came from
    0 1 2
    7 . 3

src/elements/pump.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PUMP(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/pvod.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PVOD(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/pyro.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_PYRO(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, t = parts[i].type;

src/elements/qrtz.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_QRTZ(UPDATE_FUNC_ARGS) {
 	int r, tmp, trade, rx, ry, np, t;

src/elements/rime.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_RIME(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/shld.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SHLD1(UPDATE_FUNC_ARGS) {
 	int r, nnx, nny, rx, ry;

src/elements/sing.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SING(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, cry, crx, rad, nxi, nxj, nb, j, spawncount;

src/elements/sltw.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SLTW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;

src/elements/smke.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int graphics_SMKE(GRAPHICS_FUNC_ARGS)
 {

src/elements/soap.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SOAP(UPDATE_FUNC_ARGS) 
 {

src/elements/spng.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SPNG(UPDATE_FUNC_ARGS) {
 	int r, trade, rx, ry, tmp, np;

src/elements/sprk.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SPRK(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, conduct_sprk, nearp, pavg, ct = parts[i].ctype;

src/elements/stkm.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SPAWN(UPDATE_FUNC_ARGS) {
 	if (!sim->player.spwn)

src/elements/stkm2.cpp

@@ -1,4 +1,4 @@
-#include "element.h"
+#include "simulation/Element.h"
 
 int update_SPAWN2(UPDATE_FUNC_ARGS) {
 	if (!sim->player2.spwn)