share/hedgewars/Data/Maps/Control/map.lua
changeset 5806 6778f0a7d896
parent 5325 261b79ba22b1
child 5842 30e374a27269
equal deleted inserted replaced
5805:a0e81ddb0fd4 5806:6778f0a7d896
   157 
   157 
   158 	for i = 0,(zCount-1) do
   158 	for i = 0,(zCount-1) do
   159 		SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)
   159 		SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)
   160 		cOwnerClan[i] = nil
   160 		cOwnerClan[i] = nil
   161 		for k = 0, (numhhs-1) do
   161 		for k = 0, (numhhs-1) do
   162 			if (hhs[k] ~= nil) then
   162 			if (hhs[k] ~= nil) and (GetGearType(hhs[k]) ~= nil) then
   163 			if (GearIsInZone(hhs[k],i)) == true then
   163                 if (GearIsInZone(hhs[k],i)) == true then
   164 
   164 
   165 				if cOwnerClan[i] ~= nil then
   165                     if cOwnerClan[i] ~= nil then
   166 					if cOwnerClan[i] ~= GetHogClan(hhs[k]) then 
   166                         if cOwnerClan[i] ~= GetHogClan(hhs[k]) then 
   167 						--if the hog now being compared is different to one that is also here and was previously compared
   167                             --if the hog now being compared is different to one that is also here and was previously compared
   168 						
   168                             
   169 						SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)						
   169                             SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)						
   170 						--SetVisualGearValues(vCirc[i], 2739, 1378, 20, 255, 1, 10, 0, 300, 5, 0xffffffff)
   170                             --SetVisualGearValues(vCirc[i], 2739, 1378, 20, 255, 1, 10, 0, 300, 5, 0xffffffff)
   171 	
   171         
   172 						cOwnerClan[i] = 10 -- this means conflicted
   172                             cOwnerClan[i] = 10 -- this means conflicted
   173 					end
   173                         end
   174 				elseif cOwnerClan[i] == nil then
   174                     elseif cOwnerClan[i] == nil then
   175 					cOwnerClan[i] = GetHogClan(hhs[k])
   175                         cOwnerClan[i] = GetHogClan(hhs[k])
   176 					--SetVisualGearValues(vCirc[i], 2739, 1378, 20, 255, 1, 10, 0, 300, 5, GetClanColor( GetHogClan(hhs[k])) )
   176                         --SetVisualGearValues(vCirc[i], 2739, 1378, 20, 255, 1, 10, 0, 300, 5, GetClanColor( GetHogClan(hhs[k])) )
   177 					SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], GetClanColor( GetHogClan(hhs[k])))
   177                         SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], GetClanColor( GetHogClan(hhs[k])))
   178 	
   178         
   179 				end
   179                     end
   180 
   180 
   181 			end
   181                 end
       
   182             else hhs[k] = nil
   182 			end
   183 			end
   183 		end
   184 		end
   184 
   185 
   185 	end
   186 	end
   186 
   187