diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-01-09 17:23:32 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-01-09 17:23:32 +0000 |
| commit | f815c2ed01138ef1bd1b402b3a0257c120466c1d (patch) | |
| tree | b65dc764e233cf96cb28e84899626c1a178bf27f | |
| parent | 071877484ef493631592d9f10b6c4457097eca29 (diff) | |
| download | mana-f815c2ed01138ef1bd1b402b3a0257c120466c1d.tar.gz mana-f815c2ed01138ef1bd1b402b3a0257c120466c1d.tar.bz2 mana-f815c2ed01138ef1bd1b402b3a0257c120466c1d.tar.xz mana-f815c2ed01138ef1bd1b402b3a0257c120466c1d.zip | |
Fixed canceled/cancelled inconsistency.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/game.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2006-01-09 Eugenio Favalli <elvenprogrammer@gmail.com> + + * src/game.cpp: Fixed canceled/cancelled inconsistency. + 2006-01-07 Eugenio Favalli <elvenprogrammer@gmail.com> * data/maps/new_9-1.tmx.gz: Crush fixed the issues reported on wiki. diff --git a/src/game.cpp b/src/game.cpp index aa77847d..e4064040 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1131,7 +1131,7 @@ void do_parse() BY_SERVER); break; case 2: // Invite request check failed... - chatWindow->chatLog("Trade cancelled due to an " + chatWindow->chatLog("Trade canceled due to an " "unknown reason.", BY_SERVER); break; case 3: // Trade accepted @@ -1141,8 +1141,8 @@ void do_parse() tradeWindow->setVisible(true); requestTradeDialogOpen = false; break; - case 4: // Trade cancelled - chatWindow->chatLog("Trade cancelled.", BY_SERVER); + case 4: // Trade canceled + chatWindow->chatLog("Trade canceled.", BY_SERVER); tradeWindow->setVisible(false); break; default: // Shouldn't happen as well, but to be sure |