diff options
| author | Saveliy Skresanov <savask@yandex.ru> | 2013-08-22 11:43:46 (GMT) |
|---|---|---|
| committer | Saveliy Skresanov <savask@yandex.ru> | 2013-08-22 11:43:46 (GMT) |
| commit | b2045b0a7fadbee87ecf52fe14699819b58e7667 (patch) | |
| tree | 1fc607d0182f8a3934ea5ef786ab56cb4e456456 /src | |
| parent | 12c471f25760aa8ec8b05ea7bf8d8defcff66059 (diff) | |
| download | powder-b2045b0a7fadbee87ecf52fe14699819b58e7667.zip powder-b2045b0a7fadbee87ecf52fe14699819b58e7667.tar.gz | |
Fix sign save/topic regex.
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphics/Renderer.cpp | 2 | ||||
| -rw-r--r-- | src/gui/game/GameController.cpp | 2 | ||||
| -rw-r--r-- | src/gui/game/SignTool.cpp | 2 | ||||
| -rw-r--r-- | src/simulation/Sign.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp index d47b1ba..833cec2 100644 --- a/src/graphics/Renderer.cpp +++ b/src/graphics/Renderer.cpp @@ -927,7 +927,7 @@ void Renderer::DrawSigns() sim->signs[i].pos(text, x, y, w, h); clearrect(x, y, w+1, h); drawrect(x, y, w+1, h, 192, 192, 192, 255); - if (sregexp(signs[i].text.c_str(), "^{[c|t]:[0-9]*|.*}$")) + if (sregexp(signs[i].text.c_str(), "^{[ct]:[0-9]*|.*}$")) drawtext(x+3, y+3, text, 255, 255, 255, 255); else drawtext(x+3, y+3, text, 0, 191, 255, 255); diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index 488d30a..8b58b48 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -571,7 +571,7 @@ bool GameController::MouseUp(int x, int y, unsigned button) (*iter).pos((*iter).getText(sim), signx, signy, signw, signh); if (x>=signx && x<=signx+signw && y>=signy && y<=signy+signh) { - if (sregexp((*iter).text.c_str(), "^{[c|t]:[0-9]*|.*}$")==0) + if (sregexp((*iter).text.c_str(), "^{[ct]:[0-9]*|.*}$")==0) { const char * signText = (*iter).text.c_str(); char buff[256]; diff --git a/src/gui/game/SignTool.cpp b/src/gui/game/SignTool.cpp index 5e7eb0a..87ed59e 100644 --- a/src/gui/game/SignTool.cpp +++ b/src/gui/game/SignTool.cpp @@ -183,7 +183,7 @@ void SignWindow::DoDraw() currentSign.pos(text, x, y, w, h); g->clearrect(x, y, w+1, h); g->drawrect(x, y, w+1, h, 192, 192, 192, 255); - if (sregexp(currentSign.text.c_str(), "^{[c|t]:[0-9]*|.*}$")) + if (sregexp(currentSign.text.c_str(), "^{[ct]:[0-9]*|.*}$")) g->drawtext(x+3, y+3, text, 255, 255, 255, 255); else g->drawtext(x+3, y+3, text, 0, 191, 255, 255); diff --git a/src/simulation/Sign.cpp b/src/simulation/Sign.cpp index 57d98bc..7ba94af 100644 --- a/src/simulation/Sign.cpp +++ b/src/simulation/Sign.cpp @@ -31,7 +31,7 @@ std::string sign::getText(Simulation *sim) else sprintf(buff, "Temp: 0.00"); //...temperature } - else if (sregexp(signText, "^{[c|t]:[0-9]*|.*}$")==0) + else if (sregexp(signText, "^{[ct]:[0-9]*|.*}$")==0) { int sldr, startm; memset(buff, 0, sizeof(buff)); |