The new game window can now be told to force loading of an incompatible module (…

…which will usually work anyway)


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

@@ -34,14 +34,14 @@ end
 
 --- List all available modules
 -- Static
-function _M:listModules()
+function _M:listModules(incompatible)
 	local ms = {}
 	fs.mount(engine.homepath, "/")
 --	print("Search Path: ") for k,e in ipairs(fs.getSearchPath()) do print("*",k,e) end
 
 	local knowns = {}
 	for i, short_name in ipairs(fs.list("/modules/")) do
-		local mod = self:createModule(short_name)
+		local mod = self:createModule(short_name, incompatible)
 		if mod then
 			if not knowns[mod.short_name] then
 				table.insert(ms, {short_name=mod.short_name, name=mod.name, versions={}})
@@ -76,11 +76,11 @@ function _M:listModules()
 	return ms
 end
 
-function _M:createModule(short_name)
+function _M:createModule(short_name, incompatible)
 	local dir = "/modules/"..short_name
 	print("Creating module", short_name, ":: (as dir)", fs.exists(dir.."/init.lua"), ":: (as team)", short_name:find(".team$"), "")
 	if fs.exists(dir.."/init.lua") then
-		local mod = self:loadDefinition(dir)
+		local mod = self:loadDefinition(dir, nil, incompatible)
 		if mod and mod.short_name then
 			return mod
 		end
@@ -88,7 +88,7 @@ function _M:createModule(short_name)
 		fs.mount(fs.getRealPath(dir), "/testload", false)
 		local mod
 		if fs.exists("/testload/mod/init.lua") then
-			mod = self:loadDefinition("/testload", dir)
+			mod = self:loadDefinition("/testload", dir, incompatible)
 		end
 		fs.umount(fs.getRealPath(dir))
 		if mod and mod.short_name then return mod end
@@ -96,7 +96,7 @@ function _M:createModule(short_name)
 end
 
 --- Get a module definition from the module init.lua file
-function _M:loadDefinition(dir, team)
+function _M:loadDefinition(dir, team, incompatible)
 	local mod_def = loadfile(team and (dir.."/mod/init.lua") or (dir.."/init.lua"))
 --	print("Loading module definition from", team and (dir.."/mod/init.lua") or (dir.."/init.lua"))
 	if mod_def then
@@ -116,7 +116,8 @@ function _M:loadDefinition(dir, team)
 		mod.version_string = self:versionString(mod)
 		if not __available_engines.__byname[eng_req] then
 			print("Module mismatch engine version "..mod.version_string.." using engine "..eng_req)
-			return
+			if incompatible then mod.incompatible = true
+			else return end
 		end
 
 		-- Make a function to activate it
@@ -186,7 +187,9 @@ function _M:instanciate(mod, name, new_game, no_reboot)
 		popup.__showup = nil
 		core.display.forceRedraw()
 
-		util.showMainMenu(false, mod.engine[4], ("%d.%d.%d"):format(mod.engine[1], mod.engine[2], mod.engine[3]), mod.version_string, name, new_game)
+		local eng_v = nil
+		if not mod.incompatible then eng_v = ("%d.%d.%d"):format(mod.engine[1], mod.engine[2], mod.engine[3]) end
+		util.showMainMenu(false, mod.engine[4], eng_v, mod.version_string, name, new_game)
 		return
 	end
 

@@ -28,7 +28,7 @@ function _M:init(t)
 	self.title = assert(t.title, "no checkbox title")
 	self.text = t.text or ""
 	self.checked = t.default
-	self.fct = assert(t.fct, "no checkbox fct")
+	self.fct = t.fct or function() end
 	self.on_change = t.on_change
 
 	Base.init(self, t)

@@ -962,7 +962,7 @@ function util.showMainMenu(no_reboot, reboot_engine, reboot_engine_version, rebo
 
 	if no_reboot then
 		local Module = require("engine.Module")
-		local ms = Module:listModules()
+		local ms = Module:listModules(true)
 		local mod = ms[__load_module]
 		Module:instanciate(mod, __player_name, __player_new, true)
 	else

@@ -23,6 +23,7 @@ local Dialog = require "engine.ui.Dialog"
 local ListColumns = require "engine.ui.ListColumns"
 local Textzone = require "engine.ui.Textzone"
 local Separator = require "engine.ui.Separator"
+local Checkbox = require "engine.ui.Checkbox"
 local Button = require "engine.ui.Button"
 
 module(..., package.seeall, class.inherit(Dialog))
@@ -32,11 +33,12 @@ function _M:init()
 
 	self.c_desc = Textzone.new{width=math.floor(self.iw / 3 * 2 - 10), height=self.ih, text=""}
 
-	self.c_switch = Button.new{width=math.floor(self.iw / 3 - 40), text="Show all versions", fct=function() self:switchVersions() end}
+	self.c_switch = Checkbox.new{default=false, width=math.floor(self.iw / 3 - 40), title="Show all versions", on_change=function() self:switch() end}
+	self.c_compat = Checkbox.new{default=false, width=math.floor(self.iw / 3 - 40), title="Show incompatible", on_change=function() self:switch() end}
 
 	self:generateList()
 
-	self.c_list = ListColumns.new{width=math.floor(self.iw / 3 - 10), height=self.ih - 10 - self.c_switch.h, scrollbar=true, columns={
+	self.c_list = ListColumns.new{width=math.floor(self.iw / 3 - 10), height=self.ih - 10 - self.c_switch.h - self.c_compat.h, scrollbar=true, columns={
 		{name="Game Module", width=80, display_prop="name"},
 		{name="Version", width=20, display_prop="version_txt"},
 	}, list=self.list, fct=function(item) end, select=function(item, sel) self:select(item) end}
@@ -44,7 +46,8 @@ function _M:init()
 	self:loadUI{
 		{left=0, top=0, ui=self.c_list},
 		{right=0, top=0, ui=self.c_desc},
-		{left=0, bottom=0, ui=self.c_switch},
+		{left=0, bottom=self.c_compat.h, ui=self.c_switch},
+		{left=0, bottom=0, ui=self.c_compat},
 		{left=self.c_list.w + 5, top=5, ui=Separator.new{dir="horizontal", size=self.ih - 10}},
 	}
 	self:setFocus(self.c_list)
@@ -64,16 +67,16 @@ function _M:select(item)
 end
 
 function _M:generateList()
-	local list = Module:listModules()
+	local list = Module:listModules(self.c_compat.checked)
 	self.list = {}
 	for i = 1, #list do
 		for j, mod in ipairs(list[i].versions) do
-			if not self.all_versions and j > 1 then break end
+			if not self.c_switch.checked and j > 1 then break end
 			if not mod.is_boot then
 				mod.name = tstring{{"font","bold"}, {"color","GOLD"}, mod.name, {"font","normal"}}
 				mod.fct = function(mod)
 					if mod.no_get_name then
-						Module:instanciate(mod, "player", true)
+						Module:instanciate(mod, "player", true, false)
 					else
 						game:registerDialog(require('engine.dialogs.GetText').new("Enter your character's name", "Name", 2, 25, function(text)
 							local savename = text:gsub("[^a-zA-Z0-9_-.]", "_")
@@ -88,7 +91,11 @@ function _M:generateList()
 					end
 				end
 				mod.version_txt = ("%d.%d.%d"):format(mod.version[1], mod.version[2], mod.version[3])
-				mod.zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text="#{bold}##GOLD#"..mod.long_name.."#WHITE##{normal}#\n\n"..mod.description}
+				local tstr = tstring{{"font","bold"}, {"color","GOLD"}, mod.long_name, true, true}
+				if mod.incompatible then tstr:add({"font","bold"}, {"color","LIGHT_RED"}, "This game is not compatible with your version of T-Engine, you can still try it but it might break.", true, true) end
+				tstr:add({"font","normal"}, {"color","WHITE"})
+				tstr:merge(mod.description:toTString())
+				mod.zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=tstr}
 
 				table.insert(self.list, mod)
 			end
@@ -96,11 +103,8 @@ function _M:generateList()
 	end
 end
 
-function _M:switchVersions()
-	self.all_versions = not self.all_versions
+function _M:switch()
 	self:generateList()
 	self.c_list.list = self.list
 	self.c_list:generate()
-	self.c_switch.text = self.all_versions and "Show only new versions" or "Show all versions"
-	self.c_switch:generate()
 end