Merge lp:~victor-pelt/widelands/workers into lp:widelands

[Victor Pelt]

implement an evict button as well as a production program
to merge after build 15

[lp:~victor-pelt/widelands/workers]

5189. By Victor Pelt <peltco@Voyager> on 2010-04-03

code cleanup
passing by reference
const issues

[SirVer (sirver)]

Looks good so far. Just two things: there are text conflicts against trunk, there will likely be some more when Lua is merged. Second: what does the worker program do? Is this to automatically evict workers? Can you provide a proof of concept enhancement to eg. one of the mines?

review: Needs Fixing

[lp:~victor-pelt/widelands/workers]

5190. By SirVer on 2010-04-04

Merged atlantean castle menu graphics update

5191. By Victor Pelt <peltco@Voyager> on 2010-04-04

fix for non-opengl capable system

5192. By Victor Pelt <peltco@Voyager> on 2010-04-04

style fixes

5193. By SirVer on 2010-04-05

Fixed a small bug in buildlocale.py

5194. By SirVer on 2010-04-07

Two colored empire flag

5195. By SirVer on 2010-04-07

Made Atlantean flag plateau smaller. The clipping bug is then very hard to see and maybe does not longer disturb. Also made the atlantean flag two colored

5196. By SirVer on 2010-04-07

Moved some mac os x packagers to the section where they belong.

5197. By SirVer on 2010-04-09

merged hotspot fixes for barbarians

5198. By SirVer on 2010-04-10

Merged chucks resized barbarian buildings

5199. By SirVer on 2010-04-10

Merged chucks fixed scouts hut picture

5200. By SirVer on 2010-04-10

Atlantean flag was too dark. Lightened it up a bit

5201. By SirVer on 2010-04-10

Merged latest translations

5202. By SirVer on 2010-04-12

Merged Tinos usage fixes branch

5203. By SirVer on 2010-04-12

Added a tool to quickly detect and fix illegal line breaks in translations

5204. By SirVer on 2010-04-12

Merged latest translations

5205. By SirVer on 2010-04-12

Fixed remaining illegal linebreaks in translations

5206. By SirVer on 2010-04-12

Fixed --localedir cmdline option which would only work for the very first textdomain grabbed

[Nicolai Hähnle (nha)]

1. In Player::evict:
1a. the bulldoze parameter is meaningless
1b. the check should be PCap_Evict instead of PCap_Bulldoze
1c. never throw an exception in code that is triggered from PlayerCommands, otherwise a rogue client could cause a server crash. So just print a diagnostic log() instead of the exception (also, there is a typo in the message)

2. Cmd_Evict:
2a. again, the recurse parameter makes no sense
2b. what's the point of starting a newly created command save format at version 2?

3. I am also curious about what the part in the worker program is good for.

4. You typo'd "bulldoze" in a file name. (Ironically, I did the exact same refactoring of BulldozeConfirm in my branch lp:~nha/widelands/refactor-building-ui; too bad I didn't see your changes before, we'll have to do some manual merging there)

5. In your wui changes, the PCap_Evict check is commented out, respectively incorrectly a PCap_Bulldoze check in the EvictConfirm dialog.

review: Needs Fixing

[lp:~victor-pelt/widelands/workers]

5207. By SirVer on 2010-04-16

Reintroduced fix for bug introduced in 5169 which was accidentally reverted in the merge commit 5196. Damn

5208. By SirVer on 2010-04-16

Merged ~360 commits worth of Lua enhancements. This commit breaks scenario save
games and maybe other save games as well.

- Added Lua implementation, including persitence layer, tests, documentation,
  internationalization in scripts
- Added documentation for the widelands richt text and a tutorial.
- Removed Triggers, Events, Map variables + all UI for it. Removed Command
  Checking for Triggers and Events.
- Ported all scenario maps in campaigns and the green valley to Lua
- Introduced Player initialization via Lua. Added documentation for it.
- Also introduced Lua into the Editor. This is work in progress, doesn't hurt at
  the moment but doesn't help either.
- Added a new tutorial explaining the game basics. Work in Progress.

5209. By Nicolai Hähnle on 2010-04-16

Merge lp:~nha/widelands/fixes

Changes:
- Improve soldier performance (bug #536211)
- Workers reserve immovables they are going to work on (bug #536297)
- Improve text edit behavior when entering very long chat messages
- Reduce log()-message spam on the console (use --verbose to reenable)
- Various general cleanups

5210. By SirVer on 2010-04-16

Update translation templates. Testing lua gettext

5211. By SirVer on 2010-04-16

Merged Nasenbaer's and my win-condition branch

- Add possibility to script winning conditions via Lua
- Only two very simple scripts are included which could use some improvement. I
  trust that others will take this over.

Note: This code is most useful in network games but has not been tested in one.
It should be safe though as it should be completely deterministic.

5212. By SirVer on 2010-04-16

Fixed a typo in utils/buildcat.py

5213. By SirVer on 2010-04-16

Update translation templates to include win conditions

5214. By Nasenbaer on 2010-04-17

Do not hardcode language list anymore - this A) makes it easier and more dynamic to add languages (no recompile) - and B) will now only show the installed/found languages.

5215. By Nasenbaer on 2010-04-17

Merge current version of my map fixes and improvements branch

5216. By Nasenbaer on 2010-04-17

use localedir from config/commandline instead of hardcoded 'locale' in language selection.

5217. By SirVer on 2010-04-17

Merge chucks menu worker pictures

5218. By SirVer on 2010-04-17

Fixed tutorial start up which got broken through win-conditions merge

5219. By SirVer on 2010-04-17

Story Message Boxes should not be closed by right clicking, otherwise they are accidentally closed when they pop up

5220. By Nasenbaer on 2010-04-17

As requested by the chieftain ;) - here is a new map for the new excellent tutorial

5221. By Nicolai Hähnle on 2010-04-17

Merge lp:~aber/widelands/osx-locale-path-fix:

    David Allwicher 2010-04-16 [OSX] locale path fix

5222. By Nicolai Hähnle on 2010-04-17

Loading: preserve compatibility with build15, drop compat for build <=10

5223. By Nicolai Hähnle on 2010-04-17

Merge lp:~nha/widelands/refactor-building-ui

Building windows with multiple "pages" consistently use tabs to switch between
them. Furthermore, some fixes to selections in the soldiers list as well
as general cleanups and refactorings in the wui code.

  Nicolai Hähnle 2010-04-17 wui: Improve UI::Table sorting and cleanup GameMessageMenu
  Nicolai Hähnle 2010-04-17 wui: Refactor building windows to use a consistent tabbed scheme
  Nicolai Hähnle 2010-04-16 wui: Minor cleanups
  Nicolai Hähnle 2010-04-14 wui: Factor common soldier list functionality into a new SoldierList class
  Nicolai Hähnle 2010-04-14 UI::Table: Fix selection update when item is removed
  Nicolai Hähnle 2010-04-14 wui: Move remaining building windows into separate files
  Nicolai Hähnle 2010-04-14 wui: Fix build errors
  Nicolai Hähnle 2010-04-14 wui: Extract some building windows into their own source files
  Nicolai Hähnle 2010-04-13 wui: Move BulldozeConfirm and WaresQueueDisplay out into separate files
  Nicolai Hähnle 2010-04-13 wui: Add comments

5224. By Nicolai Hähnle on 2010-04-17

Attempt to fix build problem with older versions of g++

5225. By Timowi on 2010-04-18

Changed reference to pointer

5226. By Jens Beyer (Qcumber-some) on 2010-04-18

Added scripting dir to symlinks for make lang

5227. By Nicolai Hähnle on 2010-04-18

Fix MapObjectDebugWindow to conform with new UI layouting semantics

5228. By Jens Beyer (Qcumber-some) on 2010-04-18

make install should copy the scripting dir

5229. By Nicolai Hähnle on 2010-04-18

Add "mapobject" command to debug console to open debug windows

Also, improve usability of this feature when the mapobject refers to a flag.

5230. By Timowi on 2010-04-18

Small fix to build_and_run script to accept more than one option to CFLAGS

5231. By Nicolai Hähnle on 2010-04-18

Carrier & Flag: additional log_general_info() info for debuggin

5232. By Nicolai Hähnle on 2010-04-18

Fix a subtle bug when roads are removed and built again

When a road attached to a flag was removed while its carrier was on its way
to pick up an item, then depending on the precise circumstances, this item
was sometimes not reset as waiting for a carrier.

As a result, when the exact same road was then later rebuilt, the item could
get stuck "forever".

5233. By SirVer on 2010-04-18

Merged Soeb's spelling fixes

5234. By SirVer on 2010-04-18

Merged english improvements branch for barbarians mission 1 by angreeone

5235. By SirVer on 2010-04-18

Language fixes in some scenario texts by Hanna

5236. By Victor Pelt <peltco@Voyager> on 2010-04-18

relative code paths for linux

5237. By Victor Pelt <peltco@Voyager> on 2010-04-18

allow changes of the widelands 'home' directory (where saves/replays are stored)

5238. By SirVer on 2010-04-18

Renamed aux.rst because it is a reserved filename under windows

5239. By SirVer on 2010-04-19

Added an include to fix compilation on mingw

5240. By SirVer on 2010-04-19

Merged chucks awesome new worker set

5241. By SirVer on 2010-04-19

Added a new animation to constructionsites that is played as soon as the builder arrives there

5242. By Timowi on 2010-04-19

Catch segfault if amount>max_amount. Throws gamedata exception now

5243. By Victor Pelt <peltco@Voyager> on 2010-04-19

idx should be unsigned (non negative)

5244. By Victor Pelt <peltco@Voyager> on 2010-04-19

remove dead code

5245. By SirVer on 2010-04-19

Fixed a mistake in lua script registering on windows

5246. By SirVer on 2010-04-20

Replaced some placeholder graphics with better placeholder graphics by chuckw

5247. By Nicolai Hähnle on 2010-04-20

Fix bug #566246: Broken Building Statistics Window due to recent UI changes

5248. By Nicolai Hähnle on 2010-04-20

Show workarea by default and move BuildingWindow such that mouse is over workarea button

See bug #566250. The accidental feature referenced in that bug report is thus
made official.

5249. By SirVer on 2010-04-21

Fixed some english in emp01.wmf

5250. By SirVer on 2010-04-21

Updated language catalogs

5251. By Jari Hautio on 2010-04-21

Fixed invalid assignment that caused editor to crash on windows.

5252. By Jari Hautio on 2010-04-21

Fixed to build with visual studio.

5253. By SirVer on 2010-04-22

Made empire barracks more useful

5254. By SirVer on 2010-04-22

added some more starting ironore to t03.wmf and fixed bug that red player could be settled around

5255. By SirVer on 2010-04-22

added cattlefarm + a small message to t03.wmf

5256. By Nasenbaer on 2010-04-23

Fix regression from my language selection change - now English is shown again. Further change 'System default language' to 'Try system language', as not all languages are available.

5257. By Nasenbaer on 2010-04-23

Merge current version of my map_fixes_and_improvements branch

5258. By Nasenbaer on 2010-04-23

Fix directory browsing in Map save dialog of the editor + a bunch of comment fixes

5259. By SirVer on 2010-04-23

Merged new builder animations from chuck

5260. By SirVer on 2010-04-24

Merged new worker graphics from chuck

5261. By Nasenbaer on 2010-04-24

merge current version of map_fixes_and_improvements branch

5262. By Nicolai Hähnle on 2010-04-24

Change the sudden death key from F10 to Ctrl+F10

This should be enough to stop people from hitting it by accident.

5263. By Nicolai Hähnle on 2010-04-24

Fix bug #568371: Stray numbers in player table in GGZ menu

Sorting by user type is now done explicitly.

5264. By Nicolai Hähnle on 2010-04-24

Stock menu: Use tabs and add warehouse-only tabs

This fixes bugs #568368 and #568366 (rather, wishlist items).

5265. By Nicolai Hähnle on 2010-04-24

Add hotkeys N, G, and Delete to message window

N: toggle the message window
G: go to currently viewed message
Delete: archive the currently viewed message

5266. By Nicolai Hähnle on 2010-04-24

Fix bug #536373: Race between "transfer" and "cancel" signals

If a gowarehouse task received a transfer (and thus a "transfer" signal), but
the transfer is almost immediately cancelled before the gowarehouse task is
replaced by a transfer task, the transfer wasn't cleaned up properly. Fix this
problem.

Additionally, don't fail a transfer immediately just because we've been
blocked by a battle (this avoid crazy ping-pong generation and cancellation
of transfers, and so should also help performance during battle).

5267. By Nicolai Hähnle on 2010-04-24

Show full length of wares queues

5268. By Nicolai Hähnle on 2010-04-24

Give fugitives a higher chance to find home successfully.

5269. By Jari Hautio on 2010-04-24

Options dialog uses no a copy of SDL_PixelFormat structure instead of changing bitperpixel always to 32pbm.

5270. By Nasenbaer on 2010-04-25

Fix bug #569686 - Gametype is selectable when loading a multiplayer game + some code improvements (working towards a fix for 569737)

5271. By Nasenbaer on 2010-04-25

Fix bug #569737 - failed assert when trying to overwrite save

5272. By Jens Beyer on 2010-04-25

Small typo in texts, failing make lang, corrected

[Victor Pelt (victor-pelt)]

barbarians have a 'training mine' worker will get kicked out when no experience is needed. this is to showcase the capabilities not intended as is. but it allows for writing more complex programs /buildings (like a school where workers leave)

todo: eject just a specific worker. right now it's an all or nothing thing
todo: code cleanup

want to get this in before build 16 but will do code cleanup first

[lp:~victor-pelt/widelands/workers]

5273. By SirVer on 2010-04-26

Merged new graphics from chuck

5274. By SirVer on 2010-04-27

Adding UI scripting + watch-me-do functionality for tutorials:

- Added UI::NamedPanel, a UI::Panel with a name so that it can be accessed from
  Lua
- Changed UI::TabPanel so that Tabs are NamedPanels
- Changed UI::Button so that Buttons are Named Panels
- Changed UI::Icongrid to use Flat buttons instead of custom homebrewn code.
  Removed a lot of dead code there.
- added wl.ui module that allows for UI scripting. It represents the user interface as Tree structure
  with wl.ui.MapView as root. Added tests and documentation.
- Moved some UI related stuff from wl.game.Player to wl.ui.MapView
- Renamed some functions in the auxiliary library, added new convenient functions.
- Enhanced the tutorial.

5275. By SirVer on 2010-04-27

Merged chucks farm productivity balance fixes

5276. By SirVer on 2010-04-27

Updated messages catalog

5277. By SirVer on 2010-04-27

Fixed a typo: the tutorial started in the middle

5278. By SirVer on 2010-04-27

Updated catalogs again

5279. By SirVer on 2010-04-27

Fixed textdomain in tutorial

5280. By Raul Ferriz on 2010-04-27

Restored behavior on capacity buttons at soldier capacity control.

5281. By SirVer on 2010-04-28

Merged latest frontier graphics from chuck

5282. By SirVer on 2010-04-29

Fixed a type

5283. By SirVer on 2010-04-29

Typo fixes from chuck

5284. By SirVer on 2010-04-29

Removed some remaining documentation for triggers and events

5285. By Nicolai Hähnle on 2010-04-30

Fix bug #572383: Wrong usage of constructors

Patch by Pavol Rusnak

5286. By Nicolai Hähnle on 2010-05-01

Remove flag display in the building statistic menu (bug #568373)

5287. By Nicolai Hähnle on 2010-05-01

Remove legacy code in loading routines, breaking compatibility with build <=12

Savegames created using build13 or later should in theory still work, and at
least superficial testing works fine.

5288. By SirVer on 2010-05-03

Big update to the tutorial mission

Tutorial scenario:
* made tutorial more robust against bad user input
  - by allowing user input to be completely suppressed
  - by adding a coroutine that rips everything the user builds when he shouldn't build anything.
* typo and grammatical fixes
* added infos about census & statistics
* added a chapter about resources & mining
* added infos about the mini map
* added a chapter about soldiers, training and warfare
* added mission objectives

Code:
* minimal Lua wrappings for constructionsites
* new functions to suppress user input processing in the UI
* new property fields in base immovables that offers the reverse mapping from Field.immovable
* possibility to disable autosave from lua code. This should get rid of a few
  "Attemping to persist a c function errors"

5289. By SirVer on 2010-05-03

Fixed a stupidity glitch from me

5290. By SirVer on 2010-05-03

Added stack traceback to debug output.

5291. By SirVer on 2010-05-03

Fixed a bug related to build in iterator functions pairs() and ipairs().

5292. By SirVer on 2010-05-03

Fixed a bug in the tutorial where the quarry constructionsite could already be gone, but we tried to access its field

5293. By SirVer on 2010-05-04

Fixed a regression were names of buildings were not displayed in the build grid

5294. By SirVer on 2010-05-04

Major overhaul of t02.wmf

- removed all game logic from the texts lua file
- added micro-brewery and cattlefarm objectives
- revamped and relayouted a lot of text. This invalidates a lot of translations.
- Removed duplicated text.
- Layouting is now done via functions to make the content easier editable.

5295. By SirVer on 2010-05-04

Fixed a small bug in lua-xgettext.py. Added a missing " in t02.wmf

5296. By SirVer on 2010-05-04

Merged amazing new graphics form chuck

5297. By Nicolai Hähnle on 2010-05-04

Fix bug #574500: Regression from rev 5287 due to versioning confusion

The old code saved preload packages of games as version 1 when no interactive
player was present, without documenting it well. This caused some confusion
that should now be fixed properly.

5298. By Chuck Wilder on 2010-05-04

Add new barbarian helmsmith to match the one in the building and a barbarian farmer workload animation

5299. By Chuck Wilder on 2010-05-05

Added new barbarian master-blacksmith and weaver workers.

5300. By Chuck Wilder on 2010-05-05

Added new barbarian baker worker.

5301. By Chuck Wilder on 2010-05-06

Added PlayerColor to cloth and spidercloth wares for all tribes so weavers will now produce cloth in a player's own color.

5302. By Chuck Wilder on 2010-05-07

New barbarian trainer, miner, chief-miner, and master-miner worker animations

5303. By Raul Ferriz on 2010-05-07

Change: Healing soldiers on militarysites.
Now only one soldier is healed a time.

5304. By Raul Ferriz on 2010-05-07

Reduced healing on barbarian military sites.

5305. By Raul Ferriz on 2010-05-07

Reduced healing on empire military sites.

5306. By Raul Ferriz on 2010-05-07

Reduced healing on atlantean military sites.

5307. By Raul Ferriz on 2010-05-07

Adjusted healing on conquested buildings.

5308. By Raul Ferriz on 2010-05-07

Remove unused medic code

5309. By Raul Ferriz on 2010-05-07

Update Changelog

5310. By Nasenbaer on 2010-05-07

Fix for compilation without bzr files in path

5311. By Chuck Wilder on 2010-05-07

New barbarian brewer and master-brewer workers

5312. By Nasenbaer on 2010-05-08

fix for language list initial selection

5313. By Nasenbaer on 2010-05-08

DefaultAI improvement

5314. By Chuck Wilder on 2010-05-08

New barbarian burner worker and reduced size of frontier markers for atlantean and empire tribes

5315. By Chuck Wilder on 2010-05-08

New barbarian cattlebreeder worker and adjusted hotspot for barbarian builder walking animation

5316. By Nicolai Hähnle on 2010-05-08

Fix a regression introduced by r5313: Do not divide by zero

5317. By Nicolai Hähnle on 2010-05-09

Merge soldier-cleanup: Calculate soldier attributes directly from levels

5318. By Nicolai Hähnle on 2010-05-09

Experience required by workers per level is no longer random

Previously, required experience was rolled randomly between a min and max
value. Now, it is always deterministically the same value depending on the
worker type.

5319. By Nicolai Hähnle on 2010-05-09

logic/immovable.cc: Cleanup unused variables

5320. By Nicolai Hähnle on 2010-05-09

Merge branch bob-saving

All classes derived from Bob now use the new save system.

5321. By Nicolai Hähnle on 2010-05-09

graphic/render.cc: Fix format string

5322. By Nicolai Hähnle on 2010-05-09

Fix a typo in an error message, pointed out by TinoM

5323. By SirVer on 2010-05-09

New soldier Stats with improved readability

5324. By SirVer on 2010-05-09

Fixed a bug in the tutorial

5325. By SirVer on 2010-05-10

Merged chucks lates graphic creations

5326. By Chuck Wilder on 2010-05-10

Last of the new barbarian worker models! Innkeeper, lime-burner, and smelter

[Nasenbaer (nasenbaer)]

still needs fixing - did not chekout, build and test, but I can already see two problems:

* build_and_run.sh will not work on systems that do not have ccache and it will definitely not work on Windows plattforms. This is not acceptable as it is meant as general tool for all platforms
* The trainingsmine might be good as test, however it should not go to trunk + this way Barbarians will not be playable at all atm, as the building is missing in your bzr.

Please do not be demotivated from this post - the general idea is great and we need this feature - will try to check the code changes once i find some more time.

review: Needs Fixing

[lp:~victor-pelt/widelands/workers]

5327. By Timowi on 2010-05-11

* speedup RenderTarget::brighten_rect
* avoid usage of brighten_rect by caching some ui elements
* cache tribenames in playerdescrgroup

5328. By SirVer on 2010-05-11

Fixed a typo in the tutorial

5329. By Victor Pelt <peltco@Voyager> on 2010-05-12

fix bug with nosound option

5330. By Nicolai Hähnle on 2010-05-12

Introduce cookie_priority_queue, used by pathfinding algorithms

This template class provides a priority queue that, unlike the STL
priority_queue, requires a cookie field in the objects that are stored in the
queue. This cookie field is used to implement decrease_key (and also the
typically less used increase_key) operations efficiently.

Thus the previously duplicated functionality of RoutingNodeQueue and StarQueue
is now unified in this new template class.

5331. By Nicolai Hähnle on 2010-05-12

Add new keyboard shortcuts for quick navigation

Ctrl+0 to Ctrl+9 remembers the current location, pressing 0 to 9 recalls it.
Pressing the comma ',' key goes back to the last seen location, the period '.'
key goes forward.

5332. By Nicolai Hähnle on 2010-05-13

Add missing files of last commit. Shame on me.

5333. By SirVer on 2010-05-13

Used Mix_GetError instead of strerror

5334. By SirVer on 2010-05-13

Renamed NoteField to NoteFieldPossession

5335. By SirVer on 2010-05-13

Added a new notification that informs about transformated fields (terrain changes only at the moment) and pushes players that see this field to rediscover it

5336. By Nicolai Hähnle <prefect@morningstar> on 2010-05-13

Fix regression caused by the QuickNavigation change (bug #580172)

It is perfectly valid to have an unset MapView::m_changeview callback.

5337. By Nicolai Hähnle on 2010-05-14

Fix bug #580377: Member function defined in .cc file should not be declared inline

5338. By Timowi on 2010-05-16

redraw button after resize

5339. By Timowi on 2010-05-16

Set background picture for all non flat buttons

5340. By Timowi on 2010-05-16

some code style fixes

5341. By Charles Wilder <chuck@chuck-gw-laptop> on 2010-05-17

Edited the tutorial01 script for clarification.

5342. By SirVer on 2010-05-18

Whitespace fixes in tutorial texts

5343. By Jens Beyer on 2010-05-18

Make internal cmake calls really platform independent (XCode problem)

5344. By SirVer on 2010-05-19

Corrected some calls to timed_scroll which seemed to have slipped when the function was changed

5345. By Timowi on 2010-05-19

set background for button in debug window

5346. By Timowi on 2010-05-21

fix creation of cache surface for button. Use panel size and not destination rendertarget size for cache surface

5347. By Timowi on 2010-05-21

Use panel size and not destination rendertarget size for cache surfaces in Slider, Listselect, scrollbar and editbox

5348. By SirVer on 2010-05-21

Enable fishers hut in t02.wmf. It is not mandatory to be build

5349. By Nicolai Hähnle on 2010-05-22

Rework worker creation when required wares are not all in the same place

5350. By Nicolai Hähnle on 2010-05-22

QuickNavigation: Fix referencing uninitialized values

5351. By Sigra on 2010-05-23

reported by stuur

5352. By Sigra on 2010-05-23

Do not translate this debug string (other strings here were not translated either. Show buildcaps information.

5353. By Nicolai Hähnle on 2010-05-23

Economy: Eliminate idle requests, return wares to warehouses explicitly

This also introduces transfers that are not bound to requests and eliminates
idle requests. In big games, this can improve performance dramatically.

5354. By Tino on 2010-05-23

remove unnecessary include

5355. By Nicolai Hähnle on 2010-05-23

Fix bug #577247: When constructionsite finishes, set builder's location to the new building

With this change, the builder should no longer become a fugitive after
construction site completion.

5356. By Nasenbaer on 2010-05-23

Fix for code in defaultAI as suggested by Erik

5357. By Nasenbaer on 2010-05-23

Fix calculation due to the fix in defaultAI code - now it begins to work :) - Thanks go to Erik, that he found that problem! :)

5358. By Nicolai Hähnle on 2010-05-23

Merge branch filesystem (random filesystem related bug fixes)

5359. By Jari Hautio on 2010-05-23

Fixed to compile and link with VS2008.

5360. By Jari Hautio on 2010-05-23

Fixed a crash in game startup in VS2008 builds. Now casting LuaInterface_Impl to void* and casting it back from void* both use same type. Value of this pointer is not same for LuaInterface* and LuaInterface_Impl*. This is propably due to use of virtual base class.

5361. By Nicolai Hähnle on 2010-05-24

Builder does not cause finished building to see its vision range

5362. By Nicolai Hähnle on 2010-05-24

Worker::gowarehouse: always leave buildings by their door.

5363. By SirVer on 2010-05-25

Updated message catalog

5364. By SirVer on 2010-05-25

Merged music branch for new music

5365. By Nicolai Hähnle on 2010-05-25

Fix remaining "tabard cycling" problem and cleanup related to recent economy changes

This change ensures that we don't plan for more workers than we have resources for.

5366. By Nicolai Hähnle on 2010-05-25

More worker creation fixes: take currently running transfers into account

5367. By SirVer on 2010-05-25

Removed a '_' that confused the lua xgettext script.

5368. By SirVer on 2010-05-25

Updated catalogs to get rid of a wrong entry

5369. By Nicolai Hähnle on 2010-05-26

Fix replay bug when using recursive destroy (pressing Ctrl while destroying)

It is a bug for game logic to send a player command, so don't do that.

5370. By Nicolai Hähnle on 2010-05-26

Training soldiers: Scale current hitpoints when HP level changes

It seems somewhat implausible that soldiers would leave their training site
injured because their HP level has increased...

5371. By Nicolai Hähnle on 2010-05-26

Merge branch soldier-list

5372. By Nicolai Hähnle on 2010-05-26

UI::EditBox: Consistently store data in EditBoxImpl

This also fixes a warning about initialization order in the EditBox constructor.

5373. By Chuck Wilder on 2010-05-26

New Blond Atlantean carrier and weaver workers

5374. By Chuck Wilder on 2010-05-27

New Atlantean woodcutter worker

5375. By Chuck Wilder on 2010-05-27

Added new Atlantean fisher worker

5376. By Chuck Wilder on 2010-05-28

Atlantean builder worker

5377. By Chuck Wilder on 2010-05-28

Fixed broken Atlantean builder animation

5378. By Chuck Wilder on 2010-05-28

THIS fixes the broken Atlantean fisher animation

5379. By Chuck Wilder on 2010-05-28

Removed outdated animation files for Atlantean fisher

5380. By Chuck Wilder on 2010-05-29

Modified Altantean fisher walking animation from 10fps to 20fps to circumvent missing file error

5381. By Nicolai Hähnle on 2010-05-29

Soldiers: make health bar opaque for better visibility

5382. By Nicolai Hähnle on 2010-05-29

Warehouse: add stock policies

This features allows players to control which warehouses certain wares are
stored in, at least to some extent.

5383. By Nasenbaer on 2010-05-29

Fix last place where slider.png was used.

5384. By Nicolai Hähnle on 2010-05-29

Ignore "Don't stock" policy for workers that would otherwise have to be fugitives

5385. By Tino on 2010-05-30

remove unnecessary include

5386. By Chuck Wilder on 2010-05-30

Refined the fishing animation for Atlantean fisher

5387. By Chuck Wilder on 2010-05-30

New Atlantean stonecutter worker

5388. By Chuck Wilder on 2010-06-04

New Atlantean geologist worker

5389. By Chuck Wilder on 2010-06-04

New Atlantean hunter worker and changed Atlant meat ware hotspot

5390. By Nicolai Hähnle on 2010-06-05

Merge lp:~nha/widelands/teams

5391. By Nasenbaer on 2010-06-05

Silent this massive spammer ;) - important are the used language code and the used localedir - both are written to commandline at the beginning of the game.

5392. By Nasenbaer on 2010-06-05

this assert is wrong since the directory fix

5393. By Chuck Wilder on 2010-06-05

New Atlantean farmer worker

5394. By Chuck Wilder on 2010-06-06

Added new Atlantean blackroot_farmer worker and adjusted hotspots for Atlantean farmer

5395. By Nicolai Hähnle on 2010-06-06

Fix desync bug #590458 and allow syncstream writing without replay writing

This was a regression of the new Worker saving, because a part of the new
saving code did not guarantee consistency across systems.

5396. By Nasenbaer on 2010-06-06

playerdescgroup hides team buttons in savegame now

5397. By Nasenbaer on 2010-06-06

translations update

5398. By Chuck Wilder on 2010-06-06

Add new Atlantean spiderbreeder worker. If you like a hardhat on the barbarian builder, you'll love this worker. :D

5399. By Timowi on 2010-06-07

remove conflict from last translation merge

5400. By Nasenbaer on 2010-06-07

First of all: doxygenization of comments

5401. By Nicolai Hähnle on 2010-06-12

Notify players when military sites are occupied

5402. By Nicolai Hähnle on 2010-06-12

logic/militarysite.cc: Fix a warning

5403. By Timowi on 2010-06-12

fix janus name in developers

5404. By Nicolai Hähnle on 2010-06-13

Clean up the way Building-related messages are sent, and silence a problematic assert

5405. By Timowi on 2010-06-13

Fix a bug if filename of a renamed savegame is longer than the original name plus some paths in the file

5406. By Timowi on 2010-06-14

Fix road splitting: consider carrier type during reassign carriers and request second carrier if roadtype is busy

5407. By Timowi on 2010-06-15

merge opengl support

5408. By Timowi on 2010-06-16

Add more comments to the rendering functions and update some comments

5409. By Chuck Wilder on 2010-06-16

New Atlantean fish_breeder worker

5410. By Chuck Wilder on 2010-06-16

New Atlantean sawyer worker

5411. By Timowi on 2010-06-16

style fixes

5412. By Chuck Wilder on 2010-06-16

Changed Atlantean fish_breeder walk animation to 20 fps to circumvent an error that pointed to a phantom file

5413. By Chuck Wilder on 2010-06-17

New Atlantean forester worker

5414. By Timowi on 2010-06-17

Fix opengl code for msvc.

5415. By Chuck Wilder on 2010-06-19

New Atlantean baker worker

5416. By Nasenbaer on 2010-06-21

Improvements of defaultAI's road building

5417. By Chuck Wilder on 2010-06-22

New Atlantean miner worker

5418. By Chuck Wilder on 2010-06-22

New Atlantean horsebreeder worker and restored barbarian cattlebreeder's ox

5419. By Chuck Wilder on 2010-06-22

Adjusted Atlantean horsebreeder NE walking animation pc masks and deleted old walkload animation

5420. By Chuck Wilder on 2010-06-23

New Atlantean scout worker

5421. By Nasenbaer on 2010-06-23

merge my work branch - including some hopefully useful defaultAI additions and fixes + locale list updates + highering statistics saving (and so the steps in which statistics will rise) to 20 - initially this was to improve defaultAI's behaviour - however if someone dislikes the 5\% steps, I will of course revert.

5422. By Chuck Wilder on 2010-06-23

New Atlantean trainer worker

5423. By Nasenbaer on 2010-06-24

defaultAI should only destroy a building if stats are a bit longer on 0%

5424. By Nasenbaer on 2010-06-28

Fix data type mess up - there shouldn't be a need for conversion at all + fix a graphic name - when i "fixed" the "slider.png missing" bug, i actually didn't do it better ;)

5425. By Nasenbaer on 2010-06-28

Add small note for DefaultAI for vineyard + higher number of input slots for atlantean mines to allow for faster requests

5426. By Nasenbaer on 2010-06-28

Fix bug 533245 - buildings statistics were not calculated if buildings statistics were switched off / not visible

5427. By Nasenbaer on 2010-06-28

No wonder it did not work as it should. A typical Nasenbaer bug ;)

5428. By Nasenbaer on 2010-06-28

Small defaultAI improvement: If a single constructionsite is not connectable for more than 2 minutes, remove it.

5429. By Nasenbaer on 2010-06-29

defaultAI update: 1) block fields that weren't connectable to an economy before, 2) improve calculation for military sites need, 3) improve calculation for which building should be constructed (mostely to make the defaultAI place buildings smarter), 4) remove unneeded or doubled code, 5) higher the preciousness of thatchreed for barbarians to make it more likely they build a fernery

5430. By Chuck Wilder on 2010-07-07

New Atlantean armoursmith, toolsmith, and weaponsmith workers

5431. By Chuck Wilder on 2010-07-07

New Atlantean armoursmith, toolsmith, and weaponsmith workers

5432. By SirVer on 2010-07-12

Merged locale fixes from Jens

5433. By Chuck Wilder on 2010-07-12

Completed the Atlantean workers by adding the burner, miller, smelter and smoker.

5434. By Chuck Wilder on 2010-07-14

Changed color of barbarian farmer's hat

5435. By Chuck Wilder on 2010-07-14

Added new Empire builder worker

5436. By Chuck Wilder on 2010-07-15

Animated idle cycle for empire carrier worker

5437. By Nasenbaer on 2010-07-17

little tweak for foresters and other "recreating" buildings

5438. By Chuck Wilder on 2010-07-19

Add new empire farmer worker

5439. By Nasenbaer on 2010-07-22

Better height generation in random maps for more usable maps

5440. By Nasenbaer on 2010-07-22

Add basic version of automatically placed starting positions in autogenerated maps (+ ui)

5441. By Nasenbaer on 2010-07-22

Fix a mistake in a calculation in last commit

5442. By Nasenbaer on 2010-07-23

New attempt for starting position placement - this should work much better

5443. By Nasenbaer on 2010-07-23

This was left undone ;)

5444. By SirVer on 2010-07-23

Tried to fix operator< for Soldier_Descr

5445. By Nasenbaer on 2010-07-23

Yet another algorithm improvement try to have defaultAI build more reasonable "recreating buildings"(like foresters) - from 10 test runs it looked like a real improvement, but well...

5446. By Chuck Wilder on 2010-07-24

Add new empire fisher worker.

5447. By Nasenbaer on 2010-07-27

remove left overs to get widelands working again

5448. By Nasenbaer on 2010-07-28

Merge the host commands commit from widelands-server branch + boundary for network speed to avoid abuse in 2 player games

5449. By Nasenbaer on 2010-07-30

new host commands /forcePause and /endForcedPause

5450. By Nasenbaer on 2010-07-30

Give foresters more intelligence -> use immovable attribute "seed" to avoid replanting of tiny trees

5451. By Nasenbaer on 2010-07-31

Update changelog - we all should try to keep updating it in time in mind ;)

5452. By Nasenbaer on 2010-08-01

And even more intelligence for planting workers like foresters - plant the tree (or field or whatever it wants to plant) that suits best to the terrain. I removed the worker program setdescription (just kept as dummy for savegame compatibility), as now the plant command needs the full list of possible trees, fields, etc. anyways.

5453. By Nasenbaer on 2010-08-01

Crop animations

5454. By Chuck Wilder on 2010-08-02

Modified empire fisher worker animation frame rate from 10fps to 20fps to resolve missing file bug # 612316.

5455. By SirVer on 2010-08-02

Merged Jaris massive Lua fixes for Visual Studio

5456. By SirVer on 2010-08-02

Applied XCode work around/patch by David

5457. By SirVer on 2010-08-03

Update for new elder of graphics

5458. By Timowi on 2010-08-04

Fix a bug in opengl texture loading. Four byte formats without alpha channel were loaded incorrect

5459. By Chuck Wilder on 2010-08-05

Added new empire forester worker

5460. By Timowi on 2010-08-06

fix the new empire forester conf file

5461. By Jari Hautio on 2010-08-07

Fixed GGZ game hosting to work on windows.

5462. By Jari Hautio on 2010-08-08

Added option for building unit tests. Test are enabled by default and look for single threaded libs if multithreaded are not found. Also always include boost header dir and fixed dynamic linking on MSVC.

5463. By Timowi on 2010-08-08

Improve cmake to fit static linking better: Change order of libraries

5464. By Nasenbaer on 2010-08-09

update Changelog

5465. By Nasenbaer on 2010-08-11

Give defeated players of autocrat games full vision

5466. By Nasenbaer on 2010-08-12

Reimplement teamview + fix victory check for collectors

5467. By Nasenbaer on 2010-08-16

Add spectator mode for deafeated players of "endless" games.

5468. By Nasenbaer on 2010-08-17

Move some win condition functions to their own file, to avoid doubled, tribled, ... code + add check for defeated players to collectors winning condition - now defeated players become spectators in all three currently available winning conditions.

5469. By Nasenbaer on 2010-08-17

Do not show building statistics of opposing players anymore - thanks go to user "Der Meister" who provided the base for this patch.

5470. By Nasenbaer on 2010-08-17

Fix commandline parameter "homedir" and "datadir" parsing - thanks go to Stefan Karpinski for the patch

5471. By Nasenbaer on 2010-08-17

Add forgotten line breaks in help message

5472. By SirVer on 2010-08-18

All Lua files in the scripting/ directory are now added to the docs automagically via the extract_rst.py script. Fixed a underline in win_condition_functions.lua

5473. By Nasenbaer on 2010-08-19

Make atlantean small tower less strong (bug #577891)

5474. By Nasenbaer on 2010-08-19

Make barbarian weaving mill not buildable (bug #547090)

5475. By Jari Hautio on 2010-08-19

Changed place of defining stat to_stat on win32. Caused previously a crash with vs2008.

5476. By Jari Hautio on 2010-08-21

Fixed to really check magic number in zip files.

5477. By Nasenbaer on 2010-08-23

Move build_and_run.sh to compile.sh and rework it, to be much more intuitive for users.

5478. By Nasenbaer on 2010-08-23

Add widelands main directory check to update.sh as well.

5479. By Nasenbaer on 2010-08-24

Addition to get more information about bug 536024 + update of pot files

5480. By Jari Hautio on 2010-08-24

Switch to use static libraries and static msvc-runtime in windows/visual studio builds.

5481. By Nasenbaer on 2010-08-24

Handle taskless bobs in new mapobject format (no task assigned, if created in the editor) - fixes bug #537392

5482. By Nasenbaer on 2010-08-25

Fix bug #537392 - computerplayer does not adhere to currently allowed buildings

5483. By Nasenbaer on 2010-08-25

Add "real" work animations to builder and play "idle" animation, if the builder has nothing to do.

5484. By Nasenbaer on 2010-08-25

Fix bug #618449 - [fetchfromflag] - building dissappeared

5485. By Nasenbaer on 2010-08-27

Scout fix

5486. By Nasenbaer on 2010-08-28

Update ChangeLog

5487. By Nasenbaer on 2010-08-29

A fix for the fix for the scout ;)

5488. By Nasenbaer on 2010-08-29

undo this change - sorry forgot to revert this, was just for investigation of a bug.

5489. By Jari Hautio on 2010-08-29

On windows keep root dir always with backslashes. Otherwise FileSystem::pathIsAbsolute and FileSystem::FS_CanonicalizeName do not work properly. Screenshots work now again on windows.

5490. By Jari Hautio on 2010-08-29

Fixed msvc iss installer file to copy scripting folder and omit dlls.

5491. By Nasenbaer on 2010-08-30

translations update

5492. By Nasenbaer on 2010-08-30

translations update 2

5493. By Nasenbaer on 2010-08-30

translations update part 3

5494. By Nasenbaer on 2010-08-30

and the language name list

5495. By Nasenbaer on 2010-08-31

Two new win conditions

5496. By Nasenbaer on 2010-08-31

a minor minor fix ;)

5497. By Jari Hautio on 2010-09-02

Fixed MSVC CXX compiler flags.

5498. By Nasenbaer on 2010-09-03

Fix training sites inputs

5499. By Nasenbaer on 2010-09-03

Some work on win conditions

5500. By Nasenbaer on 2010-09-03

Add missing pot files

5501. By Nasenbaer on 2010-09-03

Fix in win_conditions for localisation

5502. By Jari Hautio on 2010-09-03

Implemented support for redirecting stdio from widelands to files. Redirection is enabled if REDIRECT_STDIO is defined at compile time (enabled for MSVC builds). This allows windows version to write logs to home folder if executable folder is not writable (program files folder under Vista nd Win7). Fixes bug #625979.

5503. By SirVer on 2010-09-04

Hanna's and my work on the collectors win condition.
- Introduces a hook to implement custom statistics for win conditions/missions
  (see docs/introduction, Section about Hooks). Will be useful for more win
  conditions than collectors.
- The aim of collectors is now to only collect precious wares; we tuned the
  parameters through a few test games, but fine tuning needs more games.
- Reverts some of Nasenbaers recent changes due to merge conflicts (sorry :( ).

5504. By Nasenbaer on 2010-09-04

Reimplement my changes :)

5505. By SirVer on 2010-09-05

added statistics to woodgnome win condition. _calc_points is still pretty slow

5506. By Nasenbaer on 2010-09-05

Win condition improvements

5507. By SirVer on 2010-09-05

less confusing atlanteans corn graphic from chuck

5508. By Chuck Wilder on 2010-09-07

New empire hunter worker and adjusted hotspot for meat ware.

5509. By Sigra on 2010-09-09

Make these 2 programs identical (as they should be). The ":1" looked unintentional.

5510. By Nasenbaer on 2010-09-11

Fix typos in host commands

5511. By Nasenbaer on 2010-09-11

Basic "Share kingdom" feature via starting condition

5512. By Nasenbaer on 2010-09-11

Savegame loading for "share kingdom"

5513. By Nasenbaer on 2010-09-11

Update ChangeLog

5514. By Nasenbaer on 2010-09-12

to avoid bug reports with my lua implementation of "shared kingdom" - remove it again. Don't worry, there will be an even better "shared kingdom" feature ;)

5515. By SirVer on 2010-09-17

Fixed crash when there is not enough place for a starting building in the citadel starting conditions

5516. By Chuck Wilder on 2010-09-17

Add waiting animation for barbarian builder

5517. By SirVer on 2010-09-18

Added support for aborting road building via Lua. This was needed so that the tutorial could not be crashed so easily

5518. By SirVer on 2010-09-18

Fixed a typo in a documentation string

5519. By SirVer on 2010-09-20

Remove immovables that are in the way when building the trainingarea in the tutorial

5520. By Nasenbaer on 2010-09-20

Play full idle animation of builder

5521. By Chuck Wilder on 2010-09-21

Added waiting animation for atlantean and empire builder workers

5522. By Jens Beyer on 2010-09-21

Fix link to build_info.cc - otherwise KDevelop crashes over evaluating that link

5523. By SirVer on 2010-09-22

~200 commits worth of lua code refactoring

- Incorporated Editor into Lua scripting
- Testsuite for editor
- Lots of code was removed, for example pre/postfille
- removed module functions and Class constructores; entry point for scripting are now wl.Game() and
  wl.Editor()
- Fixed a lot of TODOs in the scripting code
- Player Immovables do not crash the editor, but not much for Player
  Infrastructure has been done

5524. By SirVer on 2010-09-22

Already the first bug in my last commit found & fixed

5525. By Nasenbaer on 2010-09-22

Merge branch with shared kingdom feature and multiplayer scenario support

5526. By Nasenbaer on 2010-09-22

Fix a leftover from merge conflicts

5527. By Nasenbaer on 2010-09-22

obviously SirVer changed something ;)

5528. By SirVer on 2010-09-23

Tutorial was not localized.

5529. By Holger Rapp <rapp@mrt140> on 2010-09-23

Fixed linking of test_widelands_scripting

5530. By Nasenbaer on 2010-09-23

Indentation fix in lua file + translation loading fix in map Plateau.wmf

5531. By Chuck Wilder on 2010-09-24

Added new empire stonemason worker animation

5532. By Chuck Wilder on 2010-09-24

Added new empire lumberjack worker animation

5533. By Nasenbaer on 2010-09-24

Fix two hostside crashes and fix some compile time warnings

5534. By Nasenbaer on 2010-09-24

Add option to make ingame chat background *not* transparent, which makes chat messages much easier to see.

5535. By Nasenbaer on 2010-09-25

Change background color in launchgame menu chat for better readability of player names.

5536. By Nasenbaer on 2010-09-25

Fix two localization issues with player initializations

5537. By Nasenbaer on 2010-09-25

Do not show "skipped work", etc. in statistics string of a building, as it is already shown in the hover message, it clutters the screen and hides the real statistics; add hover message that indicates that a mine is empty; fixed a string with boost::format to make it better translateable; added a TODO comment to a part, where boost::format should definitley be used; updated pot files

5538. By Nasenbaer on 2010-09-25

Add two new maps - Desert tournament by ivh and Swamp Monks by me - both should be nice to play in shared kingdom mode :) - my map will get a multiplayer scenario as soon as I have some free time ;)

5539. By Nasenbaer on 2010-09-25

Do not change resolution, if no other resolution was selected in the options menu

5540. By Nasenbaer on 2010-09-25

Fix bug #622888

5541. By Nasenbaer on 2010-09-25

Add delete button to in game save menu

5542. By SirVer on 2010-09-26

Reworked changes from r5536 though I could not find anything wrong with the code in an attempt to fix bug 648270. Also added more debug output to trace this problem down.

5543. By SirVer on 2010-09-27

Fixed a screwup in statistics reading

5544. By SirVer on 2010-09-27

Clicking on a building will now open the building window in a way that it is less likely to cover the buildings location

5545. By SirVer on 2010-09-27

A second attempt to fix a tutorial crash

5546. By SirVer on 2010-09-28

Added a missing delete

5547. By SirVer on 2010-09-28

Added a lot of debug output to Cmd_LuaCoroutine::execute to track down bug 647155

5548. By Chuck Wilder on 2010-09-29

Added new empire scout worker animation and adjusted empire marble ware hot spot.

5549. By Chuck Wilder on 2010-09-29

Added new empire donkeybreeder worker animation

5550. By Chuck Wilder on 2010-09-29

Added new empire pig-breeder worker animation

5551. By Chuck Wilder on 2010-09-29

Added new empire shepherd worker animation

5552. By SirVer on 2010-09-30

Sped up win conditions territorial lord and wood gnome

5553. By SirVer on 2010-09-30

Made wl.map.Map.get_field() less flexible but faster in most cases.

5554. By SirVer on 2010-09-30

Fixed an underline that was too short

5555. By SirVer on 2010-10-01

Renamed wl.map.Field.owners into wl.map.Field.claimers. Updated tests and documentation. Added __tostring field to wl.bases.PlayerBase

5556. By SirVer on 2010-10-01

Forgot to rename owners into claimers.

5557. By SirVer on 2010-10-02

Merged typo fixes by Hans Joachim Desserud

5558. By Timowi on 2010-10-02

fix scout desync. time_node_last_unseen is only valid if vision is 1

5559. By Timowi on 2010-10-03

fix loading of savegames with player_info_data_packet version < 10

5560. By SirVer on 2010-10-03

Fixed linking on MSVC 2005

5561. By Timowi on 2010-10-05

remove left over from public-static-member patch

5562. By Chuck Wilder on 2010-10-07

Added new animations for the empire innkeeper and weaver workers. (The empire now has some members of the fairer gender.) Also, adjusted the hotspot and removed playercolor for the cloth ware of the barbarian and empire tribes to match a similar change to the atlantean spidercloth.

5563. By Chuck Wilder on 2010-10-07

Supplied updated conf file for empire innkeeper.

5564. By Jari Hautio on 2010-10-09

Fixed #619045. Build unit tests option is defaulted to OFF and boost unit test library is nto needed by default build anymore. Also removed empty Boost_unit_test_framework_LIBRARIES from widelands binary.

5565. By Jari Hautio on 2010-10-09

Fixed Bug #648270. Windows machines can now host games. Resolved path issue in RealFSImpl::FindFiles so that it wont return slashes in the beginning if path argument is empty and fixed name extraction code in register_scripts function to remove slash in first position also.

5566. By SirVer on 2010-10-09

Removed no longer needed debug output

5567. By SirVer on 2010-10-09

Fixed a bug in the 3. Barbarians scenario

5568. By Chuck Wilder on 2010-10-10

Added new empire master miner animation.

5569. By SirVer on 2010-10-10

Merged the minimap marker branch from ab-tools

5570. By SirVer on 2010-10-10

Preview workarea is on by default now as it is very useful. Removed a no longer used define

5571. By SirVer on 2010-10-10

Added more features around road building to lua. Made sure that road building is entered in the tutorial whenever it is expected

5572. By Chuck Wilder on 2010-10-10

Added new empire trainer worker.

5573. By Timowi on 2010-10-11

Error handling of lua coroutine. Now send message to all players insted of exit the game

5574. By Chuck Wilder on 2010-10-11

Added new empire armoursmith and toolsmith worker animations.

5575. By Chuck Wilder on 2010-10-12

Added new empire weaponsmith worker animation.

5576. By Timowi on 2010-10-12

merge fix-loading-zipfiles branch. Now data files are stored in the root of zip files.

5577. By Chuck Wilder on 2010-10-12

Added new empire baker worker animation

5578. By Chuck Wilder on 2010-10-12

Added new empire brewer worker animation

5579. By Chuck Wilder on 2010-10-12

Added new empire burner worker animations

5580. By Chuck Wilder on 2010-10-13

Added new empire miller and miner worker animations.

5581. By Chuck Wilder on 2010-10-13

Added new empire smelter worker animations. JUST ONE MORE WORKER TO GO!!! :)

5582. By Timowi on 2010-10-13

Fix zip filesystem code. Bug was introduced in 5576. Now MakeSubFilesystem and CreateSubFilesystem write to subdirectory as intended. Zipped files (maps and savegames) beteen 5576 and this revision are broken.

5583. By Chuck Wilder on 2010-10-13

Fixed Bug #536368 and Bug #536505 by completing new animations for the empire vinefarmer worker!

5584. By SirVer on 2010-10-17

Merged minimap branch again for some improvements

5585. By Timowi on 2010-10-17

fix spectator mode for netclient.

5586. By Nasenbaer on 2010-10-18

Update translations and fix bug #657269

5587. By Nasenbaer on 2010-10-18

Add vietnamese to language list

5588. By Jari Hautio on 2010-10-18

Fixed Bug #662045. Use dynamic linking for unit test framework outside windows platform.

5589. By Jari Hautio on 2010-10-20

Fix Bug 662908. Allow also static boost unit test framework to compile and link properly.

5590. By Timowi on 2010-10-20

fix ZipFilesystem::FindFiles. respects m_basename now and thus work in sub-filesystems

5591. By SirVer on 2010-10-20

Removed some overly verbose debug output that is no longer needed

5592. By SirVer on 2010-10-22

Made detect_revision.py python3 compatible

5593. By Nasenbaer on 2010-10-24

Fix soldier die animation drawing

5594. By Nasenbaer on 2010-10-24

Merge widelands bugfix branch by hjd

5595. By Jari Hautio on 2010-10-24

Fixed MSVC build to work with unit tests.

5596. By SirVer on 2010-10-25

Merged nomeata's pause button branch

5597. By SirVer on 2010-10-25

Merged toggable buttons branch and button refactoring by Joachim Breitner. Updated ChangeLog

5598. By SirVer on 2010-10-25

Added Joachim breitner to the list of coders

5599. By SirVer on 2010-10-25

Initialize m_paused whenever it is defined

5600. By Chuck Wilder on 2010-10-25

New walking, idle and battle animations for the barbarian soldier

5601. By SirVer on 2010-10-25

Added +1 basket to empire starting wares. This allows to saturate the first marble mine and reduces the marble starving at the beginning

5602. By Jari Hautio on 2010-10-25

Improved scripting unit tests to check results properly.

5603. By Jari Hautio on 2010-10-25

Added copyright notice to test_luna.cc.

5604. By Chuck Wilder on 2010-10-27

New and Improved! Barbarian battle animation.

5605. By Chuck Wilder on 2010-10-27

Tweaked animation for barbarian soldier's walk.

5606. By Jari Hautio on 2010-10-27

Fixed invalid iteration loop in AI code found by VS2008 assertion. Likely caused crashes or heap corruption. May be related to bug #536024.

5607. By SirVer on 2010-10-28

Merged bugfix branch from nomeata

5608. By SirVer on 2010-10-28

Updated changelog with basket balance change

5609. By SirVer on 2010-10-28

Barbarian soldiers now need an axe from the axefactory to be produced

5610. By Chuck Wilder on 2010-10-28

Added walking animation for new empire soldier model

5611. By Chuck Wilder on 2010-10-28

New battle animation for the empire soldier.

5612. By SirVer on 2010-10-29

Made tile hopping easier by lowering some mountains

5613. By Chuck Wilder on 2010-10-29

Walking animation for new Atlantean soldier model. Comments, please! :)

5614. By Chuck Wilder on 2010-10-30

Completed battle animations for the Atlantean soldier in honor of WiHack 2010 Reloaded. There is now a full set of soldier animations for the tournament finals! GOOD LUCK!! :D

5615. By SirVer on 2010-10-30

Wares display reordering from nomeata and Kristin

5616. By Timowi on 2010-10-30

merge tmks soldier hp bar fix branch

5617. By Nicolai Hähnle on 2010-10-30

Fix player statistics savegame incompatibility bug

From now on, newly created savegame will remember the ware names in the stored
statistics.

5618. By Nicolai Hähnle on 2010-10-30

(Hopefully) fix compile failure from last commit

5619. By SirVer on 2010-10-30

Maps are now sorted by number of players in the map select menu

5620. By SirVer on 2010-10-30

Merged nomeata's branch to remove temporary ware target quantitiy

5621. By SirVer on 2010-10-30

Show an icon when widelands runs

5622. By SirVer on 2010-10-30

fixed my last fix

5623. By Nasenbaer on 2010-10-31

Merge refactoring of multiplayer UI and shared kingdom branch

5624. By Jens Beyer on 2010-10-31

Fixed window docking bugs (assertion and wrong inner size)

5625. By SirVer on 2010-10-31

Statistics are now calculated via Cmd_CalculateStatistics.

5626. By SirVer on 2010-10-31

Bugfix branch by nomeata

5627. By Chuck Wilder on 2010-10-31

For Bug#669085, adjusted menu images of the Empire war_lance and wood_lance to improve their visibility.

5628. By SirVer on 2010-10-31

Bugfix from nomeata

5629. By Nicolai Hähnle on 2010-10-31

Fix bug: Quit via window manager works properly from network game without GGZ now

5630. By Chuck Wilder on 2010-10-31

Updated the empire helm ware images in menus and the game to better resemble the new soldier model.

5631. By SirVer on 2010-10-31

Fix from nomeata

5632. By Jens Beyer on 2010-11-01

merge from spice-up-cmake branch

5633. By Jens Beyer on 2010-11-01

add target autotest only if WL_UNIT_TESTS is enabled

5634. By Jens Beyer on 2010-11-01

reorder libraries for linking as before merge

5635. By Jens Beyer on 2010-11-01

include test_widelands_scripting only when WL_UNIT_TESTS is ON

5636. By Jens Beyer on 2010-11-01

link SDLMain only in case of non-test environment

5637. By Jens Beyer on 2010-11-01

remove 'optimizepics' target

5638. By Jens Beyer on 2010-11-01

widelands_all library is first in linking

5639. By Jens Beyer on 2010-11-01

added WL_EXTRA_LINK_LIBRARIES to specify which libraries should be used for linking; the list is appended at the end of the linking libraries

5640. By SirVer on 2010-11-01

Fixed color output inside of vim. Should not be there

5641. By Nasenbaer on 2010-11-01

Fix for file transfer (the maximum number of all bytes (file part + commands) should not be bigger than 1024

5642. By Tino on 2010-11-01

merge fix branch

5643. By Jens Beyer on 2010-11-01

Remove SCons files and old unneeded files

5644. By Tino on 2010-11-01

correct path to supplementary files for cmake

5645. By Jens Beyer on 2010-11-01

added WL_STRICT option to treat almost every compilation warning as error

5646. By SirVer on 2010-11-01

Merged my style fixes branch. Just some, not all

5647. By SirVer on 2010-11-01

More style fixes

5648. By SirVer on 2010-11-01

Style fixes in the economy directory

5649. By Nasenbaer on 2010-11-01

Style fixes

5650. By Timowi on 2010-11-01

fix gcc warnings to compile with -Werror

5651. By Timowi on 2010-11-01

fix one more warning

5652. By Timowi on 2010-11-01

style fixes

5653. By SirVer on 2010-11-01

Added a new optimize_pngs.py script that uses various PNG shrinking tools to optimize our pngs

5654. By SirVer on 2010-11-01

Removed unused and unneeded ware flax from the barbarians. Hide cloth from the user (but keep it around) as it is currently not used

5655. By SirVer on 2010-11-01

Added carpenter to empire. Changed him to be the worker in the sawmill. Except for graphics, this fixes 536177

5656. By Nasenbaer on 2010-11-01

Style fixes and some small improvements

5657. By SirVer on 2010-11-01

Dungeon is not an enhanced building

5658. By Jens Beyer on 2010-11-01

change displayed message for disabled unit tests

5659. By Jens Beyer on 2010-11-01

one left over link from moving win32 directory fixed

5660. By Jari Hautio on 2010-11-01

Fixed to build with MSVC2008.

5661. By Jens Beyer on 2010-11-01

Lumberjacks and Stonemasons only find trees and stones which the player knows

5662. By Jens Beyer on 2010-11-01

change displayed message for disabled unit tests and enabled/disabled strict mode

5663. By Sigra on 2010-11-02

Merge style fixes.

5664. By Nasenbaer on 2010-11-02

Style fixes

5665. By Jens Beyer on 2010-11-02

Since build dir is empty, we can use it for compilation in compile.sh

5666. By Jens Beyer on 2010-11-02

added some compile.sh related files to .bzrignore

5667. By Jens Beyer on 2010-11-02

added removal of old build directory and removed creation of symlinks for old 'make lang'

5668. By Nasenbaer on 2010-11-02

Introduce new window class "HelpWindow" for easier and unique help window formation + a 'const' for a literal parameter makes no sense. Remove the const change in icons.h/.cc

5669. By Jens Beyer on 2010-11-02

remove old locale symlink in case of moving to new compile directory in compile.sh

5670. By Timowi on 2010-11-03

change std::vector,list etc [] to .at() in defaultAI and fix two container_iterate

5671. By Timowi on 2010-11-03

delete flag from new_flags in lose_immovable()

5672. By Timowi on 2010-11-03

fix crash in handle NETCMD_FILE_PART if HAVE_VARARRAY is not set.

5673. By Timowi on 2010-11-03

try to fix crash in game logic.

5674. By Timowi on 2010-11-03

fix the last commit

5675. By Jens Beyer on 2010-11-03

do not reconfigure config.h during make

5676. By Jens Beyer on 2010-11-03

removed stray files from SCons build system

5677. By Timowi on 2010-11-04

clean up my last fix

5678. By Chuck Wilder on 2010-11-04

New animation and menu icon for empire carpenter worker

5679. By Nasenbaer on 2010-11-04

Translation update

5680. By Nicolai Hähnle on 2010-11-05

Fix some style warnings

5681. By Nicolai Hähnle on 2010-11-05

Fix more style errors

5682. By SirVer on 2010-11-05

merged qcs svn handling removal. An anachronismus which we finally got rid from

5683. By Nicolai Hähnle on 2010-11-06

Increase line length limit to 110

5684. By Nicolai Hähnle on 2010-11-07

Savegame compatibility fixes and start a library of test games

This merge contains a bunch of assorted fixes for compatibility issues
related to removal of barbarian flax and introduction of empire carpenter.

5685. By Jens Beyer on 2010-11-07

Exclude test sources and src/scripting/pdep/ from CodeCheck

5686. By SirVer on 2010-11-09

Enqueue Cmd_CalculateStatistics in all game types

5687. By SirVer on 2010-11-10

More multiplayer scenario fixing

5688. By Nasenbaer on 2010-11-10

Fix multiplayer savegame loading UI + improve multiplayer UI

5689. By Jari Hautio on 2010-11-10

Fixed scripting test to compile with msvc2008. Boost stdint definitions and used 3rdparty stdint.h definitions dont work together.

5690. By Jari Hautio on 2010-11-10

Fixed to link with msvc2008. Consistently use struct Surface.

5691. By Nasenbaer on 2010-11-10

Add more infos to multiplayer UI and add a slightly better looking Empire icon

5692. By SirVer on 2010-11-10

Merged roughly 100 commits worth of ship logic, lua updates and atlantean scenario 1 stuff

5693. By Nasenbaer on 2010-11-10

Small fixes

5694. By Nasenbaer on 2010-11-10

Update locales and rewrite pot files for new strings

5695. By Timowi on 2010-11-05

fix use of uninitialized memory in Texture. Was not a error but created a output in valgrind

5696. By Timowi on 2010-11-10

fix include

5697. By Chuck Wilder on 2010-11-10

Add trial graphics for Atlantean campaign

5698. By Chuck Wilder on 2010-11-11

More new place-holder graphics

5699. By Nasenbaer on 2010-11-11

typo fixes and pot update

5700. By Chuck Wilder on 2010-11-11

Place-holder graphics for Atlantean Campaign

5701. By Chuck Wilder on 2010-11-11

Tweaked Atlant Campaign Graphics

5702. By Chuck Wilder on 2010-11-12

Added animations for new Atlantean shipwright worker.

5703. By Nasenbaer on 2010-11-12

Two fixes

5704. By SirVer on 2010-11-12

Shipwright for the atlanteans and cloth for the barbarians get a position in the wares display bracket, otherwise they are drawn in 0,0 and hide the information of the worker/ware that is displayed there

5705. By SirVer on 2010-11-12

Overwrote filler text of atlanteans campaign description

5706. By Nasenbaer on 2010-11-12

Revert a part of my last commit - seems my thoughts got mixed up :) sorry.

5707. By Nasenbaer on 2010-11-12

And fix for my lua code...

5708. By Chuck Wilder on 2010-11-12

Replaced some graphics for Atlant Campaign

5709. By Chuck Wilder on 2010-11-13

Adjusted Atlantean Cmpaign portraits to stand taller in their frames.

5710. By Tino on 2010-11-13

small variable declaration fix to make it compile on win32

5711. By Nasenbaer on 2010-11-13

Add support for "closeable" players in multiplayer savegames + fix a bug in mutliplayer UI

5712. By Chuck Wilder on 2010-11-14

Added new shipyard building for Atlanteans and resized the Atlantean shipwright worker

5713. By Nasenbaer on 2010-11-14

Fix problems from my last commit

5714. By Nasenbaer on 2010-11-14

Fix player color icon in multiplayer games

5715. By Nasenbaer on 2010-11-14

Try to fix player names in multiplayer games

5716. By Sigra on 2010-11-14

Add another test case for the C++ code style checkers.

5717. By Chuck Wilder on 2010-11-14

Enhance Atlantean shipyard

5718. By Chuck Wilder on 2010-11-14

Adjust conf files for Atlantean shipwright worker walkload, planks ware hot spot and trunk ware hot spot.

5719. By SirVer on 2010-11-15

Fixed remaining style errors

5720. By SirVer on 2010-11-15

Passing nil to any set_wares function lead to a crash. Added two new test cases and a proper fix

5721. By SirVer on 2010-11-15

Tweaked were message boxes would appear and how tall they are. This reduces the chance to oversee some text

5722. By Nasenbaer on 2010-11-15

New user interface and lua bindings for sharing a starting position into another player.

5723. By Nasenbaer on 2010-11-15

Two small fixes for multiplayer UI

5724. By Chuck Wilder on 2010-11-17

New Atlantean shipyard building and new animation for ship-construction, idle and sailing

5725. By SirVer on 2010-11-17

Made buttons in new economy options window repeating

5726. By SirVer on 2010-11-17

changed display name of goldstone to Gold Ore. Kept goldstone as internal name for compatibility

5727. By Chuck Wilder on 2010-11-17

New selection indicator for ware lists

5728. By Chuck Wilder on 2010-11-17

Adjusted colors on Atlantean Campaign graphics

5729. By Chuck Wilder on 2010-11-18

Resized Jundlina image that I had uploaded in error

5730. By SirVer on 2010-11-18

Added a shipwright worker. Fixed a text. Fixed a typo

5731. By SirVer on 2010-11-18

Merged angryone's fixes branch with some modifications by myself

5732. By SirVer on 2010-11-18

Added better difficulty descriptions to the campaign selection menu

5733. By SirVer on 2010-11-18

Surround direct speech with ""

5734. By SirVer on 2010-11-18

fixed description and names in elemental files of scenario maps

5735. By SirVer on 2010-11-18

Updated catalog files

5736. By Chuck Wilder on 2010-11-18

Gave Princess Jundlina some bling :)

5737. By Chuck Wilder on 2010-11-18

Adjust princess and sidolus graphics

5738. By Chuck Wilder on 2010-11-18

Ooops! Resized ANOTHER large file loaded in error

5739. By Chuck Wilder on 2010-11-18

Bug#671958 - Resized two loading image files from 2560x1920 to 1280x960 for a savings of 2001kB

5740. By Nicolai Hähnle on 2010-11-20

Worker::fetchfromflag: Sanity check that the item still wants to enter the building

This fixes a very subtle race condition that can occur when an item's transfer
is cancelled because of enhancing a building while the building's worker carries
that item into the building.

5741. By Nasenbaer on 2010-11-20

Fix a minor minor bug in the new multiplayer UI and initialize m_ai per default as empty string in Player class constructor

5742. By Nasenbaer on 2010-11-20

Initialize the full set of variables - be paranoid - better saver than save - no space for uninitialized values ;)

5743. By Nicolai Hähnle on 2010-11-20

Fix crash in Worker::return_update

When the "location" signal got overwritten (e.g. because of the soldier
blocking logic), this could cause a segmentation fault.

5744. By Sigra on 2010-11-20

Merge many fixes for const correctness and style. Some improvements on the style checking, including integrating the python codechecker among the other tools and marking almost all of the grep checks redundant. Cut out a lot of unused cruft from the lua files (including some whole files). Add some FIXME comments where issues were found. Optimize the work programs of each tribe's smelting works. Now they are only skipped if there is a good reason. So now the wares are accumulated in their more refined form in case of abundance. (Similar to how the atlantean mill already worked.)

5745. By Nasenbaer on 2010-11-21

Improvements and fixes for the multiplayer launchgame menu

5746. By Tino on 2010-11-21

smelting config of atlantians refers to goldstone instead of goldore

5747. By SirVer on 2010-11-21

Reverted revision 5744 as it broke automatic lua documentation creation

5748. By Timowi on 2010-11-21

set background for buttons used by watchwindows in use-single-watchwindow-mode

5749. By SirVer on 2010-11-21

Missing strings marked for translations. Found by Dirk Stoecker. Also updated catalogs to get those into translations.

5750. By Chuck Wilder on 2010-11-23

Added animation, playercolor and a new look to the barbarian headquarters building from its new 3D model.

5751. By Chuck Wilder on 2010-11-25

Added new animation for the barbarian sentry building from its newly recreated 3d model. The idle state has been animated and contains playercolor. There is a new build sequence, as well. One frame has also been uploaded to represent an as yet unsupported worker-away state.

5752. By Chuck Wilder on 2010-11-25

Modified the build sequence of the barbarian sentry building to be 4 frames with each successive frame depicting another 25% of progress to completing the building.

5753. By SirVer on 2010-11-27

More translation markers from Dirk Stoecker

5754. By SirVer on 2010-11-29

Even more translation markers from Dirk Stoecker

5755. By Nicolai Hähnle on 2010-11-29

Refactor graphics system to clarify role of Picture and Surface

Pictures are things that can act as the *source* of a blit, while Surfaces
are things that can act as the *destination* of a blit -- or, more generally,
can be rendered to using a RenderTarget.

In SDL mode, these two things coincide, but in OpenGL they don't.

Both can be accessed directly via the IPixelAccess interface, though with a
considerable performance penalty in the general case; in particular, OpenGL
texture readback is expected to be very slow usually.

5756. By Chuck Wilder on 2010-11-29

Changed texture of barbarian headquarters stonework and recreated the palisade in larger logs of blackwood.

5757. By SirVer on 2010-11-30

Fixed a translation bug

5758. By Nicolai Hähnle on 2010-11-30

Fix attempt for bug #683082: copy constructor should take const argument

5759. By Chuck Wilder on 2010-11-30

Added playercolor, new idle animation and build sequence graphics for the barbarian stronghold from its new 3D model.

5760. By Chuck Wilder on 2010-11-30

Changed texture of stonework on barbarian headquarters building.

5761. By Nicolai Hähnle on 2010-11-30

Fix regression: crash in Slider offscreen rendering when in SDL mode

5762. By Nicolai Hähnle on 2010-11-30

Fix regression: same crash as previous commit for VerticalSlider

5763. By Chuck Wilder on 2010-11-30

Added idle animation, a build sequence and playercolor to the barbarian barrier building from its new 3D model.

5764. By Nicolai Hähnle on 2010-12-01

Transfer priority at flags (by Nizamov Shawkat)

Instead of processing items in strict FIFO order, transfer with high priority
are given preference.

Priority can be controlled by setting low/medium/high priority in the
production site wares queues; on top of that, constructionsites are given
higher priority than everything else.

5765. By Chuck Wilder on 2010-12-02

Barbarian donjon received new design with player color and build animation from its new 3D model.

5766. By Chuck Wilder on 2010-12-03

Adjusted scale of barbarian carrier idle animation.

5767. By Nicolai Hähnle on 2010-12-03

RenderTarget: remove explicit copy constructor

An identical copy constructor should automatically generated by the compiler,
so this is simply unneeded cruft.

5768. By Jens Beyer on 2010-12-03

Match barbarian donjon idle pictures in military sites to the updated ones in tribe

5769. By Chuck Wilder on 2010-12-04

Updated the newly changed barbarian building images in the global militarysites folder.

5770. By Nicolai Hähnle on 2010-12-04

Cleanup UI::Panel caching logic

There is now a unified, working mechanism to cache the looks of a UI::Panel.
It has to be enabled explicitly using set_cache(true). Due to limitations in
the SDL blitter, it only works for opaque panels.

The caching facility is a no-op in OpenGL mode.

All UI::Windows are cached by default. Some windows are not currently cached,
including the WatchWindow (where caching is clearly useless), the MiniMap,
and various statistics windows.

The latter could theoretically re-eanble caching with some careful use of
update() calls, if there should be performance concerns about redrawing them
each frame. Most likely, that redraw is drowned out by the terrain renderer
anyway, and I haven't bothered to do profiling.

5771. By Jens Beyer on 2010-12-05

remove special handling of localedir for Linux, it is now always part of datadir

5772. By Nasenbaer on 2010-12-06

Fix global militarysites conf files

5773. By Chuck Wilder on 2010-12-06

Barbarian battlearena was restyled and received new idle animation with playercolor plus a new build sequence from its recreated 3D model.

5774. By Chuck Wilder on 2010-12-06

Cropped barbarian battlearena images and replaced carrier worker with trainer worker for the battlearena.

5775. By Chuck Wilder on 2010-12-07

Adjusted scale of barbarian stonemason.

5776. By Nasenbaer on 2010-12-07

Fix loading of settlers 2 maps in Editor

5777. By SirVer on 2010-12-06

Added nizamov to the list of coders

5778. By Nasenbaer on 2010-12-07

Some work on the help window

5779. By Nicolai Hähnle on 2010-12-11

AbstractWaresDisplay: update the panel properly when selection and hiding changes

This fixes a bug where the panel cache for the warehouse and economy configure
windows wasn't refreshed properly in software rendering mode.

5780. By Nicolai Hähnle on 2010-12-11

Adjust forward declarations for ImmovableProgram to struct

5781. By SirVer on 2010-12-13

Removed unused audio file

5782. By SirVer on 2010-12-13

Play a fanfare sound (by Solatis) when a military site is occupied.

5783. By SirVer on 2010-12-14

Properly implemented the playing of the fanfare sound

5784. By SirVer on 2010-12-14

added another fanfare for when you are under attack. Removed spoken military messages as english text is not fitting for the feeling. Also removed the site_defeated and site_lost messages completely as they were not particularily useful

5785. By Nasenbaer on 2010-12-20

further work on help window and multiplayer launch game menu help + pot file update

5786. By Jari Hautio on 2010-12-20

Silenced some unnecessary warnings in visual studio build.

5787. By Jens Beyer on 2010-12-21

make libwidelands_all static at all occasions and get rid of LinkExecutable macro

5788. By SirVer on 2010-12-28

Added a dirty workaround to fix compiling on GCC 4.0

5789. By Nasenbaer on 2010-12-30

Fix two small bugs in the new multip player launch game menu

5790. By Nasenbaer on 2010-12-30

Translations update

5791. By Nasenbaer on 2010-12-30

Merge a windows fix by ab-tools

5792. By Nasenbaer on 2010-12-30

Translateability fixes in new multi player launch game menu

5793. By Nasenbaer on 2010-12-30

Last ToDo for the multi player launchgame menu :)

5794. By Nasenbaer on 2011-01-03

Commit a defaultAI patch by carli with some minor changes by me

5795. By SirVer on 2011-01-04

Improved help texts in conf files by kristin and chuckw

5796. By Nasenbaer on 2011-01-04

Add dummy campaign map to show the players, that there are planned further maps, but they are not yet implemented.

5797. By Nasenbaer on 2011-01-04

A small translateability fix + update of pot files

5798. By Nasenbaer on 2011-01-04

Add carli to the developers list :)

5799. By Nasenbaer on 2011-01-04

Style fixes

5800. By Nasenbaer on 2011-01-05

Fix bug #680207 - Economy settings missing ores

5801. By Nasenbaer on 2011-01-14

Small usability bug fixes for new multi player launch game menu + update of copyright

5802. By Nasenbaer on 2011-01-17

Merge hjd's fix of atlantean miller's description with minor change by me

5803. By Nasenbaer on 2011-01-19

Small fix to avoid attacks of the enemy in tutorial01.wmf

5804. By Jari Hautio on 2011-01-20

Link additional apple and win32 dependencies through widelands_all to clean up code required for unit tests.

5805. By Nasenbaer on 2011-01-24

Update ChangeLog

5806. By Nicolai Hähnle on 2011-01-29

Productionsite: silence a signed vs. unsigned warning

5807. By Nicolai Hähnle on 2011-01-30

immovable.cc: Fix warning about initializer order in constructor

5808. By Nicolai Hähnle on 2011-01-30

animationgfx: Fix format string vs. parameter type mismatch

5809. By Nicolai Hähnle on 2011-01-30

Fix crash when savegame is deleted while the Load Game screen is open

5810. By Nicolai Hähnle on 2011-01-30

Fix bug #695016: Refresh soldiers list when soldiers are healing

5811. By Nicolai Hähnle on 2011-01-30

Refresh window caches for soldier list and economy configuration on changes

5812. By Nasenbaer on 2011-01-30

A hopefully complete fix for bug #659884

5813. By Nasenbaer on 2011-01-30

Commit fix for bug #707147 by Foppe Benedictus + decided fix for bug #695018 + a small style fix for my last commit

5814. By Nicolai Hähnle on 2011-01-31

Fix a "Hall of Mirrors" effect in the main menu in specific screen resolutions

Sometimes, the resizing in get_resized_picture() gets a scaled picture size
that is off by one, resulting in a one-pixel wide strip in the final picture
that is not covered by the scaled original.

Simply draw solid black bars in such regions to avoid ugly rendering artifacts.

5815. By Nicolai Hähnle on 2011-02-02

Initial refactoring of Font support

Major changes include:

- Word wrapping is done in a separate struct WordWrap, so that the wrapping
  results can be stored in an easily usable data structure to answer questions
  such as which line a specific character ended up in

- The cache of pre-rendered strings specifically stores only lines of text,
  so that multi-line texts no longer generate huge pictures, and only those
  lines are rendered that can actually be seen

- Since the caret is no longer part of the cache, it can easily be rendered
  in OpenGL mode (bug #594688)

Note that the refactoring is not complete. In fact, the entire rich text
renderer needs to be refactored to match the new philosophy in order to
enable hassle-free picture rendering in OpenGL mode (bug #594693), and in
order to fix a scrolling bug that manifests in software rendering mode
(bug #710250).

5816. By Nasenbaer on 2011-02-03

Send message if saved game is directory

5817. By Nasenbaer on 2011-02-05

Fix bug #695735 - "scrollbar damaged in multiline textboxes in (unique) windows in FS menu" - in fact the problem was later resizing of multilinetextareas, where scrollbars were not resized.

5818. By Nasenbaer on 2011-02-05

Fix bug #580073 - Objectives menu not updated fast enough

5819. By Nasenbaer on 2011-02-06

Fix bug #536149: miner/master miner mixed up after enhancing to deep Mine

5820. By Nasenbaer on 2011-02-06

Fix bug in t01.wmf - lua code was outdated

5821. By Nasenbaer on 2011-02-06

Merged current version of translations branch

5822. By Nasenbaer on 2011-02-06

Add translation files for dummy scenario (so the explanation is translated as well) + update all the other pot files as well.

5823. By Nasenbaer on 2011-02-06

Implement wishlist bug #660869: Savegames do not store name of the win condition

5824. By Chuck Wilder on 2011-02-06

Added kingcreole's new barbarian mines!

5825. By Chuck Wilder on 2011-02-07

Added kingcreole to list of graphicians on the Developers Page

5826. By Jari Hautio on 2011-02-10

Fixed iconv linkage in windows visual studio build.

5827. By SirVer on 2011-02-13

Description fixes by hjd

5828. By SirVer on 2011-02-13

Updated language catalogs

5829. By Chuck Wilder on 2011-02-17

Added fraang's new build help icons! Replaced menu_toggle_buildhelp.png, menu tabs and other icons that reflected the original build help symbols. Added fraang to the Graphicians in the Developers List.

5830. By Chuck Wilder on 2011-02-17

Added kingcreole's new granitemine animation for the barbarians.

5831. By Nasenbaer on 2011-02-17

Merge martin's i18n branch :)

5832. By Nasenbaer on 2011-02-17

Add an include to fix compilation on GCC 4.6 - thanks go to user triceo who provided the patch :)

5833. By Nasenbaer on 2011-02-18

Fix for the case, that VERSION file is empty

5834. By Nasenbaer on 2011-02-18

Fix bug #720834 - Size Icons Too Big in Building Statistics Window

5835. By Nasenbaer on 2011-02-18

Fix bug #720338: Options show wrong resulution as selected if no ~/.widelands/conf exists

5836. By Nasenbaer on 2011-02-18

Fix bug #606925: In-game resolution internationalization

5837. By Nasenbaer on 2011-02-18

Fix bug #708328: infinite loop(s) in building_statistics_menu.cc

5838. By Nasenbaer on 2011-02-18

Add some forgotten developers - sorry girls and guys :)\!

5839. By Nasenbaer on 2011-02-18

Improved Version of dedicated server - yet unfinished and still opening a UI

5840. By Nasenbaer on 2011-02-19

All commands implemented - now we only need to rip out the UI ;)

5841. By Nasenbaer on 2011-02-19

And we've got a GUIless dedicated server :)

5842. By Nasenbaer on 2011-02-19

Last missing commit from dedicated branch

5843. By Nasenbaer on 2011-02-19

Small changes

5844. By Nicolai Hähnle on 2011-02-20

Merge cleanups by Hans Joachim Desserud

5845. By Tino on 2011-02-20

small win32 fix: it is Sleep() not sleep(). Because it takes microseconds as arguments i changed the value to 1000 to wait a second, if a microsecond was intended, please change back.

5846. By Nicolai Hähnle on 2011-02-20

Add some game tips to inform players of useful keyboard shortcuts

5847. By Chuck Wilder on 2011-02-20

Added kingcreole's new barbarian well and made minor correction to list of developers

5848. By Nicolai Hähnle on 2011-02-20

Refactor richtext rendering to store layout information in a RichText structure

Notable changes are:

1. Richtext is now no longer stored in one big off-screen picture. This change
   should allow us to have longer richtext without problems, and it simplifies
   support of images in OpenGL mode (bug #594693).

2. Richtext is pre-layouted, and the layout stored in a dedicated data
   structure, which trivially fixes the chat display bug #710250.

3. Ascent and descent of text is calculated more precisely, which allows us to
   have more natural looking multiline text.

4. Text flows around images more naturally now, wasting less space.

5849. By Nicolai Hähnle on 2011-02-20

Fix bug #674464: brighten_rect darkens on negative factors in OpenGL mode

Note that this requires functionality from the imaging subset, but this should be
avaible pretty much everywhere.

5850. By Nicolai Hähnle on 2011-02-20

Fix bug #714122: Screenshots now right-side up in OpenGL mode

Basically, we have to compensate for the fact that the OpenGL coordinate
system is upside-down compared to the one used by SDL.

5851. By Nicolai Hähnle on 2011-02-20

Fix regression: Alignment of multiline textareas works correctly again

5852. By Nasenbaer on 2011-02-20

Make win32 behaviour mostely equivalent to the Unix version - thanks to Tino for pointing me to Sleep()

5853. By Nasenbaer on 2011-02-20

My last mini feature for build16: chat history

5854. By SirVer on 2011-02-21

Update catalogs for build 16 first-snow feature freeze

5855. By Nicolai Hähnle on 2011-02-21

Tino's changes to use GLEW, with some modifications

Use GLEW on all platforms, since we'll probably use it in other places as well
in the future. Also, document it as a new dependency.

5856. By Tino on 2011-02-21

- added missing include for windows
- adapt wait times

5857. By SirVer on 2011-02-21

Undid a change made in r5818 that broke the Lua testsuite

5858. By SirVer on 2011-02-21

Renamed Player.tribe and MapSlot.tribe to tribe_name to make it possible to add a wrapping for the tribe description which might than be called tribe

5859. By SirVer on 2011-02-21

Merged fixes to the compiling README by David Allwicher with very minor editing by myself

5860. By SirVer on 2011-02-21

Merged the datadir branch by David Allwicher which should make live easier for packagers

5861. By SirVer on 2011-02-21

Patch by Martin and Carli keeping the ordering of messages in tact.

5862. By SirVer on 2011-02-21

Removed all mentions of Scons. Also removed some mentions of svn

5863. By SirVer on 2011-02-21

Thanks to pluto library in CREDITS

5864. By SirVer on 2011-02-21

Update ChangeLog. Went through all commits since build 15.

5865. By SirVer on 2011-02-21

Merged latest translations

5866. By Jari Hautio on 2011-02-23

Support linking static version of glew library on Win32.

5867. By Nasenbaer on 2011-02-23

Merge aber's bug fix branch, which fixes a segfault at startup. Further a minimal usability bug fix for getting an errormessage from the dedicated server as answer on an unknown command.

5868. By Jari Hautio on 2011-02-23

More reasonable sleep times on windows for dedicated server. Sleep() takes integer argument and Sleep(0) is not good for lowering processor usage. On Windows Sleep resolution is tens of milliseconds so few millisecond sleeps are not reality.

5869. By Nicolai Hähnle on 2011-02-24

Sanitize richtext in chat messages on the client side

The previous server-side approach was at least partial snake oil, because
a malicious game host could easily remove those checks.

The current checks still do not eliminate richtext entirely from system
messages, because formatting is used in the context of the meta server and
dedicated server, but it should mitigate the scope of potentially accessible
bugs (not that there are any known problematic bugs in the richtext renderer
in the first place, but better safe than sorry).

5870. By Nicolai Hähnle on 2011-02-24

Fix bug #724169: Military site window no longer changes size erratically

Add Box::set_min_desired_breadth to set a minimum size for boxes, which is
used by the soldier list to fix the width to the maximum of strings that
will be displayed.

5871. By Nicolai Hähnle on 2011-02-26

Fix bug #722789: Always flush animations before loading

This is a quick and easy fix, though looking at this, we might want to simply
cache all pictures in the long run, so that subsequent game loads can be faster
than the first load. That would be too intrusive a change at the current point
in time, though.

5872. By Nicolai Hähnle on 2011-02-26

Fix bug #691909: Compatibility with old savegames with barbarian battlearena

5873. By Nicolai Hähnle on 2011-02-26

Fix bug #697375: Handle state.coords == Null() correctly in soldier attack code

Fixes loading older savegames; also added a savegame from build14 for future
testing.

5874. By Nicolai Hähnle on 2011-02-26

Fix bug #670980: Cmd_EnemyFlagAction::Write handles disappeared flag

5875. By Nasenbaer on 2011-03-03

Fixes from Jari and me to fix a security issue.

5876. By Nicolai Hähnle on 2011-03-05

Fallback to global exception handling when loading the tutorial

There is no need to special-case exception handling, and this happens to also
fix bug #728057.

5877. By Nicolai Hähnle on 2011-03-06

Fix bug #612348: Soldiers always move out of buildings to battle

5878. By Nicolai Hähnle on 2011-03-06

Allow can_act_as workers when loading transfers from savegames

No longer complain when a master miner is transferred to a mine to fill a
junior position. This fixes bug #687342.

5879. By Nasenbaer on 2011-03-07

Merge patch by martin

5880. By Nasenbaer on 2011-03-07

Lowest possible Sleep() value for Windows + comment - all other fixes are more or less a feature and so may be implemented after build16 ;)

5881. By Nasenbaer on 2011-03-07

Update Changelog

5882. By Nasenbaer on 2011-03-07

Sorry my fault - the easiest fixes still need a check before committing - I better go to bed now ;)

5883. By Nasenbaer on 2011-03-09

Revert last fix and commit new fix along the lines aber suggested for bug #729772 - this time only the fontselection code (which was broken) is changed, so nothing else will be affected. However something seems to really go wrong.

5884. By Nasenbaer on 2011-03-10

Style fixes (including bug fix to show last entries) + updated of developers file

5885. By Nasenbaer on 2011-03-10

decrease window size if the available size is smaller than the desired window size

5886. By Nicolai Hähnle on 2011-03-10

Fix bug #647583: Do not show the "Destroy road" button in replays

5887. By Nasenbaer on 2011-03-18

Wow this was a very stupid bug - I better stop committing to trunk until I've learned, that replacing all dots in a file name means removing the suffix .wmf - seems nobody played the latest development version in the last few days, as all official maps were unplayable via network... :(

5888. By SirVer on 2011-03-19

Adjusted the height of message boxes in scenarios

5889. By SirVer on 2011-03-19

Reenabled removing players in the Editor

5890. By SirVer on 2011-03-19

Update translation catalogs

5891. By SirVer on 2011-03-19

Merged in new translations

5892. By Chuck Wilder on 2011-03-23

Upgraded iron and gold wares to metal ingots for all tribes

5893. By Chuck Wilder on 2011-03-23

Added fraang's upgraded build help icons with transparencies.

5894. By David Allwicher on 2011-03-25

Merged in new and fixed translations

5895. By SirVer on 2011-03-27

Fix a small jump in soldier windows

5896. By Nicolai Hähnle on 2011-03-30

Fix uninitialized variable that was flagged by Valgrind

This missing initialization is probably benign, but initializing the modules
field with 0 is the correct behaviour.

5897. By SirVer on 2011-04-04

removed 'until now' from ChangeLog

5898. By SirVer on 2011-04-04

Added WL_RELEASE file for build-16 rc1

5899. By Tino on 2011-04-04

- update version string in several build files

5900. By SirVer on 2011-04-04

WL_RELEASE should not be in trunk, only in build 16 branch. Please do not push build16 branch to trunk

5901. By Nasenbaer on 2011-04-12

Fix program of deep_goldmine

5902. By SirVer on 2011-04-13

Backed out the fix introduce in 5901. It is a bug, but the changes would need more testing and are not critical for build 16

5903. By SirVer on 2011-04-14

Committed Jaris suggestions for Localization fixes

5904. By Tino on 2011-04-15

mine gold instead of coal
produce goldstone instead of gold

5905. By SirVer on 2011-04-17

Completed repeat of revision 5901 since the feature freeze is lifted now

5906. By David Allwicher on 2011-04-29

Try to parse revision from debian/changelog

5907. By David Allwicher on 2011-04-29

remove illegal char

5908. By David Allwicher on 2011-04-30

catch Exeption in case bzr is not found

5909. By David Allwicher on 2011-05-01

don't require tilde in version string

5910. By David Allwicher on 2011-05-01

Merge branch to fix some warnings from png.h and in request.cc

5911. By David Allwicher on 2011-05-01

Merged in new translations

5912. By Nasenbaer on 2011-05-08

Fix the fix for bug #536149 - similar to the statement of the first fix: bug should be fixed now ... + typo in CMakeLists.txt

5913. By Nasenbaer on 2011-05-08

Fix animal positions on two maps

5914. By SirVer on 2011-05-09

Applied fixes for FreeBSD from Nathan Peters

5915. By SirVer on 2011-05-11

Fix for emp02.wmf by Leif Standstede

5916. By SirVer on 2011-05-17

Corrected the name of Leif

5917. By Martin on 2011-06-22

Added names and locales for languages: Asturian, Greek, Javanese, Chinese (Simpl.), Chinese (Trad.)

5918. By Nasenbaer on 2011-07-07

merge hjd's fix for bug 565406 - focus for save window

5919. By Nasenbaer on 2011-07-07

Add saving via chat command functionality to the dedicated server

5920. By Nasenbaer on 2011-07-07

small improvement to last commit

5921. By Nasenbaer on 2011-07-08

Merge bug fix by hjd for bug 734409 - campaign texts about enhancing metalworks

5922. By Nasenbaer on 2011-07-08

Merge hjd's ware-data branchs

5923. By Nasenbaer on 2011-07-08

Merge bug fix by hjd for bug 795457 - focus in chat window

5924. By SirVer on 2011-07-10

New desert world graphics for beach, desert and drysoil by Astuur.

5925. By SirVer on 2011-07-10

Fixed a small typo in the documentation of wl.map.Field.resource_amount

5926. By SirVer on 2011-07-10

Removed stronghold mentionings from campaign texts. Patch by Leif Sandstede and Hans Joachim Desserud

5927. By Nasenbaer on 2011-07-31

Removed ancient no more used code and realigned code for better visibility a bit

5928. By Chuck Wilder <email address hidden> on 2011-08-09

Added Astuur's new water and ice floe terrain for desert, greenland and winterland

5929. By Chuck Wilder <email address hidden> on 2011-08-09

Adjusted framerate for winterland's ice floe animation from 8fps to 5fps

5930. By Chuck Wilder <email address hidden> on 2011-08-09

Added Astuur's new quarry stones for desert world

5931. By Chuck Wilder <email address hidden> on 2011-08-09

Added Astuur's new quarry stones and standing stones for all worlds

5932. By Chuck Wilder <email address hidden> on 2011-08-10

Removed old animation artifacts.

5933. By Chuck Wilder <email address hidden> on 2011-08-10

Corrected filenames inadvertantly capitalized by Windows

5934. By Chuck Wilder <email address hidden> on 2011-08-10

Added Astuur's new blackland water animation

5935. By Chuck Wilder <email address hidden> on 2011-08-10

Rescaled sstones 1-5 for all worlds

5936. By Chuck Wilder <email address hidden> on 2011-08-16

Added new roof and animation to empire armorsmithy and new roof to the empire weaponsmithy

5937. By Chuck Wilder <email address hidden> on 2011-08-17

Animated empire weaponsmithy build and working sequence

5938. By Chuck Wilder <email address hidden> on 2011-08-17

Remodeled the empire bakery

5939. By Chuck Wilder <email address hidden> on 2011-08-18

Added working animation for empire bakery

5940. By Chuck Wilder <email address hidden> on 2011-08-18

Updated empire smelting_works with new animations

5941. By SirVer on 2011-08-19

New empire fishing rods by Astuur

5942. By Chuck Wilder <email address hidden> on 2011-08-20

New working animation for empire smelting_works

5943. By SirVer on 2011-08-20

Added barriers to some maps. Suggested and patched by hjd

5944. By Nasenbaer on 2011-08-21

Add new win condition endless game (no fog) + fixed a broken conf file in winterland

5945. By Nasenbaer on 2011-08-21

merge current status of translations

5946. By Nasenbaer on 2011-08-21

Look of the street is now world depending (files rodt_... in worlddirectory/pics)

5947. By Chuck Wilder on 2011-08-22

New working animation for empire armoursmithy

5948. By Chuck Wilder <email address hidden> on 2011-08-22

Corrected conf file for sstones1 in all worlds

5949. By Nasenbaer on 2011-08-23

Add unoccupied state for buildings, played if a building is already built up complete, but no worker has yet entered the building. Added unoccupied state for barbarian helmsmithy, bakery, donjon, sentry and barrier - all other buildings without unoccupied state play the idle state per default.

5950. By Nasenbaer on 2011-08-23

Check client before any interaction in host commands

5951. By Nasenbaer on 2011-08-24

Fix Widelands Innosetup script for Windows installer to clean up all date before upgrading to a newer version

5952. By chuckw20 <email address hidden> on 2011-08-24

Modified empire armoursmithy and added unoccupied image

5953. By chuckw20 <email address hidden> on 2011-08-24

Corrected typo in empire armoursmithy conf file

5954. By chuckw20 <email address hidden> on 2011-08-25

New roofs for empire brewery, burner, donkeyfarm, farm, forester, inn, mill and tavern. Added PlayerColor to windmill.

5955. By chuckw20 <email address hidden> on 2011-08-26

New roofs for empire piggery, scouts_house, sheepfarm, and stonemasons_house. Added playercolor to scouts_house.

5956. By Nasenbaer on 2011-08-26

Fix several issues of dedicated server handling and general multiplayer

5957. By chuckw20 <email address hidden> on 2011-08-28

Added Astuur's new textures for the blackland quarry stones and added a new roof for the empire toolsmithy.

5958. By chuckw20 <email address hidden> on 2011-08-28

New roofs for empire vineyard, wareouse, weaving_mill and winery. Completes the re-roofing for empire buildings. Added PlayerColor to weaving_mill.

5959. By Nasenbaer on 2011-08-28

Added motd functionality to dedicated server, smallered idle cpu usage of dedicated servers drastically, fixed a problem with connecting to servers from metaserver - before only the first recieved ip was saved, so widelands always tried to connect to the server that was first selected - independent from whether it was connectable, whether it is already in game or perhaps even already shut down - so this is fixed now ;)

5960. By chuckw20 <email address hidden> on 2011-08-29

Added build and working animation to empire weaving_mill. Modified PlayerColor patterns in empire weaving_mill and windmill.

5961. By chuckw20 <email address hidden> on 2011-08-30

Added new working animation for empire bakery, Astuur's fishing rod to the barbarians, Astuur's iron slab graphic for all tribes, and Astuur's new animated sumpf terrain for greenland.

5962. By Nasenbaer on 2011-09-02

Added empty state for mines - once a mine is empty, the default animation will be set from 'idle' to 'empty', which is basically the same animation, just with an additional sign on the mine's wall showing a big black cross.

5963. By Nasenbaer on 2011-09-04

Fix for road loading in editor

5964. By Nasenbaer on 2011-09-04

Fix for previous revision for dedicated servers

5965. By Nasenbaer on 2011-09-04

Partly merge current scenario-branch into trunk - bringing first (yet maybe to be tuned) multiplayer scenario to widelands.

5966. By chuckw20 <email address hidden> on 2011-09-06

Added new models for barbarian fortress and citadel

5967. By chuckw20 <email address hidden> on 2011-09-06

Cropped barbarian fortress, added barbarian icon image to headquarters and adjusted its palisade

5968. By Nasenbaer on 2011-09-06

(Multiplayer) Fix a crash when switching to a saved game after having a scenario map selected before.

5969. By Nasenbaer on 2011-09-07

Fix bug #842960

5970. By chuckw20 Chuck Wilder <email address hidden> on 2011-09-07

Muted the color of the awning and emblem on the barbarian headquarters

5971. By chuckw20 on 2011-09-08

Added build animation for the barbarian fortress

5972. By chuckw20 on 2011-09-09

Corrected viewing angle of barbarian fortress

5973. By Nasenbaer on 2011-09-10

Fix for animation for building upgrade

5974. By SirVer on 2011-09-11

Merged latest translations

5975. By chuckw20 on 2011-09-12

Completed build animation for barbarian citadel

5976. By chuckw20 on 2011-09-12

For Bug #695035, adjusted hot spots

5977. By SirVer on 2011-09-14

Merged ware_hotspot fix by shevonar

5978. By SirVer on 2011-09-14

Merged fix to confgettext.py by shevonar

5979. By SirVer on 2011-09-14

Updated message catalogues

5980. By Victor Pelt on 2011-09-16

fix codecheck violations

5981. By Victor Pelt on 2011-09-16

fix code check violation

5982. By Victor Pelt on 2011-09-17

fix for bug 786243
create extra collumns if wares don't fit in a single collumn because of low resulution

5983. By SirVer on 2011-09-19

Added shevonars real-name

5984. By Nasenbaer on 2011-09-19

merge lp:~shevonar/widelands/feature-random-tribe-and-AI, thanks shevonar for this cool feature :)

5985. By Victor Pelt on 2011-09-19

update trying to get branch in sync

5986. By Victor Pelt on 2011-09-19

left over merge issues

5987. By Victor Pelt on 2011-09-19

main tree compile.sh

5988. By Victor Pelt on 2011-09-20

fix all merge conflixts. runs and compiles now

5989. By Victor Pelt on 2011-09-21

merge with trunk

5990. By Victor Pelt on 2011-09-23

local improvement

5991. By Victor Pelt on 2011-09-23

merge with main tree

5992. By Victor Pelt on 2011-09-23

evict on construction sites working properly now

5993. By Victor Pelt on 2011-09-23

small cleanup

5994. By Victor Pelt on 2011-09-23

make working positions into a vector
improve evicting of production site

[Hans Joachim Desserud (hjd)]

Hi all.

I haven't been involved in the review process for this proposal, so I don't know how close it was to making its way into trunk. However, we have had a different proposal for solving this problem [1] which has been merged and released in build 18 rc1. I've therefore taken the liberty to close this merge proposal. :)

[1] https://code.launchpad.net/~gamag/widelands/SimpleEvictWorkerButton/+merge/146268

Unmerged revisions

5994. By Victor Pelt on 2011-09-23

make working positions into a vector
improve evicting of production site

5993. By Victor Pelt on 2011-09-23

small cleanup

5992. By Victor Pelt on 2011-09-23

evict on construction sites working properly now

5991. By Victor Pelt on 2011-09-23

merge with main tree

5990. By Victor Pelt on 2011-09-23

local improvement

5989. By Victor Pelt on 2011-09-21

merge with trunk

5988. By Victor Pelt on 2011-09-20

fix all merge conflixts. runs and compiles now

5987. By Victor Pelt on 2011-09-19

main tree compile.sh

5986. By Victor Pelt on 2011-09-19

left over merge issues

5985. By Victor Pelt on 2011-09-19

update trying to get branch in sync

=== modified file 'src/logic/building.cc'
--- src/logic/building.cc	2011-09-02 12:36:04 +0000
+++ src/logic/building.cc	2011-09-23 21:20:33 +0000
@@ -252,7 +252,8 @@
 m_flag         (0),
 m_defeating_player(0),
 m_priority (DEFAULT_PRIORITY),
-m_seeing(false)
+m_seeing(false),
+m_evicted(false)
 {}
 
 Building::~Building()
@@ -479,6 +480,30 @@
 		egbase.create_immovable(pos, "destroyed_building", &t);
 }
 
+/*
+=============
+Remove workers from the building
+=============
+*/
+void Building::evict(Editor_Game_Base & egbase)
+{
+	m_evicted = ! m_evicted;
+
+	if (m_evicted) {
+		Workers wl = get_workers();
+		Game & game = ref_cast<Game, Editor_Game_Base>(egbase);
+		Workers::iterator b = wl.begin();
+		Workers::iterator e = wl.end();
+		while (b != e)
+		{
+			log ("Evicting worker");
+			(*b)->reset_tasks(game);
+			(*b)->start_task_leavebuilding(game, true);
+			++b;
+		}
+	}
+}
+
 
 /*
 ===============

=== modified file 'src/logic/building.h'
--- src/logic/building.h	2010-11-01 14:00:56 +0000
+++ src/logic/building.h	2011-09-23 21:20:33 +0000
@@ -143,6 +143,7 @@
 	enum {
 		PCap_Bulldoze = 0, // can bulldoze/remove this buildings
 		PCap_Enhancable = 3, // can be enhanced to something
+		PCap_Evict = 4
 	};
 
 public:
@@ -176,6 +177,8 @@
 
 	virtual bool burn_on_destroy();
 	virtual void destroy(Editor_Game_Base &);
+	virtual void evict  (Editor_Game_Base &);
+	bool is_evicted     () const {return m_evicted;}
 
 	void show_options(Interactive_GameBase &);
 	void hide_options();
@@ -262,6 +265,7 @@
 
 	/// Whether we see our vision_range area based on workers in the building
 	bool m_seeing;
+	bool m_evicted;
 };
 
 }

=== modified file 'src/logic/constructionsite.cc'
--- src/logic/constructionsite.cc	2011-09-10 16:13:48 +0000
+++ src/logic/constructionsite.cc	2011-09-23 21:20:33 +0000
@@ -147,10 +147,30 @@
 	uint32_t caps = Building::get_playercaps();
 
 	caps |= 1 << PCap_Bulldoze;
+	caps |= 1 << PCap_Evict;
 
 	return caps;
 }
 
+void ConstructionSite::evict(Editor_Game_Base & egbase) {
+	//toggle evict status, kick out workers
+	Building::evict(egbase);
+
+	if (m_evicted) {
+		//builder left (or will be leaving soon) so remove builder
+		m_builder = 0;
+		if (m_builder_request) {
+			delete m_builder_request;
+			m_builder_request = 0;
+		}
+	} else {
+		//un-evict. request a new builder
+		if (m_builder.get(egbase) == 0 && m_builder_request == 0) {
+			if (upcast(Game, game, &egbase))
+				request_builder(*game);
+		}
+	}
+}
 
 /*
 ===============
@@ -172,6 +192,9 @@
 std::string ConstructionSite::get_statistics_string()
 {
 	char buffer[40];
+	if (m_evicted)
+		 return _("(evicted)");
+
 	snprintf
 		(buffer, sizeof(buffer),
 		 _("%u%% built"), (get_built_per64k() * 100) >> 16);

=== modified file 'src/logic/constructionsite.h'
--- src/logic/constructionsite.h	2010-09-20 20:36:44 +0000
+++ src/logic/constructionsite.h	2011-09-23 21:20:33 +0000
@@ -93,6 +93,8 @@
 
 	virtual void log_general_info(Editor_Game_Base const &);
 
+	virtual void evict  (Editor_Game_Base &);
+
 protected:
 	virtual void create_options_window
 		(Interactive_GameBase &, UI::Window * & registry);

=== modified file 'src/logic/game.cc'
--- src/logic/game.cc	2011-09-04 18:28:23 +0000
+++ src/logic/game.cc	2011-09-23 21:20:33 +0000
@@ -741,6 +741,13 @@
 		 	(get_gametime(), pi.owner().player_number(), pi, recurse));
 }
 
+void Game::send_player_evict (PlayerImmovable & pi, bool const evict)
+{
+	send_player_command
+		(*new Cmd_Evict
+		 	(get_gametime(), pi.owner().player_number(), pi, true));
+}
+
 void Game::send_player_build
 	(int32_t const pid, Coords const coords, Building_Index const id)
 {

=== modified file 'src/logic/game.h'
--- src/logic/game.h	2011-02-19 14:30:12 +0000
+++ src/logic/game.h	2011-09-23 21:20:33 +0000
@@ -147,6 +147,7 @@
 	void send_player_command (Widelands::PlayerCommand &);
 
 	void send_player_bulldoze   (PlayerImmovable &, bool recurse = false);
+	void send_player_evict      (PlayerImmovable &, bool recurse = false);
 	void send_player_build      (int32_t, Coords, Building_Index);
 	void send_player_build_flag (int32_t, Coords);
 	void send_player_build_road (int32_t, Path &);

=== modified file 'src/logic/immovable.cc'
--- src/logic/immovable.cc	2011-01-30 15:39:12 +0000
+++ src/logic/immovable.cc	2011-09-23 21:20:33 +0000
@@ -462,6 +462,7 @@
 	(FCoords const f, Map const & map) const
 {
 	uint32_t result = 0;
+
 	//  Neighbours
 	FCoords const tr = map.tr_n(f);
 	FCoords const tl = map.tl_n(f);

=== modified file 'src/logic/militarysite.cc'
--- src/logic/militarysite.cc	2011-08-23 13:26:16 +0000
+++ src/logic/militarysite.cc	2011-09-23 21:20:33 +0000
@@ -754,4 +754,19 @@
 	return 0;
 }
 
+/*
+=======================
+Override: MilitarySite can't evict workers
+=======================
+*/
+
+uint32_t MilitarySite::get_playercaps() const throw () {
+	uint32_t caps = ProductionSite::get_playercaps();
+
+	//exclude PCap_Evict from current caps
+	caps &= ~(1 << PCap_Evict);
+
+	return caps;
+}
+
 }

=== modified file 'src/logic/militarysite.h'
--- src/logic/militarysite.h	2010-11-01 13:12:23 +0000
+++ src/logic/militarysite.h	2011-09-23 21:20:33 +0000
@@ -64,6 +64,8 @@
 	char const * type_name() const throw () {return "militarysite";}
 	virtual std::string get_statistics_string();
 
+	uint32_t get_playercaps() const throw ();
+
 	virtual void init(Editor_Game_Base &);
 	virtual void cleanup(Editor_Game_Base &);
 	virtual void act(Game &, uint32_t data);

=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2011-09-19 17:48:27 +0000
+++ src/logic/player.cc	2011-09-23 21:20:33 +0000
@@ -477,6 +477,27 @@
 	}
 }
 
+/*
+===============
+Evict worker from building
+===============
+*/
+void Player::evict(PlayerImmovable & imm, bool const recurse)
+{
+	if (imm.get_owner() != this)
+		return;
+	if (upcast(Building, building, &imm)) {
+		if (!(building->get_playercaps() & (1 << Building::PCap_Evict)))
+			return;
+		if (recurse) {
+			building->evict(egbase());
+		}
+	} else {
+		//can't evict anything else
+		throw wexception
+			("Player::evict(%u): bad immobale type", imm.serial());
+	}
+}
 
 /*
 ===============

=== modified file 'src/logic/player.h'
--- src/logic/player.h	2010-12-14 12:36:29 +0000
+++ src/logic/player.h	2011-09-23 21:20:33 +0000
@@ -433,6 +433,7 @@
 		 bool = false);
 	Building * build(Coords, Building_Index, bool = true);
 	void bulldoze(PlayerImmovable &, bool recurse = false);
+	void evict(PlayerImmovable &, bool recurse = false);
 	void flagaction(Flag &);
 	void start_stop_building(PlayerImmovable &);
 	void enhance_building

=== modified file 'src/logic/playercommand.cc'
--- src/logic/playercommand.cc	2011-02-26 19:19:25 +0000
+++ src/logic/playercommand.cc	2011-09-23 21:20:33 +0000
@@ -59,7 +59,8 @@
 	PLCMD_CHANGEMILITARYCONFIG,
 	PLCMD_MESSAGESETSTATUSREAD,
 	PLCMD_MESSAGESETSTATUSARCHIVED,
-	PLCMD_SETSTOCKPOLICY
+	PLCMD_SETSTOCKPOLICY,
+	PLCMD_EVICT
 };
 
 /*** class PlayerCommand ***/
@@ -72,6 +73,7 @@
 {
 	switch (des.Unsigned8()) {
 	case PLCMD_BULLDOZE:              return new Cmd_Bulldoze             (des);
+	case PLCMD_EVICT:                 return new Cmd_Evict                (des);
 	case PLCMD_BUILD:                 return new Cmd_Build                (des);
 	case PLCMD_BUILDFLAG:             return new Cmd_BuildFlag            (des);
 	case PLCMD_BUILDROAD:             return new Cmd_BuildRoad            (des);
@@ -197,6 +199,63 @@
 	fw.Unsigned8(recurse);
 }
 
+/*** class Cmd_Evict ***/
+Cmd_Evict::Cmd_Evict (StreamRead & des) :
+	PlayerCommand (0, des.Unsigned8()),
+	serial        (des.Unsigned32()),
+	recurse       (des.Unsigned8())
+{}
+
+void Cmd_Evict::execute (Game & game)
+{
+	if (upcast(PlayerImmovable, pimm, game.objects().get_object(serial)))
+		game.player(sender()).evict(*pimm, recurse);
+}
+
+void Cmd_Evict::serialize (StreamWrite & ser)
+{
+	ser.Unsigned8 (PLCMD_EVICT);
+	ser.Unsigned8 (sender());
+	ser.Unsigned32(serial);
+	ser.Unsigned8 (recurse);
+}
+
+#define PLAYER_CMD_EVICT_VERSION 2
+void Cmd_Evict::Read
+	(FileRead & fr, Editor_Game_Base & egbase, Map_Map_Object_Loader & mol)
+{
+	try {
+		uint16_t const packet_version = fr.Unsigned16();
+		if (1 <= packet_version and packet_version <= PLAYER_CMD_EVICT_VERSION) {
+			PlayerCommand::Read(fr, egbase, mol);
+			Serial const pimm_serial = fr.Unsigned32();
+			try {
+				serial = mol.get<PlayerImmovable>(pimm_serial).serial();
+				recurse = 2 <= packet_version ? fr.Unsigned8() : false;
+			} catch (_wexception const & e) {
+				throw game_data_error
+					(_("player immovable %u: %s"), pimm_serial, e.what());
+			}
+		} else
+			throw game_data_error
+				(_("unknnown/unhandled version %u"), packet_version);
+	} catch (_wexception const & e) {
+		throw game_data_error (_("evict: %s"), e.what());
+	}
+}
+void Cmd_Evict::Write
+	(FileWrite & fw, Editor_Game_Base & egbase, Map_Map_Object_Saver & mos)
+{
+	//First write version
+	fw.Unsigned16(PLAYER_CMD_EVICT_VERSION);
+	//Write base classes
+	PlayerCommand::Write(fw, egbase, mos);
+	// Now serial
+	Map_Object const * obj = egbase.objects().get_object(serial);
+	fw.Unsigned32(obj ? mos.get_object_file_index(*obj) : 0);
+	fw.Unsigned8(recurse);
+}
+
 /*** class Cmd_Build ***/
 
 Cmd_Build::Cmd_Build (StreamRead & des) :

=== modified file 'src/logic/playercommand.h'
--- src/logic/playercommand.h	2010-11-01 13:12:23 +0000
+++ src/logic/playercommand.h	2011-09-23 21:20:33 +0000
@@ -84,6 +84,30 @@
 	bool   recurse;
 };
 
+struct Cmd_Evict:public PlayerCommand {
+	Cmd_Evict() : PlayerCommand() {} // For savegame loading
+	Cmd_Evict
+		(int32_t const t, int32_t const p,
+		 PlayerImmovable & pi,
+		 bool const _recurse = false)
+		: PlayerCommand(t, p), serial(pi.serial()), recurse(_recurse)
+	{}
+
+	Cmd_Evict (StreamRead &);
+
+	void Write(FileWrite &, Editor_Game_Base &, Map_Map_Object_Saver  &);
+	void Read (FileRead  &, Editor_Game_Base &, Map_Map_Object_Loader &);
+
+	virtual uint8_t id() const {return QUEUE_CMD_BULLDOZE;}
+
+	virtual void execute (Game &);
+	virtual void serialize (StreamWrite &);
+
+private:
+	Serial serial;
+	bool   recurse;
+};
+
 struct Cmd_Build:public PlayerCommand {
 	Cmd_Build() : PlayerCommand() {} // For savegame loading
 	Cmd_Build

=== modified file 'src/logic/production_program.cc'
--- src/logic/production_program.cc	2011-09-02 12:36:04 +0000
+++ src/logic/production_program.cc	2011-09-23 21:20:33 +0000
@@ -235,9 +235,9 @@
 bool ProductionProgram::ActReturn::Workers_Need_Experience::evaluate
 	(ProductionSite const & ps) const
 {
-	ProductionSite::Working_Position const * const wp = ps.m_working_positions;
-	for (uint32_t i = ps.descr().nr_working_positions(); i;)
-		if (wp[--i].worker->needs_experience())
+	ProductionSite::wp_const_iterator e = ps.m_working_positions.end();
+	for (ProductionSite::wp_const_iterator b = ps.m_working_positions.begin(); b != e; ++b)
+		if (b->worker->needs_experience())
 			return true;
 	return false;
 }
@@ -481,8 +481,8 @@
 					 	 "(wrong declaration order?)"),
 					 program_name, descr.descname().c_str());
 			m_program = it->second;
+			m_program_name = program_name;
 		}
-
 		//  Override with specified handling methods.
 #if 0
 		log
@@ -548,10 +548,11 @@
 {
 	Program_Result const program_result =
 		static_cast<Program_Result>(ps.top_state().phase);
-
+#ifdef DEBUG
+	log("%s  Call %s\n", ps.descname().c_str(), m_program_name.c_str());
+#endif
 	if (program_result == None) //  The program has not yet been called.
-		//ps.molog("%s  Call %s\n", ps.descname().c_str(),
-		//         m_program->get_name().c_str());
+
 		return ps.program_start(game, m_program->name());
 
 	switch (m_handling_methods[program_result - 1]) {
@@ -1019,7 +1020,6 @@
 	return false;
 }
 
-
 ProductionProgram::ActMine::ActMine
 	(char * parameters, ProductionSite_Descr & descr,
 	 const std::string & production_program_name)

=== modified file 'src/logic/production_program.h'
--- src/logic/production_program.h	2010-11-21 11:44:22 +0000
+++ src/logic/production_program.h	2011-09-23 21:20:33 +0000
@@ -275,7 +275,10 @@
 #endif
 	private:
 		ProductionProgram             * m_program;
-		Program_Result_Handling_Method m_handling_methods[3];
+		Program_Result_Handling_Method  m_handling_methods[3];
+#ifdef DEBUG
+		std::string                     m_program_name;
+#endif
 	};
 
 	/// Calls a program of the productionsite's main worker.

=== modified file 'src/logic/productionsite.cc'
--- src/logic/productionsite.cc	2011-09-02 12:36:04 +0000
+++ src/logic/productionsite.cc	2011-09-23 21:20:33 +0000
@@ -209,7 +209,7 @@
 
 ProductionSite::ProductionSite(const ProductionSite_Descr & ps_descr) :
 	Building            (ps_descr),
-	m_working_positions (new Working_Position[ps_descr.nr_working_positions()]),
+	m_working_positions (std::vector<Working_Position>(ps_descr.nr_working_positions())),
 	m_fetchfromflag     (0),
 	m_program_timer     (false),
 	m_program_time      (0),
@@ -225,7 +225,7 @@
 }
 
 ProductionSite::~ProductionSite() {
-	delete[] m_working_positions;
+	m_working_positions.clear();
 }
 
 
@@ -236,6 +236,10 @@
 {
 	uint32_t const nr_working_positions = descr().nr_working_positions();
 	uint32_t       nr_workers           = 0;
+
+	if (m_evicted)
+		return _("(evicted)");
+
 	for (uint32_t i = nr_working_positions; i;)
 		nr_workers += m_working_positions[--i].worker ? 1 : 0;
 	if (!nr_workers)
@@ -355,7 +359,15 @@
 		(*i.current)->update();
 
 	//  Request missing workers.
-	Working_Position * wp = m_working_positions;
+	request_workers();
+
+	if (upcast(Game, game, &egbase))
+		try_start_working(*game);
+}
+
+void ProductionSite::request_workers() {
+	//  Request missing workers.
+	wp_iterator wp = m_working_positions.begin();
 	container_iterate_const(Ware_Types, descr().working_positions(), i) {
 		Ware_Index const worker_index = i.current->first;
 		for (uint32_t j = i.current->second; j; --j, ++wp)
@@ -365,8 +377,6 @@
 				wp->worker_request = &request_worker(worker_index);
 	}
 
-	if (upcast(Game, game, &egbase))
-		try_start_working(*game);
 }
 
 /**
@@ -429,11 +439,9 @@
 	(Editor_Game_Base & egbase, const Worker_Descr & wdes)
 {
 	bool assigned = false;
-	Working_Position * current = m_working_positions;
+	wp_iterator end = m_working_positions.end();
 	for
-		(Working_Position * const end = current + descr().nr_working_positions();
-		 current < end;
-		 ++current)
+		 (wp_iterator current = m_working_positions.begin(); current != end; ++current)
 	{
 		if (current->worker)
 			continue;
@@ -468,10 +476,10 @@
 void ProductionSite::remove_worker(Worker & w)
 {
 	molog("%s leaving\n", w.descname().c_str());
-	Working_Position * current = m_working_positions;
+	wp_iterator end = m_working_positions.end();
 	for
-		(Working_Position * const end = current + descr().nr_working_positions();
-		 current < end;
+		(wp_iterator current = m_working_positions.begin();
+		 current != end;
 		 ++current)
 		if (current->worker == &w) {
 			*current =
@@ -523,7 +531,7 @@
 	// placed on the slot that originally requested the arrived worker.
 	bool worker_placed = false;
 	Ware_Index     idx = w->worker_index();
-	for (Working_Position * wp = psite.m_working_positions;; ++wp) {
+	for (wp_iterator wp = psite.m_working_positions.begin();; ++wp) {
 		if (wp->worker_request == &rq) {
 			if (wp->worker_request->get_index() == idx) {
 				// Place worker
@@ -540,9 +548,8 @@
 		}
 	}
 	while (!worker_placed) {
-		uint8_t nwp = psite.descr().nr_working_positions();
-		uint8_t pos = 0;
-		for (Working_Position * wp = psite.m_working_positions; pos < nwp; ++wp) {
+		wp_iterator end = psite.m_working_positions.end();
+		for (wp_iterator wp = psite.m_working_positions.begin(); wp != end; ++wp) {
 			// Find a fitting slot
 			if (!wp->worker && !worker_placed)
 				if (wp->worker_request->get_index() == idx) {
@@ -551,7 +558,6 @@
 					worker_placed = true;
 					break;
 				}
-			++pos;
 		}
 		if (!worker_placed) {
 			// Find the next smaller version of this worker
@@ -570,7 +576,7 @@
 						("Something went wrong! No fitting place for worker %s in %s at (%u, %u) found!",
 						 w->descr().descname().c_str(), psite.descr().descname().c_str(),
 						 psite.get_position().x, psite.get_position().y);
-			pos = 0;
+			//pos=0 does what?
 		}
 	}
 
@@ -629,10 +635,6 @@
 void ProductionSite::program_act(Game & game)
 {
 	State & state = top_state();
-#if 0
-	molog
-		("PSITE: program %s#%i\n", state.program->get_name().c_str(), state.ip);
-#endif
 	if (m_is_stopped) {
 		program_end(game, Failed);
 		m_program_timer = true;
@@ -674,9 +676,13 @@
  */
 bool ProductionSite::can_start_working() const throw ()
 {
+	if (m_evicted)
+		return false;
+
 	for (uint32_t i = descr().nr_working_positions(); i;)
 		if (m_working_positions[--i].worker_request)
 			return false;
+
 	return true;
 }
 
@@ -869,8 +875,7 @@
 }
 
 /// Changes the default anim string to \li anim
-void ProductionSite::set_default_anim(std::string anim)
-{
+void ProductionSite::set_default_anim(std::string anim) {
 	if (m_default_anim == anim)
 		return;
 
@@ -880,4 +885,44 @@
 	m_default_anim = anim;
 }
 
+/*
+===============
+Override: Production sites can be bulldozed and evicted
+===============
+*/
+uint32_t ProductionSite::get_playercaps() const throw () {
+	uint32_t caps = Building::get_playercaps();
+
+	caps |= 1 << PCap_Bulldoze;
+	caps |= 1 << PCap_Evict;
+
+	return caps;
+}
+
+void ProductionSite::evict  (Editor_Game_Base & game) {
+  /*
+   * stop the program. a worker left so at least we should
+   * recheck if there is any work to be done
+   */
+
+	Building::evict(game);
+
+	m_stack.clear();
+	m_program_timer = false;
+
+	wp_iterator e = m_working_positions.end();
+
+	if (m_evicted) {
+		 for (wp_iterator wp = m_working_positions.begin(); wp != e; ++wp) {
+			if (wp->worker_request) {
+				delete wp->worker_request;
+				wp->worker_request = 0;
+			}
+		}
+	} else {
+		//un-evict, request new workers
+		request_workers();
+	}
+}
+
 }

=== modified file 'src/logic/productionsite.h'
--- src/logic/productionsite.h	2011-09-02 12:36:04 +0000
+++ src/logic/productionsite.h	2011-09-23 21:20:33 +0000
@@ -136,6 +136,8 @@
 	bool is_stopped() const {return m_is_stopped;}
 	void set_stopped(bool);
 
+	virtual void evict  (Editor_Game_Base &);
+
 	struct Working_Position {
 		Working_Position(Request * const wr = 0, Worker * const w = 0)
 			: worker_request(wr), worker(w)
@@ -144,7 +146,10 @@
 		Worker  * worker;
 	};
 
-	Working_Position const * working_positions() const {
+	typedef std::vector<Working_Position>::iterator wp_iterator;
+	 typedef std::vector<Working_Position>::const_iterator wp_const_iterator;
+	//Working_Position const * working_positions() const {
+	 const std::vector<Working_Position> & working_positions() const {
 		return m_working_positions;
 	}
 
@@ -156,6 +161,7 @@
 	virtual WaresQueue & waresqueue(Ware_Index);
 
 	char const * type_name() const throw () {return "productionsite";}
+	virtual uint32_t get_playercaps() const throw ();
 	virtual void init(Editor_Game_Base &);
 	virtual void cleanup(Editor_Game_Base &);
 	virtual void act(Game &, uint32_t data);
@@ -198,6 +204,7 @@
 		State() : coord(Coords::Null()) {}
 	};
 
+	void request_workers();
 	Request & request_worker(Ware_Index);
 	static void request_worker_callback
 		(Game &, Request &, Ware_Index, Worker *, PlayerImmovable &);
@@ -227,7 +234,7 @@
 	void set_post_timer (int32_t const t) {m_post_timer = t;}
 
 protected:  // TrainingSite must have access to this stuff
-	Working_Position                   * m_working_positions;
+	 std::vector<Working_Position>                 m_working_positions;
 
 	int32_t m_fetchfromflag; ///< Number of items to fetch from flag
 

=== modified file 'src/map_io/widelands_map_buildingdata_data_packet.cc'
--- src/map_io/widelands_map_buildingdata_data_packet.cc	2011-05-04 19:17:34 +0000
+++ src/map_io/widelands_map_buildingdata_data_packet.cc	2011-09-23 21:20:33 +0000
@@ -630,8 +630,8 @@
 			(1 <= packet_version and
 			 packet_version <= CURRENT_PRODUCTIONSITE_PACKET_VERSION)
 		{
-			ProductionSite::Working_Position & wp_begin =
-				*productionsite.m_working_positions;
+			ProductionSite::wp_iterator wp_begin =
+				 productionsite.m_working_positions.begin();
 			ProductionSite_Descr const & descr = productionsite.descr();
 			Ware_Types const & working_positions = descr.working_positions();
 
@@ -647,7 +647,7 @@
 				Ware_Index const worker_index = req.get_index();
 
 				//  Find a working position that matches this request.
-				ProductionSite::Working_Position * wp = &wp_begin;
+				ProductionSite::wp_iterator wp = wp_begin;
 				for
 					(wl_const_range<Ware_Types>
 					 j(working_positions);;
@@ -728,7 +728,7 @@
 
 				//  Find a working position that matches this worker.
 				Worker_Descr const & worker_descr = worker->descr();
-				ProductionSite::Working_Position * wp = &wp_begin;
+				ProductionSite::wp_iterator wp = wp_begin;
 				for
 					(wl_const_range<Ware_Types> j(working_positions);;
 					 ++j)

=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2010-12-03 21:41:49 +0000
+++ src/wui/buildingwindow.cc	2011-09-23 21:20:33 +0000
@@ -20,6 +20,7 @@
 #include "buildingwindow.h"
 
 #include "bulldozeconfirm.h"
+#include "evictconfirm.h"
 #include "game_debug_ui.h"
 #include "graphic/rendertarget.h"
 #include "interactive_player.h"
@@ -33,6 +34,7 @@
 #include "waresqueuedisplay.h"
 
 static char const * pic_bulldoze           = "pics/menu_bld_bulldoze.png";
+static char const * pic_evict              = "pics/menu_bld_evict.png";
 static char const * pic_debug              = "pics/menu_debug.png";
 
 
@@ -209,6 +211,17 @@
 					 _("Destroy")),
 				 UI::Box::AlignCenter);
 		}
+		if (m_capscache & (1 << Widelands::Building::PCap_Evict)) {
+			capsbuttons->add
+				(new UI::Callback_Button
+				 (capsbuttons, "evict",
+					 0, 0, 34, 34,
+					 g_gr->get_picture(PicMod_UI, "pics/but4.png"),
+					 g_gr->get_picture(PicMod_Game, pic_evict),
+				  boost::bind(&Building_Window::act_evict, boost::ref(*this)),
+					 _("Evict")),
+				 UI::Box::AlignCenter);
+		}
 	}
 
 	if (can_see) {
@@ -267,7 +280,21 @@
 
 /*
 ===============
-Callback for bulldozing request
+Callback for evicting request
+===============
+*/
+void Building_Window::act_evict()
+{
+	if (!m_building.is_evicted()) {
+		show_evict_confirm(ref_cast<Interactive_Player, Interactive_GameBase>(igbase()), m_building);
+	} else {
+		igbase().game().send_player_evict(m_building);
+	}
+}
+
+/*
+===============
+Callback for Enhancing request
 ===============
 */
 void Building_Window::act_enhance(Widelands::Building_Index const id)

=== modified file 'src/wui/buildingwindow.h'
--- src/wui/buildingwindow.h	2010-10-31 11:18:00 +0000
+++ src/wui/buildingwindow.h	2011-09-23 21:20:33 +0000
@@ -56,6 +56,7 @@
 	UI::Tab_Panel * get_tabs() {return m_tabs;}
 
 	void act_bulldoze();
+	void act_evict();
 	void act_debug();
 	void show_workarea();
 	void hide_workarea();

=== added file 'src/wui/evictconfirm.cc'
--- src/wui/evictconfirm.cc	1970-01-01 00:00:00 +0000
+++ src/wui/evictconfirm.cc	2011-09-23 21:20:33 +0000
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2002-2004, 2006-2010 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.
+ *
+ */
+
+#include "evictconfirm.h"
+
+#include "interactive_player.h"
+#include "logic/building.h"
+#include "logic/player.h"
+#include "ui_basic/textarea.h"
+#include "ui_basic/window.h"
+#include "upcast.h"
+
+#include <boost/format.hpp>
+
+using boost::format;
+
+
+/**
+ * Confirmation dialog box for the evict request for a building.
+ */
+struct EvictConfirm : public UI::Window {
+	EvictConfirm
+		(Interactive_Player         & parent,
+		 Widelands::Building        & building,
+		 Widelands::PlayerImmovable * todestroy = 0);
+
+	Interactive_Player & iaplayer() const {
+		return ref_cast<Interactive_Player, UI::Panel>(*get_parent());
+	}
+
+	virtual void think();
+	void close_window() {die();}
+private:
+	Widelands::Object_Ptr m_building;
+	Widelands::Object_Ptr m_todestroy;
+
+	struct Message : public UI::Textarea {
+		Message(EvictConfirm & parent, Widelands::Building const & building) :
+			UI::Textarea
+				(&parent,
+				 0, 0, 0, 74,
+				 (format(_("Do you really want to evict workers from %s?"))
+				  % building.descname())
+				 	.str(),
+				 UI::Align_Left)
+		{}
+	} m_message;
+
+	struct OK     : public UI::Button {
+		OK(EvictConfirm & parent) :
+			UI::Button
+			(&parent, "Ok",
+				 6, 80, 80, 34,
+				 g_gr->get_picture(PicMod_UI,   "pics/but4.png"),
+				 g_gr->get_picture(PicMod_Game, "pics/menu_okay.png"))
+		{}
+		void clicked();
+	} m_ok;
+
+	struct Cancel : public UI::Button {
+		Cancel(EvictConfirm & parent) :
+			UI::Button
+			(&parent, "Cancel",
+				 114, 80, 80, 34,
+				 g_gr->get_picture(PicMod_UI,   "pics/but4.png"),
+				 g_gr->get_picture(PicMod_Game, "pics/menu_abort.png"))
+		{}
+		void clicked() {
+			ref_cast<EvictConfirm, UI::Panel>(*get_parent()).close_window();
+		}
+	} m_cancel;
+};
+
+
+/*
+===============
+Create the panels.
+If todestroy is 0, the building will be destroyed when the user confirms it.
+Otherwise, todestroy is destroyed when the user confirms it. This is useful to
+confirm building destruction when the building's base flag is removed.
+===============
+*/
+EvictConfirm::EvictConfirm
+	(Interactive_Player         & parent,
+	 Widelands::Building        & building,
+	 Widelands::PlayerImmovable * todestroy)
+	:
+	UI::Window (&parent, "Evict workers", 0, 0, 300, 120, _("Evict Workers?")),
+	m_building (&building),
+	m_todestroy(todestroy ? todestroy : &building),
+	m_message  (*this, building),
+	m_ok       (*this),
+	m_cancel   (*this)
+{
+	center_to_parent();
+	m_cancel.center_mouse();
+}
+
+
+/*
+===============
+Make sure the building still exists and can in fact be evictd.
+===============
+*/
+void EvictConfirm::think()
+{
+	Widelands::Editor_Game_Base const & egbase = iaplayer().egbase();
+	upcast(Widelands::Building,        building,  m_building .get(egbase));
+	upcast(Widelands::PlayerImmovable, todestroy, m_todestroy.get(egbase));
+
+	if
+		(!todestroy ||
+		 !building  ||
+		 not iaplayer().can_act(building->owner().player_number()) or
+		 !(building->get_playercaps() & (1 << Widelands::Building::PCap_Evict)))
+		die();
+}
+
+
+/*
+===============
+Issue the CMD_EVICT command for this building.
+===============
+*/
+void EvictConfirm::OK::clicked()
+{
+	EvictConfirm & parent =
+		ref_cast<EvictConfirm, UI::Panel>(*get_parent());
+	Interactive_Player & iaplayer = parent.iaplayer();
+	Widelands::Game & game   = iaplayer.game();
+	upcast(Widelands::Building,        building,  parent.m_building.get(game));
+	upcast(Widelands::PlayerImmovable, todestroy, parent.m_todestroy.get(game));
+
+	if
+		(todestroy &&
+		 building &&
+		 iaplayer.can_act(building->owner().player_number()) and
+		 building->get_playercaps() & (1 << Widelands::Building::PCap_Evict))
+	{
+		game.send_player_evict
+			(*todestroy, get_key_state(SDLK_LCTRL) or get_key_state(SDLK_RCTRL));
+		iaplayer.need_complete_redraw();
+	}
+
+	parent.close_window();
+}
+
+
+/**
+ * Create a EvictConfirm window.
+ * No further action is required by the caller: any action necessary to actually
+ * evict all workers from the building if the user confirims
+ *
+ * \param building this is the building that the confirmation dialog displays.
+ * \param toevict if this is non-zero, then workers will be evicted
+ * instead of \p building if the user confirms the dialog.
+ */
+void show_evict_confirm
+	(Interactive_Player         &       player,
+	 Widelands::Building        &       building,
+	 Widelands::PlayerImmovable * const toevict)
+{
+	new EvictConfirm(player, building, toevict);
+}

=== added file 'src/wui/evictconfirm.h'
--- src/wui/evictconfirm.h	1970-01-01 00:00:00 +0000
+++ src/wui/evictconfirm.h	2011-09-23 21:20:33 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010 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 _EVICTCONFIRM_H_
+#define _EVICTCONFIRM_H_
+
+struct Interactive_Player;
+
+namespace Widelands {
+struct Building;
+struct PlayerImmovable;
+}
+
+void show_evict_confirm
+	(Interactive_Player & player,
+	 Widelands::Building & building,
+	 Widelands::PlayerImmovable * const toevict = 0);
+
+#endif // _BULLDOZECONFIRM_H_

=== modified file 'tribes/barbarians/conf'
--- tribes/barbarians/conf	2011-01-04 11:56:56 +0000
+++ tribes/barbarians/conf	2011-09-23 21:20:33 +0000
@@ -218,6 +218,25 @@
 [initializations]
 headquarters_medium=_Headquarters medium
 castle_village=_Citadel village
+granitemine=_Granite Mine
+hardener=_Wood Hardener
+helmsmithy=_Helmsmithy
+hunters_hut=_Hunter's Hut
+inn=_Inn
+lime_kiln=_Lime Kiln
+lumberjacks_hut=_Lumberjack's Hut
+metalworks=_Metalwork Shop
+micro-brewery=_Micro Brewery
+oremine=_Iron Ore Mine
+quarry=_Quarry
+rangers_hut=_Ranger's Hut
+smelting_works=_Smelting Works
+tavern=_Tavern
+trainingmine=_Training Mine
+weaving-mill=_Weaving-Mill
+well=_Well
+scouts_hut=_"Scout's Hut"
+cattlefarm=_Cattle Farm
 
 [military_data]
 retreat_interval=0-80