Changeset 11313 for code/branches

Timestamp:

Nov 28, 2016, 4:53:24 PM (8 years ago)

Author:

kappenh

Message:

Able to save scores in ini. todo: save and retrieve pong score

Location:

code/branches/Highscore_HS16

Files:

• data/defaultConfig/orxonox.ini (modified) (1 diff)
• data/gui/scripts/HighscoreMenu.lua (modified) (3 diffs)
• src/libraries/core/CMakeLists.txt (modified) (2 diffs)
• src/libraries/core/Highscore.cc (deleted)
• src/libraries/core/Highscore.h (deleted)
• src/modules/jump/Jump.cc (modified) (2 diffs)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/Highscore.cc (added)
• src/orxonox/Highscore.h (added)

code/branches/Highscore_HS16/data/defaultConfig/orxonox.ini

@@ -9 +9 @@
 campaignMissions_[7] = "shuttleAttack.oxw"
 campaignMissions_[8] = "shuttleRetaliation.oxw"
+
+[Highscore]
+tests_[0] = "name1"
+tests_[1] = "name2"
+

code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua

@@ -24 +24 @@
         
         P.scoreList = {}
-        
-        for i=1,20 do
-                table.insert(P.nameList, "Player "..i)
+        test = orxonox.Highscore:getInstance():getNumberOfHighscores()
+
+        for i=0,orxonox.Highscore:getInstance():getNumberOfHighscores()-1 do
+                table.insert(P.nameList, orxonox.Highscore:getInstance():getHighscore(i))
                 table.insert(P.scoreList, i)
         
@@ -41 +42 @@
             P.createFilterTab(v:getName(), v:getName())
         end
-        local highscores = v:getHighscores()
-        orxonox.CommandExecutor:execute("log test:".. highscores)
+        --local highscores = v:getHighscores()
+        --orxonox.CommandExecutor:execute("log test:".. highscores)
 
     end
@@ -55 +56 @@
 
 function P.onShow()
+        P.nameList = {}
+        
+        P.scoreList = {}
+        test = orxonox.Highscore:getInstance():getNumberOfHighscores()
+
+        for i=0,orxonox.Highscore:getInstance():getNumberOfHighscores()-1 do
+                table.insert(P.nameList, orxonox.Highscore:getInstance():getHighscore(i))
+                table.insert(P.scoreList, i)
+        
+        end
     --local description = winMgr:getWindow("orxonox/HighscoreText")
 

code/branches/Highscore_HS16/src/libraries/core/CMakeLists.txt

@@ -27 +27 @@
   GameMode.cc
   GameState.cc
-  Highscore.cc
   Language.cc
   Loader.cc
@@ -91 +90 @@
     GraphicsManager.h
     GUIManager.h
-    Highscore.h
     Loader.h
     LuaState.h

code/branches/Highscore_HS16/src/modules/jump/Jump.cc

@@ -34 +34 @@
 #include "Jump.h"
 #include "core/CoreIncludes.h"
+#include "Highscore.h"
 
 #include "JumpCenterpoint.h"
@@ -311 +312 @@
         cleanup();
         GSLevel::startMainMenu();
-
+        orxout() << "Test Highscore" << endl;
+        if (Highscore::exists()){
+                    orxout() << "exists" << endl;
+                   Highscore::getInstance().storeHighscore("player","jump",sectionNumber_ - 2);
+          }
         Deathmatch::end();
     }

code/branches/Highscore_HS16/src/orxonox/CMakeLists.txt

@@ -27 +27 @@
   LevelInfo.cc
   LevelManager.cc
+  Highscore.cc
   Main.cc
   MoodManager.cc
@@ -61 +62 @@
     LevelInfo.h
     LevelManager.h
+    Highscore.h
     MoodManager.h
     controllers/HumanController.h