matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

visual studio compatibility, plus change text a little

Browse Source
This commit is contained in:
jacob1 2012-10-11 18:14:14 -04:00 committed by Simon Robertshaw
parent 3f093c8072
commit b84460d79b
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/localbrowser/LocalBrowserController.cpp
View File

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

2
src/simulation/Simulation.h
View File

@ -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];

4
src/simulation/elements/DMG.cpp
View File

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