← Back to team overview

widelands-dev team mailing list archive

Re: [Merge] lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1 into lp:widelands

 

Review: Needs Fixing

Looks like there was a merge conflict wich is not solved in scenario/richtext.lua. See line number 350 in the div below.

The scenario does not even load:

Trying to run: map:scripting/init.lua: Fatal exception: lua: [/home/kaputtnik/Quellcode/widelands-repo/fh1-scenario-groundwork-emp1/src/scripting/lua_errors.cc:22] [/home/kaputtnik/Quellcode/widelands-repo/fh1-scenario-groundwork-emp1/src/scripting/lua_errors.cc:22] [/home/kaputtnik/Quellcode/widelands-repo/fh1-scenario-groundwork-emp1/src/scripting/lua_errors.cc:22] [/home/kaputtnik/Quellcode/widelands-repo/fh1-scenario-groundwork-emp1/src/scripting/lua_errors.cc:22] [string "scripting/richtext.lua"]:311: 'end' expected (to close 'function' at line 309) near '                            
FATAL ERROR - game crashed. Attempting emergency save.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-scenario-groundwork-emp1/+merge/335294
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1.


References