Changeset 3333

Timestamp:

11/30/08 21:49:34 (5 weeks ago)

Author:

licho

Message:

• changes to awards and morphing to allow variable hostname
• hopefully fixed boost crash when 16 people in game

Location:

trunk/mods/ca/LuaRules/Gadgets

Files:

• awards.lua (modified) (5 diffs)
• unit_morph.lua (modified) (3 diffs)
• unit_start_boost.lua (modified) (1 diff)

trunk/mods/ca/LuaRules/Gadgets/awards.lua

@@ -200 +200 @@
                 end
         end
+
 end
 
@@ -437 +438 @@
 -------------------------------------------------------------------------------------
 
+local hostName = nil --planetwars hostname
+
 local spGetGameFrame    = Spring.GetGameFrame
 local spGetMouseState   = Spring.GetMouseState
 local spSendCommands    = Spring.SendCommands
+
 
 local glPushMatrix              = gl.PushMatrix
@@ -480 +484 @@
 local maxRow            = 8
 local fontHeight        = 16
+
 
 local awardDescs = 
@@ -509 +514 @@
         end
         spSendCommands({'endgraph 0'})
+
+        -- planetwars init
+        local modOptions = Spring.GetModOptions()
+        if (modOptions) and modOptions.planetwars then
+                hostName = modOptions.planetwars.hostname
+        end  
 end
 
@@ -607 +618 @@
                         for awardType, record in spairs(awards) do
                                 awardCount = awardCount + 1
-                                if not sentToPlanetWars then
-                                        local planetWarsData = 'award: '.. teamNames[team] ..' '.. awardType ..' '.. awardDescs[awardType] ..', '.. record
-                                        Spring.SendCommands("w PlanetWars Encoded mission report:".. planetWarsData)
+                                if not sentToPlanetWars and hostName ~= nil then
+                                        local planetWarsData = teamNames[team] ..' '.. awardType ..' '.. awardDescs[awardType] ..', '.. record
+                                        Spring.SendCommands("w "..hostName.." pwaward:".. planetWarsData)
                                         Spring.Echo(planetWarsData)
                                 end

trunk/mods/ca/LuaRules/Gadgets/unit_morph.lua

@@ -107 +107 @@
 local morphDefs  = {} --// make it global in Initialize()
 local extraUnitMorphDefs = {} -- stores mainly planetwars morphs
+local hostName = nil -- planetwars hostname
 local morphUnits = {} --// make it global in Initialize()
 local reqDefIDs  = {} --// all possible unitDefID's, which are used as a requirement for a morph
@@ -394 +395 @@
   local newUnit = Spring.CreateUnit(defName, px, py, pz, 0, unitTeam)
   
-  if (extraUnitMorphDefs[unitID] ~= nil) then  -- send planetwars deployment message
+  if (extraUnitMorphDefs[unitID] ~= nil and hostName ~= nil) then  -- send planetwars deployment message
         local data = unitTeam..","..defName..","..math.floor(px)..","..math.floor(pz)..",".."S" -- todo determine and apply smart orientation of the structure
-        Spring.SendCommands("w pwdeploy:"..data)
+        Spring.SendCommands("w "..hostName.." pwdeploy:"..data)
         extraUnitMorphDefs[unitID] = nil
   end
@@ -489 +490 @@
   end
   
-  -- self linking
+  -- self linking for planetwars
   GG['morphHandler'] = {}
   GG['morphHandler'].AddExtraUnitMorph = AddExtraUnitMorph
+  local modOptions = Spring.GetModOptions()
+  if (modOptions) and modOptions.planetwars then
+        hostName = modOptions.planetwars.hostname
+  end  
+  
   
   if (type(GG.UnitRanked)~="table") then GG.UnitRanked = {} end

trunk/mods/ca/LuaRules/Gadgets/unit_start_boost.lua

@@ -105 +105 @@
         for _, teamID in pairs(Spring.GetTeamList()) do
                 local gaiaID = Spring.GetGaiaTeamID()
-                local teamLuaAI = Spring.GetTeamLuaAI(teamID)
+                local teamLuaAI = nil
+                pcall(function() teamLuaAI = Spring.GetTeamLuaAI(teamID) end)
                 if (teamID ~= gaiaID and (not teamLuaAI or teamLuaAI == "")) then
                         local metal = Spring.GetTeamResources(teamID, 'metal')