Home / Browse / Widelands / Mail / Archive

Donate

Widelands

Email Archive: widelands-cvs (read-only)

2004:	_Jan	_Feb	_Mar	_Apr	_May (11)	_Jun (4)	_Jul (77)	_Aug (249)	_Sep (214)	_Oct (21)	_Nov (15)	_Dec (551)
2005:	_Jan (116)	_Feb	_Mar (4)	_Apr (10)	_May (2)	_Jun (237)	_Jul (38)	_Aug (5)	_Sep (2)	_Oct (4)	_Nov (325)	_Dec (337)
2006:	_Jan (67)	_Feb (71)	_Mar (21)	_Apr (40)	_May (204)	_Jun (320)	_Jul (10)	_Aug (5)	_Sep (348)	_Oct (83)	_Nov (90)	_Dec (53)
2007:	_Jan (95)	_Feb (91)	_Mar (86)	_Apr (83)	_May (48)	_Jun (39)	_Jul (24)	_Aug (212)	_Sep (193)	_Oct (50)	_Nov (4)	_Dec (2)
2008:	_Jan (64)	_Feb (39)	_Mar (222)	_Apr (47)	_May (1)	_Jun (17)	_Jul (27)	_Aug (59)	_Sep (22)	_Oct (143)	_Nov (111)	_Dec (72)
2009:	_Jan (13)	_Feb (7)	_Mar (88)	_Apr (211)	_May (235)	_Jun (145)	_Jul (108)	_Aug (49)	_Sep (96)	_Oct (10)	_Nov (136)	_Dec (87)
2010:	_Jan (200)	_Feb (3)	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
			1	2	3	4
					(27)
5	6	7	8	9	10	11
	(7)
12	13	14	15	16	17	18
(3)					(9)	(1)
19	20	21	22	23	24	25
(3)		(12)	(11)	(5)	(2)	(1)
26	27	28	29	30	31
(6)	(37)	(38)	(30)	(3)	(17)

[Widelands-cvs] SF.net SVN: widelands: [2543] trunk/src

From: <sigra@us...> - 2007-08-29 09:40

Revision: 2543
          http://widelands.svn.sourceforge.net/widelands/?rev=2543&view=rev
Author:   sigra
Date:     2007-08-29 02:40:14 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Port casts to C++.

Modified Paths:
--------------
    trunk/src/building.cc
    trunk/src/building_ui.cc
    trunk/src/constructionsite.cc
    trunk/src/filesystem/unzip.cc
    trunk/src/md5.cc
    trunk/src/network.cc
    trunk/src/productionsite.cc
    trunk/src/singleton.h
    trunk/src/terrain.h
    trunk/src/world.cc
    trunk/src/wui_plot_area.cc

Modified: trunk/src/building.cc
===================================================================
--- trunk/src/building.cc	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/building.cc	2007-08-29 09:40:14 UTC (rev 2543)
@@ -627,7 +627,7 @@
 
 	if (!m_leave_queue.size())
 	{
-		if ((int)(time - m_leave_time) >= 0) {
+		if (static_cast<int>(time - m_leave_time) >= 0) {
 			m_leave_time = time + BUILDING_LEAVE_INTERVAL;
 			return true;
 		}
@@ -651,7 +651,7 @@
 {
 	uint time = g->get_gametime();
 
-	if ((int)(time - m_leave_time) >= 0)
+	if (static_cast<int>(time - m_leave_time) >= 0)
 	{
 		bool wakeup = false;
 

Modified: trunk/src/building_ui.cc
===================================================================
--- trunk/src/building_ui.cc	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/building_ui.cc	2007-08-29 09:40:14 UTC (rev 2543)
@@ -384,10 +384,10 @@
 */
 void WaresQueueDisplay::think()
 {
-	if ((uint)m_queue->get_size() != m_cache_size)
+	if (static_cast<uint>(m_queue->get_size()) != m_cache_size)
 		recalc_size();
 
-	if ((uint)m_queue->get_filled() != m_cache_filled)
+	if (static_cast<uint>(m_queue->get_filled()) != m_cache_filled)
 		update(0, 0, get_w(), get_h());
 }
 

Modified: trunk/src/constructionsite.cc
===================================================================
--- trunk/src/constructionsite.cc	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/constructionsite.cc	2007-08-29 09:40:14 UTC (rev 2543)
@@ -467,7 +467,7 @@
 
 	// Check if one step has completed
 	if (m_working) {
-		if ((int)(g->get_gametime() - m_work_steptime) < 0) {
+		if (static_cast<int>(g->get_gametime() - m_work_steptime) < 0) {
 			w->start_task_idle(g, w->get_animation("idle"), m_work_steptime - g->get_gametime());
 			return true;
 		} else {

Modified: trunk/src/filesystem/unzip.cc
===================================================================
--- trunk/src/filesystem/unzip.cc	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/filesystem/unzip.cc	2007-08-29 09:40:14 UTC (rev 2543)
@@ -175,10 +175,10 @@
 local int unzlocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, int* pi)
 {
     unsigned char c;
-    int err = (int)ZREAD(*pzlib_filefunc_def, filestream, &c, 1);
-    if (err==1)
-    {
-        *pi = (int)c;
+	const int err =
+		static_cast<int>(ZREAD(*pzlib_filefunc_def, filestream, &c, 1));
+	if (err == 1) {
+		*pi = static_cast<int>(c);
         return UNZ_OK;
 	}
     else
@@ -1060,8 +1060,8 @@
 
     pfile_in_zip_read_info->stream_initialised=0;
 
-    if (method!=NULL)
-        *method = (int)s->cur_file_info.compression_method;
+	if (method != NULL)
+		*method = static_cast<int>(s->cur_file_info.compression_method);
 
     if (level!=NULL)
     {
@@ -1375,8 +1375,7 @@
     size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
                 pfile_in_zip_read_info->pos_local_extrafield);
 
-    if (buf==NULL)
-        return (int)size_to_read;
+	if (buf == NULL) return static_cast<int>(size_to_read);
 
     if (len>size_to_read)
         read_now = (uInt)size_to_read;
@@ -1398,7 +1397,7 @@
               buf, read_now)!=read_now)
         return UNZ_ERRNO;
 
-    return (int)read_now;
+	return static_cast<int>(read_now);
 }
 
 /*
@@ -1473,7 +1472,7 @@
 
     if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
         *(szComment+s->gi.size_comment)='\0';
-    return (int)uReadThis;
+	return static_cast<int>(uReadThis);
 }
 
 /* Additions by RX '2004 */
@@ -1820,10 +1819,10 @@
 local int ziplocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, int* pi)
 {
     unsigned char c;
-    int err = (int)ZREAD(*pzlib_filefunc_def, filestream, &c, 1);
-    if (err==1)
-    {
-        *pi = (int)c;
+	const int err =
+		static_cast<int>(ZREAD(*pzlib_filefunc_def, filestream, &c, 1));
+	if (err == 1) {
+		*pi = static_cast<int>(c);
         return ZIP_OK;
 	}
     else

Modified: trunk/src/md5.cc
===================================================================
--- trunk/src/md5.cc	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/md5.cc	2007-08-29 09:40:14 UTC (rev 2543)
@@ -273,7 +273,7 @@
 		/* Before we start, one word to the strange constants.
 		They are defined in RFC 1321 as
 
-		T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+		T[i] = static_cast<int>(4294967296.0 * fabs (sin (i))), i=1..64
 		*/
 
 		/* Round 1.  */

Modified: trunk/src/network.cc
===================================================================
--- trunk/src/network.cc	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/network.cc	2007-08-29 09:40:14 UTC (rev 2543)
@@ -488,7 +488,7 @@
 
 		// send any outstanding player commands
 		while (!cmds.empty()) {
-			log ("[Host] %d player commands queued\n", (int)cmds.size());
+			log ("[Host] %u player commands queued\n", cmds.size());
 
 			PlayerCommand* cmd=cmds.front();
 			cmds.pop ();
@@ -585,7 +585,7 @@
 
 	net_delay/=4;
 
-	log ("network delay is now %dms\n", (int) net_delay);
+	log ("network delay is now %ums\n", net_delay);
 }
 
 void NetHost::send_player_command (PlayerCommand* cmd)

Modified: trunk/src/productionsite.cc
===================================================================
--- trunk/src/productionsite.cc	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/productionsite.cc	2007-08-29 09:40:14 UTC (rev 2543)
@@ -229,7 +229,7 @@
 		return _("(not occupied)");
 	else if (m_worker_requests.size()) {
 		char buf[1000];
-		sprintf(buf, "Waiting for %i workers!", (int)m_worker_requests.size());
+		sprintf(buf, "Waiting for %u workers!", m_worker_requests.size());
 		return buf;
 	}
 
@@ -274,7 +274,7 @@
 			 "%.0f%% %s", percOk, trend.c_str());
 	else snprintf(m_statistics_buf, sizeof(m_statistics_buf), "%.0f%%", percOk);
 
-	m_last_stat_percent = (char)percOk;
+	m_last_stat_percent = static_cast<char>(percOk);
 
 	m_statistics_changed = false;
 }
@@ -509,7 +509,11 @@
 {
 	Building::act(g, data);
 
-	if (m_program_timer && (int)(g->get_gametime() - m_program_time) >= 0) {
+	if
+		(m_program_timer
+		 and
+		 static_cast<int>(g->get_gametime() - m_program_time) >= 0)
+	{
 		m_program_timer = false;
 
 		if (!m_program.size())

Modified: trunk/src/singleton.h
===================================================================
--- trunk/src/singleton.h	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/singleton.h	2007-08-29 09:40:14 UTC (rev 2543)
@@ -28,11 +28,14 @@
 		  static T* ms;
 
 		  public:
-		  Singleton() {
+	Singleton() {
 					 assert (!ms) ;
-					 int offset = (int)(T*)1 - (int)(Singleton <T>*)(T*)1;
-					 ms=(T*)((int)this+offset);
-		}
+		const int offset =
+			static_cast<int>                            (static_cast<T *>(1))
+			-
+			static_cast<int>(static_cast<Singleton<T> *>(static_cast<T *>(1)));
+		ms = static_cast<T *>(static_cast<int>(this) + offset);
+	}
 		  ~Singleton() {assert(ms); ms=0;}
 		  static inline T& get_singleton() {assert (ms); return *ms;}
 		  static inline T* get_ptsingleton() {assert(ms); return ms;}

Modified: trunk/src/terrain.h
===================================================================
--- trunk/src/terrain.h	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/terrain.h	2007-08-29 09:40:14 UTC (rev 2543)
@@ -34,7 +34,7 @@
 /**
  * \todo Dangerous: casting, assumptions for sizeof(X), bitshifting
  */
-#define FTOFIX(f) ((int) ((f)*0x10000))
+#define FTOFIX(f) (static_cast<int>((f) * 0x10000))
 #define ITOFIX(i) ((i)<<16)
 #define FIXTOI(f) ((f)>>16)
 

Modified: trunk/src/world.cc
===================================================================
--- trunk/src/world.cc	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/world.cc	2007-08-29 09:40:14 UTC (rev 2543)
@@ -101,8 +101,9 @@
 
 	for (uint i = 1; i < m_editor_pics.size(); ++i)
 	{
-		int diff1 = m_editor_pics[bestmatch].upperlimit - (int)amount;
-		int diff2 = m_editor_pics[i].upperlimit - (int)amount;
+		const int diff1 =
+			m_editor_pics[bestmatch].upperlimit - static_cast<int>(amount);
+		const int diff2 = m_editor_pics[i].upperlimit - static_cast<int>(amount);
 
 		// This is a catch-all for high amounts
 		if (m_editor_pics[i].upperlimit < 0)

Modified: trunk/src/wui_plot_area.cc
===================================================================
--- trunk/src/wui_plot_area.cc	2007-08-29 05:36:14 UTC (rev 2542)
+++ trunk/src/wui_plot_area.cc	2007-08-29 09:40:14 UTC (rev 2543)
@@ -187,16 +187,21 @@
 
    // Now, plot the pixels
    sub = xline_length / ((float)time_in_ms[m_time] / (float)m_sample_rate);
-   for (uint plot = 0; plot < m_plotdata.size(); plot++) {
+	for (uint plot = 0; plot < m_plotdata.size(); ++plot) {
       if (!m_plotdata[plot].showplot) continue;
 
       RGBColor color = m_plotdata[plot].plotcolor;
       const std::vector<uint>* dataset = m_plotdata[plot].dataset;
 
       std::vector<uint> m_data;
-      if (m_plotmode == PLOTMODE_RELATIVE) {
+		if (m_plotmode == PLOTMODE_RELATIVE) {
          // How many do we take together
-         int how_many = (int)(((float)time_in_ms[m_time] / (float)NR_SAMPLES) /(float)m_sample_rate);
+			const int how_many = static_cast<int>
+				((static_cast<float>(time_in_ms[m_time])
+				  /
+				  static_cast<float>(NR_SAMPLES))
+				 /
+				 static_cast<float>(m_sample_rate));
 
          uint add = 0;
          // Relative data, first entry is always zero
@@ -217,14 +222,17 @@
 
       int lx = get_inner_w()-space_at_right;
       int ly = get_inner_h()-space_at_bottom;
-      for (int i = dataset->size()-1; i > 0 && posx > spacing; i--) {
+		for (int i = dataset->size() - 1; i > 0 and posx > spacing; --i) {
          int value = (*dataset)[i];
 
-         int curx = (int)posx;
+			int curx = static_cast<int>(posx);
          int cury = get_inner_h()-space_at_bottom;
-         if (value) {
-            float length_y = yline_length / ((float)max / (float)value);
-            cury -= (int)length_y;
+			if (value) {
+				const float length_y =
+					yline_length
+					/
+					(static_cast<float>(max) / static_cast<float>(value));
+				cury -= static_cast<int>(length_y);
 			}
          dst->draw_line(lx, ly, curx, cury, color);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2544] trunk/src

From: <sigra@us...> - 2007-08-29 10:08

Revision: 2544
          http://widelands.svn.sourceforge.net/widelands/?rev=2544&view=rev
Author:   sigra
Date:     2007-08-29 03:08:06 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Fix issues found by utils/detect_spurious_source_code.sh.

Modified Paths:
--------------
    trunk/src/cmd_queue.cc
    trunk/src/cmd_queue.h
    trunk/src/editor/ui_menus/editor_tool_place_bob_options_menu.cc
    trunk/src/fileread.h
    trunk/src/game.cc
    trunk/src/game.h
    trunk/src/game_cmd_queue_data_packet.cc
    trunk/src/game_server_proto_packet_chatmessage.cc
    trunk/src/game_server_proto_packet_connect.cc
    trunk/src/game_server_proto_packet_getroominfo.cc
    trunk/src/game_server_proto_packet_getuserinfo.cc
    trunk/src/md5.cc
    trunk/src/md5.h
    trunk/src/militarysite.cc
    trunk/src/network.cc
    trunk/src/replay.cc
    trunk/src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.cc
    trunk/src/widelands_map_buildingdata_data_packet.cc
    trunk/src/wlapplication.cc
    trunk/src/worker_descr.cc

Modified: trunk/src/cmd_queue.cc
===================================================================
--- trunk/src/cmd_queue.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/cmd_queue.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -108,7 +108,7 @@
 
 		if (dynamic_cast<GameLogicCommand*>(c)) {
 			StreamWrite& ss(m_game->syncstream());
-			static const Uint8 tag[] = { 0xde, 0xad, 0x00 };
+			static const Uint8 tag[] = {0xde, 0xad, 0x00};
 			ss.Data(tag, 3); // provide an easy-to-find pattern as debugging aid
 			ss.Unsigned32(c->get_duetime());
 			ss.Unsigned32(c->get_id());

Modified: trunk/src/cmd_queue.h
===================================================================
--- trunk/src/cmd_queue.h	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/cmd_queue.h	2007-08-29 10:08:06 UTC (rev 2544)
@@ -78,8 +78,8 @@
 	virtual void execute (Game*) = 0;
 	virtual int get_id() = 0;
 
-	int get_duetime() const { return m_duetime; }
-	void set_duetime(int t) { m_duetime = t; }
+	int get_duetime() const {return m_duetime;}
+	void set_duetime(int t) {m_duetime = t;}
 };
 
 

Modified: trunk/src/editor/ui_menus/editor_tool_place_bob_options_menu.cc
===================================================================
--- trunk/src/editor/ui_menus/editor_tool_place_bob_options_menu.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/editor/ui_menus/editor_tool_place_bob_options_menu.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -54,8 +54,7 @@
 	const uint bobs_in_row =
 		std::max
 		(std::min
-		 (static_cast<uint>(ceil(sqrt(static_cast<const float>(nr_bobs)))),
-		  24U),
+		 (static_cast<uint>(ceil(sqrt(static_cast<float>(nr_bobs)))), 24U),
 		 12U);
 
 	m_tabpanel.set_snapparent(true);

Modified: trunk/src/fileread.h
===================================================================
--- trunk/src/fileread.h	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/fileread.h	2007-08-29 10:08:06 UTC (rev 2544)
@@ -39,10 +39,11 @@
 
 	struct FileRead_Exception : public std::exception {};
 	struct File_Boundary_Exceeded : public FileRead_Exception {
-		virtual const char* what() const throw() { return "File boundary exceeded"; }
+		virtual const char * what() const throw()
+		{return "File boundary exceeded";}
 	};
 	struct Buffer_Overflow : public FileRead_Exception {
-		virtual const char* what() const throw() { return "Buffer overflow"; }
+		virtual const char * what() const throw() {return "Buffer overflow";}
 	};
 
 	FileRead (); /// Create the object with nothing to read.

Modified: trunk/src/game.cc
===================================================================
--- trunk/src/game.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/game.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -74,8 +74,8 @@
 		assert(m_target);
 
 		log("[sync:%08u]", m_counter);
-		for(size_t i = 0; i < size; ++i)
-			log(" %02x", ((const Uint8*)data)[i]);
+		for (size_t i = 0; i < size; ++i)
+			log(" %02x", (static_cast<const Uint8 *>(data))[i]);
 		log("\n");
 
 		m_target->Data(data, size);

Modified: trunk/src/game.h
===================================================================
--- trunk/src/game.h	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/game.h	2007-08-29 10:08:06 UTC (rev 2544)
@@ -109,7 +109,7 @@
 	virtual void postload();
 	void think();
 
-	ReplayWriter* get_replaywriter() { return m_replaywriter; }
+	ReplayWriter * get_replaywriter() {return m_replaywriter;}
 
 	/**
 	 * \return \c true if the game is completely loaded and running (or paused)

Modified: trunk/src/game_cmd_queue_data_packet.cc
===================================================================
--- trunk/src/game_cmd_queue_data_packet.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/game_cmd_queue_data_packet.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -56,7 +56,7 @@
 
 			if (packet_version == CURRENT_PACKET_VERSION)
 			{
-				for(;;) {
+				for (;;) {
 					uint packet_id = fr.Unsigned16();
 
 					if (!packet_id)
@@ -96,7 +96,7 @@
 					++i;
 				}
 			}
-		} catch(std::exception& e) {
+		} catch (const std::exception & e) {
 			throw wexception("Error loading Cmd_Queue_Data_Packet: %s", e.what());
 		}
 	else

Modified: trunk/src/game_server_proto_packet_chatmessage.cc
===================================================================
--- trunk/src/game_server_proto_packet_chatmessage.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/game_server_proto_packet_chatmessage.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -59,10 +59,15 @@
 void Game_Server_Protocol_Packet_ChatMessage::handle_reply(Game_Server_Connection* gsc, Network_Buffer* buf) {
    uchar answer = buf->get_8();
 
-   if (answer != CM_ACK) {
+	if (answer != CM_ACK) {
       char buffer[1024];
 
-      snprintf(buffer, 1024, _("Server replied illegally to ChatMessage package. Should have sent %i but sent %i. Ignored").c_str(), CM_ACK, answer);
+		snprintf
+			(buffer, sizeof(buffer),
+			 _("Server replied illegally to ChatMessage package. Should have sent "
+			   "%i but sent %i. Ignored")
+			 .c_str(),
+			 CM_ACK, answer);
 
       gsc->server_message(buffer);
 	}

Modified: trunk/src/game_server_proto_packet_connect.cc
===================================================================
--- trunk/src/game_server_proto_packet_connect.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/game_server_proto_packet_connect.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -57,23 +57,30 @@
 
    char buffer[1024];
 
-   switch (retcode) {
+	switch (retcode) {
       case WELCOME: // Everything is ok
          break;
 
-      case PROTOCOL_TO_OLD:
-	      snprintf(buffer, 1024, _("Server delivers a connection Error. Your Protocol (%i.%02i) is too old, Server runs %i.%02i\n").c_str(),
-			 GSP_MAJOR_VERSION, GSP_MINOR_VERSION, version &0xff00, version &0x00ff);
+	case PROTOCOL_TO_OLD:
+		snprintf
+			(buffer, sizeof(buffer),
+			 _("Server delivers a connection Error. Your Protocol (%i.%02i) is "
+			   "too old, Server runs %i.%02i\n")
+			 .c_str(),
+			 GSP_MAJOR_VERSION, GSP_MINOR_VERSION,
+			 version &0xff00, version &0x00ff);
          gsc->critical_error(buffer);
          break;
 
-      case SERVER_FULL:
-	      snprintf(buffer, 1024, _("Server is full!\n").c_str());
+	case SERVER_FULL:
+		snprintf(buffer, sizeof(buffer), _("Server is full!\n").c_str());
          gsc->critical_error(buffer);
          break;
 
-      case GAME_NOT_SERVED:
-	      snprintf(buffer, 1024, _("This server doesn't serve widelands!\n").c_str());
+	case GAME_NOT_SERVED:
+		snprintf
+			(buffer, sizeof(buffer),
+			 _("This server doesn't serve widelands!\n").c_str());
          gsc->critical_error(buffer);
          break;
 

Modified: trunk/src/game_server_proto_packet_getroominfo.cc
===================================================================
--- trunk/src/game_server_proto_packet_getroominfo.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/game_server_proto_packet_getroominfo.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -58,10 +58,15 @@
 void Game_Server_Protocol_Packet_GetRoomInfo::handle_reply(Game_Server_Connection* gsc, Network_Buffer* buf) {
    uchar flags = buf->get_8();
 
-   if (flags == RI_NONEXISTANT) {
+	if (flags == RI_NONEXISTANT) {
       char buffer[1024];
 
-      snprintf(buffer, 1024, _("The Room %s is currently not logged in or unknown to the server.\n").c_str(), m_roomname.c_str());
+		snprintf
+			(buffer, sizeof(buffer),
+			 _("The Room %s is currently not logged in or unknown to the "
+			   "server.\n")
+			 .c_str(),
+			 m_roomname.c_str());
 
       gsc->server_message(buffer);
       return;

Modified: trunk/src/game_server_proto_packet_getuserinfo.cc
===================================================================
--- trunk/src/game_server_proto_packet_getuserinfo.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/game_server_proto_packet_getuserinfo.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -58,10 +58,15 @@
 void Game_Server_Protocol_Packet_GetUserInfo::handle_reply(Game_Server_Connection* gsc, Network_Buffer* buf) {
    uchar flags = buf->get_8();
 
-   if (flags == UI_UNKNOWN) {
+	if (flags == UI_UNKNOWN) {
       char buffer[1024];
 
-      snprintf(buffer, 1024, _("The User %s is currently not logged in or unknown to the server.\n").c_str(), m_username.c_str());
+		snprintf
+			(buffer, sizeof(buffer),
+			 _("The User %s is currently not logged in or unknown to the "
+			   "server.\n")
+			 .c_str(),
+			 m_username.c_str());
 
       gsc->server_message(buffer);
       return;

Modified: trunk/src/md5.cc
===================================================================
--- trunk/src/md5.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/md5.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -41,7 +41,7 @@
 {
 	std::string s;
 
-	for(uint i = 0; i < sizeof(data); ++i) {
+	for (uint i = 0; i < sizeof(data); ++i) {
 		char buf[3];
 		snprintf(buf, sizeof(buf), "%02x", data[i]);
 		s += buf;
@@ -127,7 +127,7 @@
  * From GNU textutils. md5.c
  *******************************************************************/
 
-static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
+static const unsigned char fillbuf[64] = {0x80, 0/*, 0, 0, ... 0 */};
 
 /* Process the remaining bytes in the internal buffer and the usual
    prolog according to the standard and write the result to RESBUF.
@@ -256,15 +256,13 @@
 		before the computation.  To reduce the work for the next steps
 		we store the swapped words in the array CORRECT_WORDS.  */
 
-#define OP(a, b, c, d, s, T)						\
-	do								\
-	{								\
-		a += FF (b, c, d) + (*cwp++ = (*words)) + T;		\
-		++words;							\
-		CYCLIC (a, s);						\
-		a += b;							\
-	}								\
-	while (0)
+#define OP(a, b, c, d, s, T)                                                   \
+	do {                                                                        \
+		a += FF (b, c, d) + (*cwp++ = (*words)) + T;                             \
+		++words;                                                                 \
+		CYCLIC (a, s);                                                           \
+		a += b;                                                                  \
+	} while (0)                                                                 \
 
 		/* It is unfortunate that C does not provide an operator for
 		cyclic rotation.  Hope the C compiler is smart enough.  */
@@ -298,14 +296,12 @@
 		in CORRECT_WORDS.  Redefine the macro to take an additional first
 		argument specifying the function to use.  */
 #undef OP
-#define OP(f, a, b, c, d, k, s, T)					\
-	do 								\
-	{								\
-		a += f (b, c, d) + correct_words[k] + T;			\
-		CYCLIC (a, s);						\
-		a += b;							\
-	}								\
-	while (0)
+#define OP(f, a, b, c, d, k, s, T)                                             \
+	do {                                                                        \
+		a += f (b, c, d) + correct_words[k] + T;                                 \
+		CYCLIC (a, s);                                                           \
+		a += b;                                                                  \
+	} while (0)                                                                 \
 
 		/* Round 2.  */
 		OP (FG, A, B, C, D,  1,  5, 0xf61e2562);

Modified: trunk/src/md5.h
===================================================================
--- trunk/src/md5.h	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/md5.h	2007-08-29 10:08:06 UTC (rev 2544)
@@ -51,7 +51,7 @@
 		return memcmp(data, o.data, sizeof(data)) == 0;
 	}
 
-	bool operator!=(const md5_checksum& o) const { return !(*this == o); }
+	bool operator!=(const md5_checksum& o) const {return not (*this == o);}
 };
 
 /**

Modified: trunk/src/militarysite.cc
===================================================================
--- trunk/src/militarysite.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/militarysite.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -130,13 +130,20 @@
 */
 std::string MilitarySite::get_statistics_string()
 {
-	char str[255];
+	char buffer[255];
 	if (m_soldier_requests.size())
-		snprintf (str, 255, ngettext("%d soldier (+%d)", "%d soldiers (+%d)", (int)m_soldiers.size()), (int)m_soldiers.size(), (int)m_soldier_requests.size());
+		snprintf
+			(buffer, sizeof(buffer),
+			 ngettext
+			 ("%u soldier (+%u)", "%u soldiers (+%u)",
+			  m_soldiers.size()), m_soldiers.size(), m_soldier_requests.size());
 	else
-		snprintf (str, 255, ngettext("%d soldier", "%d soldiers", (int)m_soldiers.size()), (int)m_soldiers.size());
+		snprintf
+			(buffer, sizeof(buffer),
+			 ngettext
+			 ("%u soldier", "%u soldiers", m_soldiers.size()), m_soldiers.size());
 
-	return str;
+	return buffer;
 }
 
 

Modified: trunk/src/network.cc
===================================================================
--- trunk/src/network.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/network.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -619,7 +619,7 @@
 
 	mysyncreports.push (newsync);
 
-	while(mysyncreports.size()) {
+	while (mysyncreports.size()) {
 		// Now look whether there is at least one syncreport from everyone.
 		// If so, make sure they match.
 		for (i=0;i<clients.size();i++) {
@@ -906,7 +906,7 @@
 {
 	char buffer[64];
 
-	snprintf (buffer, 64, "%s %d", _("Player").c_str(), num);
+	snprintf (buffer, sizeof(buffer), "%s %d", _("Player").c_str(), num);
 
 	Entry entry = {&table.add(), num};
 	entry.entry->set_string (0, buffer);

Modified: trunk/src/replay.cc
===================================================================
--- trunk/src/replay.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/replay.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -49,7 +49,7 @@
 	{
 	}
 
-	int get_id() { return QUEUE_CMD_REPLAYSYNCREAD; }
+	int get_id() {return QUEUE_CMD_REPLAYSYNCREAD;}
 
 	void execute(Game* g)
 	{
@@ -193,9 +193,9 @@
  */
 class Cmd_ReplaySyncWrite : public Command {
 public:
-	Cmd_ReplaySyncWrite(uint t) : Command(t) { }
+	Cmd_ReplaySyncWrite(uint t) : Command(t) {}
 
-	int get_id() { return QUEUE_CMD_REPLAYSYNCWRITE; }
+	int get_id() {return QUEUE_CMD_REPLAYSYNCWRITE;}
 
 	void execute(Game* g) {
 		if (ReplayWriter* rw = g->get_replaywriter()) {

Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -177,7 +177,10 @@
 void Fullscreen_Menu_InetLobby::user_info(std::string user, std::string game, std::string room) {
    char buffer[1024];
 
-   snprintf(buffer, 1024, _("User %s is using \"%s\" in room \"%s\"\n").c_str(), user.c_str(), game.c_str(), room.c_str());
+	snprintf
+		(buffer, sizeof(buffer),
+		 _("User %s is using \"%s\" in room \"%s\"\n").c_str(),
+		 user.c_str(), game.c_str(), room.c_str());
    server_message(buffer);
 }
 

Modified: trunk/src/widelands_map_buildingdata_data_packet.cc
===================================================================
--- trunk/src/widelands_map_buildingdata_data_packet.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/widelands_map_buildingdata_data_packet.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -135,8 +135,8 @@
 				else read_productionsite(*productionsite, fr, egbase, ol);
 			} else {
 				assert(false);
-				//  Type of building is not one of (or derived from)
-				//  {ConstructionSite, Warehouse, ProductionSite}.
+				//  type of building is not one of (or derived from)
+				//  {ConstructionSite, Warehouse, ProductionSite}
 			}
 
 
@@ -567,8 +567,8 @@
 				else write_productionsite(*productionsite, fw, egbase, os);
 			} else {
 				assert(false);
-				//  Type of building is not one of (or derived from)
-				//  {ConstructionSite, Warehouse, ProductionSite}.
+				//  type of building is not one of (or derived from)
+				//  {ConstructionSite, Warehouse, ProductionSite}
 				}
 
             os->mark_object_as_saved(building);

Modified: trunk/src/wlapplication.cc
===================================================================
--- trunk/src/wlapplication.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/wlapplication.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -916,7 +916,7 @@
 	}
 
 	if (m_commandline.count("nozip")>0) {
-		g_options.pull_section("global")->create_val("nozip","true");
+		g_options.pull_section("global")->create_val("nozip", "true");
 		m_commandline.erase("nozip");
 	}
 

Modified: trunk/src/worker_descr.cc
===================================================================
--- trunk/src/worker_descr.cc	2007-08-29 09:40:14 UTC (rev 2543)
+++ trunk/src/worker_descr.cc	2007-08-29 10:08:06 UTC (rev 2544)
@@ -145,7 +145,7 @@
 		g_sound_handler.load_fx(directory, string);
 
 	// Read the becomes and experience
-	m_becomes = sglobal->get_string("becomes","");
+	m_becomes = sglobal->get_string("becomes", "");
 	std::string exp=sglobal->get_string("experience", "");
 	m_min_experience=m_max_experience=-1;
 	if (exp.size()) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2546] trunk/src

From: <sigra@us...> - 2007-08-29 12:03

Revision: 2546
          http://widelands.svn.sourceforge.net/widelands/?rev=2546&view=rev
Author:   sigra
Date:     2007-08-29 05:03:18 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Fix issues found by utils/detect_spurious_source_code.sh.

Modified Paths:
--------------
    trunk/src/attack_controller.cc
    trunk/src/computer_player.cc
    trunk/src/editor/ui_menus/editor_tool_place_bob_options_menu.cc
    trunk/src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc
    trunk/src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc
    trunk/src/editor/ui_menus/event_message_box_option_menu.cc
    trunk/src/field.cc
    trunk/src/journal.cc
    trunk/src/militarysite.cc
    trunk/src/network_lan_promotion.cc
    trunk/src/player.cc
    trunk/src/replay.cc
    trunk/src/s2map.cc
    trunk/src/texture.cc
    trunk/src/trainingsite.cc
    trunk/src/transport.cc
    trunk/src/tribe.cc
    trunk/src/tribedata.h
    trunk/src/ui/ui_basic/ui_button.cc
    trunk/src/ui/ui_basic/ui_icongrid.cc
    trunk/src/ui/ui_basic/ui_scrollbar.cc
    trunk/src/ui/ui_basic/ui_table.cc
    trunk/src/ui/ui_basic/ui_tabpanel.cc
    trunk/src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.cc
    trunk/src/warehouse.cc
    trunk/src/warelist.cc
    trunk/src/warelist.h
    trunk/src/widelands_map_buildingdata_data_packet.cc
    trunk/src/widelands_map_waredata_data_packet.cc
    trunk/src/worker.cc
    trunk/src/worlddata.h
    trunk/src/wui_plot_area.cc

Modified: trunk/src/attack_controller.cc
===================================================================
--- trunk/src/attack_controller.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/attack_controller.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -144,7 +144,7 @@
 		 ++it)
 	{
       uint soldiersOfMs = (*it)->nr_attack_soldiers();
-      uint nrLaunch = ((max > -1) && (soldiersOfMs > (uint)max) ? (uint)max : soldiersOfMs);
+		const uint nrLaunch = (max > -1 and (soldiersOfMs > static_cast<uint>(max)) ? static_cast<uint>(max) : soldiersOfMs);
 		if (nrLaunch == 0) continue;
 
 		launchedSoldier = true;

Modified: trunk/src/computer_player.cc
===================================================================
--- trunk/src/computer_player.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/computer_player.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -1211,17 +1211,17 @@
 
 	const clock_t time_before = clock();
 	int i, j, k;
-	for (i=0;i<(int) spots.size();i++)
-	    for (j=0;j<6;j++) {
+	for (i=0;i<static_cast<int>(spots.size());i++)
+		for (j=0;j<6;j++) {
 		Coords nc;
 
 		map.get_neighbour (spots[i].coords, j + 1, &nc);
 
-		for (k=0;k<(int) spots.size();k++)
+			for (k=0;k<static_cast<int>(spots.size());k++)
 		    if (spots[k].coords==nc)
 			break;
 
-		spots[i].neighbours[j]=(k<(int) spots.size()) ? k : -1;
+			spots[i].neighbours[j]=(k<static_cast<int>(spots.size())) ? k : -1;
 		}
 
 	log

Modified: trunk/src/editor/ui_menus/editor_tool_place_bob_options_menu.cc
===================================================================
--- trunk/src/editor/ui_menus/editor_tool_place_bob_options_menu.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/editor/ui_menus/editor_tool_place_bob_options_menu.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -133,7 +133,7 @@
 		for (uint i = 0; m_pit.get_nr_enabled(); ++i) m_pit.enable(i, false);
       // Disable all checkboxes
       // TODO: the uint cast is ugly!
-		for (uint i = 0; i < m_checkboxes.size(); ++i, i += i == (uint)n) {
+		for (uint i = 0; i < m_checkboxes.size(); ++i, i += i == static_cast<uint>(n)) {
          m_checkboxes[i]->changedtoid.set(this, &Editor_Tool_Place_Bob_Options_Menu::do_nothing);
          m_checkboxes[i]->set_state(false);
          m_checkboxes[i]->changedtoid.set(this, &Editor_Tool_Place_Bob_Options_Menu::clicked);

Modified: trunk/src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc
===================================================================
--- trunk/src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -139,7 +139,7 @@
       // Disable all checkboxes
 			const uint size = m_checkboxes.size();
 			//TODO: the uint cast is ugly!
-			for (uint i = 0; i < size; ++i, i += i == (uint)n) {
+			for (uint i = 0; i < size; ++i, i += i == static_cast<uint>(n)) {
          m_checkboxes[i]->changedtoid.set(this, &Editor_Tool_Place_Immovable_Options_Menu::do_nothing);
          m_checkboxes[i]->set_state(false);
          m_checkboxes[i]->changedtoid.set(this, &Editor_Tool_Place_Immovable_Options_Menu::clicked);

Modified: trunk/src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc
===================================================================
--- trunk/src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -192,7 +192,7 @@
       // Disable all checkboxes
 			const uint size = m_checkboxes.size();
 			//TODO: the uint cast is ugly!
-			for (uint i = 0; i < size; ++i, i += i == (uint)n) {
+			for (uint i = 0; i < size; ++i, i += i == static_cast<uint>(n)) {
          m_checkboxes[i]->changedtoid.set(this, &Editor_Tool_Set_Terrain_Tool_Options_Menu::do_nothing);
          m_checkboxes[i]->set_state(false);
          m_checkboxes[i]->changedtoid.set(this, &Editor_Tool_Set_Terrain_Tool_Options_Menu::selected);

Modified: trunk/src/editor/ui_menus/event_message_box_option_menu.cc
===================================================================
--- trunk/src/editor/ui_menus/event_message_box_option_menu.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/editor/ui_menus/event_message_box_option_menu.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -163,9 +163,9 @@
          m_null_triggers.push_back(i);
 	}
 
-   for (int i=0; i<m_event->get_nr_buttons(); i++) {
+	for (int i = 0; i < m_event->get_nr_buttons(); ++i) {
       m_buttons[i].name=m_event->get_button_name(i);
-      for (int j=0; j<((int)m_null_triggers.size()); j++) {
+		for (size_t j = 0; j < m_null_triggers.size(); ++j) {
          // Get this triggers index
          int foundidx = -1;
          for (MapTriggerManager::Index x = 0; x < nr_triggers; ++x)

Modified: trunk/src/field.cc
===================================================================
--- trunk/src/field.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/field.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -39,5 +39,5 @@
 
 	if (b < -128) b = -128;
 	else if (b > 127) b = 127;
-	brightness = (char)b;
+	brightness = static_cast<char>(b);
 }

Modified: trunk/src/journal.cc
===================================================================
--- trunk/src/journal.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/journal.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -82,8 +82,8 @@
 {
 	Uint32 vv;
 
-	vv = Little32((Uint32)v);
-	m_recordstream.write((char*)&v, sizeof(v));
+	vv = Little32(static_cast<Uint32>(v));
+	m_recordstream.write(reinterpret_cast<char *>(&v), sizeof(v));
 }
 
 /**
@@ -94,8 +94,8 @@
 {
 	Uint32 vv;
 
-	vv = Little32((Uint32)v);
-	m_recordstream.write((char*)&v, sizeof(v));
+	vv = Little32(static_cast<Uint32>(v));
+	m_recordstream.write(reinterpret_cast<char *>(&v), sizeof(v));
 }
 
 /**
@@ -104,7 +104,7 @@
  */
 void Journal::read(char &v)
 {
-	m_playbackstream.read((char*)&v, sizeof(char));
+	m_playbackstream.read(static_cast<char *>(&v), sizeof(char));
 }
 
 /**

Modified: trunk/src/militarysite.cc
===================================================================
--- trunk/src/militarysite.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/militarysite.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -420,11 +420,10 @@
 
 	if (Game * const game = dynamic_cast<Game *>(&owner().egbase()))
 		if (m_soldiers.size()) {
-      int i = 0;
+			size_t i = 0;
       Soldier* s = m_soldiers[i];
 
-      while ((s) && (s->get_serial() != serial) && (i < (int)m_soldiers.size()))
-      {
+			while (s and s->get_serial() != serial and i < m_soldiers.size()) {
          molog ("Serial: %d -- \n!", s->get_serial());
          i++;
          s = m_soldiers[i];
@@ -456,8 +455,7 @@
       Soldier *s;
 
       // Check if its out of bounds
-      if ((nr < 0) || (nr > (int) m_soldiers.size()))
-         return;
+	if (nr < 0 or nr > static_cast<int>(m_soldiers.size())) return;
 
       s = m_soldiers.at(nr);
 
@@ -496,24 +494,20 @@
 */
 void MilitarySite::change_soldier_capacity(int how)
 {
-   if (how)
-   {
-      if (how > 0)
-      {
+	if (how) {
+		if (how > 0) {
          m_capacity += how;
 
-         if (m_capacity > (uint) descr().get_max_number_of_soldiers())
-            m_capacity = (uint) descr().get_max_number_of_soldiers();
+			if
+				(m_capacity > static_cast<uint>(descr().get_max_number_of_soldiers()))
+				m_capacity = static_cast<uint>(descr().get_max_number_of_soldiers());
 			call_soldiers();
 		}
-      else
-      {
+		else {
          how = -how;
 
-         if (how >= (int) m_capacity)
-            m_capacity = 1;
-         else
-            m_capacity -= how;
+			if (how >= static_cast<int>(m_capacity)) m_capacity  = 1;
+			else                                     m_capacity -= how;
 
          while (m_capacity < m_soldiers.size() + m_soldier_requests.size())
          {
@@ -678,7 +672,7 @@
       return 0;
 	}
    uint nr_soldiers = 0;
-   for (uint i = 0; (uint) i < m_soldiers.size(); i++) {
+	for (uint i = 0; i < m_soldiers.size(); ++i) {
       if (!m_soldiers[i]->is_marked())
          nr_soldiers++;
 	}

Modified: trunk/src/network_lan_promotion.cc
===================================================================
--- trunk/src/network_lan_promotion.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/network_lan_promotion.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -213,12 +213,11 @@
 
 void LAN_Game_Finder::run ()
 {
-    while (avail()) {
+	while (avail()) {
 	LAN_Game_Info info;
 	sockaddr_in addr;
 
-	if (recv(&info, sizeof(info), &addr) < (int)sizeof(info))
-	    continue;
+		if (recv(&info, sizeof(info), &addr) < static_cast<int>(sizeof(info))) continue;
 
 	printf ("Received %s packet\n", info.magic);
 

Modified: trunk/src/player.cc
===================================================================
--- trunk/src/player.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/player.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -542,10 +542,12 @@
 
 		switch (action) {
 		case ENEMYFLAGACTION_ATTACK:
-		{
-			game->create_attack_controller(flag, attacker, flag->get_owner()->get_player_number(), (uint)num);
+			game->create_attack_controller
+				(flag,
+				 attacker,
+				 flag->get_owner()->get_player_number(),
+				 static_cast<uint>(num));
 			break;
-		}
 
 		default:
 			log("Player sent bad enemyflagaction = %i\n", action);
@@ -656,7 +658,7 @@
  */
 void Player::sample_statistics()
 {
-	if (m_ware_productions.size() != (uint)tribe().get_nrwares()) {
+	if (m_ware_productions.size() != static_cast<uint>(tribe().get_nrwares())) {
 		m_ware_productions.resize(tribe().get_nrwares());
 		m_current_statistics.resize(tribe().get_nrwares());
 	}
@@ -673,12 +675,12 @@
  */
 void Player::ware_produced(uint wareid)
 {
-	if (m_ware_productions.size() != (uint)tribe().get_nrwares()) {
+	if (m_ware_productions.size() != static_cast<uint>(tribe().get_nrwares())) {
 		m_ware_productions.resize(tribe().get_nrwares());
 		m_current_statistics.resize(tribe().get_nrwares());
 	}
 
-	assert(wareid < (uint)tribe().get_nrwares());
+	assert(wareid < static_cast<uint>(tribe().get_nrwares()));
 
 	m_current_statistics[wareid]++;
 }
@@ -690,7 +692,7 @@
 const std::vector<uint> * Player::get_ware_production_statistics
 		(const int ware) const
 {
-	assert(ware < (int)m_ware_productions.size()) ;
+	assert(ware < static_cast<int>(m_ware_productions.size()));
 
 	return &m_ware_productions[ware];
 }

Modified: trunk/src/replay.cc
===================================================================
--- trunk/src/replay.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/replay.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -121,7 +121,7 @@
 	if (!m_cmdlog)
 		return 0;
 
-	if ((int)(m_replaytime - time) > 0)
+	if (static_cast<int>(m_replaytime - time) > 0)
 		return 0;
 
 	try {

Modified: trunk/src/s2map.cc
===================================================================
--- trunk/src/s2map.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/s2map.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -321,7 +321,7 @@
 			for (X_Coordinate x = 0; x < mapwidth; ++x, ++f, ++pc) {
 				char c = *pc;
 				c &= 0x1f;
-				switch ((int)c) {
+				switch (static_cast<int>(c)) {
 					case 0x00: c=0; break;
 					case 0x01: c=1; break;
 					case 0x02: c=2; break;
@@ -364,7 +364,7 @@
 			for (X_Coordinate x = 0; x < mapwidth; ++x, ++f, ++pc) {
 				char c = *pc;
 				c &= 0x1f;
-				switch ((int)c) {
+				switch (static_cast<int>(c)) {
 					case 0x00: c=0; break;
 					case 0x01: c=1; break;
 					case 0x02: c=2; break;
@@ -476,7 +476,7 @@
 					case 0x08: bobname = "duck"; break;
 					// case 0x09: bobname = "donkey"; break; -> Not implemented, yet.
 					default:
-						cerr << "Unsupported animal: " << (int)section[i] << endl;
+					cerr << "Unsupported animal: " << static_cast<int>(section[i]) << endl;
 						break;
 				}
 
@@ -582,7 +582,8 @@
                if (static_cast<signed char>(nres)==-1)
                   throw wexception("World doesn't define Resource %s\n, you can't play settler maps here!\n", res.c_str());
 				}
-            int real_amount=((int)(2.86*(float)amount));
+				const int real_amount = static_cast<int>
+					(2.86 * static_cast<float>(amount));
             f->set_resources(nres, real_amount);
             f->set_starting_res_amount(real_amount);
 			}
@@ -745,9 +746,9 @@
 					case BOB_BUSH4: bobname = "bush4"; break;
 					case BOB_BUSH5: bobname = "bush5"; break;
 
-					default:
-						cerr << "Unknown bob " << (uint)c << endl;
-						break;
+				default:
+					cerr << "Unknown bob " << static_cast<uint>(c) << endl;
+					break;
 				}
 
 				if (bobname) {

Modified: trunk/src/texture.cc
===================================================================
--- trunk/src/texture.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/texture.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -156,7 +156,7 @@
 */
 Uint32 Texture::get_minimap_color(const char shade) {
 	uchar clr = m_pixels[0]; // just use the top-left pixel
-	uint table = (uchar)shade;
+	uint table = static_cast<uchar>(shade);
 
 	return is_32bit ?
 		static_cast<const Uint32 *>(m_colormap->get_colormap())

Modified: trunk/src/trainingsite.cc
===================================================================
--- trunk/src/trainingsite.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/trainingsite.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -401,18 +401,20 @@
 	assert(g);
 
 	if (m_soldiers.size()) {
-		int i = 0;
+		size_t i = 0;
 		Soldier *s = m_soldiers[i];
-		while ((s->get_serial() != serial) && (i < (int) m_soldiers.size())) {
+		while (s->get_serial() != serial and i < m_soldiers.size()) {
 			i++;
 			s = m_soldiers.at(i);
 		}
-		if ((i < (int) m_soldiers.size()) && (s->get_serial() == serial)) {
+		if (i < m_soldiers.size() and s->get_serial() == serial) {
 			drop_soldier(g, i);
 		}
 	} else
-		molog("TrainingSite::drop_soldier(uint serial): trying to drop non-existant serial number %i !!",
-		      serial);
+		molog
+			("TrainingSite::drop_soldier(uint serial): trying to drop nonexistent "
+			 "serial number %i !!",
+			 serial);
 }
 
 /**
@@ -534,7 +536,7 @@
 
 	Building::act(g, data);
 
-	if (m_program_timer && (int) (g->get_gametime() - m_program_time) >= 0) {
+	if (m_program_timer && static_cast<int>(g->get_gametime() - m_program_time) >= 0) {
 		m_program_timer = false;
 
 		if (!m_program.size()) {
@@ -606,8 +608,8 @@
 
 				while ((min_level < max_level) && (!done)) {
 
-					for (j = 0; j < (int) m_soldiers.size(); j++)
-						if ((int) m_soldiers[j]->get_level(attrib) == max_level)
+					for (j = 0; j < static_cast<int>(m_soldiers.size()); j++)
+						if (static_cast<int>(m_soldiers[j]->get_level(attrib)) == max_level)
 							done = true;
 
 					if (!done)
@@ -617,8 +619,8 @@
 
 				while ((min_level < max_level) && (!done)) {
 
-					for (j = 0; j < (int) m_soldiers.size(); j++)
-						if ((int) m_soldiers[j]->get_level(attrib) == min_level)
+					for (j = 0; j < static_cast<int>(m_soldiers.size()); ++j)
+						if (static_cast<int>(m_soldiers[j]->get_level(attrib)) == min_level)
 							done = true;
 
 					if (!done)

Modified: trunk/src/transport.cc
===================================================================
--- trunk/src/transport.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/transport.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -1539,7 +1539,7 @@
 */
 void Route::starttrim(int count)
 {
-	assert(count < (int)m_route.size());
+	assert(count < static_cast<int>(m_route.size()));
 
 	m_route.erase(m_route.begin(), m_route.begin()+count);
 }
@@ -1549,7 +1549,7 @@
 */
 void Route::truncate(int count)
 {
-	assert(count < (int)m_route.size());
+	assert(count < static_cast<int>(m_route.size()));
 
 	m_route.erase(m_route.begin()+count+1, m_route.end());
 }
@@ -1816,8 +1816,6 @@
 
 bool Requeriments::check (int hp, int attack, int defense, int evade)
 {
-	bool result = false;
-
    int total = hp + attack + defense + evade;
 
 	return
@@ -2220,7 +2218,7 @@
 	// Cancel unneeded transfers. This should be more clever about which
 	// transfers to cancel. Then again, this loop shouldn't execute during
 	// normal play anyway
-	while (m_count < (int)m_transfers.size())
+	while (m_count < static_cast<int>(m_transfers.size()))
 		cancel_transfer(m_transfers.size() - 1);
 
 	// Update the economy
@@ -2903,7 +2901,7 @@
 	{
 		unsigned l = node*2 + 1;
 		unsigned r = node*2 + 2;
-		if (m_data[node]->mpf_heapindex != (int)node) {
+		if (m_data[node]->mpf_heapindex != static_cast<int>(node)) {
 			fprintf(stderr, "%s: mpf_heapindex integrity!\n", str);
 			abort();
 		}
@@ -3254,8 +3252,7 @@
 {
 	//log("add_worker_supply(%i, %p)\n", ware, supp);
 
-	if (ware >= (int)m_worker_supplies.size())
-		m_worker_supplies.resize(ware+1);
+	if (ware >= static_cast<int>(m_worker_supplies.size())) m_worker_supplies.resize(ware + 1);
 
 	m_worker_supplies[ware].add_supply(supp);
 
@@ -3268,8 +3265,7 @@
 */
 bool Economy::have_worker_supply(int ware, Supply* supp)
 {
-	if (ware >= (int)m_worker_supplies.size())
-		return false;
+	if (ware >= static_cast<int>(m_worker_supplies.size())) return false;
 
 	for (int i = 0; i < m_worker_supplies[ware].get_nrsupplies(); i++)
 		if (m_worker_supplies[ware].get_supply(i) == supp)
@@ -3295,8 +3291,7 @@
 {
 	//log("add_soldier_supply(%i, %p)\n", ware, supp);
 
-	if (ware >= (int)m_worker_supplies.size())
-		m_worker_supplies.resize(ware+1);
+	if (ware >= static_cast<int>(m_worker_supplies.size())) m_worker_supplies.resize(ware + 1);
 
 	m_worker_supplies[ware].add_supply(supp);
 
@@ -3307,8 +3302,7 @@
  * Return true if the given soldier_supply is registered with the economy.
 */
 bool Economy::have_soldier_supply(int ware, Supply* supp, Requeriments *) {
-	if (ware >= (int)m_worker_supplies.size())
-		return false;
+	if (ware >= static_cast<int>(m_worker_supplies.size())) return false;
 
 	for (int i = 0; i < m_worker_supplies[ware].get_nrsupplies(); i++)
 		if (m_worker_supplies[ware].get_supply(i) == supp)
@@ -3334,8 +3328,7 @@
 {
 	//log("add_ware_supply(%i, %p)\n", ware, supp);
 
-	if (ware >= (int)m_ware_supplies.size())
-		m_ware_supplies.resize(ware+1);
+	if (ware >= static_cast<int>(m_ware_supplies.size())) m_ware_supplies.resize(ware + 1);
 
 	m_ware_supplies[ware].add_supply(supp);
 
@@ -3347,8 +3340,7 @@
 */
 bool Economy::have_ware_supply(int ware, Supply* supp)
 {
-	if (ware >= (int)m_ware_supplies.size())
-		return false;
+	if (ware >= static_cast<int>(m_ware_supplies.size())) return false;
 
 	for (int i = 0; i < m_ware_supplies[ware].get_nrsupplies(); i++)
 		if (m_ware_supplies[ware].get_supply(i) == supp)
@@ -3498,7 +3490,7 @@
 	Flag * const target_flag = req->get_target_flag();
 
 	// Look for matches in all possible supplies in this economy
-	if (*pware >= (int)use_supply->size())
+	if (*pware >= static_cast<int>(use_supply->size()))
 		return false; // tough luck, we have definitely no supplies for this ware
 
 	// if there are no resources of requested ware, try a substitute

Modified: trunk/src/tribe.cc
===================================================================
--- trunk/src/tribe.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/tribe.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -558,8 +558,8 @@
 			 name().c_str(),
 			 res->name().c_str());
 
-   uint bestmatch = (uint) ((static_cast<float>(amount)/res->get_max_amount()) * num_indicators);
-   if (((int)amount)<res->get_max_amount())
+   uint bestmatch = static_cast<uint>((static_cast<float>(amount)/res->get_max_amount()) * num_indicators);
+	if (static_cast<int>(amount) < res->get_max_amount())
       bestmatch+=1; // Resi start with 1, not 0
 
 	sprintf(buffer, "resi_%s%i", res->name().c_str(), bestmatch);

Modified: trunk/src/tribedata.h
===================================================================
--- trunk/src/tribedata.h	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/tribedata.h	2007-08-29 12:03:18 UTC (rev 2546)
@@ -21,15 +21,15 @@
 #define __S__TRIBEDATA_H
 
 #ifndef PACK_VERSION
-#define PACK_VERSION(major, minor) ((ushort) (((uchar) (major))<<8) | (((uchar) (minor))))
+#define PACK_VERSION(major, minor) (static_cast<ushort>((static_cast<uchar>(major))<<8) | ((static_cast<uchar>(minor))))
 #endif
 
 #ifndef VERSION_MAJOR
-#define VERSION_MAJOR(vers) ((ushort) (((ushort) (vers)>>8) & 0xff))
+#define VERSION_MAJOR(vers) (static_cast<ushort>((static_cast<ushort>(vers)>>8) & 0xff))
 #endif
 
 #ifndef VERSION_MINOR
-#define VERSION_MINOR(vers) ((ushort) (((ushort) (vers)) & 0xff))
+#define VERSION_MINOR(vers) (static_cast<ushort>((static_cast<ushort>(vers)) & 0xff))
 #endif
 
 #define WLTF_VERSION     PACK_VERSION(1, 0)

Modified: trunk/src/ui/ui_basic/ui_button.cc
===================================================================
--- trunk/src/ui/ui_basic/ui_button.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/ui/ui_basic/ui_button.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -145,7 +145,8 @@
 				 -1,
 				 Widget_Cache_None,
 				 0,
-				 (m_draw_caret ? m_title.length() : (uint)-1));
+				 (m_draw_caret ?
+				  m_title.length() : std::numeric_limits<uint>::max()));
 		}
 
 	// draw border

Modified: trunk/src/ui/ui_basic/ui_icongrid.cc
===================================================================
--- trunk/src/ui/ui_basic/ui_icongrid.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/ui/ui_basic/ui_icongrid.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -94,7 +94,7 @@
 */
 void* Icon_Grid::get_data(int idx)
 {
-	assert((uint)idx < m_items.size());
+	assert(static_cast<uint>(idx) < m_items.size());
 
 	return m_items[idx].data;
 }
@@ -106,7 +106,7 @@
 void Icon_Grid::set_selection(int idx)
 {
 	assert(is_persistant());
-	assert((uint)idx < m_items.size());
+	assert(static_cast<uint>(idx) < m_items.size());
 
 	if (m_selected >= 0)
 		update_for_index(m_selected);
@@ -215,10 +215,9 @@
 	if (x < 0 || x >= m_columns * w || y < 0)
 		return -1;
 
-	int index = m_columns * (y / h) + (x / w);
+	const int index = m_columns * (y / h) + (x / w);
 
-	if (index < 0 || index >= (int)m_items.size())
-		return -1;
+	if (static_cast<size_t>(index) >= m_items.size()) return -1;
 
 	return index;
 }
@@ -247,7 +246,7 @@
 */
 void Icon_Grid::update_for_index(int idx)
 {
-	if (idx >= 0 && idx < (int)m_items.size()) {
+	if (static_cast<size_t>(idx) < m_items.size()) {
 		int x, y;
 
 		get_cell_position(idx, &x, &y);

Modified: trunk/src/ui/ui_basic/ui_scrollbar.cc
===================================================================
--- trunk/src/ui/ui_basic/ui_scrollbar.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/ui/ui_basic/ui_scrollbar.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -80,8 +80,7 @@
 	if (steps < 1)
 		steps = 1;
 
-	if (m_pos >= (uint)steps)
-		set_pos(steps - 1);
+	if (m_pos >= static_cast<uint>(steps)) set_pos(steps - 1);
 
 	m_steps = steps;
 
@@ -108,11 +107,9 @@
 {
 	if (pos < 0)
 		pos = 0;
-	if ((uint)pos >= m_steps)
-		pos = m_steps - 1;
+	if (static_cast<uint>(pos) >= m_steps) pos = m_steps - 1;
 
-	if (m_pos == (uint)pos)
-		return;
+	if (m_pos == static_cast<uint>(pos)) return;
 
 	m_pos = pos;
 	moved.call(pos);
@@ -196,7 +193,7 @@
 	extent -= 3 * Size;
 	pos -= 3 * Size / 2;
 
-	pos = (pos * (int)m_steps) / extent;
+	pos = (pos * static_cast<int>(m_steps)) / extent;
 	set_pos(pos);
 }
 
@@ -217,7 +214,7 @@
 	default: return;
 	}
 
-	pos = (int)m_pos + diff;
+	pos = static_cast<int>(m_pos) + diff;
 	set_pos(pos);
 }
 

Modified: trunk/src/ui/ui_basic/ui_table.cc
===================================================================
--- trunk/src/ui/ui_basic/ui_table.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/ui/ui_basic/ui_table.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -247,8 +247,7 @@
       m_last_click_time=time;
 
       y = (y + m_scrollpos - m_columns[0].btn->get_h()) / get_lineheight();
-      if (y >= 0 && y < (int)m_entry_records.size())
-         select(y);
+	if (static_cast<size_t>(y) < m_entry_records.size()) select(y);
 
       // check if doubleclicked
 	if

Modified: trunk/src/ui/ui_basic/ui_tabpanel.cc
===================================================================
--- trunk/src/ui/ui_basic/ui_tabpanel.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/ui/ui_basic/ui_tabpanel.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -239,7 +239,7 @@
 /**
 Update highlighting
 */
-bool Tab_Panel::handle_mousemove(const Uint8 state, int x, int y, int, int) {
+bool Tab_Panel::handle_mousemove(const Uint8, int x, int y, int, int) {
 	int hl;
 
 	if (y < 0 || y >= TP_BUTTON_HEIGHT)
@@ -248,7 +248,7 @@
 		{
 		hl = x / TP_BUTTON_WIDTH;
 
-		if (hl < 0 || hl >= (int)m_tabs.size())
+			if (static_cast<size_t>(hl) >= m_tabs.size())
 			hl = -1;
 		}
 
@@ -285,8 +285,7 @@
 
 		id = x / TP_BUTTON_WIDTH;
 
-		if (id >= 0 && id < (int)m_tabs.size())
-			{
+		if (static_cast<size_t>(id) < m_tabs.size()) {
 			activate(id);
 
 			return true;

Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -79,15 +79,15 @@
 	title->set_font(UI_FONT_BIG, UI_FONT_CLR_FG);
 
 	// Chat area
-   m_chatarea = new UI::Multiline_Textarea(this, 5, 40, (int)(get_inner_w()*0.75)-5, get_inner_h()-40-50, 0, Align_Left, 1);
+   m_chatarea = new UI::Multiline_Textarea(this, 5, 40, static_cast<int>(get_inner_w()*0.75)-5, get_inner_h()-40-50, 0, Align_Left, 1);
    m_chatarea->set_scrollmode(UI::Multiline_Textarea::ScrollLog);
 
    // Chat editbox
-   m_chatbox = new UI::Edit_Box(this, 5, get_inner_h()-45, (int)(get_inner_w()*0.75)-5, 25, 0, 1);
+   m_chatbox = new UI::Edit_Box(this, 5, get_inner_h()-45, static_cast<int>(get_inner_w()*0.75)-5, 25, 0, 1);
    m_chatbox->changed.set(this, &Fullscreen_Menu_InetLobby::changed);
 
    // User Listing
-   m_userlist = new UI::Listselect<void *>(this, (int)(get_inner_w()-get_inner_w()*0.25+5), 40, (int)(get_inner_w()*0.25-10), get_inner_h()-40-50, Align_Left);
+   m_userlist = new UI::Listselect<void *>(this, static_cast<int>(get_inner_w()-get_inner_w()*0.25+5), 40, static_cast<int>(get_inner_w()*0.25-10), get_inner_h()-40-50, Align_Left);
 
    // Buttons
 	new UI::Button<Fullscreen_Menu_InetLobby>

Modified: trunk/src/warehouse.cc
===================================================================
--- trunk/src/warehouse.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/warehouse.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -81,13 +81,13 @@
 		return;
 
 	if (m_economy) {
-		for (int i = 0; i < m_wares.get_nrwareids(); i++) {
+		for (size_t i = 0; i < m_wares.get_nrwareids(); ++i) {
 			if (m_wares.stock(i)) {
 				m_economy->remove_wares(i, m_wares.stock(i));
 				m_economy->remove_ware_supply(i, this);
 			}
 		}
-		for (int i = 0; i < m_workers.get_nrwareids(); i++) {
+		for (size_t i = 0; i < m_workers.get_nrwareids(); ++i) {
 			if (m_workers.stock(i)) {
 				m_economy->remove_workers(i, m_workers.stock(i));
 				m_economy->remove_worker_supply(i, this);
@@ -98,13 +98,13 @@
 	m_economy = e;
 
 	if (m_economy) {
-		for (int i = 0; i < m_wares.get_nrwareids(); i++) {
+		for (size_t i = 0; i < m_wares.get_nrwareids(); ++i) {
 			if (m_wares.stock(i)) {
 				m_economy->add_wares(i, m_wares.stock(i));
 				m_economy->add_ware_supply(i, this);
 			}
 		}
-		for (int i = 0; i < m_workers.get_nrwareids(); i++) {
+		for (size_t i = 0; i < m_workers.get_nrwareids(); ++i) {
 			if (m_workers.stock(i)) {
 				m_economy->add_workers(i, m_workers.stock(i));
 				m_economy->add_worker_supply(i, this);
@@ -1045,7 +1045,7 @@
 bool Warehouse::can_create_worker(Game *, int worker) {
 	Worker_Descr *w_desc = 0;
 
-	if (worker >= m_supply->get_workers().get_nrwareids()) {
+	if (worker >= static_cast<int>(m_supply->get_workers().get_nrwareids())) {
 		throw wexception ("Worker type %d doesn't exists! (max is %d)", worker,
             m_supply->get_workers().get_nrwareids());
 	}

Modified: trunk/src/warelist.cc
===================================================================
--- trunk/src/warelist.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/warelist.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -41,15 +41,11 @@
 /**
  * Add the given number of items (default = 1) to the storage.
  */
-void WareList::add(int id, int count)
-{
+void WareList::add(const size_type id, const count_type count) {
 	if (!count)
 		return;
 
-	assert(id >= 0);
-
-	if (id >= (int)m_wares.size())
-		m_wares.resize(id+1, 0);
+	if (id >= m_wares.size()) m_wares.resize(id + 1, 0);
 	m_wares[id] += count;
 	assert(m_wares[id] >= count);
 }
@@ -69,12 +65,11 @@
 /**
  * Remove the given number of items (default = 1) from the storage.
  */
-void WareList::remove(int id, int count)
-{
+void WareList::remove(const size_type id, const count_type count) {
 	if (!count)
 		return;
 
-	assert(id >= 0 && id < (int)m_wares.size());
+	assert(id < m_wares.size());
    assert(m_wares[id] >= count);
 	m_wares[id] -= count;
 }
@@ -90,13 +85,8 @@
 /**
  * Return the number of wares of a given type stored in this storage.
  */
-int WareList::stock(int id) const
-{
-	assert(id >= 0);
-
-	if (id >= (int)m_wares.size())
-		return 0;
-	return m_wares[id];
+int WareList::stock(const size_type id) const {
+	return id < m_wares.size() ? m_wares[id] : 0;
 }
 
 
@@ -109,7 +99,7 @@
 	uint i = 0;
 
 	while (i < wl.m_wares.size()) {
-		int count = wl.m_wares[i];
+		const count_type count = wl.m_wares[i];
 		if (i < this->m_wares.size()) {
 			if (count != this->m_wares[i])
 				return false;

Modified: trunk/src/warelist.h
===================================================================
--- trunk/src/warelist.h	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/warelist.h	2007-08-29 12:03:18 UTC (rev 2546)
@@ -22,29 +22,33 @@
 
 #include <vector>
 
+#include <SDL.h>
+
 /**
  * WareList is a simple wrapper around an array of ware types.
  * It is useful for warehouses and for economy-wide inventory.
  */
-class WareList
-{
-	public:
+struct WareList {
 		WareList() {};
 		~WareList();
 
 		/// Clear the storage
 		void clear() {m_wares.clear();};
 
+	typedef Uint32 count_type;
+	typedef std::vector<count_type> vector_type;
+	typedef vector_type::size_type size_type;
+
 		/// \return Highest possible ware id
-		const int get_nrwareids() const {return m_wares.size();}
+	const size_type get_nrwareids() const {return m_wares.size();}
 
-		void add(int id, int count = 1);
+	void add   (const size_type id, const count_type count = 1);
 		void add(const WareList &wl);
-		void remove(int id, int count = 1);
+	void remove(const size_type id, const count_type count = 1);
 		void remove(const WareList &wl);
-		int stock(int id) const;
+	int stock(size_type id) const;
 
-		void set_nrwares(int i) {
+	void set_nrwares(const size_type i) {
 			assert(m_wares.size()==0);
 			m_wares.resize(i, 0);
 		}
@@ -52,8 +56,8 @@
 		bool operator==(const WareList &wl) const;
 		bool operator!=(const WareList &wl) const {return not (*this==wl);}
 
-	private:
-		std::vector<int> m_wares;
+private:
+	vector_type m_wares;
 };
 
 

Modified: trunk/src/widelands_map_buildingdata_data_packet.cc
===================================================================
--- trunk/src/widelands_map_buildingdata_data_packet.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/widelands_map_buildingdata_data_packet.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -645,14 +645,14 @@
 
    // Supply
    const WareList& wares=warehouse.m_supply->get_wares();
-   for (int i=0; i<wares.get_nrwareids(); i++) {
+	for (size_t i = 0; i < wares.get_nrwareids(); ++i) {
       fw.Unsigned8(1);
       fw.CString(warehouse.get_owner()->tribe().get_ware_descr(i)->name().c_str());
       fw.Unsigned16(wares.stock(i));
 	}
    fw.Unsigned8(0);
    const WareList& workers=warehouse.m_supply->get_workers();
-   for (int i=0; i<workers.get_nrwareids(); i++) {
+	for (size_t i = 0; i < workers.get_nrwareids(); ++i) {
       fw.Unsigned8(1);
       fw.CString(warehouse.get_owner()->tribe().get_worker_descr(i)->name().c_str());
       fw.Unsigned16(workers.stock(i));

Modified: trunk/src/widelands_map_waredata_data_packet.cc
===================================================================
--- trunk/src/widelands_map_waredata_data_packet.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/widelands_map_waredata_data_packet.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -87,7 +87,7 @@
 						ware->m_economy = 0;
 
 						const Tribe_Descr & tribe = player_immovable->owner().tribe();
-						if (tribe.get_nrwares() <= (int)ware_index_from_file)
+						if (tribe.get_nrwares() <= static_cast<int>(ware_index_from_file))
 							throw wexception
 								("Widelands_Map_Waredata_Data_Packet: ware index out "
 								 "of range: %i\n",
@@ -103,7 +103,7 @@
 					(Worker * const worker = dynamic_cast<Worker *>(location))
 				{
 					const Tribe_Descr & tribe = *worker->get_tribe();
-					if (tribe.get_nrwares() <= (int)ware_index_from_file)
+					if (tribe.get_nrwares() <= static_cast<int>(ware_index_from_file))
 						throw wexception
 							("Widelands_Map_Waredata_Data_Packet: ware index out of "
 							 "range: %i\n",

Modified: trunk/src/worker.cc
===================================================================
--- trunk/src/worker.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/worker.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -2132,7 +2132,7 @@
 		if (best) {
 			bool use = false;
 
-			if ((int)((g->logic_rand() % 30)) <= (30 - bestdist))
+			if (static_cast<int>((g->logic_rand() % 30)) <= (30 - bestdist))
 				use = true;
 
 			// okay, move towards the flag of this warehouse

Modified: trunk/src/worlddata.h
===================================================================
--- trunk/src/worlddata.h	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/worlddata.h	2007-08-29 12:03:18 UTC (rev 2546)
@@ -21,15 +21,15 @@
 #define __S__TRIBEDATA_H
 
 #ifndef PACK_VERSION
-#define PACK_VERSION(major, minor) ((ushort) (((uchar) (major))<<8) | (((uchar) (minor))))
+#define PACK_VERSION(major, minor) (static_cast<ushort>((static_cast<uchar>(major))<<8) | ((static_cast<uchar>(minor))))
 #endif
 
 #ifndef VERSION_MAJOR
-#define VERSION_MAJOR(vers) ((ushort) (((ushort) (vers)>>8) & 0xff))
+#define VERSION_MAJOR(vers) (static_cast<ushort>((static_cast<ushort>(vers)>>8) & 0xff))
 #endif
 
 #ifndef VERSION_MINOR
-#define VERSION_MINOR(vers) ((ushort) (((ushort) (vers)) & 0xff))
+#define VERSION_MINOR(vers) (static_cast<ushort>((static_cast<ushort>(vers)) & 0xff))
 #endif
 
 #define WLWF_VERSION PACK_VERSION(1, 0)

Modified: trunk/src/wui_plot_area.cc
===================================================================
--- trunk/src/wui_plot_area.cc	2007-08-29 12:01:32 UTC (rev 2545)
+++ trunk/src/wui_plot_area.cc	2007-08-29 12:03:18 UTC (rev 2546)
@@ -117,12 +117,15 @@
    float sub = xline_length / how_many_ticks[m_time];
    float posx = get_inner_w()-space_at_right;
    char buffer[200];
-   for (int i = 0; i <= how_many_ticks[m_time]; i++) {
-      dst->draw_line((int)posx, get_inner_h()-space_at_bottom, (int) posx, get_inner_h()-space_at_bottom+3, LINE_COLOR);
+	for (size_t i = 0; static_cast<int>(i) <= how_many_ticks[m_time]; ++i) {
+		dst->draw_line
+			(static_cast<int>(posx), get_inner_h() - space_at_bottom,
+			 static_cast<int>(posx), get_inner_h() - space_at_bottom + 3,
+			 LINE_COLOR);
 
 		snprintf
 			(buffer, sizeof(buffer),
-			 "%i", max_x[m_time] / how_many_ticks[m_time] * i);
+			 "%u", max_x[m_time] / how_many_ticks[m_time] * i);
 
       int w, h;
       g_fh->get_size(UI_FONT_SMALL, buffer, &w, &h, 0);
@@ -153,13 +156,18 @@
                max = (*m_plotdata[i].dataset)[l];
 		}
 	} else {
-      for (uint plot = 0; plot < m_plotdata.size(); plot++) {
+		for (uint plot = 0; plot < m_plotdata.size(); ++plot) {
          if (!m_plotdata[plot].showplot) continue;
 
          const std::vector<uint>* dataset = m_plotdata[plot].dataset;
 
          // How many do we take together
-         int how_many = (int)(((float)time_in_ms[m_time] / (float)NR_SAMPLES) /(float)m_sample_rate);
+			const int how_many = static_cast<int>
+				((static_cast<float>(time_in_ms[m_time])
+				  /
+				  static_cast<float>(NR_SAMPLES))
+				 /
+				 static_cast<float>(m_sample_rate));
 
          uint add = 0;
          // Relative data, first entry is always zero
@@ -186,7 +194,12 @@
 		 Widget_Cache_None, 0, -1, false);
 
    // Now, plot the pixels
-   sub = xline_length / ((float)time_in_ms[m_time] / (float)m_sample_rate);
+	sub =
+		xline_length
+		/
+		(static_cast<float>(time_in_ms[m_time])
+		 /
+		 static_cast<float>(m_sample_rate));
 	for (uint plot = 0; plot < m_plotdata.size(); ++plot) {
       if (!m_plotdata[plot].showplot) continue;
 
@@ -215,7 +228,7 @@
 			}
 
          dataset = &m_data;
-         sub = xline_length /  (float)NR_SAMPLES;
+			sub = xline_length / static_cast<float>(NR_SAMPLES);
 		}
 
       posx = get_inner_w()-space_at_right;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2549] trunk/src

From: <sigra@us...> - 2007-08-29 18:54

Revision: 2549
          http://widelands.svn.sourceforge.net/widelands/?rev=2549&view=rev
Author:   sigra
Date:     2007-08-29 11:54:11 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Add new iteration macro and use it.

Modified Paths:
--------------
    trunk/src/editor/tools/editor_set_terrain_tool.cc
    trunk/src/editor/ui_menus/editor_main_menu_load_map.cc
    trunk/src/map.h

Modified: trunk/src/editor/tools/editor_set_terrain_tool.cc
===================================================================
--- trunk/src/editor/tools/editor_set_terrain_tool.cc	2007-08-29 16:49:50 UTC (rev 2548)
+++ trunk/src/editor/tools/editor_set_terrain_tool.cc	2007-08-29 18:54:11 UTC (rev 2549)
@@ -32,6 +32,7 @@
 	const Uint16 radius = parent.get_sel_radius();
 	if (get_nr_enabled()) {
 		int max = 0;
+		const World & world = map.world();
 		MapTriangleRegion<TCoords<FCoords> > mr
 			(map,
 			 Area<TCoords<FCoords> >

Modified: trunk/src/editor/ui_menus/editor_main_menu_load_map.cc
===================================================================
--- trunk/src/editor/ui_menus/editor_main_menu_load_map.cc	2007-08-29 16:49:50 UTC (rev 2548)
+++ trunk/src/editor/ui_menus/editor_main_menu_load_map.cc	2007-08-29 18:54:11 UTC (rev 2549)
@@ -275,7 +275,7 @@
 void Main_Menu_Load_Map::load_map(std::string filename) {
 	Map & map = m_parent->editor().map();
 
-   if (filename!="") {
+	if (filename != "") {
 		m_parent->editor().cleanup_for_load(true, false);
 
 		Map_Loader * const ml = map.get_correct_loader(filename.c_str());
@@ -314,18 +314,14 @@
        * not expect to meet them here. */
 		const World & world = map.world();
 		Overlay_Manager & overlay_manager = map.overlay_manager();
-		const X_Coordinate mapwidth  = map.get_width ();
-		const Y_Coordinate mapheight = map.get_height();
-		Map::Index i = 0;
-		for (Y_Coordinate y = 0; y < mapheight; ++y)
-			for (X_Coordinate x = 0; x < mapwidth; ++x, ++i) {
-				Field f = map[i];
-				if (const uchar amount = f.get_resources_amount()) {
+		const Extent extent = map.extent();
+		iterate_Map_FCoords(map, extent, fc) {
+				if (const uchar amount = fc.field->get_resources_amount()) {
 					const std::string & immname =
-						world.get_resource(f.get_resources())->get_editor_pic(amount);
+						world.get_resource(fc.field->get_resources())->get_editor_pic(amount);
 					if (immname.size())
 						overlay_manager.register_overlay
-							(Coords(x, y),
+							(fc,
 							 g_gr->get_picture(PicMod_Game, immname.c_str()),
 							 4);
 				}

Modified: trunk/src/map.h
===================================================================
--- trunk/src/map.h	2007-08-29 16:49:50 UTC (rev 2548)
+++ trunk/src/map.h	2007-08-29 18:54:11 UTC (rev 2549)
@@ -1280,5 +1280,11 @@
 }
 
 
+#define iterate_Map_FCoords(map, extent, fc)                                   \
+	FCoords fc(map.get_fcoords(Coords(0, 0)));                                  \
+	for (fc.y = 0; fc.y < extent.h; ++fc.y)                                     \
+		for (fc.x = 0; fc.x < extent.w; ++fc.x, ++fc.field)                      \
+
+
 std::string g_MapVariableCallback(std::string str, void* data);
 #endif // __S__MAP_H


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2552] trunk/src

From: <ixprefect@us...> - 2007-08-29 21:40

Revision: 2552
          http://widelands.svn.sourceforge.net/widelands/?rev=2552&view=rev
Author:   ixprefect
Date:     2007-08-29 14:40:42 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Widelands_Map_Bob_Data_Packet: Fix whitespace and split function.

Modified Paths:
--------------
    trunk/src/widelands_map_bob_data_packet.cc
    trunk/src/widelands_map_bob_data_packet.h

Modified: trunk/src/widelands_map_bob_data_packet.cc
===================================================================
--- trunk/src/widelands_map_bob_data_packet.cc	2007-08-29 20:21:25 UTC (rev 2551)
+++ trunk/src/widelands_map_bob_data_packet.cc	2007-08-29 21:40:42 UTC (rev 2552)
@@ -42,84 +42,111 @@
 Widelands_Map_Bob_Data_Packet::~Widelands_Map_Bob_Data_Packet() {}
 
 
-void Widelands_Map_Bob_Data_Packet::Read
-(FileSystem & fs,
- Editor_Game_Base* egbase,
- const bool skip,
- Widelands_Map_Map_Object_Loader * const ol)
-throw(_wexception)
+void Widelands_Map_Bob_Data_Packet::ReadBob
+		(FileRead& fr,
+		 Editor_Game_Base* egbase,
+		 bool skip,
+		 Widelands_Map_Map_Object_Loader * ol,
+		 Coords coords)
 {
+	std::string owner = fr.CString();
+	std::string name = fr.CString();
+	uchar subtype = fr.Unsigned8();
 
-   FileRead fr;
-   fr.Open(fs, "binary/bob");
+	uint reg = fr.Unsigned32();
+	assert(not ol->is_object_known(reg));
 
-   Map* map=egbase->get_map();
+	Bob* bob = 0;
+	if (subtype != Bob::CRITTER && subtype != Bob::WORKER)
+		throw wexception
+				("Unknown bob type %i in Widelands_Map_Bob_Data_Packet!\n",
+				 subtype);
 
-   // First packet version
-   int packet_version=fr.Unsigned16();
+	if (owner == "world") {
+		if (subtype != Bob::CRITTER)
+			throw wexception("world bob is not a critter!\n");
 
-   if (packet_version==CURRENT_PACKET_VERSION) {
-      // Now get all the the bobs
-      for (ushort y=0; y<map->get_height(); y++) {
-         for (ushort x=0; x<map->get_width(); x++) {
-            uint nr_bobs=fr.Unsigned32();
+		int idx = egbase->get_map()->get_world()->get_bob(name.c_str());
+		if (idx == -1)
+			throw wexception
+					("Map defines Bob %s, but world doesn't deliver!\n",
+					 name.c_str());
 
-            uint i=0;
+		bob = egbase->create_bob(coords, idx);
+	} else {
+		if (skip)
+			return; // We do no load player bobs when no scenario
 
-            assert(!egbase->get_map()->get_field(Coords(x, y))->get_first_bob());
+		// Make sure that the correct tribe is known and loaded
+		egbase->manually_load_tribe(owner.c_str());
 
-            for (i=0;i<nr_bobs;i++) {
-               std::string owner=fr.CString();
-               std::string name=fr.CString();
-               uchar subtype=fr.Unsigned8();
+		Tribe_Descr* tribe = egbase->get_tribe(owner.c_str());
+		if (!tribe)
+			throw wexception
+					("Map asks for Tribe %s, but world doesn't deliver!\n",
+					 owner.c_str());
 
-               uint reg=fr.Unsigned32();
-					assert(not ol->is_object_known(reg));
+		if (subtype == Bob::WORKER) {
+			int idx = tribe->get_worker_index(name.c_str());
+			if (idx == -1)
+				throw wexception
+						("Map defines Bob %s, but tribe %s doesn't deliver!\n",
+						 name.c_str(), owner.c_str());
 
-               Bob* bob=0;
-               if (subtype != Bob::CRITTER && subtype != Bob::WORKER)
-                  throw wexception("Unknown bob type %i in Widelands_Map_Bob_Data_Packet!\n", subtype);
+			Worker_Descr* descr = tribe->get_worker_descr(idx);
 
-               if (owner=="world") {
-                  if (subtype!=Bob::CRITTER)
-                     throw wexception("world bob is not a critter!\n");
-                  int idx=egbase->get_map()->get_world()->get_bob(name.c_str());
-                  if (idx==-1)
-                     throw wexception("Map defines Bob %s, but world doesn't deliver!\n", name.c_str());
-                  bob=egbase->create_bob(Coords(x, y), idx);
-					} else {
-                  if (skip) continue; // We do no load player bobs when no scenario
-                  egbase->manually_load_tribe(owner.c_str()); // Make sure that the correct tribe is known and loaded
-                  Tribe_Descr* tribe=egbase->get_tribe(owner.c_str());
-                  if (!tribe)
-                     throw wexception("Map asks for Tribe %s, but world doesn't deliver!\n", owner.c_str());
-                  if (subtype==Bob::WORKER) {
-                     int idx=tribe->get_worker_index(name.c_str());
-                     if (idx==-1)
-                        throw wexception("Map defines Bob %s, but tribe %s doesn't deliver!\n", name.c_str(), owner.c_str());
-                     Worker_Descr* descr=tribe->get_worker_descr(idx);
-                     bob=descr->create_object();
-                     bob->set_position(egbase, Coords(x, y));
-                     bob->init(egbase);
-						} else if (subtype==Bob::CRITTER) {
-                     int idx=tribe->get_bob(name.c_str());
-                     if (idx==-1)
-                        throw wexception("Map defines Bob %s, but tribe %s doesn't deliver!\n", name.c_str(), owner.c_str());
-                     bob=egbase->create_bob(Coords(x, y), idx, tribe);
-						}
-					}
+			bob = descr->create_object();
+			bob->set_position(egbase, coords);
+			bob->init(egbase);
+		} else if (subtype == Bob::CRITTER) {
+			int idx = tribe->get_bob(name.c_str());
+			if (idx == -1)
+				throw wexception
+						("Map defines Bob %s, but tribe %s doesn't deliver!\n",
+						 name.c_str(), owner.c_str());
 
-               assert(bob);
+			bob = egbase->create_bob(coords, idx, tribe);
+		}
+	}
 
-               // Register the bob for further loading
-					if (not skip) ol->register_object(egbase, reg, bob);
+	assert(bob);
+
+	// Register the bob for further loading
+	ol->register_object(egbase, reg, bob);
+}
+
+void Widelands_Map_Bob_Data_Packet::Read
+(FileSystem & fs,
+ Editor_Game_Base* egbase,
+ const bool skip,
+ Widelands_Map_Map_Object_Loader * const ol)
+throw(_wexception)
+{
+	FileRead fr;
+	fr.Open(fs, "binary/bob");
+
+	Map* map = egbase->get_map();
+
+	// First packet version
+	Uint16 packet_version = fr.Unsigned16();
+
+	if (packet_version == CURRENT_PACKET_VERSION) {
+		// Now get all the the bobs
+		for (ushort y = 0; y < map->get_height(); y++) {
+			for (ushort x = 0; x < map->get_width(); x++) {
+				uint nr_bobs = fr.Unsigned32();
+
+				assert(!egbase->get_map()->get_field(Coords(x, y))->get_first_bob());
+
+				for (uint i = 0; i < nr_bobs; i++) {
+					ReadBob(fr, egbase, skip, ol, Coords(x, y));
 				}
 			}
 		}
-      // DONE
-      return;
-	}
-   assert(0); // never here
+	} else
+		throw wexception
+				("Widelands_Map_Bob_Data_Packet: Unknown packet version %u\n",
+				 packet_version);
 }
 
 
@@ -132,59 +159,58 @@
  Widelands_Map_Map_Object_Saver * const os)
 throw (_wexception)
 {
-   FileWrite fw;
+	FileWrite fw;
 
 	assert(os);
 
-   // now packet version
-   fw.Unsigned16(CURRENT_PACKET_VERSION);
+	// now packet version
+	fw.Unsigned16(CURRENT_PACKET_VERSION);
 
-   // Now, all bob id and registerd it
-   // A Field can have more
-   // than one bob, we have to take this into account
-   //  uchar   numbers of bob for field
-   //      bob1
-   //      bob2
-   //      ...
-   //      bobn
-   Map* map=egbase->get_map();
-   for (ushort y=0; y<map->get_height(); y++) {
-      for (ushort x=0; x<map->get_width(); x++) {
-            std::vector<Bob*> bobarr;
+	// Now, all bob id and registerd it
+	// A Field can have more
+	// than one bob, we have to take this into account
+	//  uchar   numbers of bob for field
+	//      bob1
+	//      bob2
+	//      ...
+	//      bobn
+	Map* map=egbase->get_map();
+	for (ushort y=0; y<map->get_height(); y++) {
+		for (ushort x=0; x<map->get_width(); x++) {
+			std::vector<Bob*> bobarr;
 
-            map->find_bobs(Area<FCoords>(map->get_fcoords(Coords(x, y)), 0), &bobarr); //  FIXME clean up this mess!
-            fw.Unsigned32(bobarr.size());
+			map->find_bobs(Area<FCoords>(map->get_fcoords(Coords(x, y)), 0), &bobarr); //  FIXME clean up this mess!
+			fw.Unsigned32(bobarr.size());
 
-            for (uint i=0; i<bobarr.size(); i++) {
-               Bob* ibob=bobarr[i];
-               for (uint j=i; j<bobarr.size(); j++) {
-                  Bob* jbob=bobarr[j];
-                  if (ibob->get_file_serial() < jbob->get_file_serial()) {
-                     bobarr[i] = jbob;
-                     bobarr[j] = ibob;
-                     ibob=jbob;
-						}
+			for (uint i=0; i<bobarr.size(); i++) {
+				Bob* ibob=bobarr[i];
+				for (uint j=i; j<bobarr.size(); j++) {
+					Bob* jbob=bobarr[j];
+					if (ibob->get_file_serial() < jbob->get_file_serial()) {
+						bobarr[i] = jbob;
+						bobarr[j] = ibob;
+						ibob=jbob;
 					}
 				}
+			}
 
-            for (uint i=0;i<bobarr.size(); i++) {
-               // write serial number
-					assert(not os->is_object_known(bobarr[i])); // a bob can't be owned by two fields
-					const uint reg = os->register_object(bobarr[i]);
-               // Write its owner
-               std::string owner_tribe = bobarr[i]->descr().get_owner_tribe() ? bobarr[i]->descr().get_owner_tribe()->name() : "world";
-               fw.CString(owner_tribe.c_str());
-               // Write it's name
-               fw.CString(bobarr[i]->name().c_str());
-               // Write it's subtype
-               fw.Unsigned8(bobarr[i]->get_bob_type());
-               // And it's file register index
-               fw.Unsigned32(reg);
-				}
+			for (uint i=0;i<bobarr.size(); i++) {
+				// write serial number
+				assert(not os->is_object_known(bobarr[i])); // a bob can't be owned by two fields
+				const uint reg = os->register_object(bobarr[i]);
+
+				// Write its owner
+				std::string owner_tribe = bobarr[i]->descr().get_owner_tribe() ? bobarr[i]->descr().get_owner_tribe()->name() : "world";
+				fw.CString(owner_tribe.c_str());
+				// Write it's name
+				fw.CString(bobarr[i]->name().c_str());
+				// Write it's subtype
+				fw.Unsigned8(bobarr[i]->get_bob_type());
+				// And it's file register index
+				fw.Unsigned32(reg);
+			}
 		}
 	}
 
-   fw.Write(fs, "binary/bob");
-
-   // DONE
+	fw.Write(fs, "binary/bob");
 }

Modified: trunk/src/widelands_map_bob_data_packet.h
===================================================================
--- trunk/src/widelands_map_bob_data_packet.h	2007-08-29 20:21:25 UTC (rev 2551)
+++ trunk/src/widelands_map_bob_data_packet.h	2007-08-29 21:40:42 UTC (rev 2552)
@@ -20,8 +20,11 @@
 #ifndef __S__WIDELANDS_MAP_BOB_DATA_PACKET_H
 #define __S__WIDELANDS_MAP_BOB_DATA_PACKET_H
 
+#include "geometry.h"
 #include "widelands_map_data_packet.h"
 
+class FileRead;
+
 /*
  * This data packet contains the various bobs on
  * the map (animals for now)
@@ -30,7 +33,7 @@
  * written
  */
 struct Widelands_Map_Bob_Data_Packet : public Widelands_Map_Data_Packet {
-      virtual ~Widelands_Map_Bob_Data_Packet();
+	virtual ~Widelands_Map_Bob_Data_Packet();
 
 	virtual void Read
 		(FileSystem &,
@@ -44,8 +47,13 @@
 		 Widelands_Map_Map_Object_Saver * const  = 0)
 		throw (_wexception);
 
-   private:
-      void read_packet_version_1(FileSystem*, Editor_Game_Base*, bool, Widelands_Map_Map_Object_Loader*);
+private:
+	void ReadBob
+		(FileRead& fr,
+		 Editor_Game_Base* egbase,
+		 bool skip,
+		 Widelands_Map_Map_Object_Loader * ol,
+		 Coords coords);
 };
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2553] trunk/src

From: <ixprefect@us...> - 2007-08-29 21:40

Revision: 2553
          http://widelands.svn.sourceforge.net/widelands/?rev=2553&view=rev
Author:   ixprefect
Date:     2007-08-29 14:40:47 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Fix indentation and whitespace. Make internally used typedef private.

Modified Paths:
--------------
    trunk/src/widelands_map_map_object_loader.cc
    trunk/src/widelands_map_map_object_loader.h
    trunk/src/widelands_map_map_object_saver.cc
    trunk/src/widelands_map_map_object_saver.h

Modified: trunk/src/widelands_map_map_object_loader.cc
===================================================================
--- trunk/src/widelands_map_map_object_loader.cc	2007-08-29 21:40:42 UTC (rev 2552)
+++ trunk/src/widelands_map_map_object_loader.cc	2007-08-29 21:40:47 UTC (rev 2553)
@@ -29,53 +29,66 @@
 /*
  * Returns true if this object has already been inserted
  */
-bool Widelands_Map_Map_Object_Loader::is_object_known(uint n) {
-   Reverse_Map_Object_Map::iterator i;
-   i=m_objects.find(n);
-   return (i!=m_objects.end());
+bool Widelands_Map_Map_Object_Loader::is_object_known(uint n)
+{
+	Reverse_Map_Object_Map::iterator i;
+	i = m_objects.find(n);
+	return (i != m_objects.end());
 }
 
 /*
  * Registers this object as a new one
  */
-void Widelands_Map_Map_Object_Loader::register_object(Editor_Game_Base* egbase, uint n, Map_Object* obj) {
-   assert(!is_object_known(n));
+void Widelands_Map_Map_Object_Loader::register_object
+		(Editor_Game_Base* egbase,
+		 uint n,
+		 Map_Object* obj)
+{
+	assert(!is_object_known(n));
 
-   egbase->objects().overwrite_file_serial(obj, n);
+	egbase->objects().overwrite_file_serial(obj, n);
 
-   m_objects.insert(std::pair<uint, Map_Object*>(n, obj));
-   m_loaded_obj[obj]=false;
+	m_objects.insert(std::pair<uint, Map_Object*>(n, obj));
+	m_loaded_obj[obj]=false;
 }
 
 /*
  * Returns the file index for this map object. This is used on load
  * to regenerate the depencies between the objects
  */
-Map_Object* Widelands_Map_Map_Object_Loader::get_object_by_file_index(uint n) {
-   // This check should rather be an assert(), but we get more information
-   // from a throw and time's not soo much an issue here
-   if (!is_object_known(n))
-      throw wexception("Widelands_Map_Map_Object_Loader::get_object_by_file_index(): Map Object %i is not known!\n", n);
+Map_Object* Widelands_Map_Map_Object_Loader::get_object_by_file_index(uint n)
+{
+	// This check should rather be an assert(), but we get more information
+	// from a throw and time's not soo much an issue here
+	if (!is_object_known(n))
+		throw wexception
+				("Widelands_Map_Map_Object_Loader::get_object_by_file_index(): "
+				 "Map Object %i is not known!\n",
+				 n);
 
-   return m_objects[n];
+	return m_objects[n];
 }
 
 /*
  * mark this object as saved
  */
-void Widelands_Map_Map_Object_Loader::mark_object_as_loaded(Map_Object* obj) {
-   m_loaded_obj[obj]=true;
+void Widelands_Map_Map_Object_Loader::mark_object_as_loaded(Map_Object* obj)
+{
+   m_loaded_obj[obj] = true;
 }
 
 /*
  * Return the number of unsaved objects
  */
-int Widelands_Map_Map_Object_Loader::get_nr_unloaded_objects() {
-   std::map<Map_Object*, bool>::iterator i=m_loaded_obj.begin();
-   int retval=0;
-   while (i!=m_loaded_obj.end()) {
-      if (!i->second) retval++;
-      ++i;
+int Widelands_Map_Map_Object_Loader::get_nr_unloaded_objects()
+{
+	std::map<Map_Object*, bool>::iterator i = m_loaded_obj.begin();
+	int retval = 0;
+
+	while (i != m_loaded_obj.end()) {
+		if (!i->second)
+			retval++;
+		++i;
 	}
-   return retval;
+	return retval;
 }

Modified: trunk/src/widelands_map_map_object_loader.h
===================================================================
--- trunk/src/widelands_map_map_object_loader.h	2007-08-29 21:40:42 UTC (rev 2552)
+++ trunk/src/widelands_map_map_object_loader.h	2007-08-29 21:40:47 UTC (rev 2553)
@@ -28,22 +28,22 @@
  *   - keep track of map objects on the map (to be loaded)
  *   - translate file index pointers into Map_Objects
  */
-typedef std::map<uint, Map_Object*> Reverse_Map_Object_Map;
-
 struct Widelands_Map_Map_Object_Loader {
-      bool is_object_known(uint);
-      void register_object(Editor_Game_Base*, uint, Map_Object*);
+	bool is_object_known(uint);
+	void register_object(Editor_Game_Base*, uint, Map_Object*);
 
-      Map_Object* get_object_by_file_index(uint);
+	Map_Object* get_object_by_file_index(uint);
 
-      int get_nr_unloaded_objects();
-      bool is_object_loaded(Map_Object* obj) {return m_loaded_obj[obj];}
+	int get_nr_unloaded_objects();
+	bool is_object_loaded(Map_Object* obj) {return m_loaded_obj[obj];}
 
-      void mark_object_as_loaded(Map_Object* obj);
+	void mark_object_as_loaded(Map_Object* obj);
 
-   private:
-      std::map<Map_Object*, bool> m_loaded_obj;
-      Reverse_Map_Object_Map m_objects;
+private:
+	typedef std::map<uint, Map_Object*> Reverse_Map_Object_Map;
+
+	std::map<Map_Object*, bool> m_loaded_obj;
+	Reverse_Map_Object_Map m_objects;
 };
 
 

Modified: trunk/src/widelands_map_map_object_saver.cc
===================================================================
--- trunk/src/widelands_map_map_object_saver.cc	2007-08-29 21:40:42 UTC (rev 2552)
+++ trunk/src/widelands_map_map_object_saver.cc	2007-08-29 21:40:47 UTC (rev 2553)
@@ -46,26 +46,26 @@
 uint Widelands_Map_Map_Object_Saver::register_object
 (const Map_Object * const obj)
 {
-   assert(!is_object_known(obj));
+	assert(!is_object_known(obj));
 
-   switch (obj->get_type()) {
-      case Map_Object::FLAG: ++m_nr_flags; break;
-      case Map_Object::ROAD: ++m_nr_roads; break;
-      case Map_Object::BUILDING: ++m_nr_buildings; break;
-      case Map_Object::IMMOVABLE: ++m_nr_immovables; break;
-      case Map_Object::WARE: ++m_nr_wares; break;
-      case Map_Object::BOB: ++m_nr_bobs; break;
-      case Map_Object::BATTLE: ++m_nr_battles; break;
-      case Map_Object::ATTACKCONTROLLER: ++m_nr_attack_controllers; break;
-      default: throw wexception("Widelands_Map_Map_Object_Saver: Unknown MapObject type : %i\n", obj->get_type());
+	switch (obj->get_type()) {
+		case Map_Object::FLAG: ++m_nr_flags; break;
+		case Map_Object::ROAD: ++m_nr_roads; break;
+		case Map_Object::BUILDING: ++m_nr_buildings; break;
+		case Map_Object::IMMOVABLE: ++m_nr_immovables; break;
+		case Map_Object::WARE: ++m_nr_wares; break;
+		case Map_Object::BOB: ++m_nr_bobs; break;
+		case Map_Object::BATTLE: ++m_nr_battles; break;
+		case Map_Object::ATTACKCONTROLLER: ++m_nr_attack_controllers; break;
+		default: throw wexception("Widelands_Map_Map_Object_Saver: Unknown MapObject type : %i\n", obj->get_type());
 	}
 
-   assert(obj->get_file_serial());
+	assert(obj->get_file_serial());
 
-   m_objects.insert(std::pair<const Map_Object*, uint>(obj, obj->get_file_serial()));
-   m_saved_obj[obj]=false;
+	m_objects.insert(std::pair<const Map_Object*, uint>(obj, obj->get_file_serial()));
+	m_saved_obj[obj]=false;
 
-   return obj->get_file_serial();
+	return obj->get_file_serial();
 }
 
 /*
@@ -75,30 +75,38 @@
 uint Widelands_Map_Map_Object_Saver::get_object_file_index
 (const Map_Object * const obj)
 {
-   // This check should rather be an assert(), but we get more information
-   // from a throw and time's not soo much an issue here
-   if (!is_object_known(obj))
-      throw wexception("Widelands_Map_Map_Object_Saver::get_object_file_index(): Map Object %p (%i) is not known!\n", obj, obj->get_serial());
+	// This check should rather be an assert(), but we get more information
+	// from a throw and time's not soo much an issue here
+	if (!is_object_known(obj))
+		throw wexception
+				("Widelands_Map_Map_Object_Saver::get_object_file_index(): "
+				 "Map Object %p (%i) is not known!\n",
+				 obj, obj->get_serial());
 
-   return m_objects[obj];
+	return m_objects[obj];
 }
 
 /*
  * mark this object as saved
  */
 void Widelands_Map_Map_Object_Saver::mark_object_as_saved
-(const Map_Object * const obj)
-{m_saved_obj[obj] = true;}
+		(const Map_Object * const obj)
+{
+	m_saved_obj[obj] = true;
+}
 
 /*
  * Return the number of unsaved objects
  */
-uint Widelands_Map_Map_Object_Saver::get_nr_unsaved_objects() const throw () {
+uint Widelands_Map_Map_Object_Saver::get_nr_unsaved_objects() const throw ()
+{
 	std::map<const Map_Object *, bool>::const_iterator i = m_saved_obj.begin();
 	uint retval = 0;
-   while (i!=m_saved_obj.end()) {
-      if (!i->second) retval++;
-      ++i;
+
+	while (i!=m_saved_obj.end()) {
+		if (!i->second) retval++;
+		++i;
 	}
-   return retval;
+
+	return retval;
 }

Modified: trunk/src/widelands_map_map_object_saver.h
===================================================================
--- trunk/src/widelands_map_map_object_saver.h	2007-08-29 21:40:42 UTC (rev 2552)
+++ trunk/src/widelands_map_map_object_saver.h	2007-08-29 21:40:47 UTC (rev 2553)
@@ -29,10 +29,8 @@
  *   - keep track of map objects on the map
  *   - translate Map_Object* Pointer into the index used in the saved file
  */
-typedef std::map<const Map_Object *, const uint> Map_Object_Map;
-
 class Widelands_Map_Map_Object_Saver {
-   public:
+public:
 	Widelands_Map_Map_Object_Saver();
 
 	bool is_object_known(const Map_Object * const) const;
@@ -42,7 +40,7 @@
 
 	void mark_object_as_saved(const Map_Object * const);
 
-      // Information functions
+	// Information functions
 	uint get_nr_unsaved_objects() const throw ();
 	uint get_nr_roads          () const throw () {return m_nr_roads;}
 	uint get_nr_flags          () const throw () {return m_nr_flags;}
@@ -53,16 +51,22 @@
 	uint get_nr_battles        () const throw () {return m_nr_battles;}
 	uint get_nr_attack_controllers() const throw () {return m_nr_attack_controllers;}
 
-
-
 	bool is_object_saved(const Map_Object * const obj) throw ()
 	{return m_saved_obj[obj];}
 
-   private:
+private:
+	typedef std::map<const Map_Object *, const uint> Map_Object_Map;
+
 	std::map<const Map_Object *, bool> m_saved_obj;
-      Map_Object_Map m_objects;
-      uint m_nr_roads, m_nr_flags, m_nr_buildings, m_nr_bobs,
-           m_nr_wares, m_nr_immovables, m_nr_battles, m_nr_attack_controllers;
+	Map_Object_Map m_objects;
+	uint m_nr_roads;
+	uint m_nr_flags;
+	uint m_nr_buildings;
+	uint m_nr_bobs;
+	uint m_nr_wares;
+	uint m_nr_immovables;
+	uint m_nr_battles;
+	uint m_nr_attack_controllers;
 };
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2554] trunk/src

From: <ixprefect@us...> - 2007-08-29 21:41

Revision: 2554
          http://widelands.svn.sourceforge.net/widelands/?rev=2554&view=rev
Author:   ixprefect
Date:     2007-08-29 14:41:01 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Use file serials only temporarily during loading and saving of games.

The Map_Object_Saver will assign file serials on the fly as needed.

Modified Paths:
--------------
    trunk/src/instances.cc
    trunk/src/instances.h
    trunk/src/widelands_map_bob_data_packet.cc
    trunk/src/widelands_map_bobdata_data_packet.cc
    trunk/src/widelands_map_map_object_loader.cc
    trunk/src/widelands_map_map_object_saver.cc
    trunk/src/widelands_map_map_object_saver.h

Modified: trunk/src/instances.cc
===================================================================
--- trunk/src/instances.cc	2007-08-29 21:40:47 UTC (rev 2553)
+++ trunk/src/instances.cc	2007-08-29 21:41:01 UTC (rev 2554)
@@ -183,10 +183,9 @@
 {
 	while (!m_objects.empty()) {
 		objmap_t::iterator it = m_objects.begin();
-      it->second->remove(g);
+		it->second->remove(g);
 	}
-   m_lastserial = 0;
-   m_last_file_serial = 0;
+	m_lastserial = 0;
 }
 
 /*
@@ -199,26 +198,12 @@
 void Object_Manager::insert(Map_Object *obj)
 {
 	m_lastserial++;
-   assert(m_lastserial);
+	assert(m_lastserial);
 	obj->m_serial = m_lastserial;
-   if (obj->m_file_serial==0) {
-      m_last_file_serial++;
-      obj->m_file_serial = m_last_file_serial;
-	}
 	m_objects[m_lastserial] = obj;
 }
 
 /*
- * Overwrite the file serial for this object
- * The file serial number is a unique number
- * for a file which is used in various sortings
- */
-void Object_Manager::overwrite_file_serial(Map_Object* obj, uint new_serial) {
-   if (new_serial>m_last_file_serial) m_last_file_serial=new_serial;
-   obj->m_file_serial = new_serial;
-}
-
-/*
 ===============
 Object_Manager::remove
 
@@ -380,7 +365,7 @@
 ===============
 */
 Map_Object::Map_Object(const Map_Object_Descr * const the_descr) :
-m_descr(the_descr), m_serial(0), m_file_serial(0), m_logsink(0)
+m_descr(the_descr), m_serial(0), m_logsink(0)
 {}
 
 

Modified: trunk/src/instances.h
===================================================================
--- trunk/src/instances.h	2007-08-29 21:40:47 UTC (rev 2553)
+++ trunk/src/instances.h	2007-08-29 21:41:01 UTC (rev 2554)
@@ -180,7 +180,6 @@
 public:
 	virtual int get_type() const throw () = 0;
 
-   inline uint get_file_serial() const {return m_file_serial;}
 	inline uint get_serial() const {return m_serial;}
 	bool has_attribute(const uint attr) const throw ()
 	{return descr().has_attribute(attr);}
@@ -210,7 +209,6 @@
 protected:
 	const Map_Object_Descr * m_descr;
 	uint                     m_serial;
-	uint                     m_file_serial;
 	LogSink                * m_logsink;
 
 private:
@@ -229,7 +227,7 @@
 	typedef std::map<uint, Map_Object *> objmap_t;
 
 public:
-	Object_Manager() {m_lastserial = m_last_file_serial = 0;}
+	Object_Manager() {m_lastserial = 0;}
 	~Object_Manager();
 
 	void cleanup(Editor_Game_Base *g);
@@ -251,11 +249,8 @@
 		return false;
 	}
 
-	void overwrite_file_serial(Map_Object*, uint);
-
 private:
 	uint m_lastserial;
-	uint m_last_file_serial;
 	objmap_t m_objects;
 
 	Object_Manager & operator=(const Object_Manager &);

Modified: trunk/src/widelands_map_bob_data_packet.cc
===================================================================
--- trunk/src/widelands_map_bob_data_packet.cc	2007-08-29 21:40:47 UTC (rev 2553)
+++ trunk/src/widelands_map_bob_data_packet.cc	2007-08-29 21:41:01 UTC (rev 2554)
@@ -182,18 +182,6 @@
 			map->find_bobs(Area<FCoords>(map->get_fcoords(Coords(x, y)), 0), &bobarr); //  FIXME clean up this mess!
 			fw.Unsigned32(bobarr.size());
 
-			for (uint i=0; i<bobarr.size(); i++) {
-				Bob* ibob=bobarr[i];
-				for (uint j=i; j<bobarr.size(); j++) {
-					Bob* jbob=bobarr[j];
-					if (ibob->get_file_serial() < jbob->get_file_serial()) {
-						bobarr[i] = jbob;
-						bobarr[j] = ibob;
-						ibob=jbob;
-					}
-				}
-			}
-
 			for (uint i=0;i<bobarr.size(); i++) {
 				// write serial number
 				assert(not os->is_object_known(bobarr[i])); // a bob can't be owned by two fields

Modified: trunk/src/widelands_map_bobdata_data_packet.cc
===================================================================
--- trunk/src/widelands_map_bobdata_data_packet.cc	2007-08-29 21:40:47 UTC (rev 2553)
+++ trunk/src/widelands_map_bobdata_data_packet.cc	2007-08-29 21:41:01 UTC (rev 2554)
@@ -414,18 +414,6 @@
 		map->find_bobs(Area<FCoords>(map->get_fcoords(Coords(x, y)), 0), &bobarr);
 
          for (uint i=0; i<bobarr.size(); i++) {
-            Bob* ibob=bobarr[i];
-            for (uint j=i; j<bobarr.size(); j++) {
-               Bob* jbob=bobarr[j];
-               if (ibob->get_file_serial() < jbob->get_file_serial()) {
-                  bobarr[i] = jbob;
-                  bobarr[j] = ibob;
-                  ibob=jbob;
-					}
-				}
-			}
-
-         for (uint i=0; i<bobarr.size(); i++) {
             Bob* bob=bobarr[i];
             assert(os->is_object_known(bob));
             uint reg=os->get_object_file_index(bob);

Modified: trunk/src/widelands_map_map_object_loader.cc
===================================================================
--- trunk/src/widelands_map_map_object_loader.cc	2007-08-29 21:40:47 UTC (rev 2553)
+++ trunk/src/widelands_map_map_object_loader.cc	2007-08-29 21:41:01 UTC (rev 2554)
@@ -46,10 +46,8 @@
 {
 	assert(!is_object_known(n));
 
-	egbase->objects().overwrite_file_serial(obj, n);
-
 	m_objects.insert(std::pair<uint, Map_Object*>(n, obj));
-	m_loaded_obj[obj]=false;
+	m_loaded_obj[obj] = false;
 }
 
 /*

Modified: trunk/src/widelands_map_map_object_saver.cc
===================================================================
--- trunk/src/widelands_map_map_object_saver.cc	2007-08-29 21:40:47 UTC (rev 2553)
+++ trunk/src/widelands_map_map_object_saver.cc	2007-08-29 21:41:01 UTC (rev 2554)
@@ -29,7 +29,8 @@
 m_nr_buildings (0),
 m_nr_bobs      (0),
 m_nr_wares     (0),
-m_nr_immovables(0)
+m_nr_immovables(0),
+m_lastserial   (0)
 {}
 
 
@@ -60,12 +61,12 @@
 		default: throw wexception("Widelands_Map_Map_Object_Saver: Unknown MapObject type : %i\n", obj->get_type());
 	}
 
-	assert(obj->get_file_serial());
+	uint fileserial = ++m_lastserial;
 
-	m_objects.insert(std::pair<const Map_Object*, uint>(obj, obj->get_file_serial()));
-	m_saved_obj[obj]=false;
+	m_objects.insert(std::pair<const Map_Object*, uint>(obj, fileserial));
+	m_saved_obj[obj] = false;
 
-	return obj->get_file_serial();
+	return fileserial;
 }
 
 /*

Modified: trunk/src/widelands_map_map_object_saver.h
===================================================================
--- trunk/src/widelands_map_map_object_saver.h	2007-08-29 21:40:47 UTC (rev 2553)
+++ trunk/src/widelands_map_map_object_saver.h	2007-08-29 21:41:01 UTC (rev 2554)
@@ -67,6 +67,7 @@
 	uint m_nr_immovables;
 	uint m_nr_battles;
 	uint m_nr_attack_controllers;
+	uint m_lastserial;
 };
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2555] trunk/src

From: <ixprefect@us...> - 2007-08-29 23:12

Revision: 2555
          http://widelands.svn.sourceforge.net/widelands/?rev=2555&view=rev
Author:   ixprefect
Date:     2007-08-29 16:12:13 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Bugfix 1784422: Regression in pathfinding introduced by r2505

Costs for fields were calculated incorrectly due to missing
parenthesis around ternary operator. Make the calculation a lot more
explicit to avoid future related bugs.

Also change the way costs are calculated. Cost estimates during
pathfinding are now always lower bounds, and we no longer use floating
point operations to calculate costs.

Modified Paths:
--------------
    trunk/src/map.cc
    trunk/src/map.h

Modified: trunk/src/map.cc
===================================================================
--- trunk/src/map.cc	2007-08-29 21:41:01 UTC (rev 2554)
+++ trunk/src/map.cc	2007-08-29 23:12:13 UTC (rev 2555)
@@ -1464,8 +1464,8 @@
 
 
 #define BASE_COST_PER_FIELD 1800
-#define SLOPE_COST_FACTOR      0.02
-#define SLOPE_COST_STEPS       8
+#define SLOPE_COST_DIVISOR  50
+#define SLOPE_COST_STEPS    8
 
 /*
 ===============
@@ -1481,6 +1481,15 @@
 }
 
 
+/**
+ * \return a lower bound on the time required to walk from \p a to \p b
+ */
+int Map::calc_cost_lowerbound(const Coords a, const Coords b) const
+{
+	return calc_distance(a, b) * calc_cost(-SLOPE_COST_STEPS);
+}
+
+
 /*
 ===============
 Map::calc_cost
@@ -1491,17 +1500,18 @@
 
 The time is calculated as BASE_COST_PER_FIELD * f, where
 
-f = base + d(Slope)
-d = SLOPE_COST_FACTOR * (Slope + SLOPE_COST_STEPS)*(Slope + SLOPE_COST_STEPS - 1) / 2
-base = 1.0 - d(0)
+f = 1.0 + d(Slope) - d(0)
+d = (Slope + SLOPE_COST_STEPS)*(Slope + SLOPE_COST_STEPS - 1) / (2*SLOPE_COST_DIVISOR)
 
+Note that the actual calculations multiply through by (2*SLOPE_COST_DIVISOR)
+to avoid using floating point numbers in game logic code.
+
 Slope is limited to the range [ -SLOPE_COST_STEPS; +oo [
 ===============
 */
-#define CALC_COST_D(slope) (SLOPE_COST_FACTOR * ((slope) + SLOPE_COST_STEPS) * ((slope) + SLOPE_COST_STEPS - 1) * 0.5)
-#define CALC_COST_BASE     (1.0 - CALC_COST_D(0))
+#define CALC_COST_D(slope) (((slope) + SLOPE_COST_STEPS) * ((slope) + SLOPE_COST_STEPS - 1))
 
-static inline float calc_cost_d(int slope)
+static int calc_cost_d(int slope)
 {
 	if (slope < -SLOPE_COST_STEPS)
 		slope = -SLOPE_COST_STEPS;
@@ -1511,8 +1521,9 @@
 
 int Map::calc_cost(int slope) const
 {
-	return static_cast<int>
-		(BASE_COST_PER_FIELD * (CALC_COST_BASE + calc_cost_d(slope)));
+	int f = 2*SLOPE_COST_DIVISOR + calc_cost_d(slope) - CALC_COST_D(0);
+
+	return (BASE_COST_PER_FIELD * f) / (2*SLOPE_COST_DIVISOR);
 }
 
 
@@ -1896,7 +1907,7 @@
 	curpf = m_pathfields + (start.field-m_fields);
 	curpf->cycle = m_pathcycle;
 	curpf->real_cost = 0;
-	curpf->estim_cost = calc_cost_estimate(start, end);
+	curpf->estim_cost = calc_cost_lowerbound(start, end);
 	curpf->backlink = Map_Object::IDLE;
 
 	Open.push(curpf);
@@ -1949,18 +1960,16 @@
 				continue;
 
 			// Calculate cost
-			cost =
-				curpf->real_cost
-				+
-				(flags & fpBidiCost) ?
-				calc_bidi_cost(cur, *direction) : calc_cost(cur, *direction);
+			const int stepcost = (flags & fpBidiCost) ?
+					calc_bidi_cost(cur, *direction) : calc_cost(cur, *direction);
 
+			cost = curpf->real_cost + stepcost;
+
 			if (neighbpf->cycle != m_pathcycle) {
 				// add to open list
 				neighbpf->cycle = m_pathcycle;
 				neighbpf->real_cost = cost;
-				// use a slightly lower estimate for better accuracy
-				neighbpf->estim_cost = calc_cost_estimate(neighb, end) >> 1;
+				neighbpf->estim_cost = calc_cost_lowerbound(neighb, end);
 				neighbpf->backlink = *direction;
 				Open.push(neighbpf);
 			} else if (neighbpf->cost() > cost+neighbpf->estim_cost) {

Modified: trunk/src/map.h
===================================================================
--- trunk/src/map.h	2007-08-29 21:41:01 UTC (rev 2554)
+++ trunk/src/map.h	2007-08-29 23:12:13 UTC (rev 2555)
@@ -265,6 +265,7 @@
 	int is_neighbour(const Coords, const Coords) const;
 
 	int calc_cost_estimate(const Coords, const Coords) const;
+	int calc_cost_lowerbound(const Coords, const Coords) const;
 	int calc_cost(const int slope) const;
 	int calc_cost(const Coords, const int dir) const;
 	int calc_bidi_cost(const Coords, const int dir) const;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2557] trunk/src

From: <sigra@us...> - 2007-08-30 18:32

Revision: 2557
          http://widelands.svn.sourceforge.net/widelands/?rev=2557&view=rev
Author:   sigra
Date:     2007-08-30 11:30:46 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Clean up and add button (still hidden) for toggling geologic survey information.

Modified Paths:
--------------
    trunk/src/interactive_player.cc
    trunk/src/interactive_player.h

Modified: trunk/src/interactive_player.cc
===================================================================
--- trunk/src/interactive_player.cc	2007-08-30 00:01:23 UTC (rev 2556)
+++ trunk/src/interactive_player.cc	2007-08-30 18:30:46 UTC (rev 2557)
@@ -45,9 +45,6 @@
 #include "wlapplication.h"
 
 #include "ui_editbox.h"
-#include "ui_button.h"
-#include "ui_multilinetextarea.h"
-#include "ui_textarea.h"
 #include "ui_unique_window.h"
 
 #define CHAT_DISPLAY_TIME 5000 // Show chat messages as overlay for 5 seconds
@@ -71,58 +68,67 @@
 ===============
 */
 Interactive_Player::Interactive_Player(Game & g, const uchar plyn) :
-Interactive_Base(g), m_game(&g)
-{
-	// Setup all screen elements
-	set_player_number(plyn);
+Interactive_Base(g), m_game(&g),
 
-	fieldclicked.set(this, &Interactive_Player::field_action);
+m_label_speed(this, get_w(), 0, 0, 0, "", Align_TopRight),
 
-	// user interface buttons
-	int x = (get_w() - (4*34)) >> 1;
-	int y = get_h() - 34;
+m_chat_messages(this, 10, 25, get_inner_w(), get_inner_h(), "", Align_TopLeft),
+m_type_message
+(this, 10, get_inner_h()-50, get_inner_w(), 50, "", Align_TopLeft),
 
-	new UI::Button<Interactive_Player>
-		(this,
-		 x + 34, y, 34, 34,
-		 2,
-		 g_gr->get_picture(PicMod_Game, "pics/menu_toggle_menu.png"),
-		 &Interactive_Player::main_menu_btn, this,
-		 _("Menu"));
 
-	new UI::Button<Interactive_Player>
-		(this,
-		 x + 68, y, 34, 34,
-		 2,
-		 g_gr->get_picture(PicMod_Game, "pics/menu_toggle_minimap.png"),
-		 &Interactive_Player::toggle_minimap, this,
-		 _("Minimap"));
+#define BUTTON_WIDTH  34
+#define BUTTON_HEIGHT 34
 
-	new UI::Button<Interactive_Player>
-		(this,
-		 x + 102, y, 34, 34,
-		 2,
-		 g_gr->get_picture(PicMod_Game, "pics/menu_toggle_buildhelp.png"),
-		 &Interactive_Player::toggle_buildhelp, this,
-		 _("Buildhelp"));
+m_toggle_main_menu
+(this,
+ get_w() - 5 * BUTTON_WIDTH >> 1, get_h() - BUTTON_HEIGHT,
+ BUTTON_WIDTH, BUTTON_HEIGHT,
+ 2,
+ g_gr->get_picture(PicMod_Game, "pics/menu_toggle_menu.png"),
+ &Interactive_Player::toggle_main_menu, this,
+ _("Menu")),
 
-	new UI::Button<Interactive_Player>
-		(this,
-		 x + 136, y, 34, 34,
-		 2,
-		 g_gr->get_picture(PicMod_Game,  "pics/menu_help.png"),
-		 &Interactive_Player::open_encyclopedia, this,
-		 _("Tribe's ware encyclopedia"));
+m_toggle_minimap
+(this,
+ m_toggle_main_menu.get_x() + BUTTON_WIDTH, m_toggle_main_menu.get_y(),
+ BUTTON_WIDTH, BUTTON_HEIGHT,
+ 2,
+ g_gr->get_picture(PicMod_Game, "pics/menu_toggle_minimap.png"),
+ &Interactive_Player::toggle_minimap, this,
+ _("Minimap")),
 
-	// Speed info
-	m_label_speed = new UI::Textarea(this, get_w(), 0, 0, 0, "", Align_TopRight);
+m_toggle_buildhelp
+(this,
+ m_toggle_minimap.get_x() + BUTTON_WIDTH, m_toggle_minimap.get_y(),
+ BUTTON_WIDTH, BUTTON_HEIGHT,
+ 2,
+ g_gr->get_picture(PicMod_Game, "pics/menu_toggle_buildhelp.png"),
+ &Interactive_Player::toggle_buildhelp, this,
+ _("Buildhelp")),
 
-	// Chat Messages
-	m_chat_messages = new UI::Multiline_Textarea(this, 10, 25, get_inner_w(), get_inner_h(), "", Align_TopLeft);
-	m_type_message = new UI::Textarea(this, 10, get_inner_h()-50, get_inner_w(), 50, "", Align_TopLeft);
+m_toggle_resources
+(this,
+ m_toggle_buildhelp.get_x() + BUTTON_WIDTH, m_toggle_buildhelp.get_y(),
+ BUTTON_WIDTH, BUTTON_HEIGHT,
+ 2,
+ g_gr->get_picture(PicMod_Game, "pics/editor_menu_tool_change_resources.png"),
+ &Interactive_Player::toggle_resources, this,
+ _("Geologic survey information")),
 
-	m_is_typing_msg = false;
-	m_do_chat_overlays = true;
+m_toggle_help
+(this,
+ m_toggle_resources.get_x()/* + BUTTON_WIDTH "hide the geologic survey button until it does something"*/, m_toggle_resources.get_y(),
+ BUTTON_WIDTH, BUTTON_HEIGHT,
+ 2,
+ g_gr->get_picture(PicMod_Game, "pics/menu_help.png"),
+ &Interactive_Player::toggle_help, this,
+ _("Tribe's ware encyclopedia")),
+
+m_do_chat_overlays(true), m_is_typing_msg(false)
+{
+	set_player_number(plyn);
+	fieldclicked.set(this, &Interactive_Player::field_action);
 }
 
 /*
@@ -153,7 +159,7 @@
 		if (uint speed = m_game->get_speed())
 			snprintf(buffer, sizeof(buffer), _("%ux").c_str(), speed);
 		else strncpy (buffer, _("PAUSE").c_str(), sizeof(buffer));
-		m_label_speed->set_text(buffer);
+		m_label_speed.set_text(buffer);
 	}
 
 	// Check for chatmessages
@@ -169,7 +175,7 @@
 	}
 
 	// If we have chat messages to overlay, show them now
-	m_chat_messages->set_text("");
+	m_chat_messages.set_text("");
 	if (m_show_chatmsg.size() && m_do_chat_overlays) {
 		std::string str;
 		for (uint i = 0; i < m_show_chatmsg.size(); i++) {
@@ -185,15 +191,15 @@
 			}
 		}
 
-		m_chat_messages->set_text(str.c_str());
+		m_chat_messages.set_text(str.c_str());
 	}
 
 	// Is the user typing a message?
-	m_type_message->set_text("");
+	m_type_message.set_text("");
 	if (m_is_typing_msg) {
 		std::string text = _("Message: ");
 		text += m_typed_message;
-		m_type_message->set_text(text.c_str());
+		m_type_message.set_text(text.c_str());
 	}
 }
 
@@ -241,8 +247,7 @@
 Bring up or close the main menu
 ===============
 */
-void Interactive_Player::main_menu_btn()
-{
+void Interactive_Player::toggle_main_menu() {
 	if (m_mainmenu.window)
 		delete m_mainmenu.window;
 	else
@@ -257,11 +262,15 @@
 	egbase().map().overlay_manager().toggle_buildhelp();
 }
 
+
+void Interactive_Player::toggle_resources() {
+}
+
+
 //
 // Shows wares encyclopedia for wares
 //
-void Interactive_Player::open_encyclopedia()
-{
+void Interactive_Player::toggle_help() {
 	if (m_encyclopedia.window)
 		delete m_encyclopedia.window;
 	else

Modified: trunk/src/interactive_player.h
===================================================================
--- trunk/src/interactive_player.h	2007-08-30 00:01:23 UTC (rev 2556)
+++ trunk/src/interactive_player.h	2007-08-30 18:30:46 UTC (rev 2557)
@@ -24,6 +24,10 @@
 #include "interactive_base.h"
 #include "network.h" // For chat
 
+#include "ui_button.h"
+#include "ui_multilinetextarea.h"
+#include "ui_textarea.h"
+
 #include <vector>
 
 class Player;
@@ -39,8 +43,7 @@
  * to the player and draws the user interface,
  * cares for input and so on.
  */
-class Interactive_Player : public Interactive_Base {
-public:
+struct Interactive_Player : public Interactive_Base {
 	struct Game_Main_Menu_Windows {
 		UI::UniqueWindow::Registry loadgame;
 		UI::UniqueWindow::Registry savegame;
@@ -61,7 +64,6 @@
 		UI::UniqueWindow::Registry objectives;
 	};
 
-public:
 	Interactive_Player(Game &, const uchar pln);
 	~Interactive_Player();
 
@@ -69,9 +71,10 @@
 
 	void start();
 
-	void main_menu_btn();
+	void toggle_main_menu();
 	void toggle_buildhelp();
-	void open_encyclopedia();
+	void toggle_resources();
+	void toggle_help     ();
 
 	void field_action();
 
@@ -109,9 +112,14 @@
 	Game                     * m_game;
 	Player_Number m_player_number;
 
-	UI::Textarea             * m_label_speed;
-	UI::Multiline_Textarea   * m_chat_messages;
-	UI::Textarea             * m_type_message;
+	UI::Textarea                   m_label_speed;
+	UI::Multiline_Textarea         m_chat_messages;
+	UI::Textarea                   m_type_message;
+	UI::Button<Interactive_Player> m_toggle_main_menu;
+	UI::Button<Interactive_Player> m_toggle_minimap;
+	UI::Button<Interactive_Player> m_toggle_buildhelp;
+	UI::Button<Interactive_Player> m_toggle_resources;
+	UI::Button<Interactive_Player> m_toggle_help;
 
 	UI::UniqueWindow::Registry m_mainmenu;
 	UI::UniqueWindow::Registry m_fieldaction;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2561] trunk/src

From: <ixprefect@us...> - 2007-08-31 06:28

Revision: 2561
          http://widelands.svn.sourceforge.net/widelands/?rev=2561&view=rev
Author:   ixprefect
Date:     2007-08-30 23:28:30 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Indentation cleanup in instances.[h|cc]

Modified Paths:
--------------
    trunk/src/instances.cc
    trunk/src/instances.h

Modified: trunk/src/instances.cc
===================================================================
--- trunk/src/instances.cc	2007-08-31 04:17:56 UTC (rev 2560)
+++ trunk/src/instances.cc	2007-08-31 06:28:30 UTC (rev 2561)
@@ -78,13 +78,13 @@
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
-   // First, write version
+	// First, write version
 	fw.Unsigned16(CMD_DESTROY_MAP_OBJECT_VERSION);
 
 	// Write base classes
 	GameLogicCommand::Write(fw, egbase, mos);
 
-   // Now serial
+	// Now serial
 	if (const Map_Object * const obj = egbase.objects().get_object(obj_serial)) {
 		// The object might have vanished
 		assert(mos.is_object_known(obj));
@@ -96,8 +96,8 @@
 
 Cmd_Act::Cmd_Act(int t, Map_Object* o, int a) : GameLogicCommand(t)
 {
-   obj_serial=o->get_serial();
-   arg=a;
+	obj_serial = o->get_serial();
+	arg = a;
 }
 
 
@@ -117,21 +117,20 @@
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
- const Uint16 packet_version = fr.Unsigned16();
+	const Uint16 packet_version = fr.Unsigned16();
 	if (packet_version == CMD_ACT_VERSION) {
 		// Read Base Commands
 		GameLogicCommand::Read(fr, egbase, mol);
 
-      // Serial
+		// Serial
 		if (const Uint32 fileserial = fr.Unsigned32()) {
 			assert(mol.is_object_known(fileserial)); //  FIXME NEVER USE assert TO VALIDATE INPUT!!!
 			obj_serial = mol.get_object_by_file_index(fileserial)->get_serial();
 		} else
-         obj_serial = 0;
+			obj_serial = 0;
 
-      // arg
+		// arg
 		arg = fr.Unsigned32();
-
 	} else
 		throw wexception("Unknown version in Cmd_Act::Read: %u", packet_version);
 }
@@ -140,21 +139,21 @@
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
-   // First, write version
+	// First, write version
 	fw.Unsigned16(CMD_ACT_VERSION);
 
 	// Write base classes
 	GameLogicCommand::Write(fw, egbase, mos);
 
-   // Now serial
+	// Now serial
 	if (const Map_Object * const obj = egbase.objects().get_object(obj_serial)) {
 		// Object might have dissappeared
 		assert(mos.is_object_known(obj));
 		fw.Unsigned32(mos.get_object_file_index(obj));
 	} else
-      fw.Unsigned32(0);
+		fw.Unsigned32(0);
 
-   // And arg
+	// And arg
 	fw.Unsigned32(arg);
 }
 
@@ -255,35 +254,39 @@
  * Add this animation for this map object under this name
  */
 bool Map_Object_Descr::is_animation_known(const char* name) {
-   std::map<std::string, uint>::iterator i=m_anims.begin();
-   while (i!=m_anims.end()) {
-      if (i->first==name)
-         return true;
-      ++i;
+	std::map<std::string, uint>::iterator i=m_anims.begin();
+	while (i!=m_anims.end()) {
+		if (i->first==name)
+			return true;
+		++i;
 	}
-   return false;
+	return false;
 }
 
 void Map_Object_Descr::add_animation(const char* name, uint anim) {
-   std::string use_name=name;
-   std::map<std::string, uint>::iterator i=m_anims.begin();
+	std::string use_name=name;
+	std::map<std::string, uint>::iterator i=m_anims.begin();
 
-   while (i!=m_anims.end()) {
-      assert(i->first!=name);
-      ++i;
+	while (i!=m_anims.end()) {
+		assert(i->first!=name);
+		++i;
 	}
-   m_anims.insert(std::pair<std::string, uint>(use_name, anim));
+	m_anims.insert(std::pair<std::string, uint>(use_name, anim));
+}
 
-}
 std::string Map_Object_Descr::get_animation_name(uint anim) const {
 	for
 		(std::map<std::string, uint>::const_iterator it = m_anims.begin();
 		 it != m_anims.end();
 		 ++it)
-		if (it->second == anim) return it->first;
-   // Never here
-   assert(0);
-   return "";
+	{
+		if (it->second == anim)
+			return it->first;
+	}
+
+	// Never here
+	assert(0);
+	return "";
 }
 
 
@@ -467,7 +470,9 @@
 Called when a CMD_ACT triggers.
 ===============
 */
-void Map_Object::act(Game *, uint) {}
+void Map_Object::act(Game *, uint)
+{
+}
 
 
 /*

Modified: trunk/src/instances.h
===================================================================
--- trunk/src/instances.h	2007-08-31 04:17:56 UTC (rev 2560)
+++ trunk/src/instances.h	2007-08-31 06:28:30 UTC (rev 2561)
@@ -122,7 +122,7 @@
 //protected: type* m_descr; inline type* get_descr() const {return m_descr;}
 
 class Map_Object {
-   friend class Object_Manager;
+	friend class Object_Manager;
 	friend class Object_Ptr;
 
 	MO_DESCR(Map_Object_Descr);
@@ -137,8 +137,8 @@
 
 		// everything below is at least a BaseImmovable
 		IMMOVABLE,
-      BATTLE,
-      ATTACKCONTROLLER,
+		BATTLE,
+		ATTACKCONTROLLER,
 
 		// everything below is at least a PlayerImmovable
 		BUILDING,
@@ -150,7 +150,7 @@
 	enum Attribute {
 		WAREHOUSE        = 1, //  assume BUILDING
 		CONSTRUCTIONSITE, // assume BUILDING
-      WORKER,               //  assume BOB
+		WORKER,               //  assume BOB
 		SOLDIER,              //  assume WORKER
 		RESI,                 //  resource indicator, assume IMMOVABLE
 
@@ -170,7 +170,7 @@
 
 	struct LogSink {
 		virtual void log(std::string str) = 0;
-	   virtual ~LogSink() {}
+		virtual ~LogSink() {}
 	};
 
 protected:
@@ -198,9 +198,10 @@
 
 	LogSink* get_logsink() {return m_logsink;}
 	void set_logsink(LogSink* sink);
-   virtual void log_general_info(Editor_Game_Base*); // Called when a new logsink is set, used to give general informations
+	virtual void log_general_info(Editor_Game_Base*); // Called when a new logsink is set, used to give general informations
+
 protected:
-   // init for editor and game
+	// init for editor and game
 	virtual void init(Editor_Game_Base*);
 	virtual void cleanup(Editor_Game_Base*);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2562] trunk/src

From: <ixprefect@us...> - 2007-08-31 06:28

Revision: 2562
          http://widelands.svn.sourceforge.net/widelands/?rev=2562&view=rev
Author:   ixprefect
Date:     2007-08-30 23:28:54 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Merge WidelandsFile|StreamRead|Write back into File|StreamRead|Write.

Modified Paths:
--------------
    trunk/src/cmd_check_eventchain.h
    trunk/src/cmd_incorporate.cc
    trunk/src/cmd_incorporate.h
    trunk/src/cmd_queue.cc
    trunk/src/cmd_queue.h
    trunk/src/events/event_chain.cc
    trunk/src/fileread.h
    trunk/src/filesystem/disk_filesystem.cc
    trunk/src/filesystem/disk_filesystem.h
    trunk/src/filesystem/filesystem.h
    trunk/src/filesystem/layered_filesystem.cc
    trunk/src/filesystem/layered_filesystem.h
    trunk/src/filesystem/zip_filesystem.cc
    trunk/src/filesystem/zip_filesystem.h
    trunk/src/filewrite.h
    trunk/src/game_cmd_queue_data_packet.cc
    trunk/src/instances.cc
    trunk/src/instances.h
    trunk/src/network.h
    trunk/src/playercommand.cc
    trunk/src/playercommand.h
    trunk/src/replay.cc
    trunk/src/replay.h
    trunk/src/streamread.h
    trunk/src/streamwrite.h
    trunk/src/transport.cc
    trunk/src/transport.h
    trunk/src/widelands_map_attack_controller_data_packet.cc
    trunk/src/widelands_map_flagdata_data_packet.cc
    trunk/src/widelands_map_immovable_data_packet.cc
    trunk/src/widelands_map_players_areawatchers_data_packet.cc

Removed Paths:
-------------
    trunk/src/widelands_fileread.h
    trunk/src/widelands_filewrite.h
    trunk/src/widelands_streamread.h
    trunk/src/widelands_streamwrite.h

Modified: trunk/src/cmd_check_eventchain.h
===================================================================
--- trunk/src/cmd_check_eventchain.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/cmd_check_eventchain.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -33,11 +33,11 @@
 
 	// Write these commands to a file (for savegames)
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 

Modified: trunk/src/cmd_incorporate.cc
===================================================================
--- trunk/src/cmd_incorporate.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/cmd_incorporate.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -18,15 +18,15 @@
  */
 
 #include "cmd_incorporate.h"
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "widelands_map_map_object_loader.h"
 #include "widelands_map_map_object_saver.h"
 #include "wexception.h"
 
 
 void Cmd_Incorporate::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -46,7 +46,7 @@
 
 
 void Cmd_Incorporate::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {

Modified: trunk/src/cmd_incorporate.h
===================================================================
--- trunk/src/cmd_incorporate.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/cmd_incorporate.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -30,11 +30,11 @@
 		void execute (Game* g) {worker->incorporate(g);}
 
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 

Modified: trunk/src/cmd_queue.cc
===================================================================
--- trunk/src/cmd_queue.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/cmd_queue.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -20,14 +20,14 @@
 #include "cmd_queue.h"
 
 #include "error.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "game.h"
 #include "instances.h"
 #include "machdep.h"
 #include "player.h"
 #include "trigger/trigger.h"
 #include "wexception.h"
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
 #include "worker.h"
 
 
@@ -149,7 +149,7 @@
  * \note This function must be called by deriving objects that override it.
  */
 void GameLogicCommand::Write
-(WidelandsFileWrite & fw, Editor_Game_Base &, Widelands_Map_Map_Object_Saver &)
+(FileWrite & fw, Editor_Game_Base &, Widelands_Map_Map_Object_Saver &)
 {
 	// First version
 	fw.Unsigned16(BASE_CMD_VERSION);
@@ -164,7 +164,7 @@
  * \note This function must be called by deriving objects that override it.
  */
 void GameLogicCommand::Read
-(WidelandsFileRead & fr, Editor_Game_Base &, Widelands_Map_Map_Object_Loader &)
+(FileRead & fr, Editor_Game_Base &, Widelands_Map_Map_Object_Loader &)
 {
 	const Uint16 packet_version = fr.Unsigned16();
 	if (packet_version == BASE_CMD_VERSION)

Modified: trunk/src/cmd_queue.h
===================================================================
--- trunk/src/cmd_queue.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/cmd_queue.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -27,8 +27,8 @@
 class Editor_Game_Base;
 class Widelands_Map_Map_Object_Saver;
 class Widelands_Map_Map_Object_Loader;
-class WidelandsFileRead;
-class WidelandsFileWrite;
+class FileRead;
+class FileWrite;
 
 // Define here all the possible users
 #define SENDER_MAPOBJECT 0
@@ -96,11 +96,11 @@
 
 	// Write these commands to a file (for savegames)
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 };

Modified: trunk/src/events/event_chain.cc
===================================================================
--- trunk/src/events/event_chain.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/events/event_chain.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -20,6 +20,8 @@
 #include "event_chain.h"
 
 #include "event.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "game.h"
 #include "map.h"
 #include "map_event_manager.h"
@@ -27,8 +29,6 @@
 #include "map_trigger_manager.h"
 #include "trigger/trigger_conditional.h"
 #include "wexception.h"
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
 
 
 /*
@@ -152,7 +152,7 @@
 
 #define CMD_CHECK_EVENTCHAIN_VERSION 1
 void Cmd_CheckEventChain::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -168,7 +168,7 @@
 			("Unknown version in Cmd_CheckEventChain::Read: %u", packet_version);
 }
 void Cmd_CheckEventChain::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {

Modified: trunk/src/fileread.h
===================================================================
--- trunk/src/fileread.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/fileread.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -20,6 +20,7 @@
 #ifndef FILEREAD_H
 #define FILEREAD_H
 
+#include "geometry.h"
 #include "machdep.h"
 #include <exception>
 #include <limits>
@@ -124,6 +125,48 @@
 		}
 
 	void * data;
+
+	struct Data_Error {
+		Data_Error(const Pos pos) : position(pos) {}
+		Pos position;
+	};
+	struct Extent_Exceeded : public Data_Error
+	{Extent_Exceeded(const Pos pos) : Data_Error(pos) {}};
+	struct Width_Exceeded : public Extent_Exceeded {
+		Width_Exceeded(const Pos pos, const Uint16 W, const X_Coordinate X) :
+			Extent_Exceeded(pos), w(W), x(X)
+		{}
+		Uint16       w;
+		X_Coordinate x;
+	};
+	struct Height_Exceeded : public Extent_Exceeded {
+		Height_Exceeded(const Pos pos, const Uint16 H, const Y_Coordinate Y) :
+			Extent_Exceeded(pos), h(H), y(Y)
+		{}
+		Uint16       h;
+		Y_Coordinate y;
+	};
+
+	/**
+	 * Read a Coords from the file. Use this when the result can only be a node
+	 * coordinate. Will throw an exception if the width is <= the x coordinate or
+	 * the height is <= the y coordinate. Both coordinates are read from the file
+	 * before checking and possibly throwing, so in case such an exception is
+	 * thrown, it is guaranteed that the whole coordinate pair has been read.
+	 */
+	Coords Coords32(const Extent extent);
+
+	/**
+	 * Read Coords from the file. Use this when the result can only be a node
+	 * coordinate or the special value indicating invalidity, as defined by
+	 * Coords::isNull. Unless the read Coords is null, this will throw an
+	 * exception if the width is <= the x coordinate or the height is <= the y
+	 * coordinate. Both coordinates are read from the file before checking and
+	 * possibly throwing, so in case such an exception is thrown, it is
+	 * guaranteed that the whole coordinate pair has been read.
+	 */
+	Coords Coords32_allow_null(const Extent extent);
+
 private:
 	Pos    filepos;
 	Pos    prevpos;
@@ -133,4 +176,23 @@
 	FileRead            (const FileRead &);
 };
 
+inline Coords FileRead::Coords32(const Extent extent) {
+	const Uint16 x = Unsigned16();
+	const Uint16 y = Unsigned16();
+	if (extent.w <= x) throw Width_Exceeded (GetPos() - 4, extent.w, x);
+	if (extent.h <= y) throw Height_Exceeded(GetPos() - 4, extent.h, y);
+	return Coords(x, y);
+}
+
+inline Coords FileRead::Coords32_allow_null(const Extent extent) {
+	const Uint16 x = Unsigned16();
+	const Uint16 y = Unsigned16();
+	const Coords result(x, y);
+	if (not result.isNull()) {
+		if (extent.w <= x) throw Width_Exceeded (GetPos() - 4, extent.w, x);
+		if (extent.h <= y) throw Height_Exceeded(GetPos() - 4, extent.h, y);
+	}
+	return result;
+}
+
 #endif

Modified: trunk/src/filesystem/disk_filesystem.cc
===================================================================
--- trunk/src/filesystem/disk_filesystem.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/filesystem/disk_filesystem.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -32,8 +32,8 @@
 #include <glob.h>
 #endif
 
-#include "widelands_streamread.h"
-#include "widelands_streamwrite.h"
+#include "streamread.h"
+#include "streamwrite.h"
 
 /**
  * Initialize the real file-system
@@ -425,7 +425,7 @@
 
 namespace {
 
-class RealFSStreamRead : public WidelandsStreamRead {
+class RealFSStreamRead : public StreamRead {
 public:
 	RealFSStreamRead(const std::string fname)
 	{
@@ -455,7 +455,7 @@
 
 } // anonymous namespace
 
-WidelandsStreamRead * RealFSImpl::OpenWidelandsStreamRead
+StreamRead * RealFSImpl::OpenStreamRead
 (const std::string & fname)
 {
 	const std::string fullname = FS_CanonicalizeName(fname);
@@ -472,8 +472,8 @@
 
 namespace {
 
-struct RealFSWidelandsStreamWrite : public WidelandsStreamWrite {
-	RealFSWidelandsStreamWrite(const std::string fname)
+struct RealFSStreamWrite : public StreamWrite {
+	RealFSStreamWrite(const std::string fname)
 	: m_filename(fname)
 	{
 		m_file = fopen(fname.c_str(), "wb");
@@ -481,7 +481,7 @@
 			throw wexception("Couldn't open %s for writing", fname.c_str());
 	}
 
-	~RealFSWidelandsStreamWrite() {fclose(m_file);}
+	~RealFSStreamWrite() {fclose(m_file);}
 
 	void Data(const void * const data, const size_t size)
 	{
@@ -503,10 +503,10 @@
 
 } // anonymous namespace
 
-WidelandsStreamWrite * RealFSImpl::OpenWidelandsStreamWrite
+StreamWrite * RealFSImpl::OpenStreamWrite
 (const std::string & fname)
 {
 	const std::string fullname = FS_CanonicalizeName(fname);
 
-	return new RealFSWidelandsStreamWrite(fullname);
+	return new RealFSStreamWrite(fullname);
 }

Modified: trunk/src/filesystem/disk_filesystem.h
===================================================================
--- trunk/src/filesystem/disk_filesystem.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/filesystem/disk_filesystem.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -43,9 +43,9 @@
 	virtual void Write(const std::string fname, const void * const data,
 	                   const int length);
 
-	virtual WidelandsStreamRead  * OpenWidelandsStreamRead
+	virtual StreamRead  * OpenStreamRead
 		(const std::string & fname);
-	virtual WidelandsStreamWrite * OpenWidelandsStreamWrite
+	virtual StreamWrite * OpenStreamWrite
 		(const std::string & fname);
 
 	virtual FileSystem* MakeSubFileSystem(const std::string dirname);

Modified: trunk/src/filesystem/filesystem.h
===================================================================
--- trunk/src/filesystem/filesystem.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/filesystem/filesystem.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -30,8 +30,8 @@
 
 typedef std::set<std::string> filenameset_t;
 
-class WidelandsStreamRead;
-class WidelandsStreamWrite;
+class StreamRead;
+class StreamWrite;
 
 
 /**
@@ -68,7 +68,7 @@
 	 * \return a \ref StreamRead object for the file. The caller must delete this
 	 * object when done to close the file.
 	 */
-	virtual WidelandsStreamRead * OpenWidelandsStreamRead
+	virtual StreamRead * OpenStreamRead
 		(const std::string & fname)
 		= 0;
 
@@ -78,11 +78,11 @@
 	 *
 	 * Throws an exception if the file couldn't be opened.
 	 *
-	 * \return a \ref WidelandsStreamWrite object for the file. The caller must
+	 * \return a \ref StreamWrite object for the file. The caller must
 	 * delete this object when done to close the file (which will implicitly
 	 * flush unwritten data).
 	 */
-	virtual WidelandsStreamWrite * OpenWidelandsStreamWrite
+	virtual StreamWrite * OpenStreamWrite
 		(const std::string & fname)
 		= 0;
 

Modified: trunk/src/filesystem/layered_filesystem.cc
===================================================================
--- trunk/src/filesystem/layered_filesystem.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/filesystem/layered_filesystem.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -187,14 +187,14 @@
  * Analogously to Read, open the file from the first sub-filesystem where
  * it exists.
  */
-WidelandsStreamRead * LayeredFileSystem::OpenWidelandsStreamRead
+StreamRead * LayeredFileSystem::OpenStreamRead
 (const std::string & fname)
 {
 	for (FileSystem_rit it = m_filesystems.rbegin();
 	    it != m_filesystems.rend(); it++)
 	{
 		if ((*it)->FileExists(fname))
-			return (*it)->OpenWidelandsStreamRead(fname);
+			return (*it)->OpenStreamRead(fname);
 	}
 
 	throw FileNotFound_error("Could not find file", fname);
@@ -203,14 +203,14 @@
 /**
  * Analogously to Write, create the file in the first writable sub-FS.
  */
-WidelandsStreamWrite * LayeredFileSystem::OpenWidelandsStreamWrite
+StreamWrite * LayeredFileSystem::OpenStreamWrite
 (const std::string & fname)
 {
 	for (FileSystem_rit it = m_filesystems.rbegin();
 	    it != m_filesystems.rend(); it++)
 	{
 		if ((*it)->IsWritable())
-			return (*it)->OpenWidelandsStreamWrite(fname);
+			return (*it)->OpenStreamWrite(fname);
 	}
 
 	throw wexception("LayeredFileSystem: No writable filesystem!");

Modified: trunk/src/filesystem/layered_filesystem.h
===================================================================
--- trunk/src/filesystem/layered_filesystem.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/filesystem/layered_filesystem.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -62,9 +62,9 @@
 	virtual void Write(const std::string fname, const void * const data,
 	                   const int length);
 
-	virtual WidelandsStreamRead  * OpenWidelandsStreamRead
+	virtual StreamRead  * OpenStreamRead
 		(const std::string & fname);
-	virtual WidelandsStreamWrite * OpenWidelandsStreamWrite
+	virtual StreamWrite * OpenStreamWrite
 		(const std::string & fname);
 
 	virtual FileSystem* MakeSubFileSystem(const std::string dirname);

Modified: trunk/src/filesystem/zip_filesystem.cc
===================================================================
--- trunk/src/filesystem/zip_filesystem.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/filesystem/zip_filesystem.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -350,13 +350,13 @@
    zipCloseFileInZip(m_zipfile);
 }
 
-WidelandsStreamRead * ZipFilesystem::OpenWidelandsStreamRead
+StreamRead * ZipFilesystem::OpenStreamRead
 (const std::string & fname)
 {
 	throw wexception("OpenStreamRead(%s) not yet supported in ZipFilesystem", fname.c_str());
 }
 
-WidelandsStreamWrite * ZipFilesystem::OpenWidelandsStreamWrite
+StreamWrite * ZipFilesystem::OpenStreamWrite
 (const std::string & fname)
 {
 	throw wexception("OpenStreamWrite(%s) not yet supported in ZipFilesystem", fname.c_str());

Modified: trunk/src/filesystem/zip_filesystem.h
===================================================================
--- trunk/src/filesystem/zip_filesystem.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/filesystem/zip_filesystem.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -44,9 +44,9 @@
 	virtual void EnsureDirectoryExists(const std::string dirname);
 	virtual void MakeDirectory(const std::string dirname);
 
-	virtual WidelandsStreamRead  * OpenWidelandsStreamRead
+	virtual StreamRead  * OpenStreamRead
 		(const std::string & fname);
-	virtual WidelandsStreamWrite * OpenWidelandsStreamWrite
+	virtual StreamWrite * OpenStreamWrite
 		(const std::string & fname);
 
 	virtual FileSystem*  MakeSubFileSystem(const std::string dirname);

Modified: trunk/src/filewrite.h
===================================================================
--- trunk/src/filewrite.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/filewrite.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -20,10 +20,11 @@
 #ifndef FILEWRITE_H
 #define FILEWRITE_H
 
+#include "geometry.h"
 #include "machdep.h"
 
+#include <cassert>
 #include <limits>
-#include <cassert>
 
 struct FileSystem;
 
@@ -101,6 +102,8 @@
 	void CString(const char * const x, const Pos pos = NoPos())
 	{Data(x, strlen(x) + 1, pos);}
 
+	void  Coords32(const Coords);
+
 private:
 	void * data;
 	size_t length;
@@ -111,4 +114,11 @@
 	FileWrite            (const FileWrite &);
 };
 
+inline void FileWrite::Coords32(const Coords c) {
+	assert(static_cast<Uint16>(c.x) < 0x8000 or c.x == -1);
+	assert(static_cast<Uint16>(c.y) < 0x8000 or c.y == -1);
+	{const Uint16 x = Little16(c.x); Data(&x, 2);}
+	{const Uint16 y = Little16(c.y); Data(&y, 2);}
+}
+
 #endif

Modified: trunk/src/game_cmd_queue_data_packet.cc
===================================================================
--- trunk/src/game_cmd_queue_data_packet.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/game_cmd_queue_data_packet.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -21,10 +21,10 @@
 
 #include "cmd_queue.h"
 #include "error.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "game.h"
 #include "queue_cmd_factory.h"
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
 
 
 #define CURRENT_PACKET_VERSION 2
@@ -37,7 +37,7 @@
 (FileSystem & fs, Game* game, Widelands_Map_Map_Object_Loader * const ol)
 throw (_wexception)
 {
-	WidelandsFileRead fr;
+	FileRead fr;
 	fr.Open(fs, "binary/cmd_queue");
 
 	const Uint16 packet_version = fr.Unsigned16();
@@ -111,7 +111,7 @@
 (FileSystem & fs, Game* game, Widelands_Map_Map_Object_Saver * const os)
 throw (_wexception)
 {
-	WidelandsFileWrite fw;
+	FileWrite fw;
 
 	// Now packet version
 	fw.Unsigned16(CURRENT_PACKET_VERSION);

Modified: trunk/src/instances.cc
===================================================================
--- trunk/src/instances.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/instances.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -21,11 +21,11 @@
 
 #include "cmd_queue.h"
 #include "error.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "game.h"
 #include "queue_cmd_ids.h"
 #include "wexception.h"
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
 #include "widelands_map_map_object_loader.h"
 #include "widelands_map_map_object_saver.h"
 
@@ -53,7 +53,7 @@
 
 #define CMD_DESTROY_MAP_OBJECT_VERSION 1
 void Cmd_Destroy_Map_Object::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -74,7 +74,7 @@
 			 packet_version);
 }
 void Cmd_Destroy_Map_Object::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -113,7 +113,7 @@
 
 #define CMD_ACT_VERSION 1
 void Cmd_Act::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -135,7 +135,7 @@
 		throw wexception("Unknown version in Cmd_Act::Read: %u", packet_version);
 }
 void Cmd_Act::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {

Modified: trunk/src/instances.h
===================================================================
--- trunk/src/instances.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/instances.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -331,11 +331,11 @@
 	virtual void execute (Game* g);
 
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
@@ -354,11 +354,11 @@
 	virtual void execute (Game* g);
 
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 

Modified: trunk/src/network.h
===================================================================
--- trunk/src/network.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/network.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -23,9 +23,9 @@
 #include "constants.h"
 #include "error.h"
 #include "md5.h"
+#include "streamread.h"
+#include "streamwrite.h"
 #include "types.h"
-#include "widelands_streamread.h"
-#include "widelands_streamwrite.h"
 
 #include <SDL_net.h>
 
@@ -195,7 +195,7 @@
 	Deserializer   * deserializer;
 };
 
-struct Serializer : public WidelandsStreamWrite {
+struct Serializer : public StreamWrite {
 	Serializer ();
 	~Serializer ();
 
@@ -231,7 +231,7 @@
 	std::vector<unsigned char> buffer;
 };
 
-struct Deserializer : public WidelandsStreamRead {
+struct Deserializer : public StreamRead {
 	Deserializer ();
 	~Deserializer ();
 

Modified: trunk/src/playercommand.cc
===================================================================
--- trunk/src/playercommand.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/playercommand.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -20,17 +20,17 @@
 #include "playercommand.h"
 
 #include "error.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "game.h"
 #include "instances.h"
 #include "player.h"
 #include "soldier.h"
+#include "streamread.h"
+#include "streamwrite.h"
 #include "wexception.h"
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
 #include "widelands_map_map_object_saver.h"
 #include "widelands_map_map_object_loader.h"
-#include "widelands_streamread.h"
-#include "widelands_streamwrite.h"
 
 enum {
 	PLCMD_UNUSED=0,
@@ -59,7 +59,7 @@
 {
 }
 
-PlayerCommand* PlayerCommand::deserialize (WidelandsStreamRead & des)
+PlayerCommand* PlayerCommand::deserialize (StreamRead & des)
 {
 	switch (des.Unsigned8()) {
 		case PLCMD_BULLDOZE:
@@ -95,7 +95,7 @@
  */
 #define PLAYER_COMMAND_VERSION 1
 void PlayerCommand::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -107,7 +107,7 @@
 	fw.Unsigned8 (sender);
 }
 void PlayerCommand::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -123,7 +123,7 @@
 
 /*** class Cmd_Bulldoze ***/
 
-Cmd_Bulldoze::Cmd_Bulldoze (WidelandsStreamRead & des) :
+Cmd_Bulldoze::Cmd_Bulldoze (StreamRead & des) :
 PlayerCommand (0, des.Unsigned8())
 {
 	serial = des.Unsigned32();
@@ -138,7 +138,7 @@
 		player->bulldoze(static_cast<PlayerImmovable*>(obj));
 }
 
-void Cmd_Bulldoze::serialize (WidelandsStreamWrite & ser)
+void Cmd_Bulldoze::serialize (StreamWrite & ser)
 {
 	ser.Unsigned8 (PLCMD_BULLDOZE);
 	ser.Unsigned8 (get_sender());
@@ -146,7 +146,7 @@
 }
 #define PLAYER_CMD_BULLDOZE_VERSION 1
 void Cmd_Bulldoze::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -162,7 +162,7 @@
 			("Unknown version in Cmd_Bulldoze::Read: %u", packet_version);
 }
 void Cmd_Bulldoze::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -178,7 +178,7 @@
 
 /*** class Cmd_Build ***/
 
-Cmd_Build::Cmd_Build (WidelandsStreamRead & des) :
+Cmd_Build::Cmd_Build (StreamRead & des) :
 PlayerCommand (0, des.Unsigned8())
 {
 	id     = des.Signed16  ();
@@ -191,7 +191,7 @@
 	player->build(coords, id);
 }
 
-void Cmd_Build::serialize (WidelandsStreamWrite & ser) {
+void Cmd_Build::serialize (StreamWrite & ser) {
 	ser.Unsigned8 (PLCMD_BUILD);
 	ser.Unsigned8 (get_sender());
 	ser.Signed16  (id);
@@ -199,7 +199,7 @@
 }
 #define PLAYER_CMD_BUILD_VERSION 1
 void Cmd_Build::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -209,12 +209,12 @@
 		PlayerCommand::Read(fr, egbase, mol);
 		id          = fr.Unsigned16();
 		try {coords = fr.Coords32  (egbase.map().extent());}
-		catch (const WidelandsStreamRead::Width_Exceeded e) {
+		catch (const StreamRead::Width_Exceeded e) {
 			throw wexception
 				("Cmd_Build::Read: reading coords: width (%u) exceeded (x = %i)",
 				 e.w, e.x);
 		}
-		catch (const WidelandsStreamRead::Height_Exceeded e) {
+		catch (const StreamRead::Height_Exceeded e) {
 			throw wexception
 				("Cmd_Build::Read: reading coords: height (%u) exceeded (y = %i)",
 				 e.h, e.y);
@@ -225,7 +225,7 @@
 }
 
 void Cmd_Build::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -240,7 +240,7 @@
 
 /*** class Cmd_BuildFlag ***/
 
-Cmd_BuildFlag::Cmd_BuildFlag (WidelandsStreamRead & des) :
+Cmd_BuildFlag::Cmd_BuildFlag (StreamRead & des) :
 PlayerCommand (0, des.Unsigned8())
 {
 	coords = des.Coords32  ();
@@ -252,7 +252,7 @@
 	player->build_flag(coords);
 }
 
-void Cmd_BuildFlag::serialize (WidelandsStreamWrite & ser)
+void Cmd_BuildFlag::serialize (StreamWrite & ser)
 {
 	ser.Unsigned8 (PLCMD_BUILDFLAG);
 	ser.Unsigned8 (get_sender());
@@ -260,7 +260,7 @@
 }
 #define PLAYER_CMD_BUILDFLAG_VERSION 1
 void Cmd_BuildFlag::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -269,13 +269,13 @@
 		// Read Player Command
 		PlayerCommand::Read(fr, egbase, mol);
 		try {coords = fr.Coords32(egbase.map().extent());}
-		catch (const WidelandsStreamRead::Width_Exceeded e) {
+		catch (const StreamRead::Width_Exceeded e) {
 			throw wexception
 				("Cmd_BuildFlag::Read: reading coords: width (%u) exceeded (x = "
 				 "%i)",
 				 e.w, e.x);
 		}
-		catch (const WidelandsStreamRead::Height_Exceeded e) {
+		catch (const StreamRead::Height_Exceeded e) {
 			throw wexception
 				("Cmd_BuildFlag::Read: reading coords: height (%u) exceeded (y = "
 				 "%i)",
@@ -286,7 +286,7 @@
 			("Unknown version in Cmd_BuildFlag::Read: %u", packet_version);
 }
 void Cmd_BuildFlag::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -307,7 +307,7 @@
 steps        (0)
 {}
 
-Cmd_BuildRoad::Cmd_BuildRoad (WidelandsStreamRead & des) :
+Cmd_BuildRoad::Cmd_BuildRoad (StreamRead & des) :
 PlayerCommand (0, des.Unsigned8())
 {
 	start  = des.Coords32  ();
@@ -342,7 +342,7 @@
 	player->build_road(*path);
 }
 
-void Cmd_BuildRoad::serialize (WidelandsStreamWrite & ser)
+void Cmd_BuildRoad::serialize (StreamWrite & ser)
 {
 	ser.Unsigned8 (PLCMD_BUILDROAD);
 	ser.Unsigned8 (get_sender());
@@ -356,7 +356,7 @@
 }
 #define PLAYER_CMD_BUILDROAD_VERSION 1
 void Cmd_BuildRoad::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -376,7 +376,7 @@
 			("Unknown version in Cmd_BuildRoad::Read: %u", packet_version);
 }
 void Cmd_BuildRoad::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -392,7 +392,7 @@
 
 
 /*** Cmd_FlagAction ***/
-Cmd_FlagAction::Cmd_FlagAction (WidelandsStreamRead & des) :
+Cmd_FlagAction::Cmd_FlagAction (StreamRead & des) :
 PlayerCommand (0, des.Unsigned8())
 {
 	action = des.Unsigned8 ();
@@ -408,7 +408,7 @@
 		player->flagaction (static_cast<Flag*>(obj), action);
 }
 
-void Cmd_FlagAction::serialize (WidelandsStreamWrite & ser)
+void Cmd_FlagAction::serialize (StreamWrite & ser)
 {
 	ser.Unsigned8 (PLCMD_FLAGACTION);
 	ser.Unsigned8 (get_sender());
@@ -418,7 +418,7 @@
 
 #define PLAYER_CMD_FLAGACTION_VERSION 1
 void Cmd_FlagAction::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -438,7 +438,7 @@
 			("Unknown version in Cmd_FlagAction::Read: %u", packet_version);
 }
 void Cmd_FlagAction::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -457,7 +457,7 @@
 
 /*** Cmd_StartStopBuilding ***/
 
-Cmd_StartStopBuilding::Cmd_StartStopBuilding (WidelandsStreamRead & des) :
+Cmd_StartStopBuilding::Cmd_StartStopBuilding (StreamRead & des) :
 PlayerCommand (0, des.Unsigned8())
 {
 	serial=des.Unsigned32();
@@ -472,7 +472,7 @@
 		player->start_stop_building(static_cast<PlayerImmovable*>(obj));
 }
 
-void Cmd_StartStopBuilding::serialize (WidelandsStreamWrite & ser)
+void Cmd_StartStopBuilding::serialize (StreamWrite & ser)
 {
 	ser.Unsigned8 (PLCMD_STARTSTOPBUILDING);
 	ser.Unsigned8 (get_sender());
@@ -480,7 +480,7 @@
 }
 #define PLAYER_CMD_STOPBUILDING_VERSION 1
 void Cmd_StartStopBuilding::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -498,7 +498,7 @@
 			("Unknown version in Cmd_StartStopBuilding::Read: %u", packet_version);
 }
 void Cmd_StartStopBuilding::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -516,7 +516,7 @@
 
 /*** Cmd_EnhanceBuilding ***/
 
-Cmd_EnhanceBuilding::Cmd_EnhanceBuilding (WidelandsStreamRead & des) :
+Cmd_EnhanceBuilding::Cmd_EnhanceBuilding (StreamRead & des) :
 PlayerCommand (0, des.Unsigned8())
 {
 	serial = des.Unsigned32();
@@ -531,7 +531,7 @@
 		g->get_player(get_sender())->enhance_building(building, id);
 }
 
-void Cmd_EnhanceBuilding::serialize (WidelandsStreamWrite & ser)
+void Cmd_EnhanceBuilding::serialize (StreamWrite & ser)
 {
 	ser.Unsigned8 (PLCMD_ENHANCEBUILDING);
 	ser.Unsigned8 (get_sender());
@@ -540,7 +540,7 @@
 }
 #define PLAYER_CMD_ENHANCEBUILDING_VERSION 1
 void Cmd_EnhanceBuilding::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -559,7 +559,7 @@
 			("Unknown version in Cmd_EnhanceBuilding::Read: %u", packet_version);
 }
 void Cmd_EnhanceBuilding::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -580,7 +580,7 @@
 
 /*** class Cmd_ChangeTrainingOptions ***/
 Cmd_ChangeTrainingOptions::Cmd_ChangeTrainingOptions
-(WidelandsStreamRead & des)
+(StreamRead & des)
 :
 PlayerCommand (0, des.Unsigned8())
 {
@@ -601,7 +601,7 @@
 
 }
 
-void Cmd_ChangeTrainingOptions::serialize (WidelandsStreamWrite & ser) {
+void Cmd_ChangeTrainingOptions::serialize (StreamWrite & ser) {
 	ser.Unsigned8 (PLCMD_CHANGETRAININGOPTIONS);
 	ser.Unsigned8 (get_sender());
 	ser.Unsigned32(serial);
@@ -612,7 +612,7 @@
 
 #define PLAYER_CMD_CHANGETRAININGOPTIONS_VERSION 1
 void Cmd_ChangeTrainingOptions::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -635,7 +635,7 @@
 }
 
 void Cmd_ChangeTrainingOptions::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -655,7 +655,7 @@
 
 /*** class Cmd_DropSoldier ***/
 
-Cmd_DropSoldier::Cmd_DropSoldier(WidelandsStreamRead & des) :
+Cmd_DropSoldier::Cmd_DropSoldier(StreamRead & des) :
 PlayerCommand (0, des.Unsigned8())
 {
 	serial  = des.Unsigned32(); //  Serial of the building
@@ -674,7 +674,7 @@
 	}
 }
 
-void Cmd_DropSoldier::serialize (WidelandsStreamWrite & ser)
+void Cmd_DropSoldier::serialize (StreamWrite & ser)
 {
 	ser.Unsigned8 (PLCMD_DROPSOLDIER);
 	ser.Unsigned8 (get_sender());
@@ -684,7 +684,7 @@
 
 #define PLAYER_CMD_DROPSOLDIER_VERSION 1
 void Cmd_DropSoldier::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -708,7 +708,7 @@
 }
 
 void Cmd_DropSoldier::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -735,7 +735,7 @@
 
 /*** Cmd_ChangeSoldierCapacity ***/
 
-Cmd_ChangeSoldierCapacity::Cmd_ChangeSoldierCapacity(WidelandsStreamRead & des)
+Cmd_ChangeSoldierCapacity::Cmd_ChangeSoldierCapacity(StreamRead & des)
 :
 PlayerCommand (0, des.Unsigned8())
 {
@@ -752,7 +752,7 @@
 		player->change_soldier_capacity(static_cast<PlayerImmovable*>(obj), val);
 }
 
-void Cmd_ChangeSoldierCapacity::serialize (WidelandsStreamWrite & ser)
+void Cmd_ChangeSoldierCapacity::serialize (StreamWrite & ser)
 {
 	ser.Unsigned8 (PLCMD_CHANGESOLDIERCAPACITY);
 	ser.Unsigned8 (get_sender());
@@ -762,7 +762,7 @@
 
 #define PLAYER_CMD_CHANGESOLDIERCAPACITY_VERSION 1
 void Cmd_ChangeSoldierCapacity::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -785,7 +785,7 @@
 }
 
 void Cmd_ChangeSoldierCapacity::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {
@@ -807,7 +807,7 @@
 /// TESTING STUFF
 /*** Cmd_EnemyFlagAction ***/
 
-Cmd_EnemyFlagAction::Cmd_EnemyFlagAction (WidelandsStreamRead & des) :
+Cmd_EnemyFlagAction::Cmd_EnemyFlagAction (StreamRead & des) :
 PlayerCommand (0, des.Unsigned8())
 {
 	action   = des.Unsigned8 ();
@@ -838,7 +838,7 @@
 		log ("Cmd_EnemyFlagAction Player invalid.\n");
 }
 
-void Cmd_EnemyFlagAction::serialize (WidelandsStreamWrite & ser) {
+void Cmd_EnemyFlagAction::serialize (StreamWrite & ser) {
 	ser.Unsigned8 (PLCMD_ENEMYFLAGACTION);
 	ser.Unsigned8 (get_sender());
 	ser.Unsigned8 (action);
@@ -849,7 +849,7 @@
 }
 #define PLAYER_CMD_ENEMYFLAGACTION_VERSION 2
 void Cmd_EnemyFlagAction::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -876,7 +876,7 @@
 }
 
 void Cmd_EnemyFlagAction::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {

Modified: trunk/src/playercommand.h
===================================================================
--- trunk/src/playercommand.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/playercommand.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -25,8 +25,8 @@
 #include "building.h"
 #include "transport.h"
 
-struct WidelandsStreamRead;
-struct WidelandsStreamWrite;
+struct StreamRead;
+struct StreamWrite;
 
 
 // PlayerCommand is for commands issued by players. It has the additional
@@ -42,16 +42,16 @@
 
 	char get_sender() const {return sender;}
 
-	virtual void serialize (WidelandsStreamWrite &) = 0;
-	static PlayerCommand * deserialize (WidelandsStreamRead &);
+	virtual void serialize (StreamWrite &) = 0;
+	static PlayerCommand * deserialize (StreamRead &);
 
 	// Call these from child classes
 	void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 };
@@ -65,21 +65,21 @@
 	Cmd_Bulldoze (int t, int p, PlayerImmovable* pi):PlayerCommand(t, p)
 	{serial=pi->get_serial();}
 
-	Cmd_Bulldoze (WidelandsStreamRead &);
+	Cmd_Bulldoze (StreamRead &);
 
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_BULLDOZE;} // Get this command id
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 class Cmd_Build:public PlayerCommand {
@@ -92,21 +92,21 @@
 	Cmd_Build (int t, int p, const Coords& c, int i):PlayerCommand(t, p)
 	{coords=c; id=i;}
 
-	Cmd_Build (WidelandsStreamRead &);
+	Cmd_Build (StreamRead &);
 
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_BUILD;} // Get this command id
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 class Cmd_BuildFlag:public PlayerCommand {
@@ -118,21 +118,21 @@
 	Cmd_BuildFlag (int t, int p, const Coords& c):PlayerCommand(t, p)
 	{coords=c;}
 
-	Cmd_BuildFlag (WidelandsStreamRead &);
+	Cmd_BuildFlag (StreamRead &);
 
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_FLAG;} // Get this command id
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 class Cmd_BuildRoad:public PlayerCommand {
@@ -146,23 +146,23 @@
 public:
 	Cmd_BuildRoad() : PlayerCommand() {} // For savegame loading
 	Cmd_BuildRoad (int, int, Path &);
-	Cmd_BuildRoad (WidelandsStreamRead &);
+	Cmd_BuildRoad (StreamRead &);
 
 	virtual ~Cmd_BuildRoad ();
 
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_BUILDROAD;} // Get this command id
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 class Cmd_FlagAction:public PlayerCommand {
@@ -176,21 +176,21 @@
 	{serial=f->get_serial(); action=a;}
 
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_FLAGACTION;} // Get this command id
 
 
-	Cmd_FlagAction (WidelandsStreamRead &);
+	Cmd_FlagAction (StreamRead &);
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 class Cmd_StartStopBuilding:public PlayerCommand {
@@ -203,20 +203,20 @@
 	{serial=b->get_serial();}
 
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_STOPBUILDING;} // Get this command id
 
-	Cmd_StartStopBuilding (WidelandsStreamRead &);
+	Cmd_StartStopBuilding (StreamRead &);
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 class Cmd_EnhanceBuilding:public PlayerCommand {
@@ -231,20 +231,20 @@
 
 	// Write these commands to a file (for savegames)
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_ENHANCEBUILDING;} // Get this command id
 
-	Cmd_EnhanceBuilding (WidelandsStreamRead &);
+	Cmd_EnhanceBuilding (StreamRead &);
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 
@@ -261,20 +261,20 @@
 
 	// Write these commands to a file (for savegames)
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_CHANGETRAININGOPTIONS;} // Get this command id
 
-	Cmd_ChangeTrainingOptions (WidelandsStreamRead &);
+	Cmd_ChangeTrainingOptions (StreamRead &);
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 class Cmd_DropSoldier:public PlayerCommand {
@@ -289,20 +289,20 @@
 
 	// Write these commands to a file (for savegames)
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_DROPSOLDIER;} // Get this command id
 
-	Cmd_DropSoldier(WidelandsStreamRead &);
+	Cmd_DropSoldier(StreamRead &);
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 class Cmd_ChangeSoldierCapacity:public PlayerCommand {
@@ -317,20 +317,20 @@
 
 	// Write these commands to a file (for savegames)
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_CHANGESOLDIERCAPACITY;} // Get this command id
 
-	Cmd_ChangeSoldierCapacity (WidelandsStreamRead &);
+	Cmd_ChangeSoldierCapacity (StreamRead &);
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 /////////////TESTING STUFF
@@ -358,20 +358,20 @@
 
 	// Write these commands to a file (for savegames)
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 
 	virtual int get_id() {return QUEUE_CMD_ENEMYFLAGACTION;} // Get this command id
 
-	Cmd_EnemyFlagAction (WidelandsStreamRead &);
+	Cmd_EnemyFlagAction (StreamRead &);
 
 	virtual void execute (Game* g);
-	virtual void serialize (WidelandsStreamWrite &);
+	virtual void serialize (StreamWrite &);
 };
 
 

Modified: trunk/src/replay.cc
===================================================================
--- trunk/src/replay.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/replay.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -24,9 +24,9 @@
 #include "playercommand.h"
 #include "replay.h"
 #include "save_handler.h"
+#include "streamread.h"
+#include "streamwrite.h"
 #include "wexception.h"
-#include "widelands_streamread.h"
-#include "widelands_streamwrite.h"
 
 
 // File format definitions
@@ -85,7 +85,7 @@
 	gl.load_game();
 	delete fs;
 
-	m_cmdlog = g_fs->OpenWidelandsStreamRead(filename);
+	m_cmdlog = g_fs->OpenStreamRead(filename);
 
 	try {
 		Uint32 magic = m_cmdlog->Unsigned32();
@@ -224,7 +224,7 @@
 	if (!savehandler->save_game(m_game, filename + WLGF_SUFFIX, &error))
 		throw wexception("Failed to save game for replay: %s", error.c_str());
 
-	m_cmdlog = g_fs->OpenWidelandsStreamWrite(filename);
+	m_cmdlog = g_fs->OpenStreamWrite(filename);
 	m_cmdlog->Unsigned32(REPLAY_MAGIC);
 
 	game->enqueue_command(new Cmd_ReplaySyncWrite(game->get_gametime() + SYNC_INTERVAL));

Modified: trunk/src/replay.h
===================================================================
--- trunk/src/replay.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/replay.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -34,8 +34,8 @@
 
 struct md5_checksum;
 
-class WidelandsStreamRead;
-class WidelandsStreamWrite;
+class StreamRead;
+class StreamWrite;
 
 
 /**
@@ -51,7 +51,7 @@
 
 private:
 	Game* m_game;
-	WidelandsStreamRead* m_cmdlog;
+	StreamRead* m_cmdlog;
 
 	uint m_replaytime;
 };
@@ -69,7 +69,7 @@
 
 private:
 	Game* m_game;
-	WidelandsStreamWrite* m_cmdlog;
+	StreamWrite* m_cmdlog;
 };
 
 

Modified: trunk/src/streamread.h
===================================================================
--- trunk/src/streamread.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/streamread.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -20,6 +20,7 @@
 #ifndef STREAMREAD_H
 #define STREAMREAD_H
 
+#include "geometry.h"
 #include "machdep.h"
 
 #include <limits>
@@ -64,7 +65,68 @@
 	Sint32 Signed32();
 	Uint32 Unsigned32();
 	std::string String();
+
+	struct Data_Error {};
+	struct Extent_Exceeded : public Data_Error {};
+	struct Width_Exceeded : public Extent_Exceeded {
+		Width_Exceeded(const Uint16 W, const X_Coordinate X) : w(W), x(X) {}
+		Uint16       w;
+		X_Coordinate x;
+	};
+	struct Height_Exceeded : public Extent_Exceeded {
+		Height_Exceeded(const Uint16 H, const Y_Coordinate Y) : h(H), y(Y) {}
+		Uint16       h;
+		Y_Coordinate y;
+	};
+
+	/**
+	 * Read a Coords from the stream. Use this when the result can only be a node
+	 * coordinate. Will throw an exception if the width is <= the x coordinate or
+	 * the height is <= the y coordinate. Both coordinates are read from the
+	 * stream before checking and possibly throwing, so in case such an exception
+	 * is thrown, it is guaranteed that the whole coordinate pair has been read.
+	 */
+	Coords Coords32(const Extent extent);
+
+	Coords Coords32();
+
+	/**
+	 * Read Coords from the stream. Use this when the result can only be a node
+	 * coordinate or the special value indicating invalidity, as defined by
+	 * Coords::isNull. Unless the read Coords is null, this will throw an
+	 * exception if the width is <= the x coordinate or the height is <= the y
+	 * coordinate. Both coordinates are read from the stream before checking and
+	 * possibly throwing, so in case such an exception is thrown, it is
+	 * guaranteed that the whole coordinate pair has been read.
+	 */
+	Coords Coords32_allow_null(const Extent extent);
 };
 
+
+inline Coords StreamRead::Coords32() {
+	const Uint16 x = Unsigned16();
+	const Uint16 y = Unsigned16();
+	return Coords(x, y);
+}
+
+inline Coords StreamRead::Coords32(const Extent extent) {
+	const Uint16 x = Unsigned16();
+	const Uint16 y = Unsigned16();
+	if (extent.w <= x) throw Width_Exceeded (extent.w, x);
+	if (extent.h <= y) throw Height_Exceeded(extent.h, y);
+	return Coords(x, y);
+}
+
+inline Coords StreamRead::Coords32_allow_null(const Extent extent) {
+	const Uint16 x = Unsigned16();
+	const Uint16 y = Unsigned16();
+	const Coords result(x, y);
+	if (not result.isNull()) {
+		if (extent.w <= x) throw Width_Exceeded (extent.w, x);
+		if (extent.h <= y) throw Height_Exceeded(extent.h, y);
+	}
+	return result;
+}
+
 #endif
 

Modified: trunk/src/streamwrite.h
===================================================================
--- trunk/src/streamwrite.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/streamwrite.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -20,8 +20,10 @@
 #ifndef STREAMWRITE_H
 #define STREAMWRITE_H
 
+#include "geometry.h"
 #include "machdep.h"
 
+#include <cassert>
 #include <limits>
 #include <string>
 
@@ -86,6 +88,15 @@
 	{
 		Data(str.c_str(), str.size() + 1);
 	}
+
+	void  Coords32(const  Coords);
 };
 
+inline void StreamWrite::Coords32(const Coords c) {
+	assert(static_cast<Uint16>(c.x) < 0x8000 or c.x == -1);
+	assert(static_cast<Uint16>(c.y) < 0x8000 or c.y == -1);
+	{const Uint16 x = Little16(c.x); Data(&x, 2);}
+	{const Uint16 y = Little16(c.y); Data(&y, 2);}
+}
+
 #endif

Modified: trunk/src/transport.cc
===================================================================
--- trunk/src/transport.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/transport.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -33,6 +33,8 @@
 #include "building.h"
 #include "carrier.h"
 #include "editor_game_base.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "game.h"
 #include "instances.h"
 #include "player.h"
@@ -40,8 +42,6 @@
 #include "tribe.h"
 #include "warehouse.h"
 #include "wexception.h"
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
 #include "widelands_map_map_object_loader.h"
 #include "widelands_map_map_object_saver.h"
 #include "worker.h"
@@ -3794,7 +3794,7 @@
  */
 #define CURRENT_CMD_CALL_ECONOMY_VERSION 1
 void Cmd_Call_Economy_Balance::Read
-(WidelandsFileRead               & fr,
+(FileRead               & fr,
  Editor_Game_Base                & egbase,
  Widelands_Map_Map_Object_Loader & mol)
 {
@@ -3816,7 +3816,7 @@
 			 packet_version);
 }
 void Cmd_Call_Economy_Balance::Write
-(WidelandsFileWrite             & fw,
+(FileWrite             & fw,
  Editor_Game_Base               & egbase,
  Widelands_Map_Map_Object_Saver & mos)
 {

Modified: trunk/src/transport.h
===================================================================
--- trunk/src/transport.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/transport.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -48,8 +48,8 @@
 class Warehouse;
 class Widelands_Map_Map_Object_Loader;
 class Widelands_Map_Map_Object_Saver;
-class WidelandsFileRead;
-class WidelandsFileWrite;
+class FileRead;
+class FileWrite;
 
 struct Neighbour {
 	Flag * flag;
@@ -728,11 +728,11 @@
       virtual int get_id() {return QUEUE_CMD_CALL_ECONOMY_BALANCE;}
 
 	virtual void Write
-		(WidelandsFileWrite             &,
+		(FileWrite             &,
 		 Editor_Game_Base               &,
 		 Widelands_Map_Map_Object_Saver &);
 	virtual void Read
-		(WidelandsFileRead               &,
+		(FileRead               &,
 		 Editor_Game_Base                &,
 		 Widelands_Map_Map_Object_Loader &);
 

Deleted: trunk/src/widelands_fileread.h
===================================================================
--- trunk/src/widelands_fileread.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/widelands_fileread.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2007 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef WIDELANDS_FILEREAD_H
-#define WIDELANDS_FILEREAD_H
-
-#include "fileread.h"
-#include "geometry.h"
-
-/// A FileRead that can read Widelands-specific types.
-struct WidelandsFileRead : public FileRead {
-
-	struct Data_Error {
-		Data_Error(const Pos pos) : position(pos) {}
-		Pos position;
-	};
-	struct Extent_Exceeded : public Data_Error
-	{Extent_Exceeded(const Pos pos) : Data_Error(pos) {}};
-	struct Width_Exceeded : public Extent_Exceeded {
-		Width_Exceeded(const Pos pos, const Uint16 W, const X_Coordinate X) :
-			Extent_Exceeded(pos), w(W), x(X)
-		{}
-		Uint16       w;
-		X_Coordinate x;
-	};
-	struct Height_Exceeded : public Extent_Exceeded {
-		Height_Exceeded(const Pos pos, const Uint16 H, const Y_Coordinate Y) :
-			Extent_Exceeded(pos), h(H), y(Y)
-		{}
-		Uint16       h;
-		Y_Coordinate y;
-	};
-
-	/**
-	 * Read a Coords from the file. Use this when the result can only be a node
-	 * coordinate. Will throw an exception if the width is <= the x coordinate or
-	 * the height is <= the y coordinate. Both coordinates are read from the file
-	 * before checking and possibly throwing, so in case such an exception is
-	 * thrown, it is guaranteed that the whole coordinate pair has been read.
-	 */
-	Coords Coords32(const Extent extent);
-
-	/**
-	 * Read Coords from the file. Use this when the result can only be a node
-	 * coordinate or the special value indicating invalidity, as defined by
-	 * Coords::isNull. Unless the read Coords is null, this will throw an
-	 * exception if the width is <= the x coordinate or the height is <= the y
-	 * coordinate. Both coordinates are read from the file before checking and
-	 * possibly throwing, so in case such an exception is thrown, it is
-	 * guaranteed that the whole coordinate pair has been read.
-	 */
-	Coords Coords32_allow_null(const Extent extent);
-
-};
-
-inline Coords WidelandsFileRead::Coords32(const Extent extent) {
-	const Uint16 x = Unsigned16();
-	const Uint16 y = Unsigned16();
-	if (extent.w <= x) throw Width_Exceeded (GetPos() - 4, extent.w, x);
-	if (extent.h <= y) throw Height_Exceeded(GetPrevPos(), extent.h, y);
-	return Coords(x, y);
-}
-
-inline Coords WidelandsFileRead::Coords32_allow_null(const Extent extent) {
-	const Uint16 x = Unsigned16();
-	const Uint16 y = Unsigned16();
-	const Coords result(x, y);
-	if (not result.isNull()) {
-		if (extent.w <= x) throw Width_Exceeded (GetPos() - 4, extent.w, x);
-		if (extent.h <= y) throw Height_Exceeded(GetPrevPos(), extent.h, y);
-	}
-	return result;
-}
-
-#endif

Deleted: trunk/src/widelands_filewrite.h
===================================================================
--- trunk/src/widelands_filewrite.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/widelands_filewrite.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2007 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef WIDELANDS_FILEWRITE_H
-#define WIDELANDS_FILEWRITE_H
-
-#include "filewrite.h"
-#include "geometry.h"
-
-#include <cassert>
-
-/// A FileWrite that can write Widelands-specific types.
-struct WidelandsFileWrite : public FileWrite {
-
-	void  Coords32(const  Coords);
-
-};
-
-inline void WidelandsFileWrite::Coords32(const Coords c) {
-	assert(static_cast<Uint16>(c.x) < 0x8000 or c.x == -1);
-	assert(static_cast<Uint16>(c.y) < 0x8000 or c.y == -1);
-	{const Uint16 x = Little16(c.x); Data(&x, 2);}
-	{const Uint16 y = Little16(c.y); Data(&y, 2);}
-}
-
-#endif

Modified: trunk/src/widelands_map_attack_controller_data_packet.cc
===================================================================
--- trunk/src/widelands_map_attack_controller_data_packet.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/widelands_map_attack_controller_data_packet.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -21,14 +21,14 @@
 #include "battle.h"
 #include "editor_game_base.h"
 #include "error.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "geometry.h"
 #include "immovable.h"
 #include "militarysite.h"
 #include "map.h"
 #include "soldier.h"
 #include "tribe.h"
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
 #include "widelands_map_data_packet_ids.h"
 #include "widelands_map_attack_controller_data_packet.h"
 #include "widelands_map_map_object_loader.h"
@@ -57,7 +57,7 @@
 	if (skip)
 		return;
 
-	WidelandsFileRead fr;
+	FileRead fr;
 	try {
 		fr.Open(fs, "binary/attackcontroller");
 	} catch (...) {
@@ -111,13 +111,13 @@
 					battleGround = Coords(x, y);
 				} else {
 					try {battleGround = fr.Coords32(extent);}
-					catch (const WidelandsFileRead::Width_Exceeded e) {
+					catch (const FileRead::Width_Exceeded e) {
 						throw wexception
 							("Widelands_Map_Attack_Controller_Data_Packet::Read: in "
 							 "binary/attackcontroller:%u: battleGround has x "
 							 "coordinate %i, but the map width is only %u",
 							 e.position, e.x, e.w);
-					} catch (const WidelandsFileRead::Height_Exceeded e) {
+					} catch (const FileRead::Height_Exceeded e) {
 						throw wexception
 							("Widelands_Map_Attack_Controller_Data_Packet::Read: in "
 							 "binary/attackcontroller:%u: battleGround has y "
@@ -167,7 +167,7 @@
  Editor_Game_Base* egbase,
  Widelands_Map_Map_Object_Saver * const os)
 throw (_wexception) {
-	WidelandsFileWrite fw;
+	FileWrite fw;
 
 	// now packet version
 	fw.Unsigned16(CURRENT_PACKET_VERSION);

Modified: trunk/src/widelands_map_flagdata_data_packet.cc
===================================================================
--- trunk/src/widelands_map_flagdata_data_packet.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/widelands_map_flagdata_data_packet.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -23,11 +23,11 @@
 #include "editor.h"
 #include "editorinteractive.h"
 #include "editor_game_base.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "map.h"
 #include "player.h"
 #include "transport.h"
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
 #include "widelands_map_data_packet_ids.h"
 #include "widelands_map_map_object_loader.h"
 #include "widelands_map_map_object_saver.h"
@@ -54,7 +54,7 @@
    if (skip)
       return;
 
-	WidelandsFileRead fr;
+	FileRead fr;
    try {
       fr.Open(fs, "binary/flag_data");
 	} catch (...) {
@@ -78,13 +78,13 @@
          // PlayerImmovable
 
 			try {flag->m_position = fr.Coords32(extent);}
-			catch (const WidelandsFileRead::Width_Exceeded e) {
+			catch (const FileRead::Width_Exceeded e) {
 				throw wexception
 					("Widelands_Map_Flagdata_Data_Packet::Read: in "
 					 "binary/flag_data:%u: flag %u has x coordinate %i, but the map "
 					 "width is only %u",
 					 e.position, ser, e.x, e.w);
-			} catch (const WidelandsFileRead::Height_Exceeded e) {
+			} catch (const FileRead::Height_Exceeded e) {
 				throw wexception
 					("Widelands_Map_Flagdata_Data_Packet::Read: in "
 					 "binary/flag_data:%u: flag %u has y coordinate %i, but the map "
@@ -175,7 +175,7 @@
  Widelands_Map_Map_Object_Saver * const os)
 throw (_wexception)
 {
-	WidelandsFileWrite fw;
+	FileWrite fw;
 
    // now packet version
    fw.Unsigned16(CURRENT_PACKET_VERSION);

Modified: trunk/src/widelands_map_immovable_data_packet.cc
===================================================================
--- trunk/src/widelands_map_immovable_data_packet.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/widelands_map_immovable_data_packet.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -19,9 +19,9 @@
 
 #include "widelands_map_immovable_data_packet.h"
 
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
 #include "editor_game_base.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "immovable.h"
 #include "map.h"
 #include "tribe.h"
@@ -54,7 +54,7 @@
 {
 	assert(ol);
 
-	WidelandsFileRead fr;
+	FileRead fr;
    fr.Open(fs, "binary/immovable");
 
 	Map        & map        = egbase->map();
@@ -110,7 +110,7 @@
  Widelands_Map_Map_Object_Saver * const os)
 throw (_wexception)
 {
-	WidelandsFileWrite fw;
+	FileWrite fw;
 
    // now packet version
    fw.Unsigned16(CURRENT_PACKET_VERSION);

Modified: trunk/src/widelands_map_players_areawatchers_data_packet.cc
===================================================================
--- trunk/src/widelands_map_players_areawatchers_data_packet.cc	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/widelands_map_players_areawatchers_data_packet.cc	2007-08-31 06:28:54 UTC (rev 2562)
@@ -20,10 +20,10 @@
 #include "widelands_map_players_areawatchers_data_packet.h"
 
 #include "editor_game_base.h"
+#include "fileread.h"
+#include "filewrite.h"
 #include "map.h"
 #include "player.h"
-#include "widelands_fileread.h"
-#include "widelands_filewrite.h"
 #include "widelands_map_map_object_loader.h"
 #include "widelands_map_map_object_saver.h"
 
@@ -54,7 +54,7 @@
 		Player & player = egbase->player(plnum);
 		char filename[FILENAME_SIZE];
 		snprintf(filename, sizeof(filename), FILENAME_TEMPLATE, plnum);
-		WidelandsFileRead fr;
+		FileRead fr;
 		struct Not_Found {};
 		try {
 			try {fr.Open(fs, filename);}
@@ -80,13 +80,13 @@
 					 plnum, filename, fr.GetPrevPos(), reg);
 				Coords c;
 				try {c = fr.Coords32(extent);}
-				catch  (const WidelandsFileRead::Width_Exceeded e) {
+				catch  (const FileRead::Width_Exceeded e) {
 					throw wexception
 						("Widelands_Map_Players_AreaWatchers_Data_Packet::Read: "
 						 "player %u: in \"%s\":%u: area watcher %u: x-cordinate (%u) "
 						 "exceeds the witdh of the map (%u)\n",
 						 plnum, filename, e.position, reg, e.x, e.w);
-				} catch (const WidelandsFileRead::Height_Exceeded e) {
+				} catch (const FileRead::Height_Exceeded e) {
 					throw wexception
 						("Widelands_Map_Players_AreaWatchers_Data_Packet::Read: "
 						 "player %u: in \"%s\":%u: area watcher %u: y-cordinate (%u) "
@@ -121,7 +121,7 @@
 		Player * player = egbase->get_player(plnum);
 		if (NULL == player) // valid condition in editor
 			continue;
-		WidelandsFileWrite fw;
+		FileWrite fw;
 		fw.Unsigned16(CURRENT_PACKET_VERSION);
 		const Player::AreaWatchers & areawatchers = player->areawatchers();
 		const Player::AreaWatchers::const_iterator areawatchers_end =

Deleted: trunk/src/widelands_streamread.h
===================================================================
--- trunk/src/widelands_streamread.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/widelands_streamread.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2007 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef WIDELANDS_STREAMREAD_H
-#define WIDELANDS_STREAMREAD_H
-
-#include "geometry.h"
-#include "streamread.h"
-
-/// A StreamRead that can read Widelands-specific types.
-struct WidelandsStreamRead : public StreamRead {
-
-	struct Data_Error {};
-	struct Extent_Exceeded : public Data_Error {};
-	struct Width_Exceeded : public Extent_Exceeded {
-		Width_Exceeded(const Uint16 W, const X_Coordinate X) : w(W), x(X) {}
-		Uint16       w;
-		X_Coordinate x;
-	};
-	struct Height_Exceeded : public Extent_Exceeded {
-		Height_Exceeded(const Uint16 H, const Y_Coordinate Y) : h(H), y(Y) {}
-		Uint16       h;
-		Y_Coordinate y;
-	};
-
-	/**
-	 * Read a Coords from the stream. Use this when the result can only be a node
-	 * coordinate. Will throw an exception if the width is <= the x coordinate or
-	 * the height is <= the y coordinate. Both coordinates are read from the
-	 * stream before checking and possibly throwing, so in case such an exception
-	 * is thrown, it is guaranteed that the whole coordinate pair has been read.
-	 */
-	Coords Coords32(const Extent extent);
-
-	Coords Coords32();
-
-	/**
-	 * Read Coords from the stream. Use this when the result can only be a node
-	 * coordinate or the special value indicating invalidity, as defined by
-	 * Coords::isNull. Unless the read Coords is null, this will throw an
-	 * exception if the width is <= the x coordinate or the height is <= the y
-	 * coordinate. Both coordinates are read from the stream before checking and
-	 * possibly throwing, so in case such an exception is thrown, it is
-	 * guaranteed that the whole coordinate pair has been read.
-	 */
-	Coords Coords32_allow_null(const Extent extent);
-
-};
-
-inline Coords WidelandsStreamRead::Coords32() {
-	const Uint16 x = Unsigned16();
-	const Uint16 y = Unsigned16();
-	return Coords(x, y);
-}
-
-inline Coords WidelandsStreamRead::Coords32(const Extent extent) {
-	const Uint16 x = Unsigned16();
-	const Uint16 y = Unsigned16();
-	if (extent.w <= x) throw Width_Exceeded (extent.w, x);
-	if (extent.h <= y) throw Height_Exceeded(extent.h, y);
-	return Coords(x, y);
-}
-
-inline Coords WidelandsStreamRead::Coords32_allow_null(const Extent extent) {
-	const Uint16 x = Unsigned16();
-	const Uint16 y = Unsigned16();
-	const Coords result(x, y);
-	if (not result.isNull()) {
-		if (extent.w <= x) throw Width_Exceeded (extent.w, x);
-		if (extent.h <= y) throw Height_Exceeded(extent.h, y);
-	}
-	return result;
-}
-
-#endif

Deleted: trunk/src/widelands_streamwrite.h
===================================================================
--- trunk/src/widelands_streamwrite.h	2007-08-31 06:28:30 UTC (rev 2561)
+++ trunk/src/widelands_streamwrite.h	2007-08-31 06:28:54 UTC (rev 2562)
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2007 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef WIDELANDS_STREAMWRITE_H
-#define WIDELANDS_STREAMWRITE_H
-
-#include "streamwrite.h"
-#include "geometry.h"
-
-#include <cassert>
-
-/// A StreamWrite that can write Widelands-specific types.
-struct WidelandsStreamWrite : public StreamWrite {
-
-	void  Coords32(const  Coords);
-
-};
-
-inline void WidelandsStreamWrite::Coords32(const Coords c) {
-	assert(static_cast<Uint16>(c.x) < 0x8000 or c.x == -1);
-	assert(static_cast<Uint16>(c.y) < 0x8000 or c.y == -1);
-	{const Uint16 x = Little16(c.x); Data(&x, 2);}
-	{const Uint16 y = Little16(c.y); Data(&y, 2);}
-}
-
-#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2560] trunk

From: <nasenbaer_peter@us...> - 2007-08-31 04:17

Revision: 2560
          http://widelands.svn.sourceforge.net/widelands/?rev=2560&view=rev
Author:   nasenbaer_peter
Date:     2007-08-30 21:17:56 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
* Fix the crappy workaround for windows RealFS
* Fix Crash of EnsureDirectorExists on Windows for the replay folder. Main problem was the '/' - windows doesn't accept a '/' or a '\' at the end of a path in the directorycheck (and maybe even in general, don't ask me why...)

Modified Paths:
--------------
    trunk/build/win32/config.h
    trunk/src/filesystem/filesystem.cc
    trunk/src/game.cc
    trunk/src/replay.h

Modified: trunk/build/win32/config.h
===================================================================
--- trunk/build/win32/config.h	2007-08-31 03:30:52 UTC (rev 2559)
+++ trunk/build/win32/config.h	2007-08-31 04:17:56 UTC (rev 2560)
@@ -5,8 +5,8 @@
 #define NEW_SDL_MIXER 1
 #define USE_RWOPS 1
 
-#define INSTALL_PREFIX "/mingw"
-#define INSTALL_BINDIR "/l/WiLa/Setup"
-#define INSTALL_DATADIR "/l/WiLa/Setup"
+#define INSTALL_PREFIX ".\\"
+#define INSTALL_BINDIR ".\\"
+#define INSTALL_DATADIR ".\\"
 
 #endif

Modified: trunk/src/filesystem/filesystem.cc
===================================================================
--- trunk/src/filesystem/filesystem.cc	2007-08-31 03:30:52 UTC (rev 2559)
+++ trunk/src/filesystem/filesystem.cc	2007-08-31 04:17:56 UTC (rev 2560)
@@ -53,7 +53,7 @@
 {
 #ifdef __WIN32__
 	//TODO: this probably needs to be overwritten later
-	m_root="C:\\";
+	m_root="C:";
 	m_filesep='\\';
 #else
 	m_root="/";
@@ -160,12 +160,6 @@
 	if (pathIsAbsolute(path))
 		return path;
 
-#ifdef __WIN32__
-	//For "nearly" absoute paths, just append drive letter
-	if (path[0]==m_filesep)
-		return m_root+path;
-#endif
-
 	return getWorkingDirectory()+m_filesep+path;
 }
 
@@ -342,38 +336,31 @@
 	for (i=components.begin(); i!=components.end(); i++)
 		canonpath+=*i+"/";
 
-#else
+    canonpath.erase(canonpath.end() - 1); //remove trailing slash
+    
+#else // ifndef __WIN32__
+	// Still a stupid workaround: some paths still might be relative,
+	// but this is acceptable on windows, as long as all data is stored
+	// in the working directory.
 
-	/*===============================================
-	Windows-filesystems work different than Unix-FS
-	so here is a solution, to get it run.
+	bool absolute=false;
+	std::string canonpath;
 
-	Every path will be absolute afterwards.
+	 // Is a ":" at the second position? If yes, it is allready absolute ( like "C:\...")
+	if (path[1] == ':')
+		absolute=true;
 
-	Only problem:
-	Widelands will be started in the directory, the
-	the executable is in, even if you run it from
-	different directory. (Real problem???)
-	===============================================*/
+	if (absolute == true) {
+		canonpath = path;
 
-	bool absolutewin32=false;
-	components=FS_Tokenize(path);
-	if (path[0]=='\\') //Is a backslash in path? If yes, the path is allready absolute.
-		absolutewin32=true;
-
-	std::string canonpath="";
-	if (absolutewin32==true)
-		canonpath=""; //if the path is allready absolute, nothing has to be added.
-	else   {
-		canonpath=m_root.c_str();   //We simply add the root folder
-		canonpath=canonpath+"\\"; //and of course an ending backslash
+	} else {
+		if (m_root.empty())
+			canonpath = getWorkingDirectory() + "\\" + path;
+		else
+			canonpath = m_root + "\\" + path;
 	}
 
-	for (i=components.begin(); i!=components.end(); i++)
-		canonpath+=*i+"\\";
-
-#endif
-	canonpath.erase(canonpath.end() - 1); //remove trailing slash
+#endif // ifndef __WIN32__
 	return canonpath;
 }
 

Modified: trunk/src/game.cc
===================================================================
--- trunk/src/game.cc	2007-08-31 03:30:52 UTC (rev 2559)
+++ trunk/src/game.cc	2007-08-31 04:17:56 UTC (rev 2560)
@@ -545,6 +545,12 @@
 		}
 
 		std::string fname(REPLAY_DIR);
+		#ifndef __WIN32__
+		fname += '/';
+		#else
+		fname += '\\';
+		#endif
+
 		fname += time_string;
 		if (m_netgame) {
 			char buf[100];

Modified: trunk/src/replay.h
===================================================================
--- trunk/src/replay.h	2007-08-31 03:30:52 UTC (rev 2559)
+++ trunk/src/replay.h	2007-08-31 04:17:56 UTC (rev 2560)
@@ -29,8 +29,7 @@
  */
 
 #include <string>
-
-#define REPLAY_DIR "replays/"
+#define REPLAY_DIR "replays"
 #define REPLAY_SUFFIX ".wrpl"
 
 struct md5_checksum;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2559] trunk/src/game.cc

From: <ixprefect@us...> - 2007-08-31 03:31

Revision: 2559
          http://widelands.svn.sourceforge.net/widelands/?rev=2559&view=rev
Author:   ixprefect
Date:     2007-08-30 20:30:52 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Improve the logging of sync stream data.

Note that logging of sync stream data is for debugging only and
disabled by default.

Modified Paths:
--------------
    trunk/src/game.cc

Modified: trunk/src/game.cc
===================================================================
--- trunk/src/game.cc	2007-08-30 21:06:45 UTC (rev 2558)
+++ trunk/src/game.cc	2007-08-31 03:30:52 UTC (rev 2559)
@@ -23,6 +23,7 @@
 #include "computer_player.h"
 #include "events/event_chain.h"
 #include "fileread.h"
+#include "filesystem.h"
 #include "filewrite.h"
 #include "interactive_player.h"
 #include "interactive_spectator.h"
@@ -58,27 +59,24 @@
 #ifdef SYNC_DEBUG
 class SyncDebugWrapper : public StreamWrite {
 public:
-	SyncDebugWrapper()
+	SyncDebugWrapper(Game* g, StreamWrite* target)
 	{
-		m_target = 0;
+		m_game = g;
+		m_target = target;
 		m_counter = 0;
 	}
 
-	void SetTarget(StreamWrite* target)
-	{
-		m_target = target;
-	}
-
 	void Data(const void * const data, const size_t size)
 	{
 		assert(m_target);
 
-		log("[sync:%08u]", m_counter);
+		log("[sync:%08u t=%6u]", m_counter, m_game->get_gametime());
 		for (size_t i = 0; i < size; ++i)
 			log(" %02x", (static_cast<const Uint8 *>(data))[i]);
 		log("\n");
 
 		m_target->Data(data, size);
+		m_counter += size;
 	}
 
 	void Flush()
@@ -89,6 +87,7 @@
 	}
 
 private:
+	Game* m_game;
 	StreamWrite* m_target;
 	uint m_counter;
 };
@@ -100,17 +99,18 @@
 	SyncDebugWrapper syncwrapper;
 #endif
 
-	GameInternals()
-	{
+	GameInternals(Game* g)
 #ifdef SYNC_DEBUG
-		syncwrapper.SetTarget(&synchash);
+		: syncwrapper(g, &synchash)
 #endif
+	{
+		(void)g;
 	}
 };
 
 
 Game::Game() :
-m(new GameInternals),
+m(new GameInternals(this)),
 m_state   (gs_none),
 m_speed   (1),
 cmdqueue  (this),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2558] trunk/src/singleton.h

From: <ixprefect@us...> - 2007-08-30 21:06

Revision: 2558
          http://widelands.svn.sourceforge.net/widelands/?rev=2558&view=rev
Author:   ixprefect
Date:     2007-08-30 14:06:45 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Cleanup the Singleton template.

Modified Paths:
--------------
    trunk/src/singleton.h

Modified: trunk/src/singleton.h
===================================================================
--- trunk/src/singleton.h	2007-08-30 18:30:46 UTC (rev 2557)
+++ trunk/src/singleton.h	2007-08-30 21:06:45 UTC (rev 2558)
@@ -20,28 +20,49 @@
 #ifndef __S__SINGLETON_H
 #define __S__SINGLETON_H
 
-/* Referenz: Game Programming Gems I, P. 38
- * Excellent code!!
+
+#include <cassert>
+
+/* The original code seems to have come from Game Programming Gems I, P. 38
+ * but the current version probably doesn't really resemble it any more.
  */
 
+/**
+ * Singleton class, to be used in
+ *
+ * class SomeClass : public Singleton<SomeClass> {
+ *   etc.
+ * };
+ *
+ * The singleton must be explicitly instantiated using
+ *  new SomeClass;
+ * and explicitly deleted using
+ *  delete SomeClass::get_ptsingleton();
+ *
+ * \note There is a weakness here because the implementation doesn't
+ * enforce that T equals the derived class. Unfortunately, using dynamic_cast
+ * (or any other kind of RTTI) in the constructor doesn't work.
+ */
 template <typename T> class Singleton {
-		  static T* ms;
+	static T* ms;
 
-		  public:
+protected:
 	Singleton() {
-					 assert (!ms) ;
-		const int offset =
-			static_cast<int>                            (static_cast<T *>(1))
-			-
-			static_cast<int>(static_cast<Singleton<T> *>(static_cast<T *>(1)));
-		ms = static_cast<T *>(static_cast<int>(this) + offset);
+		assert(!ms);
+		ms = static_cast<T*>(this);
 	}
-		  ~Singleton() {assert(ms); ms=0;}
-		  static inline T& get_singleton() {assert (ms); return *ms;}
-		  static inline T* get_ptsingleton() {assert(ms); return ms;}
+
+	~Singleton() {
+		assert(ms);
+		ms = 0;
+	}
+
+public:
+	static inline T& get_singleton() {assert(ms); return *ms;}
+	static inline T* get_ptsingleton() {assert(ms); return ms;}
 };
 
-template <typename T> T* Singleton <T>::ms=0;
+template <typename T> T* Singleton <T>::ms = 0;
 
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2506] trunk/src/map.cc

From: <sigra@us...> - 2007-08-29 18:13

Revision: 2506
          http://widelands.svn.sourceforge.net/widelands/?rev=2506&view=rev
Author:   sigra
Date:     2007-08-28 04:49:11 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
Do not use postfix {de|in}crement without using the result.

Modified Paths:
--------------
    trunk/src/map.cc

Modified: trunk/src/map.cc
===================================================================
--- trunk/src/map.cc	2007-08-28 11:43:53 UTC (rev 2505)
+++ trunk/src/map.cc	2007-08-28 11:49:11 UTC (rev 2506)
@@ -1441,9 +1441,7 @@
 
 	// end is one row below start
 	if (dy == 1) {
-		if (start.y & 1)
-			dx--;
-
+		if (start.y & 1) --dx;
 		switch (dx) {
 		case -1: return Map_Object::WALK_SW;
 		case 0: return Map_Object::WALK_SE;
@@ -1453,9 +1451,7 @@
 
 	// end is one row above start
 	if (dy == -1) {
-		if (start.y & 1)
-			dx--;
-
+		if (start.y & 1) --dx;
 		switch (dx) {
 		case -1: return Map_Object::WALK_NW;
 		case 0: return Map_Object::WALK_NE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2556] trunk/src/map.cc

From: <ixprefect@us...> - 2007-08-30 00:01

Revision: 2556
          http://widelands.svn.sourceforge.net/widelands/?rev=2556&view=rev
Author:   ixprefect
Date:     2007-08-29 17:01:23 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Update comment for Map::findpath

Modified Paths:
--------------
    trunk/src/map.cc

Modified: trunk/src/map.cc
===================================================================
--- trunk/src/map.cc	2007-08-29 23:12:13 UTC (rev 2555)
+++ trunk/src/map.cc	2007-08-30 00:01:23 UTC (rev 2556)
@@ -1836,29 +1836,24 @@
 }
 
 
-/*
-===============
-Map::findpath
-
-Pathfinding entry-point.
-Finds a path from start to end for a Map_Object with the given movecaps.
-
-The path is stored in path, in terms of Map_Object::MOVE_* constants.
-persist tells the function how hard it should try to find a path:
-If persist is 0, the function will never give up early. Otherwise, the
-function gives up when it becomes clear that the path must be longer than
-persist*bird's distance fields long.
-[not implement right now]: If the terrain contains lots of hills, the cost
-calculation will cause the search to terminate earlier than this. If persist==1,
-findpath() can only find a path if the terrain is completely flat.
-
-findpath() calls the checkstep functor-like to determine whether moving from
-one field to another is legal.
-
-The function returns the cost of the path (in milliseconds of normal walking
-speed) or -1 if no path has been found.
-===============
-*/
+/**
+ * Finds a path from start to end for a Map_Object with the given movecaps.
+ *
+ * The path is stored in \p path, in terms of \ref Map_Object::WALK_* constants.
+ * \param persist tells the function how hard it should try to find a path:
+ * If \p persist is \c 0, the function will never give up early. Otherwise, the
+ * function gives up when it becomes clear that the path takes longer than
+ * persist*bird's distance of flat terrain.
+ * Note that if the terrain contains steep hills, the cost calculation will
+ * cause the search to terminate earlier than you may think. If persist==1,
+ * \ref findpath can only find a path if the terrain is completely flat.
+ *
+ * \param checkstep findpath() calls this checkstep functor-like to determine
+ * whether moving from one field to another is legal.
+ *
+ * \return the cost of the path (in milliseconds of normal walking
+ * speed) or -1 if no path has been found.
+ */
 int Map::findpath
 (Coords instart,
  Coords inend,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2551] trunk/build/win32/Widelands.dev

From: <nasenbaer_peter@us...> - 2007-08-29 20:21

Revision: 2551
          http://widelands.svn.sourceforge.net/widelands/?rev=2551&view=rev
Author:   nasenbaer_peter
Date:     2007-08-29 13:21:25 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Update of Win32 project-file

Modified Paths:
--------------
    trunk/build/win32/Widelands.dev

Modified: trunk/build/win32/Widelands.dev
===================================================================
--- trunk/build/win32/Widelands.dev	2007-08-29 19:10:21 UTC (rev 2550)
+++ trunk/build/win32/Widelands.dev	2007-08-29 20:21:25 UTC (rev 2551)
@@ -1,7 +1,7 @@
 [Project]
 FileName=Widelands.dev
 Name=Widelands
-UnitCount=571
+UnitCount=584
 Type=0
 Ver=1
 ObjFiles=
@@ -597,7 +597,7 @@
 BuildCmd=
 
 [Unit56]
-FileName=..\..\src\game_computer_player_data_packet.cc
+FileName=..\..\src\game_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -607,7 +607,7 @@
 BuildCmd=
 
 [Unit57]
-FileName=..\..\src\game_computer_player_data_packet.h
+FileName=..\..\src\game_debug_ui.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -617,7 +617,7 @@
 BuildCmd=
 
 [Unit58]
-FileName=..\..\src\game_data_packet.h
+FileName=..\..\src\game_debug_ui.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -627,7 +627,7 @@
 BuildCmd=
 
 [Unit59]
-FileName=..\..\src\game_data_packet_factory.cc
+FileName=..\..\src\game_game_class_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -637,7 +637,7 @@
 BuildCmd=
 
 [Unit60]
-FileName=..\..\src\game_data_packet_factory.h
+FileName=..\..\src\game_game_class_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -647,7 +647,7 @@
 BuildCmd=
 
 [Unit61]
-FileName=..\..\src\game_data_packet_ids.h
+FileName=..\..\src\game_interactive_player_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -657,7 +657,7 @@
 BuildCmd=
 
 [Unit62]
-FileName=..\..\src\game_debug_ui.cc
+FileName=..\..\src\game_interactive_player_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -667,7 +667,7 @@
 BuildCmd=
 
 [Unit63]
-FileName=..\..\src\game_debug_ui.h
+FileName=..\..\src\game_loader.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -677,7 +677,7 @@
 BuildCmd=
 
 [Unit64]
-FileName=..\..\src\game_game_class_data_packet.cc
+FileName=..\..\src\game_loader.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -687,7 +687,7 @@
 BuildCmd=
 
 [Unit65]
-FileName=..\..\src\game_game_class_data_packet.h
+FileName=..\..\src\game_main_menu.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -697,7 +697,7 @@
 BuildCmd=
 
 [Unit66]
-FileName=..\..\src\game_interactive_player_data_packet.cc
+FileName=..\..\src\game_main_menu.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -707,7 +707,7 @@
 BuildCmd=
 
 [Unit67]
-FileName=..\..\src\game_interactive_player_data_packet.h
+FileName=..\..\src\game_main_menu_load_game.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -717,7 +717,7 @@
 BuildCmd=
 
 [Unit68]
-FileName=..\..\src\game_loader.cc
+FileName=..\..\src\game_main_menu_load_game.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -727,7 +727,7 @@
 BuildCmd=
 
 [Unit69]
-FileName=..\..\src\game_loader.h
+FileName=..\..\src\game_main_menu_save_game.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -737,7 +737,7 @@
 BuildCmd=
 
 [Unit70]
-FileName=..\..\src\game_main_menu.cc
+FileName=..\..\src\game_main_menu_save_game.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -747,7 +747,7 @@
 BuildCmd=
 
 [Unit71]
-FileName=..\..\src\game_main_menu.h
+FileName=..\..\src\game_map_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -757,7 +757,7 @@
 BuildCmd=
 
 [Unit72]
-FileName=..\..\src\game_main_menu_load_game.cc
+FileName=..\..\src\game_map_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -767,7 +767,7 @@
 BuildCmd=
 
 [Unit73]
-FileName=..\..\src\game_main_menu_load_game.h
+FileName=..\..\src\game_objectives_menu.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -777,7 +777,7 @@
 BuildCmd=
 
 [Unit74]
-FileName=..\..\src\game_main_menu_save_game.cc
+FileName=..\..\src\game_objectives_menu.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -787,7 +787,7 @@
 BuildCmd=
 
 [Unit75]
-FileName=..\..\src\game_main_menu_save_game.h
+FileName=..\..\src\game_options_menu.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -797,7 +797,7 @@
 BuildCmd=
 
 [Unit76]
-FileName=..\..\src\game_map_data_packet.cc
+FileName=..\..\src\game_options_menu.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -807,7 +807,7 @@
 BuildCmd=
 
 [Unit77]
-FileName=..\..\src\game_map_data_packet.h
+FileName=..\..\src\game_player_economies_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -817,7 +817,7 @@
 BuildCmd=
 
 [Unit78]
-FileName=..\..\src\game_objectives_menu.cc
+FileName=..\..\src\game_player_economies_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -827,7 +827,7 @@
 BuildCmd=
 
 [Unit79]
-FileName=..\..\src\game_objectives_menu.h
+FileName=..\..\src\game_player_info_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -837,7 +837,7 @@
 BuildCmd=
 
 [Unit80]
-FileName=..\..\src\game_options_menu.cc
+FileName=..\..\src\game_player_info_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -847,7 +847,7 @@
 BuildCmd=
 
 [Unit81]
-FileName=..\..\src\game_options_menu.h
+FileName=..\..\src\game_preload_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -857,7 +857,7 @@
 BuildCmd=
 
 [Unit82]
-FileName=..\..\src\game_player_economies_data_packet.cc
+FileName=..\..\src\game_preload_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -867,7 +867,7 @@
 BuildCmd=
 
 [Unit83]
-FileName=..\..\src\game_player_economies_data_packet.h
+FileName=..\..\src\game_saver.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -877,7 +877,7 @@
 BuildCmd=
 
 [Unit84]
-FileName=..\..\src\game_player_info_data_packet.cc
+FileName=..\..\src\game_saver.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -887,7 +887,7 @@
 BuildCmd=
 
 [Unit85]
-FileName=..\..\src\game_player_info_data_packet.h
+FileName=..\..\src\game_server_connection.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -897,7 +897,7 @@
 BuildCmd=
 
 [Unit86]
-FileName=..\..\src\game_preload_data_packet.cc
+FileName=..\..\src\game_server_connection.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -907,7 +907,7 @@
 BuildCmd=
 
 [Unit87]
-FileName=..\..\src\game_preload_data_packet.h
+FileName=..\..\src\game_server_proto.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -917,7 +917,7 @@
 BuildCmd=
 
 [Unit88]
-FileName=..\..\src\game_saver.cc
+FileName=..\..\src\game_server_proto_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -927,7 +927,7 @@
 BuildCmd=
 
 [Unit89]
-FileName=..\..\src\game_saver.h
+FileName=..\..\src\game_server_proto_packet_chatmessage.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -937,7 +937,7 @@
 BuildCmd=
 
 [Unit90]
-FileName=..\..\src\game_server_connection.cc
+FileName=..\..\src\game_server_proto_packet_chatmessage.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -947,7 +947,7 @@
 BuildCmd=
 
 [Unit91]
-FileName=..\..\src\game_server_connection.h
+FileName=..\..\src\game_server_proto_packet_connect.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -957,7 +957,7 @@
 BuildCmd=
 
 [Unit92]
-FileName=..\..\src\game_server_proto.h
+FileName=..\..\src\game_server_proto_packet_connect.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -967,7 +967,7 @@
 BuildCmd=
 
 [Unit93]
-FileName=..\..\src\game_server_proto_packet.h
+FileName=..\..\src\game_server_proto_packet_getroominfo.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -977,7 +977,7 @@
 BuildCmd=
 
 [Unit94]
-FileName=..\..\src\game_server_proto_packet_chatmessage.cc
+FileName=..\..\src\game_server_proto_packet_getroominfo.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -987,7 +987,7 @@
 BuildCmd=
 
 [Unit95]
-FileName=..\..\src\game_server_proto_packet_chatmessage.h
+FileName=..\..\src\game_server_proto_packet_getuserinfo.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -997,7 +997,7 @@
 BuildCmd=
 
 [Unit96]
-FileName=..\..\src\game_server_proto_packet_connect.cc
+FileName=..\..\src\game_server_proto_packet_getuserinfo.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1007,7 +1007,7 @@
 BuildCmd=
 
 [Unit97]
-FileName=..\..\src\game_server_proto_packet_connect.h
+FileName=..\..\src\game_server_proto_packet_hello.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1017,7 +1017,7 @@
 BuildCmd=
 
 [Unit98]
-FileName=..\..\src\game_server_proto_packet_getroominfo.cc
+FileName=..\..\src\game_server_proto_packet_hello.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1027,7 +1027,7 @@
 BuildCmd=
 
 [Unit99]
-FileName=..\..\src\game_server_proto_packet_getroominfo.h
+FileName=..\..\src\game_server_proto_packet_ping.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1037,7 +1037,7 @@
 BuildCmd=
 
 [Unit100]
-FileName=..\..\src\game_server_proto_packet_getuserinfo.cc
+FileName=..\..\src\game_server_proto_packet_ping.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1047,7 +1047,7 @@
 BuildCmd=
 
 [Unit101]
-FileName=..\..\src\game_server_proto_packet_getuserinfo.h
+FileName=..\..\src\game_server_proto_packet_userentered.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1057,7 +1057,7 @@
 BuildCmd=
 
 [Unit102]
-FileName=..\..\src\game_server_proto_packet_hello.cc
+FileName=..\..\src\game_server_proto_packet_userentered.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1067,7 +1067,7 @@
 BuildCmd=
 
 [Unit103]
-FileName=..\..\src\game_server_proto_packet_hello.h
+FileName=..\..\src\general_statistics_menu.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1077,7 +1077,7 @@
 BuildCmd=
 
 [Unit104]
-FileName=..\..\src\game_server_proto_packet_ping.cc
+FileName=..\..\src\general_statistics_menu.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1087,7 +1087,7 @@
 BuildCmd=
 
 [Unit105]
-FileName=..\..\src\game_server_proto_packet_ping.h
+FileName=..\..\src\geometry.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1097,7 +1097,7 @@
 BuildCmd=
 
 [Unit106]
-FileName=..\..\src\game_server_proto_packet_userentered.cc
+FileName=..\..\src\graphic.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1107,7 +1107,7 @@
 BuildCmd=
 
 [Unit107]
-FileName=..\..\src\game_server_proto_packet_userentered.h
+FileName=..\..\src\graphic.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1117,7 +1117,7 @@
 BuildCmd=
 
 [Unit108]
-FileName=..\..\src\general_statistics_menu.cc
+FileName=..\..\src\helper.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1127,7 +1127,7 @@
 BuildCmd=
 
 [Unit109]
-FileName=..\..\src\general_statistics_menu.h
+FileName=..\..\src\helper.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1137,7 +1137,7 @@
 BuildCmd=
 
 [Unit110]
-FileName=..\..\src\geometry.h
+FileName=..\..\src\i18n.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1147,7 +1147,7 @@
 BuildCmd=
 
 [Unit111]
-FileName=..\..\src\graphic.cc
+FileName=..\..\src\i18n.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1157,7 +1157,7 @@
 BuildCmd=
 
 [Unit112]
-FileName=..\..\src\graphic.h
+FileName=..\..\src\immovable.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1167,7 +1167,7 @@
 BuildCmd=
 
 [Unit113]
-FileName=..\..\src\helper.cc
+FileName=..\..\src\immovable.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1177,7 +1177,7 @@
 BuildCmd=
 
 [Unit114]
-FileName=..\..\src\helper.h
+FileName=..\..\src\immovable_program.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1187,7 +1187,7 @@
 BuildCmd=
 
 [Unit115]
-FileName=..\..\src\i18n.cc
+FileName=..\..\src\instances.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1197,7 +1197,7 @@
 BuildCmd=
 
 [Unit116]
-FileName=..\..\src\i18n.h
+FileName=..\..\src\instances.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1207,7 +1207,7 @@
 BuildCmd=
 
 [Unit117]
-FileName=..\..\src\immovable.cc
+FileName=..\..\src\interactive_base.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1217,7 +1217,7 @@
 BuildCmd=
 
 [Unit118]
-FileName=..\..\src\immovable.h
+FileName=..\..\src\interactive_base.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1227,7 +1227,7 @@
 BuildCmd=
 
 [Unit119]
-FileName=..\..\src\immovable_program.h
+FileName=..\..\src\interactive_player.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1237,7 +1237,7 @@
 BuildCmd=
 
 [Unit120]
-FileName=..\..\src\instances.cc
+FileName=..\..\src\interactive_player.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1247,7 +1247,7 @@
 BuildCmd=
 
 [Unit121]
-FileName=..\..\src\instances.h
+FileName=..\..\src\journal.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1257,7 +1257,7 @@
 BuildCmd=
 
 [Unit122]
-FileName=..\..\src\interactive_base.cc
+FileName=..\..\src\journal.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1267,7 +1267,7 @@
 BuildCmd=
 
 [Unit123]
-FileName=..\..\src\interactive_base.h
+FileName=..\..\src\journal_exceptions.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1277,7 +1277,7 @@
 BuildCmd=
 
 [Unit124]
-FileName=..\..\src\interactive_player.cc
+FileName=..\..\src\journal_exceptions.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1287,7 +1287,7 @@
 BuildCmd=
 
 [Unit125]
-FileName=..\..\src\interactive_player.h
+FileName=..\..\src\keycodes.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1297,7 +1297,7 @@
 BuildCmd=
 
 [Unit126]
-FileName=..\..\src\journal.cc
+FileName=..\..\src\languages.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1307,7 +1307,7 @@
 BuildCmd=
 
 [Unit127]
-FileName=..\..\src\journal.h
+FileName=..\..\src\machdep.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1317,7 +1317,7 @@
 BuildCmd=
 
 [Unit128]
-FileName=..\..\src\journal_exceptions.cc
+FileName=..\..\src\main.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1327,7 +1327,7 @@
 BuildCmd=
 
 [Unit129]
-FileName=..\..\src\journal_exceptions.h
+FileName=..\..\src\map.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1337,7 +1337,7 @@
 BuildCmd=
 
 [Unit130]
-FileName=..\..\src\keycodes.h
+FileName=..\..\src\map.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1347,7 +1347,7 @@
 BuildCmd=
 
 [Unit131]
-FileName=..\..\src\languages.h
+FileName=..\..\src\map_event_manager.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1357,7 +1357,7 @@
 BuildCmd=
 
 [Unit132]
-FileName=..\..\src\machdep.h
+FileName=..\..\src\map_event_manager.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1367,7 +1367,7 @@
 BuildCmd=
 
 [Unit133]
-FileName=..\..\src\main.cc
+FileName=..\..\src\map_eventchain_manager.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1377,7 +1377,7 @@
 BuildCmd=
 
 [Unit134]
-FileName=..\..\src\map.cc
+FileName=..\..\src\map_eventchain_manager.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1387,7 +1387,7 @@
 BuildCmd=
 
 [Unit135]
-FileName=..\..\src\map.h
+FileName=..\..\src\map_loader.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1397,7 +1397,7 @@
 BuildCmd=
 
 [Unit136]
-FileName=..\..\src\map_event_manager.cc
+FileName=..\..\src\map_objective_manager.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1407,7 +1407,7 @@
 BuildCmd=
 
 [Unit137]
-FileName=..\..\src\map_event_manager.h
+FileName=..\..\src\map_objective_manager.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1417,7 +1417,7 @@
 BuildCmd=
 
 [Unit138]
-FileName=..\..\src\map_eventchain_manager.cc
+FileName=..\..\src\map_trigger_manager.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1427,7 +1427,7 @@
 BuildCmd=
 
 [Unit139]
-FileName=..\..\src\map_eventchain_manager.h
+FileName=..\..\src\map_trigger_manager.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1437,7 +1437,7 @@
 BuildCmd=
 
 [Unit140]
-FileName=..\..\src\map_loader.h
+FileName=..\..\src\map_variable_manager.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1447,7 +1447,7 @@
 BuildCmd=
 
 [Unit141]
-FileName=..\..\src\map_objective_manager.cc
+FileName=..\..\src\map_variable_manager.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1457,7 +1457,7 @@
 BuildCmd=
 
 [Unit142]
-FileName=..\..\src\map_objective_manager.h
+FileName=..\..\src\mapview.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1467,7 +1467,7 @@
 BuildCmd=
 
 [Unit143]
-FileName=..\..\src\map_trigger_manager.cc
+FileName=..\..\src\mapview.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1477,7 +1477,7 @@
 BuildCmd=
 
 [Unit144]
-FileName=..\..\src\map_trigger_manager.h
+FileName=..\..\src\mapviewpixelconstants.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1487,7 +1487,7 @@
 BuildCmd=
 
 [Unit145]
-FileName=..\..\src\map_variable_manager.cc
+FileName=..\..\src\mapviewpixelfunctions.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1497,7 +1497,7 @@
 BuildCmd=
 
 [Unit146]
-FileName=..\..\src\map_variable_manager.h
+FileName=..\..\src\mapviewpixelfunctions.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1507,7 +1507,7 @@
 BuildCmd=
 
 [Unit147]
-FileName=..\..\src\mapview.cc
+FileName=..\..\src\militarysite.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1517,7 +1517,7 @@
 BuildCmd=
 
 [Unit148]
-FileName=..\..\src\mapview.h
+FileName=..\..\src\militarysite.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1527,7 +1527,7 @@
 BuildCmd=
 
 [Unit149]
-FileName=..\..\src\mapviewpixelconstants.h
+FileName=..\..\src\minimap.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1537,7 +1537,7 @@
 BuildCmd=
 
 [Unit150]
-FileName=..\..\src\mapviewpixelfunctions.cc
+FileName=..\..\src\minimap.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1547,7 +1547,7 @@
 BuildCmd=
 
 [Unit151]
-FileName=..\..\src\mapviewpixelfunctions.h
+FileName=..\..\src\network.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1557,7 +1557,7 @@
 BuildCmd=
 
 [Unit152]
-FileName=..\..\src\militarysite.cc
+FileName=..\..\src\network.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1567,7 +1567,7 @@
 BuildCmd=
 
 [Unit153]
-FileName=..\..\src\militarysite.h
+FileName=..\..\src\network_buffer.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1577,7 +1577,7 @@
 BuildCmd=
 
 [Unit154]
-FileName=..\..\src\minimap.cc
+FileName=..\..\src\network_buffer.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1587,7 +1587,7 @@
 BuildCmd=
 
 [Unit155]
-FileName=..\..\src\minimap.h
+FileName=..\..\src\network_ggz.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1597,7 +1597,7 @@
 BuildCmd=
 
 [Unit156]
-FileName=..\..\src\network.cc
+FileName=..\..\src\network_ggz.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1607,7 +1607,7 @@
 BuildCmd=
 
 [Unit157]
-FileName=..\..\src\network.h
+FileName=..\..\src\network_lan_promotion.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1617,7 +1617,7 @@
 BuildCmd=
 
 [Unit158]
-FileName=..\..\src\network_buffer.cc
+FileName=..\..\src\network_lan_promotion.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1627,7 +1627,7 @@
 BuildCmd=
 
 [Unit159]
-FileName=..\..\src\network_buffer.h
+FileName=..\..\src\network_system.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1637,7 +1637,7 @@
 BuildCmd=
 
 [Unit160]
-FileName=..\..\src\network_ggz.cc
+FileName=..\..\src\overlay_manager.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1647,7 +1647,7 @@
 BuildCmd=
 
 [Unit161]
-FileName=..\..\src\network_ggz.h
+FileName=..\..\src\overlay_manager.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1657,7 +1657,7 @@
 BuildCmd=
 
 [Unit162]
-FileName=..\..\src\network_lan_promotion.cc
+FileName=..\..\src\player.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1667,7 +1667,7 @@
 BuildCmd=
 
 [Unit163]
-FileName=..\..\src\network_lan_promotion.h
+FileName=..\..\src\player.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1677,7 +1677,7 @@
 BuildCmd=
 
 [Unit164]
-FileName=..\..\src\network_system.h
+FileName=..\..\src\playercommand.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1687,7 +1687,7 @@
 BuildCmd=
 
 [Unit165]
-FileName=..\..\src\overlay_manager.cc
+FileName=..\..\src\playercommand.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1697,7 +1697,7 @@
 BuildCmd=
 
 [Unit166]
-FileName=..\..\src\overlay_manager.h
+FileName=..\..\src\playerdescrgroup.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1707,7 +1707,7 @@
 BuildCmd=
 
 [Unit167]
-FileName=..\..\src\player.cc
+FileName=..\..\src\playerdescrgroup.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1717,7 +1717,7 @@
 BuildCmd=
 
 [Unit168]
-FileName=..\..\src\player.h
+FileName=..\..\src\production_program.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1727,7 +1727,7 @@
 BuildCmd=
 
 [Unit169]
-FileName=..\..\src\playercommand.cc
+FileName=..\..\src\production_program.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1737,7 +1737,7 @@
 BuildCmd=
 
 [Unit170]
-FileName=..\..\src\playercommand.h
+FileName=..\..\src\productionsite.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1747,7 +1747,7 @@
 BuildCmd=
 
 [Unit171]
-FileName=..\..\src\playerdescrgroup.cc
+FileName=..\..\src\productionsite.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1757,7 +1757,7 @@
 BuildCmd=
 
 [Unit172]
-FileName=..\..\src\playerdescrgroup.h
+FileName=..\..\src\profile.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1767,7 +1767,7 @@
 BuildCmd=
 
 [Unit173]
-FileName=..\..\src\production_program.cc
+FileName=..\..\src\profile.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1777,7 +1777,7 @@
 BuildCmd=
 
 [Unit174]
-FileName=..\..\src\production_program.h
+FileName=..\..\src\queue_cmd_factory.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1787,7 +1787,7 @@
 BuildCmd=
 
 [Unit175]
-FileName=..\..\src\productionsite.cc
+FileName=..\..\src\queue_cmd_factory.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1797,7 +1797,7 @@
 BuildCmd=
 
 [Unit176]
-FileName=..\..\src\productionsite.h
+FileName=..\..\src\queue_cmd_ids.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1807,7 +1807,7 @@
 BuildCmd=
 
 [Unit177]
-FileName=..\..\src\profile.cc
+FileName=..\..\src\random.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1817,7 +1817,7 @@
 BuildCmd=
 
 [Unit178]
-FileName=..\..\src\profile.h
+FileName=..\..\src\random.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1827,7 +1827,7 @@
 BuildCmd=
 
 [Unit179]
-FileName=..\..\src\queue_cmd_factory.cc
+FileName=..\..\src\render.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1837,7 +1837,7 @@
 BuildCmd=
 
 [Unit180]
-FileName=..\..\src\queue_cmd_factory.h
+FileName=..\..\src\rendertarget.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1847,7 +1847,7 @@
 BuildCmd=
 
 [Unit181]
-FileName=..\..\src\queue_cmd_ids.h
+FileName=..\..\src\rgbcolor.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1857,7 +1857,7 @@
 BuildCmd=
 
 [Unit182]
-FileName=..\..\src\random.cc
+FileName=..\..\src\s2map.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1867,7 +1867,7 @@
 BuildCmd=
 
 [Unit183]
-FileName=..\..\src\random.h
+FileName=..\..\src\s2map.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1877,7 +1877,7 @@
 BuildCmd=
 
 [Unit184]
-FileName=..\..\src\render.cc
+FileName=..\..\src\singleton.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1887,7 +1887,7 @@
 BuildCmd=
 
 [Unit185]
-FileName=..\..\src\rendertarget.h
+FileName=..\..\src\soldier.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1897,7 +1897,7 @@
 BuildCmd=
 
 [Unit186]
-FileName=..\..\src\rgbcolor.h
+FileName=..\..\src\soldier.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1907,7 +1907,7 @@
 BuildCmd=
 
 [Unit187]
-FileName=..\..\src\s2map.cc
+FileName=..\..\src\stock_menu.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1917,7 +1917,7 @@
 BuildCmd=
 
 [Unit188]
-FileName=..\..\src\s2map.h
+FileName=..\..\src\stock_menu.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1927,7 +1927,7 @@
 BuildCmd=
 
 [Unit191]
-FileName=..\..\src\soldier.h
+FileName=..\..\src\text_parser.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1937,7 +1937,7 @@
 BuildCmd=
 
 [Unit192]
-FileName=..\..\src\stock_menu.cc
+FileName=..\..\src\trackptr.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1947,7 +1947,7 @@
 BuildCmd=
 
 [Unit193]
-FileName=..\..\src\stock_menu.h
+FileName=..\..\src\trainingsite.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1957,7 +1957,7 @@
 BuildCmd=
 
 [Unit194]
-FileName=..\..\src\terrain.cc
+FileName=..\..\src\trainingsite.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1967,7 +1967,7 @@
 BuildCmd=
 
 [Unit195]
-FileName=..\..\src\text_parser.cc
+FileName=..\..\src\transport.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1977,7 +1977,7 @@
 BuildCmd=
 
 [Unit196]
-FileName=..\..\src\text_parser.h
+FileName=..\..\src\transport.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1987,7 +1987,7 @@
 BuildCmd=
 
 [Unit197]
-FileName=..\..\src\trackptr.h
+FileName=..\..\src\transport_draw.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -1997,7 +1997,7 @@
 BuildCmd=
 
 [Unit198]
-FileName=..\..\src\trainingsite.cc
+FileName=..\..\src\tribe.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2007,7 +2007,7 @@
 BuildCmd=
 
 [Unit199]
-FileName=..\..\src\trainingsite.h
+FileName=..\..\src\tribe.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2017,7 +2017,7 @@
 BuildCmd=
 
 [Unit200]
-FileName=..\..\src\transport.cc
+FileName=..\..\src\tribedata.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2027,7 +2027,7 @@
 BuildCmd=
 
 [Unit201]
-FileName=..\..\src\transport.h
+FileName=..\..\src\types.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2037,7 +2037,7 @@
 BuildCmd=
 
 [Unit202]
-FileName=..\..\src\transport_draw.cc
+FileName=..\..\src\ware_statistics_menu.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2047,7 +2047,7 @@
 BuildCmd=
 
 [Unit203]
-FileName=..\..\src\tribe.cc
+FileName=..\..\src\ware_statistics_menu.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2057,7 +2057,7 @@
 BuildCmd=
 
 [Unit204]
-FileName=..\..\src\tribe.h
+FileName=..\..\src\warehouse.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2067,7 +2067,7 @@
 BuildCmd=
 
 [Unit205]
-FileName=..\..\src\tribedata.h
+FileName=..\..\src\warehouse.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2077,7 +2077,7 @@
 BuildCmd=
 
 [Unit206]
-FileName=..\..\src\types.h
+FileName=..\..\src\waresdisplay.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2087,7 +2087,7 @@
 BuildCmd=
 
 [Unit207]
-FileName=..\..\src\ware_statistics_menu.cc
+FileName=..\..\src\waresdisplay.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2097,7 +2097,7 @@
 BuildCmd=
 
 [Unit208]
-FileName=..\..\src\ware_statistics_menu.h
+FileName=..\..\src\watchwindow.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2107,7 +2107,7 @@
 BuildCmd=
 
 [Unit209]
-FileName=..\..\src\warehouse.cc
+FileName=..\..\src\watchwindow.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2117,7 +2117,7 @@
 BuildCmd=
 
 [Unit210]
-FileName=..\..\src\warehouse.h
+FileName=..\..\src\wexception.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2127,7 +2127,7 @@
 BuildCmd=
 
 [Unit211]
-FileName=..\..\src\waresdisplay.cc
+FileName=..\..\src\widelands_map_allowed_buildings_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2137,7 +2137,7 @@
 BuildCmd=
 
 [Unit212]
-FileName=..\..\src\waresdisplay.h
+FileName=..\..\src\widelands_map_allowed_buildings_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2147,7 +2147,7 @@
 BuildCmd=
 
 [Unit213]
-FileName=..\..\src\watchwindow.cc
+FileName=..\..\src\widelands_map_battle_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2157,7 +2157,7 @@
 BuildCmd=
 
 [Unit214]
-FileName=..\..\src\watchwindow.h
+FileName=..\..\src\widelands_map_battle_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2167,7 +2167,7 @@
 BuildCmd=
 
 [Unit215]
-FileName=..\..\src\wexception.h
+FileName=..\..\src\widelands_map_bob_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2177,7 +2177,7 @@
 BuildCmd=
 
 [Unit216]
-FileName=..\..\src\widelands_map_allowed_buildings_data_packet.cc
+FileName=..\..\src\widelands_map_bob_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2187,7 +2187,7 @@
 BuildCmd=
 
 [Unit217]
-FileName=..\..\src\widelands_map_allowed_buildings_data_packet.h
+FileName=..\..\src\widelands_map_bobdata_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2197,7 +2197,7 @@
 BuildCmd=
 
 [Unit218]
-FileName=..\..\src\widelands_map_battle_data_packet.cc
+FileName=..\..\src\widelands_map_bobdata_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2207,7 +2207,7 @@
 BuildCmd=
 
 [Unit219]
-FileName=..\..\src\widelands_map_battle_data_packet.h
+FileName=..\..\src\widelands_map_building_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2217,7 +2217,7 @@
 BuildCmd=
 
 [Unit220]
-FileName=..\..\src\widelands_map_bob_data_packet.cc
+FileName=..\..\src\widelands_map_building_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2227,7 +2227,7 @@
 BuildCmd=
 
 [Unit221]
-FileName=..\..\src\widelands_map_bob_data_packet.h
+FileName=..\..\src\widelands_map_buildingdata_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2237,7 +2237,7 @@
 BuildCmd=
 
 [Unit222]
-FileName=..\..\src\widelands_map_bobdata_data_packet.cc
+FileName=..\..\src\widelands_map_buildingdata_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2247,7 +2247,7 @@
 BuildCmd=
 
 [Unit223]
-FileName=..\..\src\widelands_map_bobdata_data_packet.h
+FileName=..\..\src\widelands_map_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2257,7 +2257,7 @@
 BuildCmd=
 
 [Unit224]
-FileName=..\..\src\widelands_map_building_data_packet.cc
+FileName=..\..\src\widelands_map_data_packet_ids.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2267,7 +2267,7 @@
 BuildCmd=
 
 [Unit225]
-FileName=..\..\src\widelands_map_building_data_packet.h
+FileName=..\..\src\widelands_map_elemental_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2277,7 +2277,7 @@
 BuildCmd=
 
 [Unit226]
-FileName=..\..\src\widelands_map_buildingdata_data_packet.cc
+FileName=..\..\src\widelands_map_elemental_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2287,7 +2287,7 @@
 BuildCmd=
 
 [Unit227]
-FileName=..\..\src\widelands_map_buildingdata_data_packet.h
+FileName=..\..\src\widelands_map_event_chain_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2297,7 +2297,7 @@
 BuildCmd=
 
 [Unit228]
-FileName=..\..\src\widelands_map_data_packet.h
+FileName=..\..\src\widelands_map_event_chain_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2307,7 +2307,7 @@
 BuildCmd=
 
 [Unit229]
-FileName=..\..\src\widelands_map_data_packet_ids.h
+FileName=..\..\src\widelands_map_event_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2317,7 +2317,7 @@
 BuildCmd=
 
 [Unit230]
-FileName=..\..\src\widelands_map_elemental_data_packet.cc
+FileName=..\..\src\widelands_map_event_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2327,7 +2327,7 @@
 BuildCmd=
 
 [Unit231]
-FileName=..\..\src\widelands_map_elemental_data_packet.h
+FileName=..\..\src\widelands_map_extradata_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2337,7 +2337,7 @@
 BuildCmd=
 
 [Unit232]
-FileName=..\..\src\widelands_map_event_chain_data_packet.cc
+FileName=..\..\src\widelands_map_extradata_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2347,7 +2347,7 @@
 BuildCmd=
 
 [Unit233]
-FileName=..\..\src\widelands_map_event_chain_data_packet.h
+FileName=..\..\src\widelands_map_flag_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2357,7 +2357,7 @@
 BuildCmd=
 
 [Unit234]
-FileName=..\..\src\widelands_map_event_data_packet.cc
+FileName=..\..\src\widelands_map_flag_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2367,7 +2367,7 @@
 BuildCmd=
 
 [Unit235]
-FileName=..\..\src\widelands_map_event_data_packet.h
+FileName=..\..\src\widelands_map_flagdata_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2377,7 +2377,7 @@
 BuildCmd=
 
 [Unit236]
-FileName=..\..\src\widelands_map_extradata_data_packet.cc
+FileName=..\..\src\widelands_map_flagdata_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2387,7 +2387,7 @@
 BuildCmd=
 
 [Unit237]
-FileName=..\..\src\widelands_map_extradata_data_packet.h
+FileName=..\..\src\widelands_map_heights_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2397,7 +2397,7 @@
 BuildCmd=
 
 [Unit238]
-FileName=..\..\src\widelands_map_flag_data_packet.cc
+FileName=..\..\src\widelands_map_heights_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2407,7 +2407,7 @@
 BuildCmd=
 
 [Unit239]
-FileName=..\..\src\widelands_map_flag_data_packet.h
+FileName=..\..\src\widelands_map_immovable_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2417,7 +2417,7 @@
 BuildCmd=
 
 [Unit240]
-FileName=..\..\src\widelands_map_flagdata_data_packet.cc
+FileName=..\..\src\widelands_map_immovable_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2427,7 +2427,7 @@
 BuildCmd=
 
 [Unit241]
-FileName=..\..\src\widelands_map_flagdata_data_packet.h
+FileName=..\..\src\widelands_map_immovabledata_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2437,7 +2437,7 @@
 BuildCmd=
 
 [Unit242]
-FileName=..\..\src\widelands_map_heights_data_packet.cc
+FileName=..\..\src\widelands_map_immovabledata_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2447,7 +2447,7 @@
 BuildCmd=
 
 [Unit243]
-FileName=..\..\src\widelands_map_heights_data_packet.h
+FileName=..\..\src\widelands_map_loader.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2457,7 +2457,7 @@
 BuildCmd=
 
 [Unit244]
-FileName=..\..\src\widelands_map_immovable_data_packet.cc
+FileName=..\..\src\widelands_map_loader.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2467,7 +2467,7 @@
 BuildCmd=
 
 [Unit245]
-FileName=..\..\src\widelands_map_immovable_data_packet.h
+FileName=..\..\src\widelands_map_map_object_loader.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2477,7 +2477,7 @@
 BuildCmd=
 
 [Unit246]
-FileName=..\..\src\widelands_map_immovabledata_data_packet.cc
+FileName=..\..\src\widelands_map_map_object_loader.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2487,7 +2487,7 @@
 BuildCmd=
 
 [Unit247]
-FileName=..\..\src\widelands_map_immovabledata_data_packet.h
+FileName=..\..\src\widelands_map_map_object_saver.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2497,7 +2497,7 @@
 BuildCmd=
 
 [Unit248]
-FileName=..\..\src\widelands_map_loader.cc
+FileName=..\..\src\widelands_map_map_object_saver.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2507,7 +2507,7 @@
 BuildCmd=
 
 [Unit249]
-FileName=..\..\src\widelands_map_loader.h
+FileName=..\..\src\widelands_map_objective_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2517,7 +2517,7 @@
 BuildCmd=
 
 [Unit250]
-FileName=..\..\src\widelands_map_map_object_loader.cc
+FileName=..\..\src\widelands_map_objective_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2527,7 +2527,7 @@
 BuildCmd=
 
 [Unit251]
-FileName=..\..\src\widelands_map_map_object_loader.h
+FileName=..\..\src\widelands_map_owned_fields_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2537,7 +2537,7 @@
 BuildCmd=
 
 [Unit252]
-FileName=..\..\src\widelands_map_map_object_saver.cc
+FileName=..\..\src\widelands_map_owned_fields_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2547,7 +2547,7 @@
 BuildCmd=
 
 [Unit253]
-FileName=..\..\src\widelands_map_map_object_saver.h
+FileName=..\..\src\widelands_map_player_names_and_tribes_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2557,7 +2557,7 @@
 BuildCmd=
 
 [Unit254]
-FileName=..\..\src\widelands_map_objective_data_packet.cc
+FileName=..\..\src\widelands_map_player_names_and_tribes_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2567,7 +2567,7 @@
 BuildCmd=
 
 [Unit255]
-FileName=..\..\src\widelands_map_objective_data_packet.h
+FileName=..\..\src\widelands_map_player_position_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2577,7 +2577,7 @@
 BuildCmd=
 
 [Unit256]
-FileName=..\..\src\widelands_map_owned_fields_data_packet.cc
+FileName=..\..\src\widelands_map_player_position_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2587,7 +2587,7 @@
 BuildCmd=
 
 [Unit257]
-FileName=..\..\src\widelands_map_owned_fields_data_packet.h
+FileName=..\..\src\widelands_map_resources_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2597,7 +2597,7 @@
 BuildCmd=
 
 [Unit258]
-FileName=..\..\src\widelands_map_player_names_and_tribes_data_packet.cc
+FileName=..\..\src\widelands_map_resources_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2607,7 +2607,7 @@
 BuildCmd=
 
 [Unit259]
-FileName=..\..\src\widelands_map_player_names_and_tribes_data_packet.h
+FileName=..\..\src\widelands_map_road_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2617,7 +2617,7 @@
 BuildCmd=
 
 [Unit260]
-FileName=..\..\src\widelands_map_player_position_data_packet.cc
+FileName=..\..\src\widelands_map_road_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2627,7 +2627,7 @@
 BuildCmd=
 
 [Unit261]
-FileName=..\..\src\widelands_map_player_position_data_packet.h
+FileName=..\..\src\widelands_map_roaddata_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2637,7 +2637,7 @@
 BuildCmd=
 
 [Unit262]
-FileName=..\..\src\widelands_map_resources_data_packet.cc
+FileName=..\..\src\widelands_map_roaddata_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2647,7 +2647,7 @@
 BuildCmd=
 
 [Unit263]
-FileName=..\..\src\widelands_map_resources_data_packet.h
+FileName=..\..\src\widelands_map_saver.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2657,7 +2657,7 @@
 BuildCmd=
 
 [Unit264]
-FileName=..\..\src\widelands_map_road_data_packet.cc
+FileName=..\..\src\widelands_map_saver.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2667,7 +2667,7 @@
 BuildCmd=
 
 [Unit265]
-FileName=..\..\src\widelands_map_road_data_packet.h
+FileName=..\..\src\widelands_map_seen_fields_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2677,7 +2677,7 @@
 BuildCmd=
 
 [Unit266]
-FileName=..\..\src\widelands_map_roaddata_data_packet.cc
+FileName=..\..\src\widelands_map_seen_fields_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2687,7 +2687,7 @@
 BuildCmd=
 
 [Unit267]
-FileName=..\..\src\widelands_map_roaddata_data_packet.h
+FileName=..\..\src\widelands_map_terrain_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2697,7 +2697,7 @@
 BuildCmd=
 
 [Unit268]
-FileName=..\..\src\widelands_map_saver.cc
+FileName=..\..\src\widelands_map_terrain_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2707,7 +2707,7 @@
 BuildCmd=
 
 [Unit269]
-FileName=..\..\src\widelands_map_saver.h
+FileName=..\..\src\widelands_map_trigger_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2717,7 +2717,7 @@
 BuildCmd=
 
 [Unit270]
-FileName=..\..\src\widelands_map_seen_fields_data_packet.cc
+FileName=..\..\src\widelands_map_trigger_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2727,7 +2727,7 @@
 BuildCmd=
 
 [Unit271]
-FileName=..\..\src\widelands_map_seen_fields_data_packet.h
+FileName=..\..\src\widelands_map_variable_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2737,7 +2737,7 @@
 BuildCmd=
 
 [Unit272]
-FileName=..\..\src\widelands_map_terrain_data_packet.cc
+FileName=..\..\src\widelands_map_variable_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2747,7 +2747,7 @@
 BuildCmd=
 
 [Unit273]
-FileName=..\..\src\widelands_map_terrain_data_packet.h
+FileName=..\..\src\widelands_map_ware_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2757,7 +2757,7 @@
 BuildCmd=
 
 [Unit274]
-FileName=..\..\src\widelands_map_trigger_data_packet.cc
+FileName=..\..\src\widelands_map_ware_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2767,7 +2767,7 @@
 BuildCmd=
 
 [Unit275]
-FileName=..\..\src\widelands_map_trigger_data_packet.h
+FileName=..\..\src\widelands_map_waredata_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2777,7 +2777,7 @@
 BuildCmd=
 
 [Unit276]
-FileName=..\..\src\widelands_map_variable_data_packet.cc
+FileName=..\..\src\widelands_map_waredata_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2787,7 +2787,7 @@
 BuildCmd=
 
 [Unit277]
-FileName=..\..\src\widelands_map_variable_data_packet.h
+FileName=..\..\src\wlapplication.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2797,7 +2797,7 @@
 BuildCmd=
 
 [Unit278]
-FileName=..\..\src\widelands_map_ware_data_packet.cc
+FileName=..\..\src\wlapplication.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2807,7 +2807,7 @@
 BuildCmd=
 
 [Unit279]
-FileName=..\..\src\widelands_map_ware_data_packet.h
+FileName=..\..\src\workarea_info.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2817,7 +2817,7 @@
 BuildCmd=
 
 [Unit280]
-FileName=..\..\src\widelands_map_waredata_data_packet.cc
+FileName=..\..\src\worker.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2827,7 +2827,7 @@
 BuildCmd=
 
 [Unit281]
-FileName=..\..\src\widelands_map_waredata_data_packet.h
+FileName=..\..\src\worker.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2837,7 +2837,7 @@
 BuildCmd=
 
 [Unit282]
-FileName=..\..\src\wlapplication.cc
+FileName=..\..\src\worker_program.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2847,7 +2847,7 @@
 BuildCmd=
 
 [Unit283]
-FileName=..\..\src\wlapplication.h
+FileName=..\..\src\world.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2857,7 +2857,7 @@
 BuildCmd=
 
 [Unit284]
-FileName=..\..\src\workarea_info.h
+FileName=..\..\src\world.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2867,7 +2867,7 @@
 BuildCmd=
 
 [Unit285]
-FileName=..\..\src\worker.cc
+FileName=..\..\src\worlddata.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2877,7 +2877,7 @@
 BuildCmd=
 
 [Unit286]
-FileName=..\..\src\worker.h
+FileName=..\..\src\wui_plot_area.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2887,7 +2887,7 @@
 BuildCmd=
 
 [Unit287]
-FileName=..\..\src\worker_program.h
+FileName=..\..\src\wui_plot_area.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -2897,9 +2897,9 @@
 BuildCmd=
 
 [Unit288]
-FileName=..\..\src\world.cc
+FileName=..\..\src\editor\tools\editor_decrease_height_tool.cc
 CompileCpp=1
-Folder=Widelands
+Folder=editor/tools
 Compile=1
 Link=1
 Priority=1000
@@ -2907,9 +2907,9 @@
 BuildCmd=
 
 [Unit289]
-FileName=..\..\src\world.h
+FileName=..\..\src\editor\tools\editor_decrease_height_tool.h
 CompileCpp=1
-Folder=Widelands
+Folder=editor/tools
 Compile=1
 Link=1
 Priority=1000
@@ -2917,9 +2917,9 @@
 BuildCmd=
 
 [Unit290]
-FileName=..\..\src\worlddata.h
+FileName=..\..\src\editor\tools\editor_decrease_resources_tool.cc
 CompileCpp=1
-Folder=Widelands
+Folder=editor/tools
 Compile=1
 Link=1
 Priority=1000
@@ -2927,9 +2927,9 @@
 BuildCmd=
 
 [Unit291]
-FileName=..\..\src\wui_plot_area.cc
+FileName=..\..\src\editor\tools\editor_decrease_resources_tool.h
 CompileCpp=1
-Folder=Widelands
+Folder=editor/tools
 Compile=1
 Link=1
 Priority=1000
@@ -2937,9 +2937,9 @@
 BuildCmd=
 
 [Unit292]
-FileName=..\..\src\wui_plot_area.h
+FileName=..\..\src\editor\tools\editor_delete_bob_tool.cc
 CompileCpp=1
-Folder=Widelands
+Folder=editor/tools
 Compile=1
 Link=1
 Priority=1000
@@ -2947,7 +2947,7 @@
 BuildCmd=
 
 [Unit293]
-FileName=..\..\src\editor\tools\editor_decrease_height_tool.cc
+FileName=..\..\src\editor\tools\editor_delete_bob_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -2957,7 +2957,7 @@
 BuildCmd=
 
 [Unit294]
-FileName=..\..\src\editor\tools\editor_decrease_height_tool.h
+FileName=..\..\src\editor\tools\editor_delete_immovable_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -2967,7 +2967,7 @@
 BuildCmd=
 
 [Unit295]
-FileName=..\..\src\editor\tools\editor_decrease_resources_tool.cc
+FileName=..\..\src\editor\tools\editor_delete_immovable_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -2977,7 +2977,7 @@
 BuildCmd=
 
 [Unit296]
-FileName=..\..\src\editor\tools\editor_decrease_resources_tool.h
+FileName=..\..\src\editor\tools\editor_increase_height_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -2987,7 +2987,7 @@
 BuildCmd=
 
 [Unit297]
-FileName=..\..\src\editor\tools\editor_delete_bob_tool.cc
+FileName=..\..\src\editor\tools\editor_increase_height_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -2997,7 +2997,7 @@
 BuildCmd=
 
 [Unit298]
-FileName=..\..\src\editor\tools\editor_delete_bob_tool.h
+FileName=..\..\src\editor\tools\editor_increase_resources_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3007,7 +3007,7 @@
 BuildCmd=
 
 [Unit299]
-FileName=..\..\src\editor\tools\editor_delete_immovable_tool.cc
+FileName=..\..\src\editor\tools\editor_increase_resources_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3017,7 +3017,7 @@
 BuildCmd=
 
 [Unit300]
-FileName=..\..\src\editor\tools\editor_delete_immovable_tool.h
+FileName=..\..\src\editor\tools\editor_info_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3027,7 +3027,7 @@
 BuildCmd=
 
 [Unit301]
-FileName=..\..\src\editor\tools\editor_increase_height_tool.cc
+FileName=..\..\src\editor\tools\editor_info_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3037,7 +3037,7 @@
 BuildCmd=
 
 [Unit302]
-FileName=..\..\src\editor\tools\editor_increase_height_tool.h
+FileName=..\..\src\editor\tools\editor_make_infrastructure_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3047,7 +3047,7 @@
 BuildCmd=
 
 [Unit303]
-FileName=..\..\src\editor\tools\editor_increase_resources_tool.cc
+FileName=..\..\src\editor\tools\editor_make_infrastructure_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3057,7 +3057,7 @@
 BuildCmd=
 
 [Unit304]
-FileName=..\..\src\editor\tools\editor_increase_resources_tool.h
+FileName=..\..\src\editor\tools\editor_noise_height_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3067,7 +3067,7 @@
 BuildCmd=
 
 [Unit305]
-FileName=..\..\src\editor\tools\editor_info_tool.cc
+FileName=..\..\src\editor\tools\editor_noise_height_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3077,7 +3077,7 @@
 BuildCmd=
 
 [Unit306]
-FileName=..\..\src\editor\tools\editor_info_tool.h
+FileName=..\..\src\editor\tools\editor_place_bob_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3087,7 +3087,7 @@
 BuildCmd=
 
 [Unit307]
-FileName=..\..\src\editor\tools\editor_make_infrastructure_tool.cc
+FileName=..\..\src\editor\tools\editor_place_bob_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3097,7 +3097,7 @@
 BuildCmd=
 
 [Unit308]
-FileName=..\..\src\editor\tools\editor_make_infrastructure_tool.h
+FileName=..\..\src\editor\tools\editor_place_immovable_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3107,7 +3107,7 @@
 BuildCmd=
 
 [Unit309]
-FileName=..\..\src\editor\tools\editor_noise_height_tool.cc
+FileName=..\..\src\editor\tools\editor_place_immovable_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3117,7 +3117,7 @@
 BuildCmd=
 
 [Unit310]
-FileName=..\..\src\editor\tools\editor_noise_height_tool.h
+FileName=..\..\src\editor\tools\editor_set_terrain_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3127,7 +3127,7 @@
 BuildCmd=
 
 [Unit311]
-FileName=..\..\src\editor\tools\editor_place_bob_tool.cc
+FileName=..\..\src\editor\tools\editor_set_terrain_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3137,7 +3137,7 @@
 BuildCmd=
 
 [Unit312]
-FileName=..\..\src\editor\tools\editor_place_bob_tool.h
+FileName=..\..\src\editor\tools\editor_set_height_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3147,7 +3147,7 @@
 BuildCmd=
 
 [Unit313]
-FileName=..\..\src\editor\tools\editor_place_immovable_tool.cc
+FileName=..\..\src\editor\tools\editor_set_height_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3157,7 +3157,7 @@
 BuildCmd=
 
 [Unit314]
-FileName=..\..\src\editor\tools\editor_place_immovable_tool.h
+FileName=..\..\src\editor\tools\editor_set_resources_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3167,7 +3167,7 @@
 BuildCmd=
 
 [Unit315]
-FileName=..\..\src\editor\tools\editor_set_terrain_tool.cc
+FileName=..\..\src\editor\tools\editor_set_resources_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3177,7 +3177,7 @@
 BuildCmd=
 
 [Unit316]
-FileName=..\..\src\editor\tools\editor_set_terrain_tool.h
+FileName=..\..\src\editor\tools\editor_set_starting_pos_tool.cc
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3187,7 +3187,7 @@
 BuildCmd=
 
 [Unit317]
-FileName=..\..\src\editor\tools\editor_set_height_tool.cc
+FileName=..\..\src\editor\tools\editor_set_starting_pos_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3197,7 +3197,7 @@
 BuildCmd=
 
 [Unit318]
-FileName=..\..\src\editor\tools\editor_set_height_tool.h
+FileName=..\..\src\editor\tools\editor_tool.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3207,7 +3207,7 @@
 BuildCmd=
 
 [Unit319]
-FileName=..\..\src\editor\tools\editor_set_resources_tool.cc
+FileName=..\..\src\editor\tools\multi_select.h
 CompileCpp=1
 Folder=editor/tools
 Compile=1
@@ -3217,9 +3217,9 @@
 BuildCmd=
 
 [Unit320]
-FileName=..\..\src\editor\tools\editor_set_resources_tool.h
+FileName=..\..\src\editor\ui_menus\editor_event_menu.cc
 CompileCpp=1
-Folder=editor/tools
+Folder=editor/ui_menus
 Compile=1
 Link=1
 Priority=1000
@@ -3227,9 +3227,9 @@
 BuildCmd=
 
 [Unit321]
-FileName=..\..\src\editor\tools\editor_set_starting_pos_tool.cc
+FileName=..\..\src\editor\ui_menus\editor_event_menu.h
 CompileCpp=1
-Folder=editor/tools
+Folder=editor/ui_menus
 Compile=1
 Link=1
 Priority=1000
@@ -3237,9 +3237,9 @@
 BuildCmd=
 
 [Unit322]
-FileName=..\..\src\editor\tools\editor_set_starting_pos_tool.h
+FileName=..\..\src\editor\ui_menus\editor_event_menu_edit_eventchain.cc
 CompileCpp=1
-Folder=editor/tools
+Folder=editor/ui_menus
 Compile=1
 Link=1
 Priority=1000
@@ -3247,9 +3247,9 @@
 BuildCmd=
 
 [Unit323]
-FileName=..\..\src\editor\tools\editor_tool.h
+FileName=..\..\src\editor\ui_menus\editor_event_menu_edit_eventchain.h
 CompileCpp=1
-Folder=editor/tools
+Folder=editor/ui_menus
 Compile=1
 Link=1
 Priority=1000
@@ -3257,9 +3257,9 @@
 BuildCmd=
 
 [Unit324]
-FileName=..\..\src\editor\tools\multi_select.h
+FileName=..\..\src\editor\ui_menus\editor_event_menu_edit_trigger_conditional.cc
 CompileCpp=1
-Folder=editor/tools
+Folder=editor/ui_menus
 Compile=1
 Link=1
 Priority=1000
@@ -3267,7 +3267,7 @@
 BuildCmd=
 
 [Unit325]
-FileName=..\..\src\editor\ui_menus\editor_event_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_event_menu_edit_trigger_conditional.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3277,7 +3277,7 @@
 BuildCmd=
 
 [Unit326]
-FileName=..\..\src\editor\ui_menus\editor_event_menu.h
+FileName=..\..\src\editor\ui_menus\editor_event_menu_new_event.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3287,7 +3287,7 @@
 BuildCmd=
 
 [Unit327]
-FileName=..\..\src\editor\ui_menus\editor_event_menu_edit_eventchain.cc
+FileName=..\..\src\editor\ui_menus\editor_event_menu_new_event.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3297,7 +3297,7 @@
 BuildCmd=
 
 [Unit328]
-FileName=..\..\src\editor\ui_menus\editor_event_menu_edit_eventchain.h
+FileName=..\..\src\editor\ui_menus\editor_event_menu_new_trigger.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3307,7 +3307,7 @@
 BuildCmd=
 
 [Unit329]
-FileName=..\..\src\editor\ui_menus\editor_event_menu_edit_trigger_conditional.cc
+FileName=..\..\src\editor\ui_menus\editor_event_menu_new_trigger.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3317,7 +3317,7 @@
 BuildCmd=
 
 [Unit330]
-FileName=..\..\src\editor\ui_menus\editor_event_menu_edit_trigger_conditional.h
+FileName=..\..\src\editor\ui_menus\editor_main_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3327,7 +3327,7 @@
 BuildCmd=
 
 [Unit331]
-FileName=..\..\src\editor\ui_menus\editor_event_menu_new_event.cc
+FileName=..\..\src\editor\ui_menus\editor_main_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3337,7 +3337,7 @@
 BuildCmd=
 
 [Unit332]
-FileName=..\..\src\editor\ui_menus\editor_event_menu_new_event.h
+FileName=..\..\src\editor\ui_menus\editor_main_menu_load_map.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3347,7 +3347,7 @@
 BuildCmd=
 
 [Unit333]
-FileName=..\..\src\editor\ui_menus\editor_event_menu_new_trigger.cc
+FileName=..\..\src\editor\ui_menus\editor_main_menu_load_map.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3357,7 +3357,7 @@
 BuildCmd=
 
 [Unit334]
-FileName=..\..\src\editor\ui_menus\editor_event_menu_new_trigger.h
+FileName=..\..\src\editor\ui_menus\editor_main_menu_map_options.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3367,7 +3367,7 @@
 BuildCmd=
 
 [Unit335]
-FileName=..\..\src\editor\ui_menus\editor_main_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_main_menu_map_options.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3377,7 +3377,7 @@
 BuildCmd=
 
 [Unit336]
-FileName=..\..\src\editor\ui_menus\editor_main_menu.h
+FileName=..\..\src\editor\ui_menus\editor_main_menu_new_map.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3387,7 +3387,7 @@
 BuildCmd=
 
 [Unit337]
-FileName=..\..\src\editor\ui_menus\editor_main_menu_load_map.cc
+FileName=..\..\src\editor\ui_menus\editor_main_menu_new_map.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3397,7 +3397,7 @@
 BuildCmd=
 
 [Unit338]
-FileName=..\..\src\editor\ui_menus\editor_main_menu_load_map.h
+FileName=..\..\src\editor\ui_menus\editor_main_menu_save_map.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3407,7 +3407,7 @@
 BuildCmd=
 
 [Unit339]
-FileName=..\..\src\editor\ui_menus\editor_main_menu_map_options.cc
+FileName=..\..\src\editor\ui_menus\editor_main_menu_save_map.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3417,7 +3417,7 @@
 BuildCmd=
 
 [Unit340]
-FileName=..\..\src\editor\ui_menus\editor_main_menu_map_options.h
+FileName=..\..\src\editor\ui_menus\editor_main_menu_save_map_make_directory.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3427,7 +3427,7 @@
 BuildCmd=
 
 [Unit341]
-FileName=..\..\src\editor\ui_menus\editor_main_menu_new_map.cc
+FileName=..\..\src\editor\ui_menus\editor_main_menu_save_map_make_directory.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3437,7 +3437,7 @@
 BuildCmd=
 
 [Unit342]
-FileName=..\..\src\editor\ui_menus\editor_main_menu_new_map.h
+FileName=..\..\src\editor\ui_menus\editor_objectives_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3447,7 +3447,7 @@
 BuildCmd=
 
 [Unit343]
-FileName=..\..\src\editor\ui_menus\editor_main_menu_save_map.cc
+FileName=..\..\src\editor\ui_menus\editor_objectives_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3457,7 +3457,7 @@
 BuildCmd=
 
 [Unit344]
-FileName=..\..\src\editor\ui_menus\editor_main_menu_save_map.h
+FileName=..\..\src\editor\ui_menus\editor_player_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3467,7 +3467,7 @@
 BuildCmd=
 
 [Unit345]
-FileName=..\..\src\editor\ui_menus\editor_main_menu_save_map_make_directory.cc
+FileName=..\..\src\editor\ui_menus\editor_player_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3477,7 +3477,7 @@
 BuildCmd=
 
 [Unit346]
-FileName=..\..\src\editor\ui_menus\editor_main_menu_save_map_make_directory.h
+FileName=..\..\src\editor\ui_menus\editor_player_menu_allowed_buildings_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3487,7 +3487,7 @@
 BuildCmd=
 
 [Unit347]
-FileName=..\..\src\editor\ui_menus\editor_objectives_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_player_menu_allowed_buildings_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3497,7 +3497,7 @@
 BuildCmd=
 
 [Unit348]
-FileName=..\..\src\editor\ui_menus\editor_objectives_menu.h
+FileName=..\..\src\editor\ui_menus\editor_tool_change_height_options_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3507,7 +3507,7 @@
 BuildCmd=
 
 [Unit349]
-FileName=..\..\src\editor\ui_menus\editor_player_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_tool_change_height_options_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3517,7 +3517,7 @@
 BuildCmd=
 
 [Unit350]
-FileName=..\..\src\editor\ui_menus\editor_player_menu.h
+FileName=..\..\src\editor\ui_menus\editor_tool_change_resources_options_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3527,7 +3527,7 @@
 BuildCmd=
 
 [Unit351]
-FileName=..\..\src\editor\ui_menus\editor_player_menu_allowed_buildings_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_tool_change_resources_options_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3537,7 +3537,7 @@
 BuildCmd=
 
 [Unit352]
-FileName=..\..\src\editor\ui_menus\editor_player_menu_allowed_buildings_menu.h
+FileName=..\..\src\editor\ui_menus\editor_tool_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3547,7 +3547,7 @@
 BuildCmd=
 
 [Unit353]
-FileName=..\..\src\editor\ui_menus\editor_tool_change_height_options_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_tool_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3557,7 +3557,7 @@
 BuildCmd=
 
 [Unit354]
-FileName=..\..\src\editor\ui_menus\editor_tool_change_height_options_menu.h
+FileName=..\..\src\editor\ui_menus\editor_tool_noise_height_options_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3567,7 +3567,7 @@
 BuildCmd=
 
 [Unit355]
-FileName=..\..\src\editor\ui_menus\editor_tool_change_resources_options_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_tool_noise_height_options_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3577,7 +3577,7 @@
 BuildCmd=
 
 [Unit356]
-FileName=..\..\src\editor\ui_menus\editor_tool_change_resources_options_menu.h
+FileName=..\..\src\editor\ui_menus\editor_tool_options_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3587,7 +3587,7 @@
 BuildCmd=
 
 [Unit357]
-FileName=..\..\src\editor\ui_menus\editor_tool_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_tool_options_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3597,7 +3597,7 @@
 BuildCmd=
 
 [Unit358]
-FileName=..\..\src\editor\ui_menus\editor_tool_menu.h
+FileName=..\..\src\editor\ui_menus\editor_tool_place_bob_options_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3607,7 +3607,7 @@
 BuildCmd=
 
 [Unit359]
-FileName=..\..\src\editor\ui_menus\editor_tool_noise_height_options_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_tool_place_bob_options_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3617,7 +3617,7 @@
 BuildCmd=
 
 [Unit360]
-FileName=..\..\src\editor\ui_menus\editor_tool_noise_height_options_menu.h
+FileName=..\..\src\editor\ui_menus\editor_tool_place_immovable_options_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3627,7 +3627,7 @@
 BuildCmd=
 
 [Unit361]
-FileName=..\..\src\editor\ui_menus\editor_tool_options_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_tool_place_immovable_options_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3637,7 +3637,7 @@
 BuildCmd=
 
 [Unit362]
-FileName=..\..\src\editor\ui_menus\editor_tool_options_menu.h
+FileName=..\..\src\editor\ui_menus\editor_tool_set_terrain_options_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3647,7 +3647,7 @@
 BuildCmd=
 
 [Unit363]
-FileName=..\..\src\editor\ui_menus\editor_tool_place_bob_options_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_tool_set_terrain_options_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3657,7 +3657,7 @@
 BuildCmd=
 
 [Unit364]
-FileName=..\..\src\editor\ui_menus\editor_tool_place_bob_options_menu.h
+FileName=..\..\src\editor\ui_menus\editor_toolsize_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3667,7 +3667,7 @@
 BuildCmd=
 
 [Unit365]
-FileName=..\..\src\editor\ui_menus\editor_tool_place_immovable_options_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_toolsize_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3677,7 +3677,7 @@
 BuildCmd=
 
 [Unit366]
-FileName=..\..\src\editor\ui_menus\editor_tool_place_immovable_options_menu.h
+FileName=..\..\src\editor\ui_menus\editor_variables_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3687,7 +3687,7 @@
 BuildCmd=
 
 [Unit367]
-FileName=..\..\src\editor\ui_menus\editor_tool_set_terrain_options_menu.cc
+FileName=..\..\src\editor\ui_menus\editor_variables_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3697,7 +3697,7 @@
 BuildCmd=
 
 [Unit368]
-FileName=..\..\src\editor\ui_menus\editor_tool_set_terrain_options_menu.h
+FileName=..\..\src\editor\ui_menus\event_allow_building_option_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3707,7 +3707,7 @@
 BuildCmd=
 
 [Unit369]
-FileName=..\..\src\editor\ui_menus\editor_toolsize_menu.cc
+FileName=..\..\src\editor\ui_menus\event_allow_building_option_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3717,7 +3717,7 @@
 BuildCmd=
 
 [Unit370]
-FileName=..\..\src\editor\ui_menus\editor_toolsize_menu.h
+FileName=..\..\src\editor\ui_menus\event_conquer_area_option_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3727,7 +3727,7 @@
 BuildCmd=
 
 [Unit371]
-FileName=..\..\src\editor\ui_menus\editor_variables_menu.cc
+FileName=..\..\src\editor\ui_menus\event_conquer_area_option_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3737,7 +3737,7 @@
 BuildCmd=
 
 [Unit372]
-FileName=..\..\src\editor\ui_menus\editor_variables_menu.h
+FileName=..\..\src\editor\ui_menus\event_message_box_option_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3747,7 +3747,7 @@
 BuildCmd=
 
 [Unit373]
-FileName=..\..\src\editor\ui_menus\event_allow_building_option_menu.cc
+FileName=..\..\src\editor\ui_menus\event_message_box_option_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3757,7 +3757,7 @@
 BuildCmd=
 
 [Unit374]
-FileName=..\..\src\editor\ui_menus\event_allow_building_option_menu.h
+FileName=..\..\src\editor\ui_menus\event_move_view_option_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3767,7 +3767,7 @@
 BuildCmd=
 
 [Unit375]
-FileName=..\..\src\editor\ui_menus\event_conquer_area_option_menu.cc
+FileName=..\..\src\editor\ui_menus\event_move_view_option_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3777,7 +3777,7 @@
 BuildCmd=
 
 [Unit376]
-FileName=..\..\src\editor\ui_menus\event_conquer_area_option_menu.h
+FileName=..\..\src\editor\ui_menus\event_unhide_area_option_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3787,7 +3787,7 @@
 BuildCmd=
 
 [Unit377]
-FileName=..\..\src\editor\ui_menus\event_message_box_option_menu.cc
+FileName=..\..\src\editor\ui_menus\event_unhide_area_option_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3797,7 +3797,7 @@
 BuildCmd=
 
 [Unit378]
-FileName=..\..\src\editor\ui_menus\event_message_box_option_menu.h
+FileName=..\..\src\editor\ui_menus\trigger_building_option_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3807,7 +3807,7 @@
 BuildCmd=
 
 [Unit379]
-FileName=..\..\src\editor\ui_menus\event_move_view_option_menu.cc
+FileName=..\..\src\editor\ui_menus\trigger_building_option_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3817,7 +3817,7 @@
 BuildCmd=
 
 [Unit380]
-FileName=..\..\src\editor\ui_menus\event_move_view_option_menu.h
+FileName=..\..\src\editor\ui_menus\trigger_null_option_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3827,7 +3827,7 @@
 BuildCmd=
 
 [Unit381]
-FileName=..\..\src\editor\ui_menus\event_unhide_area_option_menu.cc
+FileName=..\..\src\editor\ui_menus\trigger_null_option_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3837,7 +3837,7 @@
 BuildCmd=
 
 [Unit382]
-FileName=..\..\src\editor\ui_menus\event_unhide_area_option_menu.h
+FileName=..\..\src\editor\ui_menus\trigger_time_option_menu.cc
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3847,7 +3847,7 @@
 BuildCmd=
 
 [Unit383]
-FileName=..\..\src\editor\ui_menus\trigger_building_option_menu.cc
+FileName=..\..\src\editor\ui_menus\trigger_time_option_menu.h
 CompileCpp=1
 Folder=editor/ui_menus
 Compile=1
@@ -3857,9 +3857,9 @@
 BuildCmd=
 
 [Unit386]
-FileName=..\..\src\editor\ui_menus\trigger_null_option_menu.h
+FileName=..\..\src\editor\editorinteractive.cc
 CompileCpp=1
-Folder=editor/ui_menus
+Folder=editor
 Compile=1
 Link=1
 Priority=1000
@@ -3867,9 +3867,9 @@
 BuildCmd=
 
 [Unit387]
-FileName=..\..\src\editor\ui_menus\trigger_time_option_menu.cc
+FileName=..\..\src\editor\editorinteractive.h
 CompileCpp=1
-Folder=editor/ui_menus
+Folder=editor
 Compile=1
 Link=1
 Priority=1000
@@ -3877,9 +3877,9 @@
 BuildCmd=
 
 [Unit388]
-FileName=..\..\src\editor\ui_menus\trigger_time_option_menu.h
+FileName=..\..\src\ui\ui_basic\ui_box.cc
 CompileCpp=1
-Folder=editor/ui_menus
+Folder=ui/ui_basic
 Compile=1
 Link=1
 Priority=1000
@@ -3887,9 +3887,9 @@
 BuildCmd=
 
 [Unit389]
-FileName=..\..\src\editor\editor.cc
+FileName=..\..\src\ui\ui_basic\ui_box.h
 CompileCpp=1
-Folder=editor
+Folder=ui/ui_basic
 Compile=1
 Link=1
 Priority=1000
@@ -3897,9 +3897,9 @@
 BuildCmd=
 
 [Unit392]
-FileName=..\..\src\editor\editorinteractive.h
+FileName=..\..\src\ui\ui_basic\ui_checkbox.cc
 CompileCpp=1
-Folder=editor
+Folder=ui/ui_basic
 Compile=1
 Link=1
 Priority=1000
@@ -3907,7 +3907,7 @@
 BuildCmd=
 
 [Unit393]
-FileName=..\..\src\ui\ui_basic\ui_box.cc
+FileName=..\..\src\ui\ui_basic\ui_checkbox.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -3917,7 +3917,7 @@
 BuildCmd=
 
 [Unit394]
-FileName=..\..\src\ui\ui_basic\ui_box.h
+FileName=..\..\src\ui\ui_basic\ui_editbox.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -3927,7 +3927,7 @@
 BuildCmd=
 
 [Unit395]
-FileName=..\..\src\ui\ui_basic\ui_button.cc
+FileName=..\..\src\ui\ui_basic\ui_editbox.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -3937,7 +3937,7 @@
 BuildCmd=
 
 [Unit398]
-FileName=..\..\src\ui\ui_basic\ui_checkbox.h
+FileName=..\..\src\ui\ui_basic\ui_listselect.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -3947,7 +3947,7 @@
 BuildCmd=
 
 [Unit399]
-FileName=..\..\src\ui\ui_basic\ui_editbox.cc
+FileName=..\..\src\ui\ui_basic\ui_listselect.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -3957,7 +3957,7 @@
 BuildCmd=
 
 [Unit400]
-FileName=..\..\src\ui\ui_basic\ui_editbox.h
+FileName=..\..\src\ui\ui_basic\ui_modal_messagebox.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -3967,7 +3967,7 @@
 BuildCmd=
 
 [Unit401]
-FileName=..\..\src\ui\ui_basic\ui_icongrid.cc
+FileName=..\..\src\ui\ui_basic\ui_modal_messagebox.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -3977,7 +3977,7 @@
 BuildCmd=
 
 [Unit402]
-FileName=..\..\src\ui\ui_basic\ui_icongrid.h
+FileName=..\..\src\ui\ui_basic\ui_multilineeditbox.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -3987,7 +3987,7 @@
 BuildCmd=
 
 [Unit403]
-FileName=..\..\src\ui\ui_basic\ui_listselect.cc
+FileName=..\..\src\ui\ui_basic\ui_multilineeditbox.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -3997,7 +3997,7 @@
 BuildCmd=
 
 [Unit404]
-FileName=..\..\src\ui\ui_basic\ui_listselect.h
+FileName=..\..\src\ui\ui_basic\ui_multilinetextarea.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4007,7 +4007,7 @@
 BuildCmd=
 
 [Unit405]
-FileName=..\..\src\ui\ui_basic\ui_modal_messagebox.cc
+FileName=..\..\src\ui\ui_basic\ui_multilinetextarea.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4017,7 +4017,7 @@
 BuildCmd=
 
 [Unit406]
-FileName=..\..\src\ui\ui_basic\ui_modal_messagebox.h
+FileName=..\..\src\ui\ui_basic\ui_object.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4027,7 +4027,7 @@
 BuildCmd=
 
 [Unit407]
-FileName=..\..\src\ui\ui_basic\ui_multilineeditbox.cc
+FileName=..\..\src\ui\ui_basic\ui_panel.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4037,7 +4037,7 @@
 BuildCmd=
 
 [Unit408]
-FileName=..\..\src\ui\ui_basic\ui_multilineeditbox.h
+FileName=..\..\src\ui\ui_basic\ui_panel.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4047,7 +4047,7 @@
 BuildCmd=
 
 [Unit409]
-FileName=..\..\src\ui\ui_basic\ui_multilinetextarea.cc
+FileName=..\..\src\ui\ui_basic\ui_progressbar.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4057,7 +4057,7 @@
 BuildCmd=
 
 [Unit410]
-FileName=..\..\src\ui\ui_basic\ui_multilinetextarea.h
+FileName=..\..\src\ui\ui_basic\ui_progressbar.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4067,7 +4067,7 @@
 BuildCmd=
 
 [Unit411]
-FileName=..\..\src\ui\ui_basic\ui_object.h
+FileName=..\..\src\ui\ui_basic\ui_radiobutton.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4077,7 +4077,7 @@
 BuildCmd=
 
 [Unit412]
-FileName=..\..\src\ui\ui_basic\ui_panel.cc
+FileName=..\..\src\ui\ui_basic\ui_radiobutton.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4087,7 +4087,7 @@
 BuildCmd=
 
 [Unit413]
-FileName=..\..\src\ui\ui_basic\ui_panel.h
+FileName=..\..\src\ui\ui_basic\ui_scrollbar.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4097,7 +4097,7 @@
 BuildCmd=
 
 [Unit414]
-FileName=..\..\src\ui\ui_basic\ui_progressbar.cc
+FileName=..\..\src\ui\ui_basic\ui_scrollbar.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4107,7 +4107,7 @@
 BuildCmd=
 
 [Unit415]
-FileName=..\..\src\ui\ui_basic\ui_progressbar.h
+FileName=..\..\src\ui\ui_basic\ui_signal.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4117,7 +4117,7 @@
 BuildCmd=
 
 [Unit416]
-FileName=..\..\src\ui\ui_basic\ui_radiobutton.cc
+FileName=..\..\src\ui\ui_basic\ui_table.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4127,7 +4127,7 @@
 BuildCmd=
 
 [Unit417]
-FileName=..\..\src\ui\ui_basic\ui_radiobutton.h
+FileName=..\..\src\ui\ui_basic\ui_table.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4137,7 +4137,7 @@
 BuildCmd=
 
 [Unit418]
-FileName=..\..\src\ui\ui_basic\ui_scrollbar.cc
+FileName=..\..\src\ui\ui_basic\ui_tabpanel.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4147,7 +4147,7 @@
 BuildCmd=
 
 [Unit419]
-FileName=..\..\src\ui\ui_basic\ui_scrollbar.h
+FileName=..\..\src\ui\ui_basic\ui_tabpanel.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4157,7 +4157,7 @@
 BuildCmd=
 
 [Unit420]
-FileName=..\..\src\ui\ui_basic\ui_signal.h
+FileName=..\..\src\ui\ui_basic\ui_textarea.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4167,7 +4167,7 @@
 BuildCmd=
 
 [Unit421]
-FileName=..\..\src\ui\ui_basic\ui_table.cc
+FileName=..\..\src\ui\ui_basic\ui_textarea.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4177,7 +4177,7 @@
 BuildCmd=
 
 [Unit422]
-FileName=..\..\src\ui\ui_basic\ui_table.h
+FileName=..\..\src\ui\ui_basic\ui_unique_window.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4187,7 +4187,7 @@
 BuildCmd=
 
 [Unit423]
-FileName=..\..\src\ui\ui_basic\ui_tabpanel.cc
+FileName=..\..\src\ui\ui_basic\ui_unique_window.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4197,7 +4197,7 @@
 BuildCmd=
 
 [Unit424]
-FileName=..\..\src\ui\ui_basic\ui_tabpanel.h
+FileName=..\..\src\ui\ui_basic\ui_window.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4207,7 +4207,7 @@
 BuildCmd=
 
 [Unit425]
-FileName=..\..\src\ui\ui_basic\ui_textarea.cc
+FileName=..\..\src\ui\ui_basic\ui_window.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -4217,9 +4217,9 @@
 BuildCmd=
 
 [Unit426]
-FileName=..\..\src\ui\ui_basic\ui_textarea.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_base.cc
 CompileCpp=1
-Folder=ui/ui_basic
+Folder=ui/ui_fs_menus
 Compile=1
 Link=1
 Priority=1000
@@ -4227,9 +4227,9 @@
 BuildCmd=
 
 [Unit427]
-FileName=..\..\src\ui\ui_basic\ui_unique_window.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_base.h
 CompileCpp=1
-Folder=ui/ui_basic
+Folder=ui/ui_fs_menus
 Compile=1
 Link=1
 Priority=1000
@@ -4237,9 +4237,9 @@
 BuildCmd=
 
 [Unit428]
-FileName=..\..\src\ui\ui_basic\ui_unique_window.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_fileview.cc
 CompileCpp=1
-Folder=ui/ui_basic
+Folder=ui/ui_fs_menus
 Compile=1
 Link=1
 Priority=1000
@@ -4247,9 +4247,9 @@
 BuildCmd=
 
 [Unit429]
-FileName=..\..\src\ui\ui_basic\ui_window.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_fileview.h
 CompileCpp=1
-Folder=ui/ui_basic
+Folder=ui/ui_fs_menus
 Compile=1
 Link=1
 Priority=1000
@@ -4257,9 +4257,9 @@
 BuildCmd=
 
 [Unit430]
-FileName=..\..\src\ui\ui_basic\ui_window.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_inet_lobby.cc
 CompileCpp=1
-Folder=ui/ui_basic
+Folder=ui/ui_fs_menus
 Compile=1
 Link=1
 Priority=1000
@@ -4267,7 +4267,7 @@
 BuildCmd=
 
 [Unit431]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_base.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_inet_lobby.h
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4277,7 +4277,7 @@
 BuildCmd=
 
 [Unit432]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_base.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_inet_server_options.cc
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4287,7 +4287,7 @@
 BuildCmd=
 
 [Unit433]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_fileview.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_inet_server_options.h
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4297,7 +4297,7 @@
 BuildCmd=
 
 [Unit434]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_fileview.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_intro.cc
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4307,7 +4307,7 @@
 BuildCmd=
 
 [Unit435]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_inet_lobby.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_intro.h
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4317,7 +4317,7 @@
 BuildCmd=
 
 [Unit436]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_inet_lobby.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_launchgame.cc
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4327,7 +4327,7 @@
 BuildCmd=
 
 [Unit437]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_inet_server_options.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_launchgame.h
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4337,7 +4337,7 @@
 BuildCmd=
 
 [Unit438]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_inet_server_options.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_loadgame.cc
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4347,7 +4347,7 @@
 BuildCmd=
 
 [Unit439]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_intro.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_loadgame.h
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4357,7 +4357,7 @@
 BuildCmd=
 
 [Unit440]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_intro.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_main.cc
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4367,7 +4367,7 @@
 BuildCmd=
 
 [Unit441]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_launchgame.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_main.h
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4377,7 +4377,7 @@
 BuildCmd=
 
 [Unit442]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_launchgame.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_mapselect.cc
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4387,7 +4387,7 @@
 BuildCmd=
 
 [Unit443]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_loadgame.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_mapselect.h
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4397,7 +4397,7 @@
 BuildCmd=
 
 [Unit444]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_loadgame.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_netsetup.cc
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4407,7 +4407,7 @@
 BuildCmd=
 
 [Unit445]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_main.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_netsetup.h
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4417,7 +4417,7 @@
 BuildCmd=
 
 [Unit446]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_main.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_options.cc
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4427,7 +4427,7 @@
 BuildCmd=
 
 [Unit447]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_mapselect.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_options.h
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4437,7 +4437,7 @@
 BuildCmd=
 
 [Unit448]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_mapselect.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_singleplayer.cc
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4447,7 +4447,7 @@
 BuildCmd=
 
 [Unit449]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_netsetup.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_singleplayer.h
 CompileCpp=1
 Folder=ui/ui_fs_menus
 Compile=1
@@ -4457,9 +4457,9 @@
 BuildCmd=
 
 [Unit450]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_netsetup.h
+FileName=..\..\src\animation_gfx.h
 CompileCpp=1
-Folder=ui/ui_fs_menus
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4467,9 +4467,9 @@
 BuildCmd=
 
 [Unit451]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_options.cc
+FileName=..\..\src\encyclopedia_window.cc
 CompileCpp=1
-Folder=ui/ui_fs_menus
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4477,9 +4477,9 @@
 BuildCmd=
 
 [Unit452]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_options.h
+FileName=..\..\src\encyclopedia_window.h
 CompileCpp=1
-Folder=ui/ui_fs_menus
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4487,9 +4487,9 @@
 BuildCmd=
 
 [Unit453]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_singleplayer.cc
+FileName=..\..\src\interval.h
 CompileCpp=1
-Folder=ui/ui_fs_menus
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4497,9 +4497,9 @@
 BuildCmd=
 
 [Unit454]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_singleplayer.h
+FileName=..\..\src\player_area.h
 CompileCpp=1
-Folder=ui/ui_fs_menus
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4507,9 +4507,9 @@
 BuildCmd=
 
 [Unit455]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_tutorial_select_map.cc
+FileName=..\..\src\widelands_fileread.h
 CompileCpp=1
-Folder=ui/ui_fs_menus
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4517,9 +4517,9 @@
 BuildCmd=
 
 [Unit456]
-FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_tutorial_select_map.h
+FileName=..\..\src\widelands_filewrite.h
 CompileCpp=1
-Folder=ui/ui_fs_menus
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4527,7 +4527,7 @@
 BuildCmd=
 
 [Unit457]
-FileName=..\..\src\animation_gfx.h
+FileName=..\..\src\widelands_map_attack_controller_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4537,7 +4537,7 @@
 BuildCmd=
 
 [Unit458]
-FileName=..\..\src\encyclopedia_window.cc
+FileName=..\..\src\widelands_map_attack_controller_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4547,9 +4547,9 @@
 BuildCmd=
 
 [Unit459]
-FileName=..\..\src\encyclopedia_window.h
+FileName=..\..\src\filesystem\zip_filesystem.h
 CompileCpp=1
-Folder=Widelands
+Folder=filesystem
 Compile=1
 Link=1
 Priority=1000
@@ -4557,9 +4557,9 @@
 BuildCmd=
 
 [Unit460]
-FileName=..\..\src\interval.h
+FileName=..\..\src\filesystem\disk_filesystem.h
 CompileCpp=1
-Folder=Widelands
+Folder=filesystem
 Compile=1
 Link=1
 Priority=1000
@@ -4567,9 +4567,9 @@
 BuildCmd=
 
 [Unit461]
-FileName=..\..\src\player_area.h
+FileName=..\..\src\filesystem\filesystem.cc
 CompileCpp=1
-Folder=Widelands
+Folder=filesystem
 Compile=1
 Link=1
 Priority=1000
@@ -4577,9 +4577,9 @@
 BuildCmd=
 
 [Unit462]
-FileName=..\..\src\widelands_fileread.h
+FileName=..\..\src\filesystem\filesystem.h
 CompileCpp=1
-Folder=Widelands
+Folder=filesystem
 Compile=1
 Link=1
 Priority=1000
@@ -4587,9 +4587,9 @@
 BuildCmd=
 
 [Unit463]
-FileName=..\..\src\widelands_filewrite.h
+FileName=..\..\src\filesystem\filesystem_exceptions.h
 CompileCpp=1
-Folder=Widelands
+Folder=filesystem
 Compile=1
 Link=1
 Priority=1000
@@ -4597,9 +4597,9 @@
 BuildCmd=
 
 [Unit464]
-FileName=..\..\src\widelands_map_attack_controller_data_packet.cc
+FileName=..\..\src\filesystem\ioapi.h
 CompileCpp=1
-Folder=Widelands
+Folder=filesystem
 Compile=1
 Link=1
 Priority=1000
@@ -4607,9 +4607,9 @@
 BuildCmd=
 
 [Unit465]
-FileName=..\..\src\widelands_map_attack_controller_data_packet.h
+FileName=..\..\src\filesystem\layered_filesystem.cc
 CompileCpp=1
-Folder=Widelands
+Folder=filesystem
 Compile=1
 Link=1
 Priority=1000
@@ -4617,7 +4617,7 @@
 BuildCmd=
 
 [Unit466]
-FileName=..\..\src\filesystem\zip_filesystem.h
+FileName=..\..\src\filesystem\layered_filesystem.h
 CompileCpp=1
 Folder=filesystem
 Compile=1
@@ -4627,7 +4627,7 @@
 BuildCmd=
 
 [Unit467]
-FileName=..\..\src\filesystem\disk_filesystem.h
+FileName=..\..\src\filesystem\unzip.cc
 CompileCpp=1
 Folder=filesystem
 Compile=1
@@ -4637,7 +4637,7 @@
 BuildCmd=
 
 [Unit468]
-FileName=..\..\src\filesystem\filesystem.cc
+FileName=..\..\src\filesystem\unzip.h
 CompileCpp=1
 Folder=filesystem
 Compile=1
@@ -4647,7 +4647,7 @@
 BuildCmd=
 
 [Unit469]
-FileName=..\..\src\filesystem\filesystem.h
+FileName=..\..\src\filesystem\zip.h
 CompileCpp=1
 Folder=filesystem
 Compile=1
@@ -4657,7 +4657,7 @@
 BuildCmd=
 
 [Unit470]
-FileName=..\..\src\filesystem\filesystem_exceptions.h
+FileName=..\..\src\filesystem\zip_exceptions.h
 CompileCpp=1
 Folder=filesystem
 Compile=1
@@ -4667,7 +4667,7 @@
 BuildCmd=
 
 [Unit471]
-FileName=..\..\src\filesystem\ioapi.h
+FileName=..\..\src\filesystem\zip_filesystem.cc
 CompileCpp=1
 Folder=filesystem
 Compile=1
@@ -4677,7 +4677,7 @@
 BuildCmd=
 
 [Unit472]
-FileName=..\..\src\filesystem\layered_filesystem.cc
+FileName=..\..\src\filesystem\disk_filesystem.cc
 CompileCpp=1
 Folder=filesystem
 Compile=1
@@ -4687,9 +4687,9 @@
 BuildCmd=
 
 [Unit473]
-FileName=..\..\src\filesystem\layered_filesystem.h
+FileName=..\..\src\ui\ui_basic\ui_progresswindow.cc
 CompileCpp=1
-Folder=filesystem
+Folder=ui/ui_basic
 Compile=1
 Link=1
 Priority=1000
@@ -4697,9 +4697,9 @@
 BuildCmd=
 
 [Unit474]
-FileName=..\..\src\filesystem\unzip.cc
+FileName=..\..\src\ui\ui_basic\ui_progresswindow.h
 CompileCpp=1
-Folder=filesystem
+Folder=ui/ui_basic
 Compile=1
 Link=1
 Priority=1000
@@ -4707,9 +4707,9 @@
 BuildCmd=
 
 [Unit475]
-FileName=..\..\src\filesystem\unzip.h
+FileName=..\..\src\areawatcher.cc
 CompileCpp=1
-Folder=filesystem
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4717,9 +4717,9 @@
 BuildCmd=
 
 [Unit476]
-FileName=..\..\src\filesystem\zip.h
+FileName=..\..\src\areawatcher.h
 CompileCpp=1
-Folder=filesystem
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4727,9 +4727,9 @@
 BuildCmd=
 
 [Unit477]
-FileName=..\..\src\filesystem\zip_exceptions.h
+FileName=..\..\src\bitinbuffer.h
 CompileCpp=1
-Folder=filesystem
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4737,9 +4737,9 @@
 BuildCmd=
 
 [Unit478]
-FileName=..\..\src\filesystem\zip_filesystem.cc
+FileName=..\..\src\bitoutbuffer.h
 CompileCpp=1
-Folder=filesystem
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4747,9 +4747,9 @@
 BuildCmd=
 
 [Unit479]
-FileName=..\..\src\filesystem\disk_filesystem.cc
+FileName=..\..\src\colormap.cc
 CompileCpp=1
-Folder=filesystem
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4757,9 +4757,9 @@
 BuildCmd=
 
 [Unit480]
-FileName=..\..\src\ui\ui_basic\ui_progresswindow.cc
+FileName=..\..\src\colormap.h
 CompileCpp=1
-Folder=ui/ui_basic
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4767,9 +4767,9 @@
 BuildCmd=
 
 [Unit481]
-FileName=..\..\src\ui\ui_basic\ui_progresswindow.h
+FileName=..\..\src\config.h
 CompileCpp=1
-Folder=ui/ui_basic
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -4777,7 +4777,7 @@
 BuildCmd=
 
 [Unit482]
-FileName=..\..\src\areawatcher.cc
+FileName=..\..\src\item_ware_descr.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4787,7 +4787,7 @@
 BuildCmd=
 
 [Unit483]
-FileName=..\..\src\areawatcher.h
+FileName=..\..\src\item_ware_descr.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4797,7 +4797,7 @@
 BuildCmd=
 
 [Unit484]
-FileName=..\..\src\bitinbuffer.h
+FileName=..\..\src\mapdifferenceregion.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4807,7 +4807,7 @@
 BuildCmd=
 
 [Unit485]
-FileName=..\..\src\bitoutbuffer.h
+FileName=..\..\src\mapdifferenceregion.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4817,7 +4817,7 @@
 BuildCmd=
 
 [Unit486]
-FileName=..\..\src\colormap.cc
+FileName=..\..\src\mapfringeregion.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4827,7 +4827,7 @@
 BuildCmd=
 
 [Unit487]
-FileName=..\..\src\colormap.h
+FileName=..\..\src\mapfringeregion.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4837,7 +4837,7 @@
 BuildCmd=
 
 [Unit488]
-FileName=..\..\src\config.h
+FileName=..\..\src\maphollowregion.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4847,7 +4847,7 @@
 BuildCmd=
 
 [Unit489]
-FileName=..\..\src\item_ware_descr.cc
+FileName=..\..\src\maphollowregion.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4857,7 +4857,7 @@
 BuildCmd=
 
 [Unit490]
-FileName=..\..\src\item_ware_descr.h
+FileName=..\..\src\mapregion.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4867,7 +4867,7 @@
 BuildCmd=
 
 [Unit491]
-FileName=..\..\src\mapdifferenceregion.cc
+FileName=..\..\src\maptriangleregion.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4877,7 +4877,7 @@
 BuildCmd=
 
 [Unit492]
-FileName=..\..\src\mapdifferenceregion.h
+FileName=..\..\src\maptriangleregion.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4887,7 +4887,7 @@
 BuildCmd=
 
 [Unit493]
-FileName=..\..\src\mapfringeregion.cc
+FileName=..\..\src\picture.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4897,7 +4897,7 @@
 BuildCmd=
 
 [Unit494]
-FileName=..\..\src\mapfringeregion.h
+FileName=..\..\src\rendertarget.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4907,7 +4907,7 @@
 BuildCmd=
 
 [Unit495]
-FileName=..\..\src\maphollowregion.cc
+FileName=..\..\src\save_handler.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4917,7 +4917,7 @@
 BuildCmd=
 
 [Unit496]
-FileName=..\..\src\maphollowregion.h
+FileName=..\..\src\save_handler.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4927,7 +4927,7 @@
 BuildCmd=
 
 [Unit497]
-FileName=..\..\src\mapregion.h
+FileName=..\..\src\surface.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4937,7 +4937,7 @@
 BuildCmd=
 
 [Unit498]
-FileName=..\..\src\maptriangleregion.cc
+FileName=..\..\src\surface.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4947,7 +4947,7 @@
 BuildCmd=
 
 [Unit499]
-FileName=..\..\src\maptriangleregion.h
+FileName=..\..\src\terrain.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4957,7 +4957,7 @@
 BuildCmd=
 
 [Unit500]
-FileName=..\..\src\picture.h
+FileName=..\..\src\texture.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4967,7 +4967,7 @@
 BuildCmd=
 
 [Unit501]
-FileName=..\..\src\rendertarget.cc
+FileName=..\..\src\texture.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4977,7 +4977,7 @@
 BuildCmd=
 
 [Unit502]
-FileName=..\..\src\save_handler.cc
+FileName=..\..\src\warelist.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4987,7 +4987,7 @@
 BuildCmd=
 
 [Unit503]
-FileName=..\..\src\save_handler.h
+FileName=..\..\src\warelist.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -4997,7 +4997,7 @@
 BuildCmd=
 
 [Unit504]
-FileName=..\..\src\surface.cc
+FileName=..\..\src\widelands_map_players_areawatchers_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5007,7 +5007,7 @@
 BuildCmd=
 
 [Unit505]
-FileName=..\..\src\surface.h
+FileName=..\..\src\widelands_map_players_areawatchers_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5017,7 +5017,7 @@
 BuildCmd=
 
 [Unit506]
-FileName=..\..\src\terrain.h
+FileName=..\..\src\widelands_map_players_view_data_packet.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5027,7 +5027,7 @@
 BuildCmd=
 
 [Unit507]
-FileName=..\..\src\texture.cc
+FileName=..\..\src\widelands_map_players_view_data_packet.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5037,9 +5037,9 @@
 BuildCmd=
 
 [Unit508]
-FileName=..\..\src\texture.h
+FileName=..\..\src\events\event.cc
 CompileCpp=1
-Folder=Widelands
+Folder=events
 Compile=1
 Link=1
 Priority=1000
@@ -5047,9 +5047,9 @@
 BuildCmd=
 
 [Unit509]
-FileName=..\..\src\warelist.cc
+FileName=..\..\src\events\event.h
 CompileCpp=1
-Folder=Widelands
+Folder=events
 Compile=1
 Link=1
 Priority=1000
@@ -5057,9 +5057,9 @@
 BuildCmd=
 
 [Unit510]
-FileName=..\..\src\warelist.h
+FileName=..\..\src\events\event_allow_building.cc
 CompileCpp=1
-Folder=Widelands
+Folder=events
 Compile=1
 Link=1
 Priority=1000
@@ -5067,9 +5067,9 @@
 BuildCmd=
 
 [Unit511]
-FileName=..\..\src\widelands_map_players_areawatchers_data_packet.cc
+FileName=..\..\src\events\event_allow_building.h
 CompileCpp=1
-Folder=Widelands
+Folder=events
 Compile=1
 Link=1
 Priority=1000
@@ -5077,9 +5077,9 @@
 BuildCmd=
 
 [Unit512]
-FileName=..\..\src\widelands_map_players_areawatchers_data_packet.h
+FileName=..\..\src\events\event_chain.cc
 CompileCpp=1
-Folder=Widelands
+Folder=events
 Compile=1
 Link=1
 Priority=1000
@@ -5087,9 +5087,9 @@
 BuildCmd=
 
 [Unit513]
-FileName=..\..\src\widelands_map_players_view_data_packet.cc
+FileName=..\..\src\events\event_chain.h
 CompileCpp=1
-Folder=Widelands
+Folder=events
 Compile=1
 Link=1
 Priority=1000
@@ -5097,9 +5097,9 @@
 BuildCmd=
 
 [Unit514]
-FileName=..\..\src\widelands_map_players_view_data_packet.h
+FileName=..\..\src\events\event_conquer_area.cc
 CompileCpp=1
-Folder=Widelands
+Folder=events
 Compile=1
 Link=1
 Priority=1000
@@ -5107,7 +5107,7 @@
 BuildCmd=
 
 [Unit515]
-FileName=..\..\src\events\event.cc
+FileName=..\..\src\events\event_conquer_area.h
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5117,7 +5117,7 @@
 BuildCmd=
 
 [Unit516]
-FileName=..\..\src\events\event.h
+FileName=..\..\src\events\event_factory.cc
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5127,7 +5127,7 @@
 BuildCmd=
 
 [Unit517]
-FileName=..\..\src\events\event_allow_building.cc
+FileName=..\..\src\events\event_factory.h
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5137,7 +5137,7 @@
 BuildCmd=
 
 [Unit518]
-FileName=..\..\src\events\event_allow_building.h
+FileName=..\..\src\events\event_message_box.cc
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5147,7 +5147,7 @@
 BuildCmd=
 
 [Unit519]
-FileName=..\..\src\events\event_chain.cc
+FileName=..\..\src\events\event_message_box.h
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5157,7 +5157,7 @@
 BuildCmd=
 
 [Unit520]
-FileName=..\..\src\events\event_chain.h
+FileName=..\..\src\events\event_message_box_message_box.cc
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5167,7 +5167,7 @@
 BuildCmd=
 
 [Unit521]
-FileName=..\..\src\events\event_conquer_area.cc
+FileName=..\..\src\events\event_message_box_message_box.h
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5177,7 +5177,7 @@
 BuildCmd=
 
 [Unit522]
-FileName=..\..\src\events\event_conquer_area.h
+FileName=..\..\src\events\event_move_view.cc
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5187,7 +5187,7 @@
 BuildCmd=
 
 [Unit523]
-FileName=..\..\src\events\event_factory.cc
+FileName=..\..\src\events\event_move_view.h
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5197,7 +5197,7 @@
 BuildCmd=
 
 [Unit524]
-FileName=..\..\src\events\event_factory.h
+FileName=..\..\src\events\event_player_area.cc
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5207,7 +5207,7 @@
 BuildCmd=
 
 [Unit525]
-FileName=..\..\src\events\event_message_box.cc
+FileName=..\..\src\events\event_player_area.h
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5217,7 +5217,7 @@
 BuildCmd=
 
 [Unit526]
-FileName=..\..\src\events\event_message_box.h
+FileName=..\..\src\events\event_referencer.cc
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5227,7 +5227,7 @@
 BuildCmd=
 
 [Unit527]
-FileName=..\..\src\events\event_message_box_message_box.cc
+FileName=..\..\src\events\event_referencer.h
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5237,7 +5237,7 @@
 BuildCmd=
 
 [Unit528]
-FileName=..\..\src\events\event_message_box_message_box.h
+FileName=..\..\src\events\event_set_null_trigger.cc
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5247,7 +5247,7 @@
 BuildCmd=
 
 [Unit529]
-FileName=..\..\src\events\event_move_view.cc
+FileName=..\..\src\events\event_set_null_trigger.h
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5257,7 +5257,7 @@
 BuildCmd=
 
 [Unit189]
-FileName=..\..\src\singleton.h
+FileName=..\..\src\terrain.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5267,7 +5267,7 @@
 BuildCmd=
 
 [Unit190]
-FileName=..\..\src\soldier.cc
+FileName=..\..\src\text_parser.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5277,9 +5277,9 @@
 BuildCmd=
 
 [Unit384]
-FileName=..\..\src\editor\ui_menus\trigger_building_option_menu.h
+FileName=..\..\src\editor\editor.cc
 CompileCpp=1
-Folder=editor/ui_menus
+Folder=editor
 Compile=1
 Link=1
 Priority=1000
@@ -5287,9 +5287,9 @@
 BuildCmd=
 
 [Unit385]
-FileName=..\..\src\editor\ui_menus\trigger_null_option_menu.cc
+FileName=..\..\src\editor\editor.h
 CompileCpp=1
-Folder=editor/ui_menus
+Folder=editor
 Compile=1
 Link=1
 Priority=1000
@@ -5297,9 +5297,9 @@
 BuildCmd=
 
 [Unit390]
-FileName=..\..\src\editor\editor.h
+FileName=..\..\src\ui\ui_basic\ui_button.cc
 CompileCpp=1
-Folder=editor
+Folder=ui/ui_basic
 Compile=1
 Link=1
 Priority=1000
@@ -5307,9 +5307,9 @@
 BuildCmd=
 
 [Unit391]
-FileName=..\..\src\editor\editorinteractive.cc
+FileName=..\..\src\ui\ui_basic\ui_button.h
 CompileCpp=1
-Folder=editor
+Folder=ui/ui_basic
 Compile=1
 Link=1
 Priority=1000
@@ -5317,7 +5317,7 @@
 BuildCmd=
 
 [Unit396]
-FileName=..\..\src\ui\ui_basic\ui_button.h
+FileName=..\..\src\ui\ui_basic\ui_icongrid.cc
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -5327,7 +5327,7 @@
 BuildCmd=
 
 [Unit397]
-FileName=..\..\src\ui\ui_basic\ui_checkbox.cc
+FileName=..\..\src\ui\ui_basic\ui_icongrid.h
 CompileCpp=1
 Folder=ui/ui_basic
 Compile=1
@@ -5337,7 +5337,7 @@
 BuildCmd=
 
 [Unit530]
-FileName=..\..\src\events\event_move_view.h
+FileName=..\..\src\events\event_unhide_area.cc
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5347,7 +5347,7 @@
 BuildCmd=
 
 [Unit531]
-FileName=..\..\src\events\event_player_area.cc
+FileName=..\..\src\events\event_unhide_area.h
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5357,7 +5357,7 @@
 BuildCmd=
 
 [Unit532]
-FileName=..\..\src\events\event_player_area.h
+FileName=..\..\src\events\event_unhide_objective.cc
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5367,7 +5367,7 @@
 BuildCmd=
 
 [Unit533]
-FileName=..\..\src\events\event_referencer.cc
+FileName=..\..\src\events\event_unhide_objective.h
 CompileCpp=1
 Folder=events
 Compile=1
@@ -5377,9 +5377,9 @@
 BuildCmd=
 
 [Unit534]
-FileName=..\..\src\events\event_referencer.h
+FileName=..\..\src\sound\fxset.cc
 CompileCpp=1
-Folder=events
+Folder=sound
 Compile=1
 Link=1
 Priority=1000
@@ -5387,9 +5387,9 @@
 BuildCmd=
 
 [Unit535]
-FileName=..\..\src\events\event_set_null_trigger.cc
+FileName=..\..\src\sound\fxset.h
 CompileCpp=1
-Folder=events
+Folder=sound
 Compile=1
 Link=1
 Priority=1000
@@ -5397,9 +5397,9 @@
 BuildCmd=
 
 [Unit536]
-FileName=..\..\src\events\event_set_null_trigger.h
+FileName=..\..\src\sound\songset.cc
 CompileCpp=1
-Folder=events
+Folder=sound
 Compile=1
 Link=1
 Priority=1000
@@ -5407,9 +5407,9 @@
 BuildCmd=
 
 [Unit537]
-FileName=..\..\src\events\event_unhide_area.cc
+FileName=..\..\src\sound\songset.h
 CompileCpp=1
-Folder=events
+Folder=sound
 Compile=1
 Link=1
 Priority=1000
@@ -5417,9 +5417,9 @@
 BuildCmd=
 
 [Unit538]
-FileName=..\..\src\events\event_unhide_area.h
+FileName=..\..\src\sound\sound_handler.cc
 CompileCpp=1
-Folder=events
+Folder=sound
 Compile=1
 Link=1
 Priority=1000
@@ -5427,9 +5427,9 @@
 BuildCmd=
 
 [Unit539]
-FileName=..\..\src\events\event_unhide_objective.cc
+FileName=..\..\src\sound\sound_handler.h
 CompileCpp=1
-Folder=events
+Folder=sound
 Compile=1
 Link=1
 Priority=1000
@@ -5437,9 +5437,9 @@
 BuildCmd=
 
 [Unit540]
-FileName=..\..\src\events\event_unhide_objective.h
+FileName=..\..\src\trigger\trigger.cc
 CompileCpp=1
-Folder=events
+Folder=trigger
 Compile=1
 Link=1
 Priority=1000
@@ -5447,9 +5447,9 @@
 BuildCmd=
 
 [Unit541]
-FileName=..\..\src\sound\fxset.cc
+FileName=..\..\src\trigger\trigger.h
 CompileCpp=1
-Folder=sound
+Folder=trigger
 Compile=1
 Link=1
 Priority=1000
@@ -5457,9 +5457,9 @@
 BuildCmd=
 
 [Unit542]
-FileName=..\..\src\sound\fxset.h
+FileName=..\..\src\trigger\trigger_building.cc
 CompileCpp=1
-Folder=sound
+Folder=trigger
 Compile=1
 Link=1
 Priority=1000
@@ -5467,9 +5467,9 @@
 BuildCmd=
 
 [Unit543]
-FileName=..\..\src\sound\songset.cc
+FileName=..\..\src\trigger\trigger_building.h
 CompileCpp=1
-Folder=sound
+Folder=trigger
 Compile=1
 Link=1
 Priority=1000
@@ -5477,9 +5477,9 @@
 BuildCmd=
 
 [Unit544]
-FileName=..\..\src\sound\songset.h
+FileName=..\..\src\trigger\trigger_conditional.cc
 CompileCpp=1
-Folder=sound
+Folder=trigger
 Compile=1
 Link=1
 Priority=1000
@@ -5487,9 +5487,9 @@
 BuildCmd=
 
 [Unit545]
-FileName=..\..\src\sound\sound_handler.cc
+FileName=..\..\src\trigger\trigger_conditional.h
 CompileCpp=1
-Folder=sound
+Folder=trigger
 Compile=1
 Link=1
 Priority=1000
@@ -5497,9 +5497,9 @@
 BuildCmd=
 
 [Unit546]
-FileName=..\..\src\sound\sound_handler.h
+FileName=..\..\src\trigger\trigger_factory.cc
 CompileCpp=1
-Folder=sound
+Folder=trigger
 Compile=1
 Link=1
 Priority=1000
@@ -5507,7 +5507,7 @@
 BuildCmd=
 
 [Unit547]
-FileName=..\..\src\trigger\trigger.cc
+FileName=..\..\src\trigger\trigger_factory.h
 CompileCpp=1
 Folder=trigger
 Compile=1
@@ -5517,7 +5517,7 @@
 BuildCmd=
 
 [Unit548]
-FileName=..\..\src\trigger\trigger.h
+FileName=..\..\src\trigger\trigger_null.cc
 CompileCpp=1
 Folder=trigger
 Compile=1
@@ -5527,7 +5527,7 @@
 BuildCmd=
 
 [Unit549]
-FileName=..\..\src\trigger\trigger_building.cc
+FileName=..\..\src\trigger\trigger_null.h
 CompileCpp=1
 Folder=trigger
 Compile=1
@@ -5537,7 +5537,7 @@
 BuildCmd=
 
 [Unit550]
-FileName=..\..\src\trigger\trigger_building.h
+FileName=..\..\src\trigger\trigger_referencer.cc
 CompileCpp=1
 Folder=trigger
 Compile=1
@@ -5547,7 +5547,7 @@
 BuildCmd=
 
 [Unit551]
-FileName=..\..\src\trigger\trigger_conditional.cc
+FileName=..\..\src\trigger\trigger_referencer.h
 CompileCpp=1
 Folder=trigger
 Compile=1
@@ -5557,7 +5557,7 @@
 BuildCmd=
 
 [Unit552]
-FileName=..\..\src\trigger\trigger_conditional.h
+FileName=..\..\src\trigger\trigger_time.cc
 CompileCpp=1
 Folder=trigger
 Compile=1
@@ -5567,7 +5567,7 @@
 BuildCmd=
 
 [Unit553]
-FileName=..\..\src\trigger\trigger_factory.cc
+FileName=..\..\src\trigger\trigger_time.h
 CompileCpp=1
 Folder=trigger
 Compile=1
@@ -5577,9 +5577,9 @@
 BuildCmd=
 
 [Unit554]
-FileName=..\..\src\trigger\trigger_factory.h
+FileName=..\..\src\carrier.cc
 CompileCpp=1
-Folder=trigger
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -5587,9 +5587,9 @@
 BuildCmd=
 
 [Unit555]
-FileName=..\..\src\trigger\trigger_null.cc
+FileName=..\..\src\carrier.h
 CompileCpp=1
-Folder=trigger
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -5597,9 +5597,9 @@
 BuildCmd=
 
 [Unit556]
-FileName=..\..\src\trigger\trigger_null.h
+FileName=..\..\src\cmd_incorporate.cc
 CompileCpp=1
-Folder=trigger
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -5607,9 +5607,9 @@
 BuildCmd=
 
 [Unit557]
-FileName=..\..\src\trigger\trigger_referencer.cc
+FileName=..\..\src\cmd_incorporate.h
 CompileCpp=1
-Folder=trigger
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -5617,9 +5617,9 @@
 BuildCmd=
 
 [Unit558]
-FileName=..\..\src\trigger\trigger_referencer.h
+FileName=..\..\src\game_tips.cc
 CompileCpp=1
-Folder=trigger
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -5627,9 +5627,9 @@
 BuildCmd=
 
 [Unit559]
-FileName=..\..\src\trigger\trigger_time.cc
+FileName=..\..\src\game_tips.h
 CompileCpp=1
-Folder=trigger
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -5637,9 +5637,9 @@
 BuildCmd=
 
 [Unit560]
-FileName=..\..\src\trigger\trigger_time.h
+FileName=..\..\src\idleworkersupply.cc
 CompileCpp=1
-Folder=trigger
+Folder=Widelands
 Compile=1
 Link=1
 Priority=1000
@@ -5647,7 +5647,7 @@
 BuildCmd=
 
 [Unit561]
-FileName=..\..\src\carrier.cc
+FileName=..\..\src\idleworkersupply.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5657,7 +5657,7 @@
 BuildCmd=
 
 [Unit562]
-FileName=..\..\src\carrier.h
+FileName=..\..\src\worker_descr.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5667,7 +5667,7 @@
 BuildCmd=
 
 [Unit563]
-FileName=..\..\src\cmd_incorporate.cc
+FileName=..\..\src\worker_descr.h
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5677,7 +5677,7 @@
 BuildCmd=
 
 [Unit564]
-FileName=..\..\src\cmd_incorporate.h
+FileName=..\..\src\worker_program.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5687,9 +5687,9 @@
 BuildCmd=
 
 [Unit565]
-FileName=..\..\src\game_tips.cc
+FileName=..\..\src\ui\ui_basic\ui_slider.cc
 CompileCpp=1
-Folder=Widelands
+Folder=ui/ui_basic
 Compile=1
 Link=1
 Priority=1000
@@ -5697,9 +5697,9 @@
 BuildCmd=
 
 [Unit566]
-FileName=..\..\src\game_tips.h
+FileName=..\..\src\ui\ui_basic\ui_slider.h
 CompileCpp=1
-Folder=Widelands
+Folder=ui/ui_basic
 Compile=1
 Link=1
 Priority=1000
@@ -5707,9 +5707,9 @@
 BuildCmd=
 
 [Unit567]
-FileName=..\..\src\idleworkersupply.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_campaign_select.cc
 CompileCpp=1
-Folder=Widelands
+Folder=ui/ui_fs_menus
 Compile=1
 Link=1
 Priority=1000
@@ -5717,9 +5717,9 @@
 BuildCmd=
 
 [Unit568]
-FileName=..\..\src\idleworkersupply.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_campaign_select.h
 CompileCpp=1
-Folder=Widelands
+Folder=ui/ui_fs_menus
 Compile=1
 Link=1
 Priority=1000
@@ -5727,9 +5727,9 @@
 BuildCmd=
 
 [Unit569]
-FileName=..\..\src\worker_descr.cc
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_loadreplay.cc
 CompileCpp=1
-Folder=Widelands
+Folder=ui/ui_fs_menus
 Compile=1
 Link=1
 Priority=1000
@@ -5737,9 +5737,9 @@
 BuildCmd=
 
 [Unit570]
-FileName=..\..\src\worker_descr.h
+FileName=..\..\src\ui\ui_fs_menus\fullscreen_menu_loadreplay.h
 CompileCpp=1
-Folder=Widelands
+Folder=ui/ui_fs_menus
 Compile=1
 Link=1
 Priority=1000
@@ -5747,7 +5747,7 @@
 BuildCmd=
 
 [Unit571]
-FileName=..\..\src\worker_program.cc
+FileName=..\..\src\game_options_sound_menu.cc
 CompileCpp=1
 Folder=Widelands
 Compile=1
@@ -5756,3 +5756,133 @@
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit572]
+FileName=..\..\src\game_options_sound_menu.h
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit573]
+FileName=..\..\src\interactive_spectator.cc
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit574]
+FileName=..\..\src\interactive_spectator.h
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit575]
+FileName=..\..\src\md5.cc
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit576]
+FileName=..\..\src\md5.h
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit577]
+FileName=..\..\src\replay.cc
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit578]
+FileName=..\..\src\replay.h
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit579]
+FileName=..\..\src\streamread.cc
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit580]
+FileName=..\..\src\streamread.h
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit581]
+FileName=..\..\src\streamwrite.cc
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit582]
+FileName=..\..\src\streamwrite.h
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit583]
+FileName=..\..\src\widelands_streamread.h
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit584]
+FileName=..\..\src\widelands_streamwrite.h
+CompileCpp=1
+Folder=Widelands
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2550] trunk/worlds

From: <alexiadeath@us...> - 2007-08-29 19:10

Revision: 2550
          http://widelands.svn.sourceforge.net/widelands/?rev=2550&view=rev
Author:   alexiadeath
Date:     2007-08-29 12:10:21 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
New images for all deers by Toralf Bethke. Pretty ones ;)

Modified Paths:
--------------
    trunk/worlds/blackland/bobs/deer/conf
    trunk/worlds/blackland/bobs/deer/deer_00.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_00.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_01.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_02.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_00.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_01.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_02.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_00.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_01.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_02.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_00.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_01.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_02.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_00.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_01.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_02.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_00.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_01.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_02.png
    trunk/worlds/blackland/bobs/reindeer/conf
    trunk/worlds/blackland/bobs/reindeer/reindeer_00.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_00.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_01.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_00.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_01.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_00.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_01.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_00.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_01.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_00.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_01.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_00.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_01.png
    trunk/worlds/desert/bobs/deer/conf
    trunk/worlds/desert/bobs/deer/deer_walk_e_00.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_01.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_00.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_01.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_00.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_01.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_00.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_01.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_00.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_01.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_00.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_01.png
    trunk/worlds/greenland/bobs/deer/conf
    trunk/worlds/greenland/bobs/deer/deer_00.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_00.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_01.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_02.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_00.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_01.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_02.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_00.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_01.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_02.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_00.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_01.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_02.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_00.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_01.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_02.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_00.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_01.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_02.png
    trunk/worlds/greenland/bobs/reindeer/conf
    trunk/worlds/greenland/bobs/reindeer/reindeer_00.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_00.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_01.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_00.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_01.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_00.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_01.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_00.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_01.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_00.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_01.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_00.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_01.png
    trunk/worlds/winterland/bobs/deer/conf
    trunk/worlds/winterland/bobs/deer/deer_00.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_00.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_01.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_02.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_00.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_01.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_02.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_00.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_01.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_02.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_00.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_01.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_02.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_00.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_01.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_02.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_00.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_01.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_02.png
    trunk/worlds/winterland/bobs/reindeer/conf
    trunk/worlds/winterland/bobs/reindeer/reindeer_00.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_00.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_01.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_00.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_01.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_00.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_01.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_00.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_01.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_00.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_01.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_00.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_01.png

Added Paths:
-----------
    trunk/worlds/blackland/bobs/deer/deer_idle_se_00.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_01.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_02.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_03.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_04.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_05.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_06.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_07.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_08.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_09.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_10.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_11.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_12.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_13.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_14.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_15.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_16.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_17.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_18.png
    trunk/worlds/blackland/bobs/deer/deer_idle_se_19.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_03.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_04.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_05.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_06.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_07.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_08.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_09.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_10.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_11.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_12.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_13.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_14.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_15.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_16.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_17.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_18.png
    trunk/worlds/blackland/bobs/deer/deer_walk_e_19.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_03.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_04.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_05.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_06.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_07.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_08.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_09.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_10.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_11.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_12.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_13.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_14.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_15.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_16.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_17.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_18.png
    trunk/worlds/blackland/bobs/deer/deer_walk_ne_19.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_03.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_04.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_05.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_06.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_07.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_08.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_09.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_10.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_11.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_12.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_13.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_14.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_15.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_16.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_17.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_18.png
    trunk/worlds/blackland/bobs/deer/deer_walk_nw_19.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_03.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_04.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_05.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_06.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_07.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_08.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_09.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_10.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_11.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_12.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_13.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_14.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_15.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_16.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_17.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_18.png
    trunk/worlds/blackland/bobs/deer/deer_walk_se_19.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_03.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_04.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_05.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_06.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_07.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_08.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_09.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_10.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_11.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_12.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_13.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_14.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_15.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_16.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_17.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_18.png
    trunk/worlds/blackland/bobs/deer/deer_walk_sw_19.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_03.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_04.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_05.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_06.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_07.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_08.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_09.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_10.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_11.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_12.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_13.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_14.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_15.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_16.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_17.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_18.png
    trunk/worlds/blackland/bobs/deer/deer_walk_w_19.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_00.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_01.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_02.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_03.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_04.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_05.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_06.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_07.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_08.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_09.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_10.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_11.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_12.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_13.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_14.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_15.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_16.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_17.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_18.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_19.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_02.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_03.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_04.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_05.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_06.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_07.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_08.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_09.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_10.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_11.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_12.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_13.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_14.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_15.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_16.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_17.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_18.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_19.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_02.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_03.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_04.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_05.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_06.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_07.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_08.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_09.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_10.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_11.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_12.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_13.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_14.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_15.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_16.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_17.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_18.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_19.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_02.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_03.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_04.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_05.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_06.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_07.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_08.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_09.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_10.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_11.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_12.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_13.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_14.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_15.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_16.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_17.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_18.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_19.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_02.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_03.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_04.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_05.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_06.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_07.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_08.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_09.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_10.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_11.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_12.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_13.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_14.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_15.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_16.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_17.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_18.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_19.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_02.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_03.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_04.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_05.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_06.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_07.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_08.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_09.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_10.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_11.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_12.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_13.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_14.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_15.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_16.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_17.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_18.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_19.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_02.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_03.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_04.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_05.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_06.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_07.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_08.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_09.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_10.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_11.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_12.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_13.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_14.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_15.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_16.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_17.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_18.png
    trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_19.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_00.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_01.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_02.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_03.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_04.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_05.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_06.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_07.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_08.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_09.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_10.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_11.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_12.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_13.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_14.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_15.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_16.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_17.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_18.png
    trunk/worlds/desert/bobs/deer/deer_idle_se_19.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_02.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_03.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_04.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_05.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_06.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_07.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_08.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_09.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_10.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_11.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_12.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_13.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_14.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_15.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_16.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_17.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_18.png
    trunk/worlds/desert/bobs/deer/deer_walk_e_19.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_02.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_03.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_04.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_05.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_06.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_07.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_08.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_09.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_10.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_11.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_12.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_13.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_14.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_15.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_16.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_17.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_18.png
    trunk/worlds/desert/bobs/deer/deer_walk_ne_19.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_02.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_03.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_04.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_05.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_06.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_07.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_08.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_09.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_10.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_11.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_12.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_13.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_14.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_15.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_16.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_17.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_18.png
    trunk/worlds/desert/bobs/deer/deer_walk_nw_19.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_02.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_03.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_04.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_05.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_06.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_07.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_08.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_09.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_10.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_11.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_12.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_13.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_14.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_15.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_16.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_17.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_18.png
    trunk/worlds/desert/bobs/deer/deer_walk_se_19.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_02.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_03.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_04.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_05.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_06.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_07.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_08.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_09.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_10.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_11.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_12.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_13.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_14.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_15.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_16.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_17.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_18.png
    trunk/worlds/desert/bobs/deer/deer_walk_sw_19.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_02.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_03.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_04.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_05.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_06.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_07.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_08.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_09.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_10.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_11.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_12.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_13.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_14.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_15.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_16.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_17.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_18.png
    trunk/worlds/desert/bobs/deer/deer_walk_w_19.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_00.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_01.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_02.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_03.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_04.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_05.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_06.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_07.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_08.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_09.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_10.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_11.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_12.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_13.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_14.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_15.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_16.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_17.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_18.png
    trunk/worlds/greenland/bobs/deer/deer_idle_sw_19.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_03.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_04.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_05.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_06.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_07.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_08.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_09.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_10.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_11.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_12.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_13.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_14.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_15.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_16.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_17.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_18.png
    trunk/worlds/greenland/bobs/deer/deer_walk_e_19.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_03.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_04.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_05.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_06.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_07.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_08.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_09.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_10.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_11.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_12.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_13.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_14.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_15.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_16.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_17.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_18.png
    trunk/worlds/greenland/bobs/deer/deer_walk_ne_19.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_03.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_04.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_05.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_06.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_07.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_08.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_09.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_10.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_11.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_12.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_13.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_14.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_15.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_16.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_17.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_18.png
    trunk/worlds/greenland/bobs/deer/deer_walk_nw_19.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_03.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_04.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_05.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_06.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_07.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_08.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_09.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_10.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_11.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_12.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_13.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_14.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_15.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_16.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_17.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_18.png
    trunk/worlds/greenland/bobs/deer/deer_walk_se_19.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_03.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_04.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_05.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_06.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_07.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_08.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_09.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_10.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_11.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_12.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_13.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_14.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_15.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_16.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_17.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_18.png
    trunk/worlds/greenland/bobs/deer/deer_walk_sw_19.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_03.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_04.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_05.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_06.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_07.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_08.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_09.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_10.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_11.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_12.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_13.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_14.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_15.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_16.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_17.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_18.png
    trunk/worlds/greenland/bobs/deer/deer_walk_w_19.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_00.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_01.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_02.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_03.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_04.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_05.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_06.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_07.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_08.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_09.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_10.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_11.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_12.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_13.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_14.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_15.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_16.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_17.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_18.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_idle_wnw_19.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_02.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_03.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_04.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_05.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_06.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_07.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_08.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_09.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_10.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_11.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_12.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_13.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_14.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_15.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_16.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_17.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_18.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_e_19.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_02.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_03.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_04.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_05.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_06.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_07.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_08.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_09.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_10.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_11.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_12.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_13.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_14.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_15.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_16.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_17.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_18.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_ne_19.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_02.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_03.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_04.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_05.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_06.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_07.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_08.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_09.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_10.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_11.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_12.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_13.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_14.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_15.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_16.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_17.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_18.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_nw_19.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_02.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_03.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_04.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_05.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_06.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_07.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_08.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_09.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_10.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_11.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_12.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_13.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_14.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_15.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_16.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_17.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_18.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_se_19.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_02.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_03.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_04.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_05.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_06.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_07.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_08.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_09.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_10.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_11.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_12.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_13.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_14.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_15.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_16.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_17.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_18.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_sw_19.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_02.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_03.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_04.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_05.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_06.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_07.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_08.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_09.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_10.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_11.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_12.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_13.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_14.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_15.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_16.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_17.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_18.png
    trunk/worlds/greenland/bobs/reindeer/reindeer_walk_w_19.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_00.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_01.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_02.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_03.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_04.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_05.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_06.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_07.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_08.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_09.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_10.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_11.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_12.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_13.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_14.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_15.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_16.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_17.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_18.png
    trunk/worlds/winterland/bobs/deer/deer_idle_sw_19.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_03.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_04.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_05.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_06.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_07.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_08.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_09.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_10.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_11.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_12.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_13.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_14.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_15.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_16.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_17.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_18.png
    trunk/worlds/winterland/bobs/deer/deer_walk_e_19.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_03.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_04.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_05.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_06.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_07.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_08.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_09.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_10.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_11.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_12.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_13.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_14.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_15.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_16.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_17.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_18.png
    trunk/worlds/winterland/bobs/deer/deer_walk_ne_19.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_03.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_04.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_05.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_06.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_07.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_08.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_09.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_10.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_11.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_12.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_13.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_14.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_15.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_16.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_17.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_18.png
    trunk/worlds/winterland/bobs/deer/deer_walk_nw_19.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_03.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_04.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_05.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_06.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_07.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_08.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_09.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_10.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_11.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_12.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_13.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_14.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_15.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_16.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_17.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_18.png
    trunk/worlds/winterland/bobs/deer/deer_walk_se_19.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_03.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_04.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_05.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_06.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_07.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_08.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_09.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_10.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_11.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_12.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_13.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_14.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_15.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_16.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_17.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_18.png
    trunk/worlds/winterland/bobs/deer/deer_walk_sw_19.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_03.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_04.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_05.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_06.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_07.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_08.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_09.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_10.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_11.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_12.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_13.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_14.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_15.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_16.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_17.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_18.png
    trunk/worlds/winterland/bobs/deer/deer_walk_w_19.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_00.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_01.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_02.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_03.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_04.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_05.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_06.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_07.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_08.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_09.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_10.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_11.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_12.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_13.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_14.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_15.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_16.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_17.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_18.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_idle_wnw_19.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_02.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_03.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_04.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_05.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_06.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_07.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_08.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_09.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_10.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_11.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_12.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_13.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_14.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_15.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_16.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_17.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_18.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_e_19.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_02.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_03.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_04.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_05.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_06.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_07.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_08.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_09.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_10.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_11.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_12.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_13.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_14.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_15.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_16.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_17.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_18.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_ne_19.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_02.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_03.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_04.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_05.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_06.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_07.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_08.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_09.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_10.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_11.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_12.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_13.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_14.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_15.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_16.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_17.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_18.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_nw_19.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_02.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_03.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_04.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_05.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_06.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_07.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_08.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_09.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_10.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_11.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_12.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_13.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_14.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_15.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_16.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_17.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_18.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_se_19.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_02.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_03.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_04.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_05.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_06.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_07.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_08.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_09.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_10.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_11.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_12.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_13.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_14.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_15.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_16.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_17.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_18.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_sw_19.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_02.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_03.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_04.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_05.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_06.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_07.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_08.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_09.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_10.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_11.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_12.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_13.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_14.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_15.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_16.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_17.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_18.png
    trunk/worlds/winterland/bobs/reindeer/reindeer_walk_w_19.png

Modified: trunk/worlds/blackland/bobs/deer/conf
===================================================================
--- trunk/worlds/blackland/bobs/deer/conf	2007-08-29 18:54:11 UTC (rev 2549)
+++ trunk/worlds/blackland/bobs/deer/conf	2007-08-29 19:10:21 UTC (rev 2550)
@@ -9,6 +9,9 @@
 
 [idle]
 hotspot=5 9
+pics=deer_idle_se_??.png
+fps=20
 
 [walk]
 hotspot=5 9
+fps=20

Modified: trunk/worlds/blackland/bobs/deer/deer_00.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_00.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_00.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_01.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_01.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_02.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_02.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_idle_se_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_idle_se_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_e_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_e_01.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_e_02.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_e_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_e_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_ne_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_ne_01.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_ne_02.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_ne_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_ne_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_nw_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_nw_01.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_nw_02.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_nw_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_nw_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_se_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_se_01.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_se_02.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_se_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_se_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_sw_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_sw_01.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_sw_02.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_sw_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_sw_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_w_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_w_01.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/deer/deer_walk_w_02.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/deer/deer_walk_w_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/deer/deer_walk_w_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/reindeer/conf
===================================================================
--- trunk/worlds/blackland/bobs/reindeer/conf	2007-08-29 18:54:11 UTC (rev 2549)
+++ trunk/worlds/blackland/bobs/reindeer/conf	2007-08-29 19:10:21 UTC (rev 2550)
@@ -9,6 +9,10 @@
 
 [idle]
 hotspot=5 9
+pics=reindeer_idle_wnw_??.png
+fps=20
 
 [walk]
 hotspot=5 9
+fps=20
+

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_00.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_00.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_00.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_01.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_01.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_02.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_02.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_idle_wnw_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_01.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_02.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_02.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_e_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_01.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_02.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_02.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_ne_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_01.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_02.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_02.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_nw_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_01.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_02.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_02.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_se_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_01.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_02.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_02.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_sw_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_01.png
===================================================================
(Binary files differ)

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_02.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_02.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/blackland/bobs/reindeer/reindeer_walk_w_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/desert/bobs/deer/conf
===================================================================
--- trunk/worlds/desert/bobs/deer/conf	2007-08-29 18:54:11 UTC (rev 2549)
+++ trunk/worlds/desert/bobs/deer/conf	2007-08-29 19:10:21 UTC (rev 2550)
@@ -9,6 +9,9 @@
 
 [idle]
 hotspot=5 9
+pics=deer_idle_se_??.png
+fps=20
 
 [walk]
 hotspot=5 9
+fps=20

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_00.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_00.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_01.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_01.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_02.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_02.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_06.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_06.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_07.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_07.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_08.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_08.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_09.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_09.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_10.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_10.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_11.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_11.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_12.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_12.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_13.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_13.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_14.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_14.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_15.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_15.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_16.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_17.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_17.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_18.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_18.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_idle_se_19.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_idle_se_19.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/worlds/desert/bobs/deer/deer_walk_e_00.png
===================================================================
(Binary files differ)

Modified: trunk/worlds/desert/bobs/deer/deer_walk_e_01.png
===================================================================
(Binary files differ)

Added: trunk/worlds/desert/bobs/deer/deer_walk_e_02.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_walk_e_02.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_walk_e_03.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_walk_e_03.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_walk_e_04.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_walk_e_04.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_walk_e_05.png
===================================================================
(Binary files differ)


Property changes on: trunk/worlds/desert/bobs/deer/deer_walk_e_05.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/worlds/desert/bobs/deer/deer_walk_e_06.png
===================================================================
(Binary files differ)



@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2511] trunk/src/editor/ui_menus/ event_move_view_option_menu.cc

From: <sigra@us...> - 2007-08-29 18:14

Revision: 2511
          http://widelands.svn.sourceforge.net/widelands/?rev=2511&view=rev
Author:   sigra
Date:     2007-08-28 07:42:59 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
Fix alignment.

Modified Paths:
--------------
    trunk/src/editor/ui_menus/event_move_view_option_menu.cc

Modified: trunk/src/editor/ui_menus/event_move_view_option_menu.cc
===================================================================
--- trunk/src/editor/ui_menus/event_move_view_option_menu.cc	2007-08-28 14:40:21 UTC (rev 2510)
+++ trunk/src/editor/ui_menus/event_move_view_option_menu.cc	2007-08-28 14:42:59 UTC (rev 2511)
@@ -205,17 +205,17 @@
 
 void Event_Move_View_Option_Menu::clicked(int i) {
 	switch (i) {
-	case  3: m_location.x +=                        100;  break;
+	case  3: m_location.x +=                                      100;  break;
 	case  4: m_location.x -= std::min<X_Coordinate>(m_location.x, 100); break;
-	case  5: m_location.x +=                         10;  break;
+	case  5: m_location.x +=                                       10;  break;
 	case  6: m_location.x -= std::min<X_Coordinate>(m_location.x,  10); break;
-	case  7: m_location.x +=                          1;  break;
+	case  7: m_location.x +=                                        1;  break;
 	case  8: m_location.x -= std::min<X_Coordinate>(m_location.x,   1); break;
-	case  9: m_location.y +=                        100;  break;
+	case  9: m_location.y +=                                      100;  break;
 	case 10: m_location.y -= std::min<Y_Coordinate>(m_location.y, 100); break;
-	case 11: m_location.y +=                         10;  break;
+	case 11: m_location.y +=                                       10;  break;
 	case 12: m_location.y -= std::min<Y_Coordinate>(m_location.y,  10); break;
-	case 13: m_location.y +=                          1;  break;
+	case 13: m_location.y +=                                        1;  break;
 	case 14: m_location.y -= std::min<Y_Coordinate>(m_location.y,   1); break;
 	}
    update();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2510] trunk/src/editor/ui_menus

From: <sigra@us...> - 2007-08-29 18:14

Revision: 2510
          http://widelands.svn.sourceforge.net/widelands/?rev=2510&view=rev
Author:   sigra
Date:     2007-08-28 07:40:21 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
Use Coords.

Modified Paths:
--------------
    trunk/src/editor/ui_menus/event_move_view_option_menu.cc
    trunk/src/editor/ui_menus/event_move_view_option_menu.h

Modified: trunk/src/editor/ui_menus/event_move_view_option_menu.cc
===================================================================
--- trunk/src/editor/ui_menus/event_move_view_option_menu.cc	2007-08-28 13:48:20 UTC (rev 2509)
+++ trunk/src/editor/ui_menus/event_move_view_option_menu.cc	2007-08-28 14:40:21 UTC (rev 2510)
@@ -38,11 +38,9 @@
 Event_Move_View_Option_Menu::Event_Move_View_Option_Menu(Editor_Interactive* parent, Event_Move_View* event) :
 UI::Window(parent, 0, 0, 180, 200, _("Move View Event Options").c_str()),
 m_event   (event),
-m_parent  (parent)
+m_parent  (parent),
+m_location(event->get_coords())
 {
-   Coords pt=event->get_coords();
-   m_x=pt.x;
-   m_y=pt.y;
    const int offsx=5;
    const int offsy=25;
    int spacing=5;
@@ -200,25 +198,25 @@
 
 void Event_Move_View_Option_Menu::clicked_ok() {
 	if (m_name->get_text()) m_event->set_name(m_name->get_text());
-	m_event->set_coords(Coords(m_x, m_y));
+	m_event->set_coords(m_location);
 	end_modal(1);
 }
 
 
 void Event_Move_View_Option_Menu::clicked(int i) {
-   switch (i) {
-      case 3: m_x+=100; break;
-      case 4: m_x-=100; break;
-      case 5: m_x+=10; break;
-      case 6: m_x-=10; break;
-      case 7: m_x+=1; break;
-      case 8: m_x-=1; break;
-      case 9: m_y+=100; break;
-      case 10: m_y-=100; break;
-      case 11: m_y+=10; break;
-      case 12: m_y-=10; break;
-      case 13: m_y+=1; break;
-      case 14: m_y-=1; break;
+	switch (i) {
+	case  3: m_location.x +=                        100;  break;
+	case  4: m_location.x -= std::min<X_Coordinate>(m_location.x, 100); break;
+	case  5: m_location.x +=                         10;  break;
+	case  6: m_location.x -= std::min<X_Coordinate>(m_location.x,  10); break;
+	case  7: m_location.x +=                          1;  break;
+	case  8: m_location.x -= std::min<X_Coordinate>(m_location.x,   1); break;
+	case  9: m_location.y +=                        100;  break;
+	case 10: m_location.y -= std::min<Y_Coordinate>(m_location.y, 100); break;
+	case 11: m_location.y +=                         10;  break;
+	case 12: m_location.y -= std::min<Y_Coordinate>(m_location.y,  10); break;
+	case 13: m_location.y +=                          1;  break;
+	case 14: m_location.y -= std::min<Y_Coordinate>(m_location.y,   1); break;
 	}
    update();
 }
@@ -227,17 +225,15 @@
  * update function: update all UI elements
  */
 void Event_Move_View_Option_Menu::update() {
-   if (m_x<0) m_x=0;
-   if (m_y<0) m_y=0;
-	const Map & map = m_parent->egbase().map();
-	const X_Coordinate mapwidth  = map.get_width ();
-	const Y_Coordinate mapheight = map.get_height();
-	if (m_x >= static_cast<const int>(mapwidth))  m_x = mapwidth  - 1;
-	if (m_y >= static_cast<const int>(mapheight)) m_y = mapheight - 1;
+	const Extent extent = m_parent->egbase().map().extent();
+	if (extent.w <= static_cast<const Uint16>(m_location.x))
+		m_location.x = extent.w - 1;
+	if (extent.h <= static_cast<const Uint16>(m_location.y))
+		m_location.y = extent.h - 1;
 
-   char buf[200];
-   sprintf(buf, "%i", m_x);
+   char buf[6];
+	snprintf(buf, sizeof(buf), "%i", m_location.x);
    m_x_ta->set_text(buf);
-   sprintf(buf, "%i", m_y);
+   snprintf(buf, sizeof(buf), "%i", m_location.y);
    m_y_ta->set_text(buf);
 }

Modified: trunk/src/editor/ui_menus/event_move_view_option_menu.h
===================================================================
--- trunk/src/editor/ui_menus/event_move_view_option_menu.h	2007-08-28 13:48:20 UTC (rev 2509)
+++ trunk/src/editor/ui_menus/event_move_view_option_menu.h	2007-08-28 14:40:21 UTC (rev 2510)
@@ -49,7 +49,7 @@
       Editor_Interactive* m_parent;
 
       UI::Edit_Box* m_name;
-      int         m_x, m_y;
+	Coords m_location;
       UI::Textarea* m_x_ta, *m_y_ta;
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2508] trunk/src/widelands_map_flagdata_data_packet. cc

From: <sigra@us...> - 2007-08-29 18:13

Revision: 2508
          http://widelands.svn.sourceforge.net/widelands/?rev=2508&view=rev
Author:   sigra
Date:     2007-08-28 05:54:12 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
Fix Coords IO.

Modified Paths:
--------------
    trunk/src/widelands_map_flagdata_data_packet.cc

Modified: trunk/src/widelands_map_flagdata_data_packet.cc
===================================================================
--- trunk/src/widelands_map_flagdata_data_packet.cc	2007-08-28 12:23:37 UTC (rev 2507)
+++ trunk/src/widelands_map_flagdata_data_packet.cc	2007-08-28 12:54:12 UTC (rev 2508)
@@ -23,11 +23,11 @@
 #include "editor.h"
 #include "editorinteractive.h"
 #include "editor_game_base.h"
-#include "fileread.h"
-#include "filewrite.h"
 #include "map.h"
 #include "player.h"
 #include "transport.h"
+#include "widelands_fileread.h"
+#include "widelands_filewrite.h"
 #include "widelands_map_data_packet_ids.h"
 #include "widelands_map_map_object_loader.h"
 #include "widelands_map_map_object_saver.h"
@@ -54,7 +54,7 @@
    if (skip)
       return;
 
-   FileRead fr;
+	WidelandsFileRead fr;
    try {
       fr.Open(fs, "binary/flag_data");
 	} catch (...) {
@@ -62,11 +62,10 @@
       return ;
 	}
 
-   // First packet version
-   int packet_version=fr.Unsigned16();
-
-   if (packet_version==CURRENT_PACKET_VERSION) {
-      while (1) {
+	const Uint16 packet_version = fr.Unsigned16();
+	if (packet_version == CURRENT_PACKET_VERSION) {
+		const Extent extent = egbase->map().extent();
+		for (;;) {
          uint ser=fr.Unsigned32();
 
          if (ser==0xffffffff) break; // end of flags
@@ -78,8 +77,20 @@
          // The owner is already set, nothing to do from
          // PlayerImmovable
 
-         flag->m_position.x=fr.Unsigned16();
-         flag->m_position.y=fr.Unsigned16();
+			try {flag->m_position = fr.Coords32(extent);}
+			catch (const WidelandsFileRead::Width_Exceeded e) {
+				throw wexception
+					("Widelands_Map_Flagdata_Data_Packet::Read: in "
+					 "binary/flag_data:%u: flag %u has x coordinate %i, but the map "
+					 "width is only %u",
+					 e.position, ser, e.x, e.w);
+			} catch (const WidelandsFileRead::Height_Exceeded e) {
+				throw wexception
+					("Widelands_Map_Flagdata_Data_Packet::Read: in "
+					 "binary/flag_data:%u: flag %u has y coordinate %i, but the map "
+					 "height is only %u",
+					 e.position, ser, e.y, e.h);
+			}
          flag->m_animstart=fr.Unsigned16();
          int building=fr.Unsigned32();
          if (building) {
@@ -148,14 +159,9 @@
 
          ol->mark_object_as_loaded(flag);
 		}
-
-
-      // DONE
-      return;
-	}
-   throw wexception("Unknown version %i in Widelands_Map_Flagdata_Data_Packet!\n", packet_version);
-
-   assert(0);
+	} else throw wexception
+		("Unknown version %u in Widelands_Map_Flagdata_Data_Packet!",
+		 packet_version);
 }
 
 
@@ -168,21 +174,17 @@
  Widelands_Map_Map_Object_Saver * const os)
 throw (_wexception)
 {
-   FileWrite fw;
+	WidelandsFileWrite fw;
 
    // now packet version
    fw.Unsigned16(CURRENT_PACKET_VERSION);
 
-   Map* map=egbase->get_map();
-   for (ushort y=0; y<map->get_height(); y++) {
-      for (ushort x=0; x<map->get_width(); x++) {
-         Field* f=map->get_field(Coords(x, y));
-         BaseImmovable* imm=f->get_immovable();
-         if (!imm) continue;
-
-         if (imm->get_type()==Map_Object::FLAG) {
-            Flag* flag=static_cast<Flag*>(imm);
-
+	const Map & map = egbase->map();
+	const Field & fields_end = map[map.max_index()];
+	for (Field * field = &map[0]; field < &fields_end; ++field) if //  FIXME field should be "const Field *"
+		(Flag * const flag =
+		 dynamic_cast<Flag * const>(field->get_immovable()))
+	{
             assert(os->is_object_known(flag));
             assert(!os->is_object_saved(flag));
 
@@ -191,9 +193,7 @@
 
             // Owner is already written in the existanz packet
 
-            // Write position
-            fw.Unsigned16(flag->m_position.x);
-            fw.Unsigned16(flag->m_position.y);
+		fw.Coords32  (flag->m_position);
 
             // Animation is set by creator
             fw.Unsigned16(flag->m_animstart);
@@ -261,22 +261,9 @@
 
             os->mark_object_as_saved(flag);
 
-            // Path finding variables are not saved.
-            //fw.Unsigned32(flag->mpf_cycle);
-            //fw.Signed32(flag->mpf_heapindex);
-            //fw.Signed32(flag->mpf_realcost);
-            //if (flag->mpf_backlink) {
-            //   assert(os->is_object_known(flag->mpf_backlink));
-            //   fw.Unsigned32(os->get_object_file_index(flag->mpf_backlink));
-            //} else
-            //   fw.Unsigned32(0);
-            //fw.Signed32(flag->mpf_estimate);
-			}
-		}
 	}
 
    fw.Unsigned32(0xffffffff); // End of flags
 
    fw.Write(fs, "binary/flag_data");
-   // DONE
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2509] trunk/src/minimap.cc

From: <sigra@us...> - 2007-08-29 18:10

Revision: 2509
          http://widelands.svn.sourceforge.net/widelands/?rev=2509&view=rev
Author:   sigra
Date:     2007-08-28 06:48:20 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
Do not set Coords::x and Coords::y directly. Use the constructor instead.

Modified Paths:
--------------
    trunk/src/minimap.cc

Modified: trunk/src/minimap.cc
===================================================================
--- trunk/src/minimap.cc	2007-08-28 12:54:12 UTC (rev 2508)
+++ trunk/src/minimap.cc	2007-08-28 13:48:20 UTC (rev 2509)
@@ -88,11 +88,8 @@
 bool MiniMap::View::handle_mousepress(const Uint8 btn, int x, int y) {
 	if (btn != SDL_BUTTON_LEFT) return false;
 
-		Coords c;
-
 		// calculates the coordinates corresponding to the mouse position
-      c.x = m_viewx + 1 - (get_w() / 2) + x;
-      c.y = m_viewy + 1 - (get_h() / 2) + y;
+	Coords c(m_viewx + 1 - get_w() / 2 + x, m_viewy + 1 - get_h() / 2 + y);
 
 	m_iabase.egbase().map().normalize_coords(&c);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2548] trunk/src/worker_program.h

From: <sigra@us...> - 2007-08-29 16:51

Revision: 2548
          http://widelands.svn.sourceforge.net/widelands/?rev=2548&view=rev
Author:   sigra
Date:     2007-08-29 09:49:50 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Use initializer list, pass std::string by constant reference and make the WorkerProgram::name constant (we are certainly not going to change it).

Modified Paths:
--------------
    trunk/src/worker_program.h

Modified: trunk/src/worker_program.h
===================================================================
--- trunk/src/worker_program.h	2007-08-29 16:36:20 UTC (rev 2547)
+++ trunk/src/worker_program.h	2007-08-29 16:49:50 UTC (rev 2548)
@@ -42,8 +42,8 @@
 											   Parser* parser,
 											   const std::vector<std::string>&);
 
-		WorkerProgram(std::string name) {m_name = name;}
-		virtual ~WorkerProgram() {}
+	WorkerProgram(const std::string & name) : m_name(name) {}
+	virtual ~WorkerProgram() {}
 
 		std::string get_name() const {return m_name;}
 		int get_size() const {return m_actions.size();}
@@ -101,7 +101,7 @@
 		void parse_playFX(Worker_Descr*, Worker::Action* act, Parser* parser,
 		                  const std::vector<std::string>& cmd);
 
-		std::string                 m_name;
+	const std::string                 m_name;
 		std::vector<Worker::Action> m_actions;
 		static const ParseMap       s_parsemap[];
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2547] trunk/src/ui/ui_fs_menus/ fullscreen_menu_campaign_select.cc

From: <nasenbaer_peter@us...> - 2007-08-29 16:36

Revision: 2547
          http://widelands.svn.sourceforge.net/widelands/?rev=2547&view=rev
Author:   nasenbaer_peter
Date:     2007-08-29 09:36:20 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Improvement of Campaign UI by Erik Sigra.

Modified Paths:
--------------
    trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.cc

Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.cc	2007-08-29 12:03:18 UTC (rev 2546)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.cc	2007-08-29 16:36:20 UTC (rev 2547)
@@ -102,7 +102,6 @@
 		char cname[12];
 		char cdifficulty[12];
 		char cdescription[12];
-		std::string difficulty;
 
 		// Load maps textdomain to translate the strings from cconfig
 		i18n::grab_textdomain("maps");
@@ -121,21 +120,20 @@
 		sprintf(cdescription, "campdesc%i", i);
 
 		// Convert difficulty level to something understandable
-		const char * const dif_descriptions[] = {
-		_("[No value found]").c_str(),
-		_("Easy living").c_str(),
-		_("Be vigilant").c_str(),
-		_("Hard struggle").c_str()
+		static const std::string dif_descriptions[] = {
+			_("[No value found]"),
+			_("Easy living"),
+			_("Be vigilant"),
+			_("Hard struggle")
 		};
 
 		uint dif = s->get_int(cdifficulty);
 		if (sizeof(dif_descriptions) / sizeof(*dif_descriptions) <= dif)
 			dif = 0;
-		difficulty = dif_descriptions[dif];
 
 		// Print informations
 		tacampname.set_text(s->get_string(cname, _("[No value found]").c_str()));
-		tadifficulty.set_text(difficulty);
+		tadifficulty.set_text(dif_descriptions[dif]);
 		tacampdescr.set_text(s->get_string(cdescription, _("[No value found]").c_str()));
 
 	} else { // normally never here


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Widelands-cvs] SF.net SVN: widelands: [2545] trunk/utils/spurious_source_code_regexps

From: <sigra@us...> - 2007-08-29 12:01

Revision: 2545
          http://widelands.svn.sourceforge.net/widelands/?rev=2545&view=rev
Author:   sigra
Date:     2007-08-29 05:01:32 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Detect some deprecated casts.

Modified Paths:
--------------
    trunk/utils/spurious_source_code_regexps

Modified: trunk/utils/spurious_source_code_regexps
===================================================================
--- trunk/utils/spurious_source_code_regexps	2007-08-29 10:08:06 UTC (rev 2544)
+++ trunk/utils/spurious_source_code_regexps	2007-08-29 12:01:32 UTC (rev 2545)
@@ -12,4 +12,5 @@
 (for|if|while) \((/[^/*]|[^/])*\) (/[^/*]|[^/])*[^){};\\]$
 _cast<const( +[_a-zA-Z][_a-zA-Z0-9]*)* *>
 _cast<( *[_a-zA-Z][_a-zA-Z0-9]*)* *\* *const *>
+\( *(void|float|double|u?(char|short|int)|[US]int(8|16|32)) *\) *[^ :;{)=]
 snprintf *\( *[_a-zA-Z][_a-zA-Z0-9]* *, *[[:digit:]]+
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Next Messages