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

TPT: Check coordinates of signs before using them to read pmap or pressure 8a11b6b31d

Browse Source
This commit is contained in:
Simon Robertshaw 2012-04-17 16:14:42 +01:00
parent f4e2d188c2
commit 609db36f2e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Renderer.cpp
View File

@ -379,15 +379,18 @@ void Renderer::DrawSigns()
//Displaying special information //Displaying special information
if (strcmp(signs[i].text, "{p}")==0) if (strcmp(signs[i].text, "{p}")==0)
{ {
sprintf(buff, "Pressure: %3.2f", sim->pv[signs[i].y/CELL][signs[i].x/CELL]); //...pressure float pressure = 0.0f;
if (signs[i].x>=0 && signs[i].x<XRES && signs[i].y>=0 && signs[i].y<YRES)
pressure = sim->pv[signs[i].y/CELL][signs[i].x/CELL];
sprintf(buff, "Pressure: %3.2f", pressure); //...pressure
g->drawtext(x+3, y+3, buff, 255, 255, 255, 255); g->drawtext(x+3, y+3, buff, 255, 255, 255, 255);
} }
if (strcmp(signs[i].text, "{t}")==0) if (strcmp(signs[i].text, "{t}")==0)
{ {
if (sim->pmap[signs[i].y][signs[i].x]) if (signs[i].x>=0 && signs[i].x<XRES && signs[i].y>=0 && signs[i].y<YRES && sim->pmap[signs[i].y][signs[i].x])
sprintf(buff, "Temp: %4.2f", sim->parts[sim->pmap[signs[i].y][signs[i].x]>>8].temp-273.15); //...tempirature sprintf(buff, "Temp: %4.2f", sim->parts[sim->pmap[signs[i].y][signs[i].x]>>8].temp-273.15); //...temperature
else else
sprintf(buff, "Temp: 0.00"); //...tempirature sprintf(buff, "Temp: 0.00"); //...temperature
g->drawtext(x+3, y+3, buff, 255, 255, 255, 255); g->drawtext(x+3, y+3, buff, 255, 255, 255, 255);
} }