diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-11 17:02:16 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-11 17:02:16 +0100 |
| commit | f262dbd28f08001d70416e3cc4e62273d3fee2cd (patch) | |
| tree | 539cbc8b27edf696120df0ac26531640c323692f /src/game.cpp | |
| parent | d68f3fa13297cf4c8d29753e48c684496852ceba (diff) | |
| parent | 63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff) | |
| download | mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.gz mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.bz2 mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.xz mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/game.cpp b/src/game.cpp index 48ca1c73..5b701fc1 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -390,7 +390,7 @@ static bool saveScreenshot() else { chatWindow->chatLog(_("Saving screenshot failed!"), BY_SERVER); - logger->log(_("Error: could not save screenshot.")); + logger->log("Error: could not save screenshot."); } SDL_FreeSurface(screenshot); @@ -518,8 +518,8 @@ void Game::handleInput() { // Input chat window if (!(chatWindow->isInputFocused() || - deathNotice != NULL || - weightNotice != NULL)) + deathNotice || + weightNotice)) { // Quit by pressing Enter if the exit confirm is there if (exitConfirm && @@ -550,9 +550,9 @@ void Game::handleInput() keyboard.isKeyActive(keyboard.KEY_OK)) npcIntegerDialog->action(gcn::ActionEvent(NULL, "ok")); else if (!(keyboard.getKeyValue( - KeyboardConfig::KEY_TOGGLE_CHAT) == + KeyboardConfig::KEY_TOGGLE_CHAT) == keyboard.getKeyValue( - KeyboardConfig::KEY_OK) && + KeyboardConfig::KEY_OK) && (npcStringDialog->isVisible() || npcTextDialog->isVisible() || npcListDialog->isVisible() || @@ -595,11 +595,11 @@ void Game::handleInput() break; // Quitting confirmation dialog case KeyboardConfig::KEY_QUIT: - if (!exitConfirm) + if (!exitConfirm) { - exitConfirm = new ConfirmDialog( _("Quit"), - _("Are you sure you " - "want to quit?")); + exitConfirm = new ConfirmDialog(_("Quit"), + _("Are you sure you " + "want to quit?")); exitConfirm->addActionListener(&exitListener); exitConfirm->requestMoveToTop(); } @@ -778,7 +778,7 @@ void Game::handleInput() catch (gcn::Exception e) { const char* err = e.getMessage().c_str(); - logger->log(_("Warning: guichan input exception: %s"), err); + logger->log("Warning: guichan input exception: %s", err); } } } // End while |