upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 06:04:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

redo parts of 2008-02-03T21:36:06Z!patrick_x99@hotmail.com, 2008-02-16T08:47:16Z!koraq@xs4all.nl and 2008-03-01T15:45:18Z!martinxyz@gmx.ch...

Browse Source 
...that have been reverted by the formula ai merge
This commit is contained in:
Gunter Labes 2008-04-25 01:55:51 +00:00
parent 0883f557af
commit 469fc378fb
17 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/actions.cpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2003 - 2007 by David White <dave@whitevine.net>
Copyright (C) 2003 - 2008 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@ -218,7 +218,7 @@ std::string recruit_unit(const gamemap& map, const int side, unit_map& units,
config cfg_unit1;
new_unit.write(cfg_unit1);
DBG_NG << cfg_unit1.debug();
DBG_NG << cfg_unit1;
if (!game_config::ignore_replay_errors) {
throw replay::error("OOS while recruiting.");
}
@ -2157,6 +2157,7 @@ size_t move_unit(game_display* disp,
p->first = steps.back();
units.add(p);
ui = units.find(p->first);
unit::clear_status_caches();
if(move_recorder != NULL) {
move_recorder->add_movement(steps.front(),steps.back());

2
src/actions.hpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2003 - 2007 by David White <dave@whitevine.net>
Copyright (C) 2003 - 2008 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify

2
src/ai.cpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2003 - 2007 by David White <dave@whitevine.net>
Copyright (C) 2003 - 2008 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify

2
src/ai.hpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2003 - 2007 by David White <dave@whitevine.net>
Copyright (C) 2003 - 2008 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify

2
src/ai_attack.cpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2003 - 2007 by David White <dave@whitevine.net>
Copyright (C) 2003 - 2008 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify

2
src/ai_interface.hpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2003 - 2007 by David White <dave@whitevine.net>
Copyright (C) 2003 - 2008 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify

2
src/floating_textbox.hpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2006 - 2007 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
Copyright (C) 2006 - 2008 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
wesnoth playturn Copyright (C) 2003 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/

2
src/hotkeys.hpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2003 - 2007 by David White <dave@whitevine.net>
Copyright (C) 2003 - 2008 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify

4
src/menu_events.cpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2006 - 2007 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
Copyright (C) 2006 - 2008 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
wesnoth playturn Copyright (C) 2003 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@ -1308,6 +1308,7 @@ private:
up->second.set_movement(starting_moves);
up->first = route.back();
units_.add(up);
unit::clear_status_caches();
up->second.set_standing(up->first);
gui_->invalidate(route.back());
gui_->draw();
@ -1424,6 +1425,7 @@ private:
up->second.set_movement(starting_moves);
up->first = route.back();
units_.add(up);
unit::clear_status_caches();
up->second.set_standing(up->first);
if(map_.is_village(route.back())) {

2
src/menu_events.hpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2006 - 2007 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
Copyright (C) 2006 - 2008 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
wesnoth playturn Copyright (C) 2003 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/

2
src/play_controller.cpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2006 - 2007 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
Copyright (C) 2006 - 2008 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
wesnoth playlevel Copyright (C) 2003 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/

2
src/play_controller.hpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2006 - 2007 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
Copyright (C) 2006 - 2008 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
wesnoth playlevel Copyright (C) 2003 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/

2
src/playsingle_controller.cpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2006 - 2007 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
Copyright (C) 2006 - 2008 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
wesnoth playlevel Copyright (C) 2003 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/

2
src/playsingle_controller.hpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2006 - 2007 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
Copyright (C) 2006 - 2008 by Joerg Hinrichs <joerg.hinrichs@alice-dsl.de>
wesnoth playlevel Copyright (C) 2003 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/

2
src/tstring.hpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2004 - 2007 by Philippe Plantier <ayin@anathas.org>
Copyright (C) 2004 - 2008 by Philippe Plantier <ayin@anathas.org>
Part of the Battle for Wesnoth Project http://www.wesnoth.org
This program is free software; you can redistribute it and/or modify

2
src/unit_map.cpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2006 - 2007 by Rusty Russell <rusty@rustcorp.com.au>
Copyright (C) 2006 - 2008 by Rusty Russell <rusty@rustcorp.com.au>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify

2
src/unit_map.hpp
View File

@ -1,6 +1,6 @@
/* $Id$ */
/*
Copyright (C) 2006 - 2007 by Rusty Russell <rusty@rustcorp.com.au>
Copyright (C) 2006 - 2008 by Rusty Russell <rusty@rustcorp.com.au>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify