Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/revised_maps into lp:widelands

2016-03-26 Thread kaputtnik
Yes, this branch could brake loading a map in editor or starting a game, not 
during gameplay (maybe except scenarios).

If you got a crash, it would be always helpful to have the last console output.
-- 
https://code.launchpad.net/~widelands-dev/widelands/revised_maps/+merge/289704
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/revised_maps.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1540827 into lp:widelands

2016-03-26 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1540827 into 
lp:widelands.

Commit message:
Fixed bug with establishing smuggling routes in the Smugglers scenario.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1540827 in widelands: "Smugglers scenario needs testing"
  https://bugs.launchpad.net/widelands/+bug/1540827

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1540827/+merge/290164

I only tested that the smuggling routes get established now.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1540827 into lp:widelands.
=== modified file 'data/maps/MP_Scenarios/Smugglers.wmf/scripting/smuggling.lua'
--- data/maps/MP_Scenarios/Smugglers.wmf/scripting/smuggling.lua	2016-01-28 05:24:34 +
+++ data/maps/MP_Scenarios/Smugglers.wmf/scripting/smuggling.lua	2016-03-26 09:22:28 +
@@ -10,7 +10,7 @@
 -- Find a warehouse for in the given area
 function find_warehouse(region)
for idx,f in ipairs(region) do
-  if f.immovable and f.immovable.descr.type_name == "barbarians_warehouse" then
+  if f.immovable and f.immovable.descr.type_name == "warehouse" then
  return f.immovable
   end
end
@@ -47,10 +47,10 @@
   end
 
   if not send_whf.immovable or
- send_whf.immovable.descr.type_name ~= "barbarians_warehouse" or
+ send_whf.immovable.descr.type_name ~= "warehouse" or
  send_whf.immovable.owner ~= send_plr or
  not recv_whf.immovable or
- recv_whf.immovable.descr.type_name ~= "barbarians_warehouse" or
+ recv_whf.immovable.descr.type_name ~= "warehouse" or
  recv_whf.immovable.owner ~= recv_plr
   then
  send_to_all(smuggling_route_broken:bformat(

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands

2016-03-26 Thread kaputtnik
As i understand the "double free or corruption (!prev)" failure happens because 
of trying to free memory which is already been freed former.

And i have the feeling that the crash is mostly triggered when much memory 
(RAM) is consumed/newly assigned through some other programs. So i tried to 
consume/assign much memory by open all widelands screenshots in Gimp and let 
widelands run from trunk. Starting this branch and click on the help in editor 
causes widelands to crash with the known error message. But starting it again 
all is fine. Yesterday the error is triggered after starting blender and 
afterwards starting this branch. And again the error is only triggered once. So 
there is no real scenario for testing, but assigning new memory seems to 
trigger the error more often than starting with always the same amount of 
memory usage.
-- 
https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/289782
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/lua-driven-help.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/revised_maps into lp:widelands

2016-03-26 Thread Klaus Halfmann
Mhh, I found #1562332 again, but this is yet another other Issue, can someone 
elese reproduce this?
-- 
https://code.launchpad.net/~widelands-dev/widelands/revised_maps/+merge/289704
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/revised_maps.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/revised_maps into lp:widelands

2016-03-26 Thread kaputtnik
I don't think that bug 1562332 is related to this branch.

Lets wait with merging until eastern is past, maybe we get some comments in the 
forum over this weekend.
-- 
https://code.launchpad.net/~widelands-dev/widelands/revised_maps/+merge/289704
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/revised_maps.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/about into lp:widelands

2016-03-26 Thread kaputtnik
Works :-) The only thing is F1 hotkey, which triggers the tribal encyclopedia 
during gameplay and Trees/terrains in editor and not a general help. But i 
think this would be fixed with the lua_driven_help branch.

Some other things:
Editor:
"H" Shortcut: Closes README window if open
Opening the README window and close the main Menu window (move the README 
window a bit) closes also the README window
"C: Toggle census" is shown in Editor README window

In Game:
None :-)
-- 
https://code.launchpad.net/~widelands-dev/widelands/about/+merge/288697
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/about.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/revised_maps into lp:widelands

2016-03-26 Thread Klaus Halfmann
Archipelago works for Atlanters, so it should work for pretty every tribe.
Ill try another Map the next days. One of the three AIs 
was able to develop at least a bit. You will need horses (ochsen, donkeys)
in the long term however
-- 
https://code.launchpad.net/~widelands-dev/widelands/revised_maps/+merge/289704
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/revised_maps.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/about into lp:widelands

2016-03-26 Thread kaputtnik
Sorry, meant the Help window instead of README window
-- 
https://code.launchpad.net/~widelands-dev/widelands/about/+merge/288697
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/about.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/revised_maps into lp:widelands

2016-03-26 Thread kaputtnik
Klaus, i don't know what your intend to doing... If a shipped map is loaded in 
Game or Editor, the changes of this branch does not take any effect anymore. 
The only exception are maybe the scenarios (but i don't understand them at all 
:-( ).
-- 
https://code.launchpad.net/~widelands-dev/widelands/revised_maps/+merge/289704
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/revised_maps.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp