[Wesnoth-cvs-commits] wesnoth ./changelog src/serialization/preproces...

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/07/03 20:14:42

Modified files:
        .              : changelog 
        src/serialization: preprocessor.cpp 

Log message:
        preprocess files that do not end with a final newline correctly (thanks 
to silene for tracking this down and suggesting the fix)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.768&tr2=1.769&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/preprocessor.cpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.768 wesnoth/changelog:1.769
--- wesnoth/changelog:1.768     Sun Jul  3 13:48:56 2005
+++ wesnoth/changelog   Sun Jul  3 20:14:42 2005
@@ -6,6 +6,9 @@
    * changed Naga Warrior attack from 5-5 to 7-4
  * graphics and sound improvements:
    * new or revised images for Dark Sorcerer, Dwarvish Thunderguard, 
Necromancer
+ * WML improvements:
+   * #define's in user campaigns are now local to each campaign (patch 4138)
+   * preprocess files that do not end with a final newline correctly
 
 Version 0.9.3:
  * user interface improvements:
@@ -91,7 +94,7 @@
    * decreased Merman Netcaster hitpoints from 42 to 40
    * increased Merman Netcaster ranged attack from 7-2 to 9-2
    * increased Merman Fighter hitpoints from 32 to 36
-   * increased Merman Warrior hitpoints from 48 to 50 and attack from 7-4 to 
8-4  
+   * increased Merman Warrior hitpoints from 48 to 50 and attack from 7-4 to 
8-4
    * decreased Elvish defence in swamp from 40% to 30%
    * increased Elvish Shaman ranged attack from 3-2 to 4-2
    * decreased Elvish Shaman meele attack from 3-2 to 2-2
Index: wesnoth/src/serialization/preprocessor.cpp
diff -u wesnoth/src/serialization/preprocessor.cpp:1.22 
wesnoth/src/serialization/preprocessor.cpp:1.23
--- wesnoth/src/serialization/preprocessor.cpp:1.22     Sat Jul  2 21:37:19 2005
+++ wesnoth/src/serialization/preprocessor.cpp  Sun Jul  3 20:14:42 2005
@@ -1,4 +1,4 @@
-/* $Id: preprocessor.cpp,v 1.22 2005/07/02 21:37:19 ott Exp $ */
+/* $Id: preprocessor.cpp,v 1.23 2005/07/03 20:14:42 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
@@ -282,8 +282,10 @@
        std::string res;
        for(;;) {
                int c = in_->peek();
-               if (!in_->good() || utils::portable_isspace(c))
+               if (c == preprocessor_streambuf::traits_type::eof() || 
utils::portable_isspace(c)) {
+                       // LOG_CF << "(" << res << ")\n";
                        return res;
+               }
                in_->get();
                res += (char)c;
        }