Author: boucman
Date: Fri Nov 2 19:50:35 2007
New Revision: 21437
URL: http://svn.gna.org/viewcvs/wesnoth?rev=21437&view=rev
Log:
more moving around of backward compatibility stuff
Modified:
trunk/src/unit.hpp
trunk/src/unit_animation.cpp
trunk/src/unit_display.cpp
trunk/src/unit_frame.cpp
trunk/src/unit_frame.hpp
Modified: trunk/src/unit.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.hpp?rev=21437&r1=21436&r2=21437&view=diff
==============================================================================
--- trunk/src/unit.hpp (original)
+++ trunk/src/unit.hpp Fri Nov 2 19:50:35 2007
@@ -256,7 +256,6 @@
const std::string& image_halo() const { return cfg_["halo"]; }
const std::string& get_hit_sound() const { return
cfg_["get_hit_sound"]; }
- const std::string& die_sound() const { return cfg_["die_sound"]; }
const std::string& image_ellipse() const { return cfg_["ellipse"]; }
const std::string& usage() const { return cfg_["usage"]; }
Modified: trunk/src/unit_animation.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_animation.cpp?rev=21437&r1=21436&r2=21437&view=diff
==============================================================================
--- trunk/src/unit_animation.cpp (original)
+++ trunk/src/unit_animation.cpp Fri Nov 2 19:50:35 2007
@@ -452,6 +452,8 @@
animations.push_back(unit_animation(**anim_itor));
image::locator image_loc =
animations.back().get_last_frame().image();
animations.back().add_frame(600,unit_frame(image_loc,600,"1~0:600"));
+ animations.back().sub_anims_["_death_sound"] =
crude_animation();
+
animations.back().sub_anims_["_death_sound"].add_frame(1,unit_frame(image::locator(),1,"","",0,"","","","","",cfg["die_sound"]),true);
//lg::wml_error<<"death animations are deprecate, support will
be removed in 1.3.11 (in unit "<<cfg["name"]<<")\n";
//lg::wml_error<<"please put it with an [animation] tag and
apply_to=death flag\n";
}
Modified: trunk/src/unit_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_display.cpp?rev=21437&r1=21436&r2=21437&view=diff
==============================================================================
--- trunk/src/unit_display.cpp (original)
+++ trunk/src/unit_display.cpp Fri Nov 2 19:50:35 2007
@@ -179,10 +179,6 @@
if(!disp ||disp->video().update_locked() || disp->fogged(loc) ||
preferences::show_combat() == false) {
return;
}
- const std::string& die_sound = loser.die_sound();
- if(die_sound != "" && die_sound != "null") {
- sound::play_sound(die_sound);
- }
loser.set_dying(*disp,loc,attack,secondary_attack);
if(winner == NULL) { // Test to see if there is no victor.
Modified: trunk/src/unit_frame.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_frame.cpp?rev=21437&r1=21436&r2=21437&view=diff
==============================================================================
--- trunk/src/unit_frame.cpp (original)
+++ trunk/src/unit_frame.cpp Fri Nov 2 19:50:35 2007
@@ -161,14 +161,15 @@
const std::string& highlight, const std::string& offset,
Uint32 blend_color, const std::string& blend_rate,
const std::string& in_halo, const std::string& halox, const
std::string& haloy,
- const image::locator & diag) :
+ const image::locator & diag,const std::string & sound) :
image_(image),image_diagonal_(diag),
halo_(in_halo,duration),
halo_x_(halox,duration),
halo_y_(haloy,duration),
duration_(duration),
blend_with_(blend_color), blend_ratio_(blend_rate,duration),
- highlight_ratio_(highlight,duration),offset_(offset,duration)
+ highlight_ratio_(highlight,duration),offset_(offset,duration),
+ sound_(sound)
{
// let's decide of duration ourselves
duration_ = maximum<int>(duration_, highlight_ratio_.duration());
Modified: trunk/src/unit_frame.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_frame.hpp?rev=21437&r1=21436&r2=21437&view=diff
==============================================================================
--- trunk/src/unit_frame.hpp (original)
+++ trunk/src/unit_frame.hpp Fri Nov 2 19:50:35 2007
@@ -68,7 +68,7 @@
Uint32 blend_color = 0, const std::string&
blend_rate = "",
const std::string & in_halo = "",
const std::string & halox = "",const
std::string & haloy = "",
- const image::locator & diag ="");
+ const image::locator & diag ="",const
std::string & sound = "");
explicit unit_frame(const config& cfg);
image::locator image() const { return image_ ;}
image::locator image_diagonal() const { return image_diagonal_
; }
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
