Merge lp:~widelands-dev/widelands/bug-1408775 into lp:widelands
Proposed by
GunChleoc
Status: | Merged |
---|---|
Merged at revision: | 7385 |
Proposed branch: | lp:~widelands-dev/widelands/bug-1408775 |
Merge into: | lp:widelands |
Diff against target: |
170 lines (+39/-29) 5 files modified
scripting/win_conditions/init.lua (+12/-0) src/logic/game_settings.h (+18/-1) src/network/netclient.cc (+2/-6) src/network/nethost.cc (+5/-14) src/ui_fsmenu/launch_spg.cc (+2/-8) |
To merge this branch: | bzr merge lp:~widelands-dev/widelands/bug-1408775 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
SirVer | Approve | ||
GunChleoc | Needs Resubmitting | ||
Review via email: mp+248181@code.launchpad.net |
Description of the change
Win conditions order is now determined by an init.lua file.
I kept the file names in case a change would break savegames.
To post a comment you must log in.
> I kept the file names in case a change would break savegames.
Should be save I think - win conditions are loaded on game start and then are part of the Lua state and are therefore persisted with the savegame. If the display logic in the menus is not trying to load the files nothing should. I'd say rename the files, but drop the numbers.