diff options
| author | jacob1 <jfu614@gmail.com> | 2013-08-22 15:58:37 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-08-22 15:58:37 (GMT) |
| commit | 6ef3f4126fce8e4aaa1173f202d83db7cff6ec17 (patch) | |
| tree | a627d039c8cf9952a9843fb11da690e6ab61f1f2 /src/gui/game/GameController.cpp | |
| parent | 68984bb9be07ea4b6eccf76dddaf3f31d23f577c (diff) | |
| parent | e2cb5838c6b89bf0f34aa08562d3e3763729cba6 (diff) | |
| download | powder-6ef3f4126fce8e4aaa1173f202d83db7cff6ec17.zip powder-6ef3f4126fce8e4aaa1173f202d83db7cff6ec17.tar.gz | |
Merge pull request #156 from mniip/regex
regex fix
Diffstat (limited to 'src/gui/game/GameController.cpp')
| -rw-r--r-- | src/gui/game/GameController.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index c514d3e..539b084 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -571,30 +571,13 @@ 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) { - 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) + int pos=splitsign(str); + if (pos) { char buff[256]; strcpy(buff, str+3); - buff[e-str-3]=0; + buff[pos]=0; int tempSaveID = format::StringToNumber<int>(std::string(buff)); if (tempSaveID) { |
