Changeset 10250

Timestamp:

Feb 1, 2015, 10:51:47 PM (9 years ago)

Author:

landauf

Message:

tabs → spaces. removed temp-file

Location:

code/branches/storymodeHS14

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• data/gui/scripts/CampaignMenu.lua (modified) (2 diffs)
• data/gui/scripts/SingleplayerMenu.lua (modified) (2 diffs)
• data/gui/scripts/campaign.txt (deleted)

code/branches/storymodeHS14/cmake/LibraryConfig.cmake

@@ -161 +161 @@
 SET(Boost_ADDITIONAL_VERSIONS 1.40 1.40.0 1.41 1.41.0 1.42 1.42.0 1.43 1.43.0
                               1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1 1.49.0
-                              1.53.0)
+                              1.53.0)
 IF(NOT TARDIS)
   FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)

code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua

@@ -4 +4 @@
 
 function P.onLoad()
-        
-        local MissionTwoButton = winMgr:getWindow("orxonox/MissionTwoButton")
-        if (P.CheckLevel("missionOne.oxw")) then
-        MissionTwoButton:setProperty("Disabled", "False")
-        end
-        
-        local MissionThreeButton = winMgr:getWindow("orxonox/MissionThreeButton")
-        if (P.CheckLevel("fightInOurBack.oxw")) then
-        MissionThreeButton:setProperty("Disabled", "False")
-        end
+    
+    local MissionTwoButton = winMgr:getWindow("orxonox/MissionTwoButton")
+    if (P.CheckLevel("missionOne.oxw")) then
+    MissionTwoButton:setProperty("Disabled", "False")
+    end
+    
+    local MissionThreeButton = winMgr:getWindow("orxonox/MissionThreeButton")
+    if (P.CheckLevel("fightInOurBack.oxw")) then
+    MissionThreeButton:setProperty("Disabled", "False")
+    end
 
-        local MissionFourButton = winMgr:getWindow("orxonox/MissionFourButton")
-        if (P.CheckLevel("pirateAttack.oxw")) then
-        MissionFourButton:setProperty("Disabled", "False")
-        end
-        
-        local Completed = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
-        if (P.CheckLevel("iJohnVane_TriptoArea51.oxw")) then
-        Completed:setProperty("Visible","True")
-        end
+    local MissionFourButton = winMgr:getWindow("orxonox/MissionFourButton")
+    if (P.CheckLevel("pirateAttack.oxw")) then
+    MissionFourButton:setProperty("Disabled", "False")
+    end
+    
+    local Completed = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
+    if (P.CheckLevel("iJohnVane_TriptoArea51.oxw")) then
+    Completed:setProperty("Visible","True")
+    end
 end
 
 function P.GenerateHelperString(number)
-        local string = ""
-        while number > 1 do
-                string = string.." "
-                number = number-1
-        end
-        string = string.."."
-        return string
+    local string = ""
+    while number > 1 do
+        string = string.." "
+        number = number-1
+    end
+    string = string.."."
+    return string
 end
 
 function P.FindLevel(filename)
-        local level = nil
-        local templevel = nil
-        local size = orxonox.LevelManager:getInstance():getNumberOfLevels()
+    local level = nil
+    local templevel = nil
+    local size = orxonox.LevelManager:getInstance():getNumberOfLevels()
     local index = 0
     while index < size do
-        templevel = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
-        if(templevel:getXMLFilename()==filename) then 
-                level = templevel
-        end
+        templevel = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
+        if(templevel:getXMLFilename()==filename) then 
+            level = templevel
+        end
     index=index+1
     end
@@ -52 +52 @@
     
 function P.CheckLevel(filename)
-        local file = io.open("/home/pmao/pmao-extra-0/orxonox/storymode/campaign.txt", "r+")
-        local index = 0
-        local returnvalue = false
-        local numberoflines = 58-string.len(filename)
-        local helpstringfalse = filename.." 0"..P.GenerateHelperString(numberoflines) 
-        local helpstringtrue = filename.." 1"..P.GenerateHelperString(numberoflines)
-        while index < 100 do
-                local line = file:read()
-                if(line == helpstringfalse) then
-                        returnvalue = false 
-                        break
-                end
-                if(line == helpstringtrue) then
-                        returnvalue = true
-                        break
-                end
-                index=index+1
-        end     
-        io.close(file)
-        return returnvalue
+    local file = io.open("/home/pmao/pmao-extra-0/orxonox/storymode/campaign.txt", "r+")
+    local index = 0
+    local returnvalue = false
+    local numberoflines = 58-string.len(filename)
+    local helpstringfalse = filename.." 0"..P.GenerateHelperString(numberoflines) 
+    local helpstringtrue = filename.." 1"..P.GenerateHelperString(numberoflines)
+    while index < 100 do
+        local line = file:read()
+        if(line == helpstringfalse) then
+            returnvalue = false 
+            break
+        end
+        if(line == helpstringtrue) then
+            returnvalue = true
+            break
+        end
+        index=index+1
+    end
+    io.close(file)
+    return returnvalue
 end
 
 function P.MissionOneButton_clicked(e)
-        local level = P.FindLevel("missionOne.oxw")
-                orxonox.execute("startGame " .. level:getXMLFilename())
-                hideAllMenuSheets()
+    local level = P.FindLevel("missionOne.oxw")
+        orxonox.execute("startGame " .. level:getXMLFilename())
+        hideAllMenuSheets()
 end
 
 function P.MissionTwoButton_clicked(e)
-        local level = P.FindLevel("fightInOurBack.oxw")
-        if (P.CheckLevel("missionOne.oxw")) then
-                orxonox.execute("startGame " .. level:getXMLFilename())
-                hideAllMenuSheets()
-        end
+    local level = P.FindLevel("fightInOurBack.oxw")
+    if (P.CheckLevel("missionOne.oxw")) then
+        orxonox.execute("startGame " .. level:getXMLFilename())
+        hideAllMenuSheets()
+    end
 end
 
 function P.MissionThreeButton_clicked(e)
-        local level = P.FindLevel("pirateAttack.oxw")
-        if (P.CheckLevel("fightInOurBack.oxw")) then
-                orxonox.execute("startGame " .. level:getXMLFilename())
-                hideAllMenuSheets()
-        else
-                 hideMenuSheet(P.name)
-        end
+    local level = P.FindLevel("pirateAttack.oxw")
+    if (P.CheckLevel("fightInOurBack.oxw")) then
+        orxonox.execute("startGame " .. level:getXMLFilename())
+        hideAllMenuSheets()
+    else
+         hideMenuSheet(P.name)
+    end
 end
 
 function P.MissionFourButton_clicked(e)
-        local level = P.FindLevel("iJohnVane_TriptoArea51.oxw")
-        if (P.CheckLevel("pirateAttack.oxw")) then
-                orxonox.execute("startGame " .. level:getXMLFilename())
-                hideAllMenuSheets()
-        else
-                 hideMenuSheet(P.name)
-        end
+    local level = P.FindLevel("iJohnVane_TriptoArea51.oxw")
+    if (P.CheckLevel("pirateAttack.oxw")) then
+        orxonox.execute("startGame " .. level:getXMLFilename())
+        hideAllMenuSheets()
+    else
+         hideMenuSheet(P.name)
+    end
 end
 
 function P.CampaignMenuRefreshButton_clicked(e)
-        local MissionTwoButton = winMgr:getWindow("orxonox/MissionTwoButton")
-        if (P.CheckLevel("missionOne.oxw")) then
-        MissionTwoButton:setProperty("Disabled", "False")
-        end
-        
-        local MissionThreeButton = winMgr:getWindow("orxonox/MissionThreeButton")
-        if (P.CheckLevel("fightInOurBack.oxw")) then
-        MissionThreeButton:setProperty("Disabled", "False")
-        end
+    local MissionTwoButton = winMgr:getWindow("orxonox/MissionTwoButton")
+    if (P.CheckLevel("missionOne.oxw")) then
+    MissionTwoButton:setProperty("Disabled", "False")
+    end
+    
+    local MissionThreeButton = winMgr:getWindow("orxonox/MissionThreeButton")
+    if (P.CheckLevel("fightInOurBack.oxw")) then
+    MissionThreeButton:setProperty("Disabled", "False")
+    end
 
-        local MissionFourButton = winMgr:getWindow("orxonox/MissionFourButton")
-        if (P.CheckLevel("pirateAttack.oxw")) then
-        MissionFourButton:setProperty("Disabled", "False")
-        end
-        
-        local Completed = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
-        if (P.CheckLevel("iJohnVane_TriptoArea51.oxw")) then
-        Completed:setProperty("Visible","True")
-        end
+    local MissionFourButton = winMgr:getWindow("orxonox/MissionFourButton")
+    if (P.CheckLevel("pirateAttack.oxw")) then
+    MissionFourButton:setProperty("Disabled", "False")
+    end
+    
+    local Completed = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
+    if (P.CheckLevel("iJohnVane_TriptoArea51.oxw")) then
+    Completed:setProperty("Visible","True")
+    end
 end
 

code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua

@@ -40 +40 @@
     })
     P:setButton(1, 4,{
-                ["button"] = winMgr:getWindow("orxonox/CampaignButton"),
-                ["callback"] = P.CampaignButton_clicked
+            ["button"] = winMgr:getWindow("orxonox/CampaignButton"),
+            ["callback"] = P.CampaignButton_clicked
     })
 end
@@ -172 +172 @@
 
 function P.CampaignButton_clicked(e)
-        showMenuSheet("CampaignMenu", true)
+    showMenuSheet("CampaignMenu", true)
 end