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

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/05/13 19:06:36

Modified files:
        src            : actions.cpp 

Log message:
        revert incorrect "fix" -- still leaves the problem of Soliton's Debian
        gcc 3.3.6 seemingly not initializing "strings" to NULL as per
        actions.hpp:94 and causing the strings in evaluate_battle_stats() to be
        constructed unnecessarily, need to investigate

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

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.219 wesnoth/src/actions.cpp:1.220
--- wesnoth/src/actions.cpp:1.219       Fri May 13 16:48:44 2005
+++ wesnoth/src/actions.cpp     Fri May 13 19:06:36 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.219 2005/05/13 16:48:44 ott Exp $ */
+/* $Id: actions.cpp,v 1.220 2005/05/13 19:06:36 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -293,9 +293,7 @@
                                    std::map<gamemap::location,unit>& units,
                                    const gamestatus& state,
                                    gamemap::TERRAIN attacker_terrain_override,
-                                   battle_stats_strings *strings = NULL)
-// strings != NULL if we want the Damage Calculations to be shown
-// it should otherwise be NULL to avoid diagnostics being constructed!
+                                   battle_stats_strings *strings)
 {
        battle_stats res;