diff options
| author | mniip <mniip@mniip.com> | 2013-08-22 12:52:14 (GMT) |
|---|---|---|
| committer | mniip <mniip@mniip.com> | 2013-08-22 13:51:19 (GMT) |
| commit | 4e9fe8b8e731d2edd5de254c0fd7b9162ebb0c77 (patch) | |
| tree | 950a1418596876dd4dcaf07dea91866cb824e9c4 /src/gui/game/GameController.cpp | |
| parent | 95c01bcf0af64eed9e843346f3ff013cc7197cef (diff) | |
| download | powder-4e9fe8b8e731d2edd5de254c0fd7b9162ebb0c77.zip powder-4e9fe8b8e731d2edd5de254c0fd7b9162ebb0c77.tar.gz | |
regexless gameModel
Diffstat (limited to 'src/gui/game/GameController.cpp')
| -rw-r--r-- | src/gui/game/GameController.cpp | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index 8b58b48..c514d3e 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -571,19 +571,30 @@ 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(), "^{[ct]:[0-9]*|.*}$")==0) + int match=0; + const char* str=(*iter).text.c_str(); + const char* e; + 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++; + e=p; + if (*p=='|') + { + while (*p) + p++; + if (p[-1]=='}') + { + match=1; + } + } + } + if (match) { - const char * signText = (*iter).text.c_str(); char buff[256]; - int sldr; - - memset(buff, 0, sizeof(buff)); - - for (sldr=3; signText[sldr] != '|'; sldr++) - buff[sldr-3] = signText[sldr]; - - buff[sldr-3] = '\0'; - + strcpy(buff, str+3); + buff[e-str-3]=0; int tempSaveID = format::StringToNumber<int>(std::string(buff)); if (tempSaveID) { |
