[Wesnoth-cvs-commits] wesnoth src/game_events.cpp data/scenarios/Heir...

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/10/03 19:28:43

Modified files:
        src            : game_events.cpp 
        data/scenarios/Heir_To_The_Throne: Crossroads.cfg 

Log message:
        added back in 'ambushed!' text in Crossroads

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.108&tr2=1.109&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.16 
wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.17
--- wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.16       Sat Sep 
 4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg    Sun Oct  3 
19:28:43 2004
@@ -208,7 +208,7 @@
                type=Orcish Grunt
                [/unit]
                [print]
-               id=ambushed
+               text=_"Ambushed!"
                red,green,blue=255,0,0
                size=32
                [/print]
@@ -256,9 +256,9 @@
                type=Orcish Archer
                [/unit]
                [print]
-               id=ambushed
+               text=_"Ambushed!"
                red,green,blue=255,0,0
-               size=16
+               size=32
                [/print]
        [/event]
        [event]
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.108 wesnoth/src/game_events.cpp:1.109
--- wesnoth/src/game_events.cpp:1.108   Sat Oct  2 15:20:59 2004
+++ wesnoth/src/game_events.cpp Sun Oct  3 19:28:43 2004
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.108 2004/10/02 15:20:59 Sirp Exp $ */
+/* $Id: game_events.cpp,v 1.109 2004/10/03 19:28:43 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -891,7 +891,7 @@
        else if(cmd == "print") {
                const std::string& text = cfg["text"];
                const int size = 
lexical_cast_default<int>(cfg["size"],font::SIZE_SMALL);
-               const int lifetime = 
lexical_cast_default<int>(cfg["duration"],20);
+               const int lifetime = 
lexical_cast_default<int>(cfg["duration"],50);
                const int red = lexical_cast_default<int>(cfg["red"],0);
                const int green = lexical_cast_default<int>(cfg["green"],0);
                const int blue = lexical_cast_default<int>(cfg["blue"],0);