Author: soliton
Date: Sun Mar 23 23:22:22 2008
New Revision: 25038
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25038&view=rev
Log:
attempt to fix problem with WML ordering (merged r25003 from trunk)
Modified:
branches/1.4/src/server/simple_wml.cpp
Modified: branches/1.4/src/server/simple_wml.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/server/simple_wml.cpp?rev=25038&r1=25037&r2=25038&view=diff
==============================================================================
--- branches/1.4/src/server/simple_wml.cpp (original)
+++ branches/1.4/src/server/simple_wml.cpp Sun Mar 23 23:22:22 2008
@@ -409,11 +409,9 @@
int node::output_size() const
{
-/*
if(output_cache_.empty() == false) {
return output_cache_.size();
}
- */
int res = 0;
for(attribute_list::const_iterator i = attr_.begin(); i != attr_.end();
++i) {
@@ -452,14 +450,13 @@
void node::output(char*& buf)
{
-/*
if(output_cache_.empty() == false) {
memcpy(buf, output_cache_.begin(), output_cache_.size());
shift_buffers(buf - output_cache_.begin());
buf += output_cache_.size();
return;
}
-*/
+
char* begin = buf;
for(std::vector<attribute>::iterator i = attr_.begin(); i !=
attr_.end(); ++i) {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
