[Wesnoth-cvs-commits] wesnoth/src language.cpp unit.cpp unit.hpp unit...

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/11/30 21:14:14

Modified files:
        src            : language.cpp unit.cpp unit.hpp unit_display.cpp 

Log message:
        Quick and dirty hack to translate the 'system default language' string.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.hpp.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_display.cpp.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.58 wesnoth/src/language.cpp:1.59
--- wesnoth/src/language.cpp:1.58       Thu Nov 18 22:00:12 2004
+++ wesnoth/src/language.cpp    Tue Nov 30 21:14:13 2004
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.58 2004/11/18 22:00:12 ydirson Exp $ */
+/* $Id: language.cpp,v 1.59 2004/11/30 21:14:13 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -156,6 +156,7 @@
        current_language = locale;
        wesnoth_setlocale (LC_MESSAGES, locale.localename.c_str());
        font::set_font();
+       known_languages[0].language = gettext("System default language");
 
        // fill string_table (should be moved somwhere else some day)
        try {
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.105 wesnoth/src/unit.cpp:1.106
--- wesnoth/src/unit.cpp:1.105  Thu Nov 18 22:00:12 2004
+++ wesnoth/src/unit.cpp        Tue Nov 30 21:14:13 2004
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.105 2004/11/18 22:00:12 ydirson Exp $ */
+/* $Id: unit.cpp,v 1.106 2004/11/30 21:14:13 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -885,11 +885,10 @@
        }
 }
 
-void unit::set_defending(bool newval, bool hits, int ms, attack_type::RANGE 
range)
+void unit::set_defending(bool newval, bool hits, attack_type::RANGE range)
 {
        state_ = newval ? (range == attack_type::LONG_RANGE ? 
STATE_DEFENDING_LONG :
                           STATE_DEFENDING_SHORT): STATE_NORMAL;
-       // attackingMilliseconds_ = ms;
        type_->defend_animation(getsHit_,range);
 
        getsHit_ = hits;
Index: wesnoth/src/unit.hpp
diff -u wesnoth/src/unit.hpp:1.54 wesnoth/src/unit.hpp:1.55
--- wesnoth/src/unit.hpp:1.54   Mon Nov  1 19:43:06 2004
+++ wesnoth/src/unit.hpp        Tue Nov 30 21:14:13 2004
@@ -1,4 +1,4 @@
-/* $Id: unit.hpp,v 1.54 2004/11/01 19:43:06 gruikya Exp $ */
+/* $Id: unit.hpp,v 1.55 2004/11/30 21:14:13 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -117,7 +117,7 @@
        //(could be in the middle of an attack etc)
        const std::string& image() const;
 
-       void set_defending(bool newval, bool hits=false, int ms=0,
+       void set_defending(bool newval, bool hits = false,
                           attack_type::RANGE range=attack_type::LONG_RANGE);
        void set_attacking(bool newval, const attack_type* type=NULL, int ms=0);
 
Index: wesnoth/src/unit_display.cpp
diff -u wesnoth/src/unit_display.cpp:1.39 wesnoth/src/unit_display.cpp:1.40
--- wesnoth/src/unit_display.cpp:1.39   Thu Nov 18 04:08:32 2004
+++ wesnoth/src/unit_display.cpp        Tue Nov 30 21:14:13 2004
@@ -379,7 +379,7 @@
 
        while(animation_time < end_at) {
 
-               def->second.set_defending(true,hits,animation_time - 
missile_impact,attack_type::LONG_RANGE);
+               def->second.set_defending(true, hits, attack_type::LONG_RANGE);
 
                //this is a while instead of an if, because there might be 
multiple
                //sounds playing simultaneously or close together
@@ -662,7 +662,7 @@
        const int time_resolution = 20;
        const int acceleration = disp.turbo() ? 5 : 1;
 
-       def->second.set_defending(true,attack_type::SHORT_RANGE);
+       def->second.set_defending(true, hits, attack_type::SHORT_RANGE);
 
        const gamemap::location leader_loc = under_leadership(units,a);
        unit_map::iterator leader = units.end();
@@ -714,7 +714,7 @@
        int animation_time = attack_anim.get_animation_time();
        while(animation_time < end_at) {
 
-               
def->second.set_defending(true,hits,animation_time,attack_type::SHORT_RANGE);
+               def->second.set_defending(true, hits, attack_type::SHORT_RANGE);
 
                //this is a while instead of an if, because there might be 
multiple
                //sounds playing simultaneously or close together