[Wesnoth-cvs-commits] wesnoth/src game.cpp gamestatus.cpp reports.cpp...

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/08/29 16:09:57

Modified files:
        src            : game.cpp gamestatus.cpp reports.cpp unit.cpp 
        src/widgets    : widget.cpp widget.hpp 

Log message:
        some gettext fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.120&tr2=1.121&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gamestatus.cpp.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/reports.cpp.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.93&tr2=1.94&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/widget.cpp.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/widget.hpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.120 wesnoth/src/game.cpp:1.121
--- wesnoth/src/game.cpp:1.120  Sun Aug 29 11:48:34 2004
+++ wesnoth/src/game.cpp        Sun Aug 29 16:09:57 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.120 2004/08/29 11:48:34 isaaccp Exp $ */
+/* $Id: game.cpp,v 1.121 2004/08/29 16:09:57 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -347,6 +347,8 @@
        std::cerr << "starting play_game\n";
 
        CVideo video;
+
+       std::cerr << "initialized video...\n";
        const font::manager font_manager;
 
        const sound::manager sound_manager;
@@ -799,20 +801,15 @@
 
                                defines_map.clear();
                                defines_map[state.difficulty] = 
preproc_define();
-                       } catch(gamestatus::load_game_failed& e) {
+                       } catch(gamestatus::error& e) {
                                std::cerr << "caught load_game_failed\n";
                                gui::show_dialog(disp,NULL,"",
-                                          _("The file you have tried to load 
is corrupt"),gui::OK_ONLY);
-                               continue;
-                       } catch(gamestatus::game_error& e) {
-                               std::cerr << "caught game_error\n";
-                               gui::show_dialog(disp,NULL,"",
-                                          _("The file you have tried to load 
is corrupt"),gui::OK_ONLY);
+                                          _("The file you have tried to load 
is corrupt") + std::string(": '") + e.message + "'",gui::OK_ONLY);
                                continue;
                        } catch(config::error& e) {
                                std::cerr << "caught config::error\n";
                                gui::show_dialog(disp,NULL,"",
-                                   _("The file you have tried to load is 
corrupt") + std::string(": ") + e.message + "\n",
+                                   _("The file you have tried to load is 
corrupt") + std::string(": '") + e.message + "'",
                                    gui::OK_ONLY);
                                continue;
                        } catch(io_exception& e) {
Index: wesnoth/src/gamestatus.cpp
diff -u wesnoth/src/gamestatus.cpp:1.40 wesnoth/src/gamestatus.cpp:1.41
--- wesnoth/src/gamestatus.cpp:1.40     Wed Aug 25 02:59:51 2004
+++ wesnoth/src/gamestatus.cpp  Sun Aug 29 16:09:57 2004
@@ -1,4 +1,4 @@
-/* $Id: gamestatus.cpp,v 1.40 2004/08/25 02:59:51 Sirp Exp $ */
+/* $Id: gamestatus.cpp,v 1.41 2004/08/29 16:09:57 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -369,6 +369,7 @@
        config cfg(file_data);
 
        if(cfg.empty()) {
+               std::cerr << "Could not parse file data into config\n";
                throw gamestatus::load_game_failed();
        }
        
Index: wesnoth/src/reports.cpp
diff -u wesnoth/src/reports.cpp:1.44 wesnoth/src/reports.cpp:1.45
--- wesnoth/src/reports.cpp:1.44        Sat Aug 28 14:34:00 2004
+++ wesnoth/src/reports.cpp     Sun Aug 29 16:09:57 2004
@@ -201,7 +201,7 @@
                                   seen_units.count(&u_it->second.type()) == 0) 
{
                                        seen_units.insert(&u_it->second.type());
                                        const int resistance = 
u_it->second.type().movement_type().resistance_against(*at_it) - 100;
-                                       
resistances[resistance].push_back(string_table[u_it->second.type().name()]);
+                                       
resistances[resistance].push_back(u_it->second.type().language_name());
                                }
                        }
 
@@ -250,7 +250,7 @@
                const time_of_day& tod = timeofday_at(status,units,mouseover);
                std::stringstream tooltip;
                
-               tooltip << font::LARGE_TEXT << tod.name << "\n"
+               tooltip << tod.name << "\n"
                        << _("Lawful units") << ": "
                                << (tod.lawful_bonus > 0 ? "+" : "") << 
tod.lawful_bonus << "%\n"
                                << _("Neutral units") << ": " << "0%\n"
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.93 wesnoth/src/unit.cpp:1.94
--- wesnoth/src/unit.cpp:1.93   Sun Aug 29 11:12:20 2004
+++ wesnoth/src/unit.cpp        Sun Aug 29 16:09:57 2004
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.93 2004/08/29 11:12:20 isaaccp Exp $ */
+/* $Id: unit.cpp,v 1.94 2004/08/29 16:09:57 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -589,7 +589,7 @@
        if(i != data.unit_types.end())
                type_ = &i->second;
        else
-               throw gamestatus::load_game_failed("Unit not found: '" + 
cfg["type"] + "'" + " : " + cfg.write() + "'\n");
+               throw gamestatus::load_game_failed("Unit not found: '" + 
cfg["type"] + "'");
 
        assert(type_ != NULL);
 
Index: wesnoth/src/widgets/widget.cpp
diff -u wesnoth/src/widgets/widget.cpp:1.18 wesnoth/src/widgets/widget.cpp:1.19
--- wesnoth/src/widgets/widget.cpp:1.18 Thu Aug 26 11:53:53 2004
+++ wesnoth/src/widgets/widget.cpp      Sun Aug 29 16:09:57 2004
@@ -138,7 +138,7 @@
        }
 }
 
-const bool widget::dirty() const
+bool widget::dirty() const
 {
        return dirty_;
 }
Index: wesnoth/src/widgets/widget.hpp
diff -u wesnoth/src/widgets/widget.hpp:1.16 wesnoth/src/widgets/widget.hpp:1.17
--- wesnoth/src/widgets/widget.hpp:1.16 Wed Jun 23 23:43:38 2004
+++ wesnoth/src/widgets/widget.hpp      Sun Aug 29 16:09:57 2004
@@ -42,7 +42,7 @@
        void set_volatile(bool val=true);
 
        void set_dirty(bool dirty=true);
-       const bool dirty() const;
+       bool dirty() const;
 
        void set_help_string(const std::string& str);