From b84460d79b35e3e410f9d5ee2cec93d7babc424f Mon Sep 17 00:00:00 2001 From: jacob1 Date: Thu, 11 Oct 2012 18:14:14 -0400 Subject: [PATCH] visual studio compatibility, plus change text a little --- src/localbrowser/LocalBrowserController.cpp | 2 +- src/simulation/Simulation.h | 2 -- src/simulation/elements/DMG.cpp | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/localbrowser/LocalBrowserController.cpp b/src/localbrowser/LocalBrowserController.cpp index 0f6ec760c..e932e7239 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 98c5025c8..9cdd3a7e8 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 2e755d99d..9c19199d3 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