mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 19:29:52 +02:00
Code Issues Projects Releases Wiki Activity

remove regex in renderer

Browse Source
This commit is contained in:
mniip
2013-08-22 16:51:42 +04:00
parent b2045b0a7f
commit 5e1385324a
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/graphics/Renderer.cpp
View File

@@ -912,7 +912,7 @@ void Renderer::DrawWalls()
void Renderer::DrawSigns() void Renderer::DrawSigns()
{ {
int i, j, x, y, w, h, dx, dy,mx,my,b=1,bq; int i, j, x, y, w, h, dx, dy,mx,my,b=1,bq,match;
std::vector<sign> signs = sim->signs; std::vector<sign> signs = sim->signs;
#ifdef OGLR #ifdef OGLR
GLint prevFbo; GLint prevFbo;
@@ -923,14 +923,30 @@ void Renderer::DrawSigns()
for (i=0; i < signs.size(); i++) for (i=0; i < signs.size(); i++)
if (signs[i].text.length()) if (signs[i].text.length())
{ {
std::string text = sim->signs[i].getText(sim); std::string text = signs[i].getText(sim);
sim->signs[i].pos(text, x, y, w, h); const char* str = signs[i].text.c_str();
signs[i].pos(text, x, y, w, h);
clearrect(x, y, w+1, h); clearrect(x, y, w+1, h);
drawrect(x, y, w+1, h, 192, 192, 192, 255); drawrect(x, y, w+1, h, 192, 192, 192, 255);
if (sregexp(signs[i].text.c_str(), "^{[ct]:[0-9]*|.*}$")) match=0;
drawtext(x+3, y+3, text, 255, 255, 255, 255); // check if it's a link sign
else if (str[0]=='{' && (str[1]=='c' || str[1]=='t') && str[2]==':' && str[3]>='0' && str[3]<='9')
{
const char* p=str+4;
while (*p>='0' && *p<='9')
p++;
if (*p=='|')
{
while (*p)
p++;
if (p[-1]=='}')
match=1;
}
}
if (match)
drawtext(x+3, y+3, text, 0, 191, 255, 255); drawtext(x+3, y+3, text, 0, 191, 255, 255);
else
drawtext(x+3, y+3, text, 255, 255, 255, 255);
x = signs[i].x; x = signs[i].x;
y = signs[i].y; y = signs[i].y;