visual studio compatibility, plus change text a little

3 files changed, 3 insertions, 5 deletions

diff --git a/src/localbrowser/LocalBrowserController.cpp b/src/localbrowser/LocalBrowserController.cpp
index 0f6ec76..e932e72 100644
--- a/src/localbrowser/LocalBrowserController.cpp
+++ b/src/localbrowser/LocalBrowserController.cpp
@@ -103,7 +103,7 @@ void LocalBrowserController::RescanStamps()
 	};
 
 	std::stringstream desc;
-	desc << "Rescanning the stamps folder can find stamps added to the stamps folder or recover stamps when the stamps.def file has been lost or damaged. However, be warned that this may mess up the current sorting order";
+	desc << "Rescanning the stamps folder can find stamps added to the stamps folder or recover stamps when the stamps.def file has been lost or damaged. However, be warned that this will mess up the current sorting order";
 	new ConfirmPrompt("Rescan", desc.str(), new RescanConfirmation(this));
 }
 
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h
index 98c5025..9cdd3a7 100644
--- a/src/simulation/Simulation.h
+++ b/src/simulation/Simulation.h
@@ -117,10 +117,8 @@ public:
 	int pretty_powder;
 	int sandcolour;
 	int sandcolour_frame;
-	static int loverule[9][9];
 	bool ISLOVE;
 	int love[XRES/9][YRES/9];
-	static int lolzrule[9][9];
 	bool ISLOLZ;
 	int lolz[XRES/9][YRES/9];
 
diff --git a/src/simulation/elements/DMG.cpp b/src/simulation/elements/DMG.cpp
index 2e755d9..9c19199 100644
--- a/src/simulation/elements/DMG.cpp
+++ b/src/simulation/elements/DMG.cpp
@@ -67,13 +67,13 @@ int Element_DMG::update(UPDATE_FUNC_ARGS)
 						for (nxi=-rad; nxi<=rad; nxi++)
 							if (x+nxi>=0 && y+nxj>=0 && x+nxi<XRES && y+nxj<YRES && (nxi || nxj))
 							{
-								dist = sqrt(pow(nxi, 2)+pow(nxj, 2));//;(pow((float)nxi,2))/(pow((float)rad,2))+(pow((float)nxj,2))/(pow((float)rad,2));
+								dist = sqrt(pow(nxi, 2.0f)+pow(nxj, 2.0f));//;(pow((float)nxi,2))/(pow((float)rad,2))+(pow((float)nxj,2))/(pow((float)rad,2));
 								if (!dist || (dist <= rad))
 								{
 									rr = pmap[y+nxj][x+nxi]; 
 									if (rr)
 									{
-										angle = atan2(nxj, nxi);
+										angle = atan2((float)nxj, nxi);
 										fx = cos(angle) * 7.0f;
 										fy = sin(angle) * 7.0f;