[Wesnoth-cvs-commits] wesnoth/src game_events.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/10/31 19:46:57

Modified files:
        src            : game_events.cpp 

Log message:
        The code for handling objects was obsolete. Now fixed.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.110&tr2=1.111&r1=text&r2=text

Patches:
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.110 wesnoth/src/game_events.cpp:1.111
--- wesnoth/src/game_events.cpp:1.110   Tue Oct 19 18:18:20 2004
+++ wesnoth/src/game_events.cpp Sun Oct 31 19:46:57 2004
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.110 2004/10/19 18:18:20 silene Exp $ */
+/* $Id: game_events.cpp,v 1.111 2004/10/31 19:46:57 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -819,10 +819,6 @@
                const std::string image = cfg["image"];
                std::string caption = cfg["name"];
 
-               const std::string& caption_lang = string_table[id + "_name"];
-               if(caption_lang.empty() == false)
-                       caption = caption_lang;
-
                std::string text;
 
                gamemap::location loc;
@@ -844,11 +840,7 @@
                std::string command_type = "then";
 
                if(u != units->end() && (filter == NULL || 
game_events::unit_matches_filter(u,*filter))) {
-                       const std::string& lang = string_table[id];
-                       if(!lang.empty())
-                               text = lang;
-                       else
-                               text = cfg["description"];
+                       text = cfg["description"];
 
                        u->second.add_modification("object",cfg);
 
@@ -858,11 +850,7 @@
                        //mark that this item won't be used again
                        used_items.insert(id);
                } else {
-                       const std::string& lang = string_table[id + 
"_cannot_use"];
-                       if(!lang.empty())
-                               text = lang;
-                       else
-                               text = cfg["cannot_use_message"];
+                       text = cfg["cannot_use_message"];
 
                        command_type = "else";
                }