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

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/07/31 23:56:05

Modified files:
        .              : changelog 
        src            : unit.cpp unit.hpp playturn.cpp 

Log message:
        fixed spurious warning when loading a saved game and ending turn 
(#12986)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.819&tr2=1.820&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.156&tr2=1.157&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.hpp.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.387&tr2=1.388&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.819 wesnoth/changelog:1.820
--- wesnoth/changelog:1.819     Sun Jul 31 13:53:00 2005
+++ wesnoth/changelog   Sun Jul 31 23:56:04 2005
@@ -1,13 +1,15 @@
 CVS HEAD:
  * language and i18n:
    * new translation: Hebrew (no rtl support added in yet)
-   * updated translations:
-     * British English, Catalan, German, Hungarian, Swedish, Turkish
+   * updated translations: British English, Catalan, German, Hungarian,
+     Swedish, Turkish
    * fixed linebreaks not working properly for Chinese translation (#13352)
    * updated several unit descriptions
    * added GPL to help
    * fixed some untranslatable attack names (part of #12788)
-   * fixed Battle Princess not being translateable different than Princess
+   * added MANUAL to in-game help
+   * Battle Princess can now have translation different to Princess
+   * fix terrain list cross-references in unit help
  * graphics and sound improvements:
    * fixed layering of multi-hex tiles (#13586)
    * removed Mac OS X icon border (#12928)
@@ -29,6 +31,10 @@
  * fixed failed recruit attempt clearing undo stack (#13833)
  * fixed recall not clearing shroud (#13824)
  * fixed towupper causing build to fail on OpenBSD (#13709)
+ * fixed replay errors due to capture events not saving randomness (#13666)
+ * fixed editor insisting on path without spaces, for saving map (#13919)
+ * fixed spurious warning when loading a saved game and ending turn (#12986)
+ * sound is handled better, and can now be set as a preference (rest of #11669)
  * various bug fixes and code cleanups
 
 Version 0.9.4:
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.387 wesnoth/src/playturn.cpp:1.388
--- wesnoth/src/playturn.cpp:1.387      Sat Jul 30 21:43:00 2005
+++ wesnoth/src/playturn.cpp    Sun Jul 31 23:56:05 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.387 2005/07/30 21:43:00 Sirp Exp $ */
+/* $Id: playturn.cpp,v 1.388 2005/07/31 23:56:05 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -1290,21 +1290,24 @@
        if(browse_)
                return;
 
-       bool unmoved_units = false, partmoved_units = false;
+       bool unmoved_units = false, partmoved_units = false, 
some_units_have_moved = false;
        for(unit_map::const_iterator un = units_.begin(); un != units_.end(); 
++un) {
                if(un->second.side() == team_num_) {
                        if(unit_can_move(un->first,units_,map_,teams_)) {
-                               if(un->second.movement_left() == 
un->second.total_movement()) {
+                               if(!un->second.has_moved()) {
                                        unmoved_units = true;
                                }
 
                                partmoved_units = true;
                        }
+                       if(un->second.has_moved()) {
+                               some_units_have_moved = true;
+                       }
                }
        }
 
        //Ask for confirmation if the player hasn't made any moves (other than 
gotos).
-       if(preferences::confirm_no_moves() && unmoved_units) {
+       if(preferences::confirm_no_moves() && ! some_units_have_moved) {
                if (recorder.ncommands() == start_ncmd_) {
                        const int res = gui::show_dialog(gui_,NULL,"",_("You 
have not started your turn yet.  Do you really want to end your turn?"), 
gui::YES_NO);
                        if(res != 0) {
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.156 wesnoth/src/unit.cpp:1.157
--- wesnoth/src/unit.cpp:1.156  Tue Jul  5 13:42:45 2005
+++ wesnoth/src/unit.cpp        Sun Jul 31 23:56:05 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.156 2005/07/05 13:42:45 darthfool Exp $ */
+/* $Id: unit.cpp,v 1.157 2005/07/31 23:56:05 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -485,6 +485,11 @@
 bool unit::incapacitated() const
 {
        return stone();
+}
+
+bool unit::has_moved() const
+{
+       return this->movement_left() != this->total_movement();
 }
 
 bool unit::emits_zoc() const
Index: wesnoth/src/unit.hpp
diff -u wesnoth/src/unit.hpp:1.71 wesnoth/src/unit.hpp:1.72
--- wesnoth/src/unit.hpp:1.71   Sat Jul  2 21:37:19 2005
+++ wesnoth/src/unit.hpp        Sun Jul 31 23:56:05 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.hpp,v 1.71 2005/07/02 21:37:19 ott Exp $ */
+/* $Id: unit.hpp,v 1.72 2005/07/31 23:56:05 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -90,6 +90,7 @@
        bool stone() const;
 
        bool incapacitated() const;
+       bool has_moved() const;
 
        bool emits_zoc() const;