Merge lp:~nha/widelands/fixes into lp:widelands

[Nicolai Hähnle]

Various small fixes and behavior changes that I suggest for merging after the release of build15.

[SirVer (sirver)]

Nicolai, most of these are no brainers and i agree of merging them.

However about the reserved thing please see my comment on the bug report.

[Raul Ferriz (raul.ferriz)]

I have checked the code, but not try to compile and run. It is safe, some clean up and longer waiting checks for soldiers when waiting a signal.
The only but is that I think that this can break replays.

[Nicolai Hähnle (nha)]

Yes, it does break replays. I don't think this is a problem, since we have never guaranteed compatibility of replays.

=== modified file 'src/log.cc'
--- src/log.cc	2010-03-27 23:50:23 +0000
+++ src/log.cc	2010-04-13 18:44:39 +0000
@@ -25,6 +25,8 @@
 
 extern std::ostream & wout;
 
+bool g_verbose = false;
+
 void log(const char * const fmt, ...) {
 	char buffer[2048];
 	va_list va;
@@ -33,8 +35,6 @@
 	vsnprintf(buffer, sizeof(buffer), fmt, va);
 	va_end(va);
 
-	//TODO: use iostreams instead of vprintf because other parts of
-	//      Widelands use iostreams
 	wout << buffer;
 	wout.flush();
 }

=== modified file 'src/log.h'
--- src/log.h	2010-03-27 23:50:23 +0000
+++ src/log.h	2010-04-13 18:44:39 +0000
@@ -33,4 +33,6 @@
 // wout is either std::cout or specified logfile.
 void log(const char *, ...) PRINTF_FORMAT(1, 2);
 
+extern bool g_verbose;
+
 #endif

=== modified file 'src/logic/bob.cc'
--- src/logic/bob.cc	2010-04-04 12:32:35 +0000
+++ src/logic/bob.cc	2010-04-13 18:44:39 +0000
@@ -692,10 +692,6 @@
 void Bob::movepath_update(Game & game, State & state)
 {
 	if (get_signal().size()) {
-		if (serial() == 3755)
-			molog
-				("[movepath_update] signal '%s'; popping task\n",
-				 get_signal().c_str());
 		return pop_task(game);
 	}
 
@@ -919,10 +915,6 @@
 	m_walkstart = game.get_gametime();
 	m_walkend = m_walkstart + tdelta;
 
-	if (serial() == 3755)
-		molog
-			("[start_walk]: changint position from (%i, %i) to (%i, %i)\n",
-			 get_position().x, get_position().y, newnode.x, newnode.y);
 	set_position(game, newnode);
 	set_animation(game, a);
 

=== modified file 'src/logic/bob.h'
--- src/logic/bob.h	2010-04-03 16:44:44 +0000
+++ src/logic/bob.h	2010-04-13 18:44:39 +0000
@@ -323,11 +323,17 @@
 	bool is_walking() {return m_walking != IDLE;}
 
 
+	/**
+	 * This is a hack that should not be used, if possible.
+	 * It is only introduced here because profiling showed
+	 * that soldiers spend a lot of time in the node blocked check.
+	 */
+	Bob * get_next_on_field() const {return m_linknext;}
+
 protected:
 	Bob(const Descr & descr);
 	virtual ~Bob();
 
-
 private:
 	void do_act(Game &);
 	void do_pop_task(Game &);

=== modified file 'src/logic/immovable.cc'
--- src/logic/immovable.cc	2010-04-01 11:19:48 +0000
+++ src/logic/immovable.cc	2010-04-13 18:44:39 +0000
@@ -337,7 +337,8 @@
 m_anim        (0),
 m_program     (0),
 m_program_ptr (0),
-m_program_step(0)
+m_program_step(0),
+m_reserved_by_worker(false)
 {}
 
 
@@ -471,6 +472,22 @@
 		dst.drawanim(pos, m_anim, game.get_gametime() - m_animstart, 0);
 }
 
+/**
+ * Returns whether this immovable was reserved by a worker.
+ */
+bool Immovable::is_reserved_by_worker() const
+{
+	return m_reserved_by_worker;
+}
+
+/**
+ * Change whether this immovable is marked as reserved by a worker.
+ */
+void Immovable::set_reserved_by_worker(bool reserve)
+{
+	m_reserved_by_worker = reserve;
+}
+
 
 /*
 ==============================
@@ -480,7 +497,7 @@
 ==============================
 */
 
-#define IMMOVABLE_SAVEGAME_VERSION 2
+#define IMMOVABLE_SAVEGAME_VERSION 3
 
 void Immovable::Loader::load(FileRead & fr, uint8_t const version)
 {
@@ -537,6 +554,9 @@
 	}
 
 	imm.m_program_step = fr.Signed32();
+
+	if (version >= 3)
+		imm.m_reserved_by_worker = fr.Unsigned8();
 }
 
 void Immovable::Loader::load_pointers()
@@ -560,7 +580,7 @@
 void Immovable::save
 	(Editor_Game_Base & egbase, Map_Map_Object_Saver & mos, FileWrite & fw)
 {
-	// This is in front because it is required to obtain the descriptiong
+	// This is in front because it is required to obtain the description
 	// necessary to create the Immovable
 	fw.Unsigned8(header_Immovable);
 	fw.Unsigned8(IMMOVABLE_SAVEGAME_VERSION);
@@ -586,6 +606,8 @@
 
 	fw.Unsigned32(m_program_ptr);
 	fw.Signed32(m_program_step);
+
+	fw.Unsigned8(m_reserved_by_worker);
 }
 
 Map_Object::Loader * Immovable::load

=== modified file 'src/logic/immovable.h'
--- src/logic/immovable.h	2010-02-28 18:40:36 +0000
+++ src/logic/immovable.h	2010-04-13 18:44:39 +0000
@@ -153,6 +153,9 @@
 		return descr().get_owner_tribe();
 	}
 
+	bool is_reserved_by_worker() const;
+	void set_reserved_by_worker(bool reserve);
+
 protected:
 	Coords                   m_position;
 
@@ -163,6 +166,12 @@
 	uint32_t m_program_ptr; ///< index of next instruction to execute
 	int32_t                      m_program_step; ///< time of next step
 
+	/**
+	 * Immovables like trees are reserved by a worker that is walking
+	 * towards them, so that e.g. two lumberjacks don't attempt to
+	 * work on the same tree simultaneously.
+	 */
+	bool m_reserved_by_worker;
 
 	// Load/save support
 protected:

=== modified file 'src/logic/instances.cc'
--- src/logic/instances.cc	2010-03-27 23:50:23 +0000
+++ src/logic/instances.cc	2010-04-13 18:44:39 +0000
@@ -437,6 +437,9 @@
  */
 void Map_Object::molog(char const * fmt, ...) const
 {
+	if (!g_verbose && !m_logsink)
+		return;
+
 	va_list va;
 	char buffer[2048];
 

=== modified file 'src/logic/map.cc'
--- src/logic/map.cc	2010-04-03 16:44:44 +0000
+++ src/logic/map.cc	2010-04-13 18:44:39 +0000
@@ -1892,6 +1892,7 @@
 
 	// Recursively check integrity
 	void debug(uint32_t const node, char const * const str) {
+#if 0
 		uint32_t l = node * 2 + 1;
 		uint32_t r = node * 2 + 2;
 		if (m_data[node]->heap_index != static_cast<int32_t>(node)) {
@@ -1912,6 +1913,7 @@
 			}
 			debug(r, str);
 		}
+#endif
 	}
 
 private:

=== modified file 'src/logic/soldier.cc'
--- src/logic/soldier.cc	2010-04-04 12:32:35 +0000
+++ src/logic/soldier.cc	2010-04-13 18:44:39 +0000
@@ -781,7 +781,9 @@
 	if (signal == "blocked")
 		// Wait before we try again. Note that this must come *after*
 		// we check for a battle
-		return start_task_idle(game, get_animation("idle"), 250);
+		// Note that we *should* be woken via sendSpaceSignals,
+		// so the timeout is just an additional safety net.
+		return start_task_idle(game, get_animation("idle"), 5000);
 
 	if (!location) {
 		molog("[attack] our location disappeared during a battle\n");
@@ -854,7 +856,7 @@
 			(start_task_movepath
 			 	(game,
 			 	 baseflag.get_position(),
-			 	 0,
+			 	 4, // use larger persist when returning home
 			 	 descr().get_right_walk_anims(does_carry_ware())))
 			return;
 		else {
@@ -870,7 +872,7 @@
 			(start_task_movepath
 			 	(game,
 			 	 enemy->base_flag().get_position(),
-			 	 2,
+			 	 3,
 			 	 descr().get_right_walk_anims(does_carry_ware())))
 			return;
 		else {
@@ -1015,7 +1017,9 @@
 	if (signal == "blocked")
 		// Wait before we try again. Note that this must come *after*
 		// we check for a battle
-		return start_task_idle(game, get_animation("idle"), 250);
+		// Note that we *should* be woken via sendSpaceSignals,
+		// so the timeout is just an additional safety net.
+		return start_task_idle(game, get_animation("idle"), 5000);
 
 	// If we only are defending our home ...
 	if (state.ivar1 & CF_DEFEND_STAYHOME) {
@@ -1103,7 +1107,7 @@
 			(start_task_movepath
 			 	(game,
 			 	 baseflag.get_position(),
-			 	 0,
+			 	 4, // use larger persist when returning home
 			 	 descr().get_right_walk_anims(does_carry_ware())))
 			return;
 
@@ -1153,7 +1157,7 @@
 			(start_task_movepath
 			 	(game,
 			 	 target.s->get_position(),
-			 	 1,
+			 	 3,
 			 	 descr().get_right_walk_anims(does_carry_ware()),
 			 	 false,
 			 	 1))
@@ -1506,62 +1510,67 @@
 bool Soldier::checkNodeBlocked
 	(Game & game, FCoords const & field, bool const commit)
 {
-	if (!isOnBattlefield())
-		return false;
-
-	if (upcast(Building, building, get_location(game))) {
-		if (field == building->get_position()) {
-			if (commit)
-				sendSpaceSignals(game);
-			return false; // we can always walk home
-		}
-	}
-
-	std::vector<Bob *> soldiers;
-	game.map().find_bobs
-		(Area<FCoords>(field, 0), &soldiers, FindBobSoldierOnBattlefield());
+	State * attackdefense = get_state(taskAttack);
+
+	if (!attackdefense)
+		attackdefense = get_state(taskDefense);
 
 	if
-		(soldiers.size() &&
-		 (!m_battle ||
-		  std::find(soldiers.begin(), soldiers.end(), m_battle->opponent(*this))
-		  ==
-		  soldiers.end()))
+		(!attackdefense ||
+		 (attackdefense->ivar1 & CF_RETREAT_WHEN_INJURED and
+		  attackdefense->ui32var3 > get_current_hitpoints()))
 	{
-		if (commit && soldiers.size() == 1) {
-			Soldier & soldier = ref_cast<Soldier, Bob>(*soldiers[0]);
-			if (soldier.get_owner() != get_owner() && soldier.canBeChallenged()) {
+		// Retreating or non-combatant soldiers act like normal bobs
+		return Bob::checkNodeBlocked(game, field, commit);
+	}
+
+	if (field.field->get_immovable() && field.field->get_immovable() == get_location(game)) {
+		if (commit)
+			sendSpaceSignals(game);
+		return false; // we can always walk home
+	}
+
+	Soldier * foundsoldier = 0;
+	bool foundbattle = false;
+	bool foundopponent = false;
+	bool multiplesoldiers = false;
+
+	for (Bob * bob = field.field->get_first_bob(); bob; bob = bob->get_next_on_field()) {
+		if (upcast(Soldier, soldier, bob)) {
+			if (!soldier->isOnBattlefield() || !soldier->get_current_hitpoints())
+				continue;
+
+			if (!foundsoldier) {
+				foundsoldier = soldier;
+			} else {
+				multiplesoldiers = true;
+			}
+
+			if (soldier->getBattle()) {
+				foundbattle = true;
+
+				if (m_battle && m_battle->opponent(*this) == soldier)
+					foundopponent = true;
+			}
+		}
+	}
+
+	if (!foundopponent && (foundbattle || foundsoldier)) {
+		if (commit && !foundbattle && !multiplesoldiers) {
+			if (foundsoldier->get_owner() != get_owner() && foundsoldier->canBeChallenged()) {
 				molog
 					("[checkNodeBlocked] attacking a soldier (%u)\n",
-					 soldier.serial());
-				new Battle(game, *this, soldier);
-			}
-		}
-
-		/// Only battles block retreating soldiers
-		State * state = 0;
-
-		if (get_state(taskAttack)) {
-			state = get_state(taskAttack);
-		}
-		if (get_state(taskDefense)) {
-			state = get_state(taskDefense);
-		}
-		if (state) {
-			if
-				(state->ivar1 & CF_RETREAT_WHEN_INJURED and
-				 state->ui32var3 > get_current_hitpoints())
-			{
-				// Retreating soldiers act like normal bobs
-				return Bob::checkNodeBlocked(game, field, commit);
-			}
-		}
+					 foundsoldier->serial());
+				new Battle(game, *this, *foundsoldier);
+			}
+		}
+
 		return true;
+	} else {
+		if (commit)
+			sendSpaceSignals(game);
+		return false;
 	}
-
-	if (commit)
-		sendSpaceSignals(game);
-	return false;
 }
 
 

=== modified file 'src/logic/worker.cc'
--- src/logic/worker.cc	2010-03-21 20:09:51 +0000
+++ src/logic/worker.cc	2010-04-13 18:44:39 +0000
@@ -453,15 +453,18 @@
 
 	Map & map = game.map();
 	Area<FCoords> area (map.get_fcoords(get_position()), 0);
-	if (action.sparam1 == "immovable")
+	if (action.sparam1 == "immovable") {
+		bool found_reserved = false;
+
 		for (;; ++area.radius) {
 			if (action.iparam1 < area.radius) {
 				send_signal(game, "fail"); //  no object found, cannot run program
 				pop_task(game);
-				informPlayer
-					(game,
-					 ref_cast<Building, PlayerImmovable>(*get_location(game)),
-					 Map_Object_Descr::get_attribute_name(action.iparam2));
+				if (!found_reserved)
+					informPlayer
+						(game,
+						 ref_cast<Building, PlayerImmovable>(*get_location(game)),
+						 Map_Object_Descr::get_attribute_name(action.iparam2));
 				return true;
 			}
 			std::vector<ImmovableFound> list;
@@ -472,12 +475,21 @@
 				map.find_reachable_immovables
 					(area, &list, cstep, FindImmovableAttribute(action.iparam2));
 
+			for (int idx = list.size() - 1; idx >= 0; idx--) {
+				if (upcast(Immovable, imm, list[idx].object)) {
+					if (imm->is_reserved_by_worker()) {
+						found_reserved = true;
+						list.erase(list.begin() + idx);
+					}
+				}
+			}
+
 			if (list.size()) {
-				state.objvar1 = list[game.logic_rand() % list.size()].object;
+				set_program_objvar(game, state, list[game.logic_rand() % list.size()].object);
 				break;
 			}
 		}
-	else
+	} else {
 		for (;; ++area.radius) {
 			if (action.iparam1 < area.radius) {
 				send_signal(game, "fail"); //  no object found, cannot run program
@@ -497,10 +509,11 @@
 					(area, &list, cstep, FindBobAttribute(action.iparam2));
 
 			if (list.size()) {
-				state.objvar1 = list[game.logic_rand() % list.size()];
+				set_program_objvar(game, state, list[game.logic_rand() % list.size()]);
 				break;
 			}
 		}
+	}
 
 	++state.ivar1;
 	schedule_act(game, 10);
@@ -1701,7 +1714,7 @@
 	"program",
 	static_cast<Bob::Ptr>(&Worker::program_update),
 	0,
-	0,
+	static_cast<Bob::Ptr>(&Worker::program_pop),
 	false
 };
 
@@ -1739,6 +1752,25 @@
 	}
 }
 
+void Worker::program_pop(Game & game, State & state)
+{
+	set_program_objvar(game, state, 0);
+}
+
+void Worker::set_program_objvar(Game & game, State & state, Map_Object * obj)
+{
+	assert(state.task == &taskProgram);
+
+	if (upcast(Immovable, imm, state.objvar1.get(game))) {
+		imm->set_reserved_by_worker(false);
+	}
+
+	state.objvar1 = obj;
+
+	if (upcast(Immovable, imm, obj)) {
+		imm->set_reserved_by_worker(true);
+	}
+}
 
 const Bob::Task Worker::taskGowarehouse = {
 	"gowarehouse",

=== modified file 'src/logic/worker.h'
--- src/logic/worker.h	2010-02-28 18:40:36 +0000
+++ src/logic/worker.h	2010-04-13 18:44:39 +0000
@@ -181,6 +181,8 @@
 
 	bool does_carry_ware() {return m_carried_item.is_set();}
 
+	void set_program_objvar(Game &, State &, Map_Object * obj);
+
 public:
 	static const Task taskTransfer;
 	static const Task taskBuildingwork;
@@ -203,6 +205,7 @@
 	void buildingwork_update(Game &, State &);
 	void return_update(Game &, State &);
 	void program_update(Game &, State &);
+	void program_pop(Game &, State &);
 	void gowarehouse_update(Game &, State &);
 	void gowarehouse_signalimmediate
 		(Game &,

=== modified file 'src/ui_basic/editbox.cc'
--- src/ui_basic/editbox.cc	2010-03-27 23:50:23 +0000
+++ src/ui_basic/editbox.cc	2010-04-13 18:44:39 +0000
@@ -46,6 +46,9 @@
 	/// Position of the caret.
 	uint32_t caret;
 
+	/// Current scrolling offset to the text anchor position, in pixels
+	int32_t scrolloffset;
+
 	/// Alignment of the text. Vertical alignment is always centered.
 	Align align;
 };
@@ -69,8 +72,9 @@
 
 	m->id = id;
 	m->align = static_cast<Align>((_align & Align_Horizontal) | Align_VCenter);
+	m->caret = 0;
+	m->scrolloffset = 0;
 	// yes, use *signed* max as maximum length; just a small safe-guard.
-	m->caret = 0;
 	m->maxLength = std::numeric_limits<int32_t>::max();
 
 	set_handle_mouse(true);
@@ -138,6 +142,7 @@
 		if (m->caret > m->text.size())
 			m->caret = m->text.size();
 
+		check_caret();
 		update();
 	}
 }
@@ -163,6 +168,8 @@
 	_align = static_cast<Align>((_align & Align_Horizontal) | Align_VCenter);
 	if (_align != m->align) {
 		m->align = _align;
+		m->scrolloffset = 0;
+		check_caret();
 		update();
 	}
 }
@@ -220,6 +227,7 @@
 				while ((m->text[--m->caret] & 0xc0) == 0x80)
 					m->text.erase(m->text.begin() + m->caret);
 				m->text.erase(m->text.begin() + m->caret);
+				check_caret();
 				changed.call();
 				changedid.call(m->id);
 				update();
@@ -233,6 +241,7 @@
 					for (uint32_t new_caret = m->caret;; m->caret = new_caret)
 						if (0 == new_caret or isspace(m->text[--new_caret]))
 							break;
+				check_caret();
 				update();
 			}
 			return true;
@@ -250,6 +259,7 @@
 							m->caret = new_caret;
 							break;
 						}
+				check_caret();
 				update();
 			}
 			return true;
@@ -257,6 +267,7 @@
 		case SDLK_HOME:
 			if (m->caret != 0) {
 				m->caret = 0;
+				check_caret();
 				update();
 			}
 			return true;
@@ -264,6 +275,7 @@
 		case SDLK_END:
 			if (m->caret != m->text.size()) {
 				m->caret = m->text.size();
+				check_caret();
 				update();
 			}
 			return true;
@@ -296,6 +308,7 @@
 							(m->text.begin() + m->caret++,
 							 ((code.unicode & 0x3f) | 0x80));
 					}
+					check_caret();
 					changed.call();
 					changedid.call(m->id);
 					update();
@@ -354,6 +367,8 @@
 		break;
 	}
 
+	pos.x += m->scrolloffset;
+
 	UI::g_fh->draw_string
 		(dst,
 		 m_fontname, m_fontsize, m_fontcolor, UI_FONT_CLR_BG,
@@ -367,4 +382,46 @@
 		 std::numeric_limits<uint32_t>::max());
 }
 
+/**
+ * Check the caret's position and scroll it into view if necessary.
+ */
+void EditBox::check_caret()
+{
+	std::string leftstr(m->text, 0, m->caret);
+	std::string rightstr(m->text, m->caret, std::string::npos);
+	uint32_t leftw;
+	uint32_t rightw;
+	uint32_t tmp;
+
+	UI::g_fh->get_size(m_fontname, m_fontsize, leftstr, leftw, tmp);
+	UI::g_fh->get_size(m_fontname, m_fontsize, rightstr, rightw, tmp);
+
+	int32_t caretpos;
+
+	switch (m->align & Align_Horizontal) {
+	case Align_HCenter:
+		caretpos = (get_w() - static_cast<int32_t>(leftw + rightw)) / 2 + m->scrolloffset + leftw;
+		break;
+	case Align_Right:
+		caretpos = get_w() - 4 + m->scrolloffset - rightw;
+		break;
+	default:
+		caretpos = 4 + m->scrolloffset + leftw;
+		break;
+	}
+
+	if (caretpos < 4)
+		m->scrolloffset += 4 - caretpos + get_w()/5;
+	else if (caretpos > get_w() - 4)
+		m->scrolloffset -= caretpos - get_w() + 4 + get_w()/5;
+
+	if ((m->align & Align_Horizontal) == Align_Left) {
+		if (m->scrolloffset > 0)
+			m->scrolloffset = 0;
+	} else if ((m->align & Align_Horizontal) == Align_Right) {
+		if (m->scrolloffset < 0)
+			m->scrolloffset = 0;
+	}
+}
+
 }

=== modified file 'src/ui_basic/editbox.h'
--- src/ui_basic/editbox.h	2010-03-27 23:50:23 +0000
+++ src/ui_basic/editbox.h	2010-04-13 18:44:39 +0000
@@ -74,6 +74,8 @@
 	RGBColor                       m_fontcolor;
 
 	boost::scoped_ptr<EditBoxImpl> m;
+
+	void check_caret();
 };
 
 }

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2010-04-12 09:11:24 +0000
+++ src/wlapplication.cc	2010-04-13 18:44:39 +0000
@@ -1116,6 +1116,12 @@
 		m_commandline.erase("double");
 	}
 
+	if (m_commandline.count("verbose")) {
+		g_verbose = true;
+
+		m_commandline.erase("verbose");
+	}
+
 	if (m_commandline.count("editor")) {
 		m_filename = m_commandline["editor"];
 		if (m_filename.size() and *m_filename.rbegin() == '/')
@@ -1332,6 +1338,7 @@
 			 "                      testing)\n\n");
 #endif
 #endif
+	wout << _(" --verbose            Enable verbose debug messages\n") << endl;
 	wout << _(" --help               Show this help\n") << endl;
 	wout
 		<<