[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth ./changelog src/ai.cpp src/playlevel.cpp
From: |
ott |
Subject: |
[Wesnoth-cvs-commits] wesnoth ./changelog src/ai.cpp src/playlevel.cpp |
Date: |
Thu, 05 May 2005 18:24:41 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: ott <address@hidden> 05/05/05 22:24:41
Modified files:
. : changelog
src : ai.cpp playlevel.cpp
Log message:
fix #12943, suggested by silene after we finally managed to isolate its
cause
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.647&tr2=1.648&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai.cpp.diff?tr1=1.149&tr2=1.150&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.204&tr2=1.205&r1=text&r2=text
Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.647 wesnoth/changelog:1.648
--- wesnoth/changelog:1.647 Wed May 4 21:08:56 2005
+++ wesnoth/changelog Thu May 5 22:24:40 2005
@@ -50,6 +50,7 @@
* Turkish
* slow now affects units with 2 or more attacks (not just 1 remaining)
* slow now works with berserk and is cumulative across berserk rounds
+ * fix replays with idle_ai, as seen in user scenario Rebellion (#12943)
* various bug fixes and code cleanups
Version 0.9.1:
Index: wesnoth/src/ai.cpp
diff -u wesnoth/src/ai.cpp:1.149 wesnoth/src/ai.cpp:1.150
--- wesnoth/src/ai.cpp:1.149 Mon May 2 19:42:04 2005
+++ wesnoth/src/ai.cpp Thu May 5 22:24:40 2005
@@ -1,4 +1,4 @@
-/* $Id: ai.cpp,v 1.149 2005/05/02 19:42:04 silene Exp $ */
+/* $Id: ai.cpp,v 1.150 2005/05/05 22:24:40 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -877,9 +877,6 @@
move_leader_after_recruit(enemy_dstsrc);
}
}
-
- recorder.end_turn();
- sync_network();
}
bool ai::do_combat(std::map<gamemap::location,paths>& possible_moves, const
move_map& srcdst, const move_map& dstsrc, const move_map& enemy_srcdst, const
move_map& enemy_dstsrc)
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.204 wesnoth/src/playlevel.cpp:1.205
--- wesnoth/src/playlevel.cpp:1.204 Mon May 2 19:42:04 2005
+++ wesnoth/src/playlevel.cpp Thu May 5 22:24:40 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.204 2005/05/02 19:42:04 silene Exp $ */
+/* $Id: playlevel.cpp,v 1.205 2005/05/05 22:24:40 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -645,6 +645,8 @@
ai_interface::info
ai_info(gui,map,gameinfo,units,teams,player_number,status,turn_data);
util::scoped_ptr<ai_interface>
ai_obj(create_ai(team_it->ai_algorithm(),ai_info));
ai_obj->play_turn();
+ recorder.end_turn();
+ ai_obj->sync_network();
gui.recalculate_minimap();
clear_shroud(gui,status,map,gameinfo,units,teams,player_number-1);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth ./changelog src/ai.cpp src/playlevel.cpp,
ott <=