[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth ./changelog src/game_events.cpp
From: |
ott |
Subject: |
[Wesnoth-cvs-commits] wesnoth ./changelog src/game_events.cpp |
Date: |
Mon, 02 May 2005 08:00:06 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: ott <address@hidden> 05/05/02 12:00:06
Modified files:
. : changelog
src : game_events.cpp
Log message:
Added note= attribute to [objectives], for hints and other footer info.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.641&tr2=1.642&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.641 wesnoth/changelog:1.642
--- wesnoth/changelog:1.641 Sun May 1 20:33:00 2005
+++ wesnoth/changelog Mon May 2 12:00:04 2005
@@ -6,6 +6,7 @@
* better diagnostics on parsing: file inclusion sequence
* fixed items appearing in traits description (#12603)
* preserve order of unit traits so no more quick,resilient but 33 vs 34 HP
+ * added note= attribute to [objectives], displayed as footer, eg. for hints
* campaign improvements:
* Eastern Invasion:
* fixed Dacyn not being [recall]-ed in Unexpected Appearance (#10619)
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.145 wesnoth/src/game_events.cpp:1.146
--- wesnoth/src/game_events.cpp:1.145 Sat Apr 23 12:13:10 2005
+++ wesnoth/src/game_events.cpp Mon May 2 12:00:05 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.145 2005/04/23 12:13:10 gruikya Exp $ */
+/* $Id: game_events.cpp,v 1.146 2005/05/02 12:00:05 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -565,6 +565,7 @@
const std::string lose_str = "#";
const t_string& summary = cfg["summary"];
+ const t_string& note = cfg["note"];
const size_t side = lexical_cast_default<size_t>(cfg["side"],
0);
bool silent = cfg["silent"] == "yes";
@@ -614,6 +615,8 @@
objs += lose_string + "\n";
objs += lose_objectives + "\n";
}
+ if(!note.empty())
+ objs += note + "\n";
if(side == 0) {
for(std::vector<team>::iterator itor = teams->begin();
- [Wesnoth-cvs-commits] wesnoth ./changelog src/game_events.cpp,
ott <=