Author: mordante
Date: Fri Jul 11 23:47:59 2008
New Revision: 27916

URL: http://svn.gna.org/viewcvs/wesnoth?rev=27916&view=rev
Log:
Make the portrait shown configurable from C++, this means I can start to wire in
images to start the real testing.

Modified:
    trunk/data/gui/default/window/message.cfg
    trunk/src/game_events.cpp

Modified: trunk/data/gui/default/window/message.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/message.cfg?rev=27916&r1=27915&r2=27916&view=diff
==============================================================================
--- trunk/data/gui/default/window/message.cfg (original)
+++ trunk/data/gui/default/window/message.cfg Fri Jul 11 23:47:59 2008
@@ -24,8 +24,7 @@
                                [image]
                                        x = 0
                                        y = "(height - image_height)"
-                                       # NOTE this image can be removed once 
we move to the final code.
-                                       name = "shyde200.png"
+                                       name = "(portrait_image)"
                                [/image]
 
                        [/draw]

Modified: trunk/src/game_events.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=27916&r1=27915&r2=27916&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Fri Jul 11 23:47:59 2008
@@ -1912,6 +1912,8 @@
                window.set_size(::create_rect(0, 
                        gui2::settings::screen_height - 400, 
                        gui2::settings::screen_width - 140, 400));
+
+               window.canvas(1).set_variable("portrait_image", 
variant("shyde200.png"));
 
                gui2::tcontrol* label = 
dynamic_cast<gui2::tcontrol*>(window.find_widget("message", false));
                assert(label);


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to