Restart as same character will preserve addons used

git-svn-id: http://svn.net-core.org/repos/t-engine4@6451 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/Module.lua

@@ -676,7 +676,7 @@ function _M:instanciate(mod, name, new_game, no_reboot)
 		end
 	end
 
-	self:loadAddons(mod, save_desc and save_desc.addons)
+	self:loadAddons(mod, (save_desc and save_desc.addons) or (__module_extra_info.set_addons))
 
 	-- Check addons
 	if hash_valid then

game/loader/init.lua

@@ -30,6 +30,7 @@ local load load = function(...)
 	__player_name = args[4] or "player"
 	__player_new = args[5] and true or false
 	if args[6] then
+		print('===', args[6])
 		local f = loadstring(args[6])
 		__module_extra_info = {}
 		setfenv(f, __module_extra_info)

game/modules/tome/dialogs/DeathDialog.lua

@@ -204,7 +204,9 @@ function _M:use(item)
 		if item.subaction == "none" then
 			util.showMainMenu()
 		elseif item.subaction == "restart" then
-			util.showMainMenu(false, engine.version[4], engine.version[1].."."..engine.version[2].."."..engine.version[3], game.__mod_info.short_name, game.save_name, true, ("auto_quickbirth=%q"):format(game:getPlayer(true).name))
+			local addons = {}
+			for add, _ in pairs(game.__mod_info.addons) do addons[#addons+1] = "'"..add.."'" end
+			util.showMainMenu(false, engine.version[4], engine.version[1].."."..engine.version[2].."."..engine.version[3], game.__mod_info.short_name, game.save_name, true, ("auto_quickbirth=%q set_addons={%s}"):format(game:getPlayer(true).name, table.concat(addons, ", ")))
 		elseif item.subaction == "restart-new" then
 			util.showMainMenu(false, engine.version[4], engine.version[1].."."..engine.version[2].."."..engine.version[3], game.__mod_info.short_name, game.save_name, true)
 		end