Author: soliton
Date: Sat Nov 3 06:21:44 2007
New Revision: 21461
URL: http://svn.gna.org/viewcvs/wesnoth?rev=21461&view=rev
Log:
* silence an initialization order warning
* correct line length in the changelog
Modified:
trunk/changelog
trunk/src/unit_frame.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=21461&r1=21460&r2=21461&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Sat Nov 3 06:21:44 2007
@@ -22,7 +22,8 @@
* graphics:
* polished ankh prop picture from Liberty, and moved to core replacing
old ankh-necklace.png used by Eastern Invasion
- * updated unit graphics: Necromancer, Dark Adept, Dark Sorcerer, Fugitive,
Huntsman
+ * updated unit graphics: Necromancer, Dark Adept, Dark Sorcerer, Fugitive,
+ Huntsman
* various shadow under units updates for consistency
* language and i18n:
* updated translations: Chinese, Czech, Danish, Finnish, French, Galician,
@@ -35,9 +36,9 @@
* multiplayer:
* revised maps: Den of Onis, Silverhead Crossing, Sulla's Ruins,
Weldyn Channel, Blue Water Province
- * removed option to enforce female gender on side leaders, replaced with a
gender
- choice combo-box in the MP side setup UI (client and host), which can
choose between
- random, male, and female, when available.
+ * removed option to enforce female gender on side leaders, replaced with a
+ gender choice combo-box in the MP side setup UI (client and host), which
+ can choose between random, male, and female, when available.
* the server sends a periodical 'ping' to all players to detect ghosts
* implemented reloading of the server config on SIGHUP
* sound
Modified: trunk/src/unit_frame.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_frame.cpp?rev=21461&r1=21460&r2=21461&view=diff
==============================================================================
--- trunk/src/unit_frame.cpp (original)
+++ trunk/src/unit_frame.cpp Sat Nov 3 06:21:44 2007
@@ -150,10 +150,10 @@
#include "unit_frame.hpp"
unit_frame::unit_frame() :
- image_(), image_diagonal_(),halo_(), sound_(),
+ image_(), image_diagonal_(),halo_(), sound_(),
halo_x_(), halo_y_(), duration_(0),
blend_with_(0),blend_ratio_(),
- highlight_ratio_(""),offset_()
+ highlight_ratio_(""), offset_()
{
}
@@ -162,14 +162,14 @@
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 std::string & sound) :
- image_(image),image_diagonal_(diag),
+ image_(image),image_diagonal_(diag),
halo_(in_halo,duration),
+ sound_(sound),
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),
- sound_(sound)
+ highlight_ratio_(highlight,duration),offset_(offset,duration)
{
// let's decide of duration ourselves
duration_ = maximum<int>(duration_, highlight_ratio_.duration());
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
