0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 2006-07-21T10:00:04Z!patrick_x99@hotmail.com, fix tc in game event messages, and in the tutorial macros

Browse source
This commit is contained in:
Isaac Clerencia Perez 2006-07-22 08:48:58 +00:00
parent 2eed1b7bb1
commit 51073e5b2a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/tutorial/scenarios/2_Speaking.cfg
View file

@ -34,7 +34,7 @@ You can press 'u' to undo most things: useful to correct mistakes.")}
# Pretend this is narrator, since otherwise we scroll back.
[message]
speaker=narrator
image=units/elves-wood/captain.png
image=units/elves-wood/captain.png~TC(3,magenta)
message=_ "*Galdrad" + "
" + {MESSAGE}
[/message]
@ -44,7 +44,7 @@ You can press 'u' to undo most things: useful to correct mistakes.")}
# Pretend this is narrator, since otherwise we scroll back.
[message]
speaker=narrator
image=units/elves-wood/captain.png
image=units/elves-wood/captain.png~TC(3,magenta)
message=_ "*Galdrad" + "
" + {MESSAGE}
[/message]
@ -57,7 +57,7 @@ You can press 'u' to undo most things: useful to correct mistakes.")}
# Pretend this is narrator, since otherwise we scroll back.
[message]
speaker=narrator
image=units/elves-wood/captain.png
image=units/elves-wood/captain.png~TC(3,magenta)
message=_ "*Galdrad" + "
" + {MESSAGE}
[/message]

7
src/game_events.cpp
View file

@ -1367,6 +1367,13 @@ bool event_handler::handle_event_command(const queued_event& event_info,
if(image.empty()) {
image = speaker->second.profile();
if(image == speaker->second.absolute_image()) {
std::stringstream ss;
ss << image << "~TC("
<< speaker->second.side() << ","
<< speaker->second.team_color() << ")";
image = ss.str();
}
}
if(caption.empty()) {