bump to 34

Fix Arena start under some circumstances


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

build/options.lua

@@ -17,7 +17,7 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-TE4CORE_VERSION = 15
+TE4CORE_VERSION = 16
 corename = "te4core-"..TE4CORE_VERSION
 
 newoption {

game/engines/default/engine/Module.lua

@@ -133,8 +133,18 @@ function _M:loadDefinition(dir, team, incompatible)
 					if fs.exists(dir.."/engine") then fs.mount(fs.getRealPath(dir).."/engine/", "/engine", false) end
 				else
 					local src = fs.getRealPath(team)
-
 					fs.mount(src, "/", false)
+
+					-- Addional teams
+					for i, t in ipairs(mod.teams or {}) do
+						local base = team:gsub("/[^/]+$", "/")
+						local file = base..t[1]:gsub("#name#", mod.short_name):gsub("#version#", ("%d.%d.%d"):format(mod.version[1], mod.version[2], mod.version[3]))
+						if fs.exists(file) then
+							print("Mounting additional team file:", file)
+							local src = fs.getRealPath(file)
+							fs.mount(src, "/", false)
+						end
+					end
 				end
 
 				-- Load moonscript support
@@ -526,50 +536,6 @@ end
 -- @param src the url to load the list from, if nil it will default to te4.org
 -- @return a linda object (see lua lanes documentation) which should be waited upon like this <code>local mylist = l:receive("moduleslist")</code>. Also returns a thread handle
 function _M:loadRemoteList(src)
---[[
-	local l = lanes.linda()
-
-	function list_handler(src)
-		local http = require "socket.http"
-		local ltn12 = require "ltn12"
-
-		local t = {}
-		print("Downloading modules list from", src)
-		http.request{url = src, sink = ltn12.sink.table(t)}
-		local f, err = loadstring(table.concat(t))
-		if err then
-			print("Could not load modules list from ", src, ":", err)
-			l:send("moduleslist", {})
-			return
-		end
-
-		local list = {}
-		local dmods = {}
-		dmods.installableModule = function (t)
-			local ok = true
-
-			if not t.name or not t.long_name or not t.short_name or not t.author then ok = false end
-
-			if ok then
-				list[#list+1] = t
-			end
-		end
-		setfenv(f, dmods)
-		local ok, err = pcall(f)
-		if not ok and err then
-			print("Could not read modules list from ", src, ":", err)
-			l:send("moduleslist", {})
-			return
-		end
-
-		for k, e in ipairs(list) do print("[INSTALLABLE MODULE] ", e.name) end
-
-		l:send("moduleslist", list)
-	end
-
-	local h = lanes.gen("*", list_handler)(src or "http://te4.org/modules.lualist")
-	return l, h
-]]
 	local DownloadDialog = require "engine.dialogs.DownloadDialog"
 	local d = DownloadDialog.new("Fetching updates", "http://te4.org/dl/t-engine/t-engine4-windows-1.0.0beta21.zip")
 	d:startDownload()

game/engines/default/engine/dialogs/DownloadDialog.lua

@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 require "engine.class"
-local ispatch = require "dispatch"
+local dispatch = require "dispatch"
 local Dialog = require "engine.ui.Dialog"
 local Textzone = require "engine.ui.Textzone"
 
@@ -93,6 +93,7 @@ function _M:startDownload()
 	local handler = dispatch.newhandler("coroutine")
 	local done = false
 	handler:start(function()
+		print("plop")
 		http.request{
 			url = self.url,
 			sink = function(chunk, err) print("=====") end,

game/engines/default/engine/init.lua

@@ -18,6 +18,7 @@
 -- darkgod@te4.org
 
 -- load some utility functions
+local dispatch = require "dispatch"
 dofile("/engine/utils.lua")
 dofile("/engine/colors.lua")
 

game/engines/default/engine/version.lua

@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 -- Engine Version
-engine.version = {0,9,33,"te4",15}
+engine.version = {0,9,34,"te4",16}
 engine.require_c_core = engine.version[5]
 engine.version_id = ("%s-%d_%d.%d.%d"):format(engine.version[4], engine.require_c_core, engine.version[1], engine.version[2], engine.version[3])
 

game/modules/example/init.lua

@@ -23,7 +23,7 @@ short_name = "example"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "http://te4.org/modules:example"
 version = {1,0,0}
-engine = {0,9,33,"te4"}
+engine = {0,9,34,"te4"}
 description = [[
 This is *NOT* a game, just an example/template to make your own using the T-Engine4.
 ]]

game/modules/example_realtime/init.lua

@@ -23,7 +23,7 @@ short_name = "example_realtime"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "http://te4.org/modules:example"
 version = {1,0,0}
-engine = {0,9,33,"te4"}
+engine = {0,9,34,"te4"}
 description = [[
 This is *NOT* a game, just an example/template to make your own using the T-Engine4.
 ]]

game/modules/tome/data/zones/arena/zone.lua

@@ -243,7 +243,7 @@ return {
 					local i = 1
 					while(scores[i] and scores[i].name) do
 						p = scores[i]
-						tmp = stri:format(p.name:capitalize(), p.sex, p.race, p.class, p.score, p.perk, p.wave)
+						tmp = stri:format(p.name:capitalize(), p.sex or "???", p.race or "???", p.class or "???", p.score or 0, p.perk or "???", p.wave or 0)
 						text = text..line(tmp, "#LIGHT_BLUE#")
 						i = i + 1
 					end

game/modules/tome/init.lua

@@ -22,8 +22,8 @@ long_name = "Tales of Maj'Eyal: Age of Ascendancy"
 short_name = "tome"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "http://tome.te4.org/"
-version = {3,9,33}
-engine = {0,9,33,"te4"}
+version = {3,9,34}
+engine = {0,9,34,"te4"}
 description = [[
 Welcome to Maj'Eyal.