[Orxonox-commit 6667] r11304 - in code/branches/Highscore_HS16: data/gui/scripts src/libraries/core src/orxonox src/orxonox/highscore
kappenh at orxonox.net
kappenh at orxonox.net
Mon Nov 21 16:10:07 CET 2016
Author: kappenh
Date: 2016-11-21 16:10:07 +0100 (Mon, 21 Nov 2016)
New Revision: 11304
Added:
code/branches/Highscore_HS16/src/libraries/core/Highscore.cc
code/branches/Highscore_HS16/src/libraries/core/Highscore.h
code/branches/Highscore_HS16/src/orxonox/highscore/
code/branches/Highscore_HS16/src/orxonox/highscore/CMakeLists.txt
code/branches/Highscore_HS16/src/orxonox/highscore/HighscoreIO.cc
code/branches/Highscore_HS16/src/orxonox/highscore/HighscoreIO.h
Modified:
code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua
code/branches/Highscore_HS16/src/libraries/core/CMakeLists.txt
code/branches/Highscore_HS16/src/orxonox/CMakeLists.txt
Log:
try to save highscore
Modified: code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua
===================================================================
--- code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua 2016-11-21 15:06:13 UTC (rev 11303)
+++ code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua 2016-11-21 15:10:07 UTC (rev 11304)
@@ -21,12 +21,15 @@
function P.onLoad()
P.createLevelList()
P.nameList = {}
- table.insert(P.nameList, "firsttestPlayer")
- table.insert(P.nameList, "secondtestPlayer")
+
P.scoreList = {}
- table.insert(P.scoreList, 120)
- table.insert(P.scoreList, 20)
+ for i=1,20 do
+ table.insert(P.nameList, "Player "..i)
+ table.insert(P.scoreList, i)
+
+ end
+
P.linesList = {}
Modified: code/branches/Highscore_HS16/src/libraries/core/CMakeLists.txt
===================================================================
--- code/branches/Highscore_HS16/src/libraries/core/CMakeLists.txt 2016-11-21 15:06:13 UTC (rev 11303)
+++ code/branches/Highscore_HS16/src/libraries/core/CMakeLists.txt 2016-11-21 15:10:07 UTC (rev 11304)
@@ -26,6 +26,7 @@
GameConfig.cc
GameMode.cc
GameState.cc
+ Highscore.cc
Language.cc
Loader.cc
LuaState.cc
@@ -89,6 +90,7 @@
GameMode.h
GraphicsManager.h
GUIManager.h
+ Highscore.h
Loader.h
LuaState.h
input/InputManager.h
Added: code/branches/Highscore_HS16/src/libraries/core/Highscore.cc
===================================================================
--- code/branches/Highscore_HS16/src/libraries/core/Highscore.cc (rev 0)
+++ code/branches/Highscore_HS16/src/libraries/core/Highscore.cc 2016-11-21 15:10:07 UTC (rev 11304)
@@ -0,0 +1,30 @@
+#include "Highscore.h"
+
+#include <vector>
+#include "core/CoreIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
+
+
+namespace orxonox
+{
+
+ RegisterClassNoArgs(Highscore);
+
+ Highscore::Highscore()
+ {
+ RegisterObject(Highscore);
+ this->setConfigValues();
+ }
+
+ void Highscore::setConfigValues()
+ {
+
+ SetConfigValue(name_, "Orxonox").description("The name of the game");
+ }
+
+ /* static */ std::string Highscore::getName(){
+ std::string result;
+ result = Highscore::name_;
+ return result;
+ }
+}
Added: code/branches/Highscore_HS16/src/libraries/core/Highscore.h
===================================================================
--- code/branches/Highscore_HS16/src/libraries/core/Highscore.h (rev 0)
+++ code/branches/Highscore_HS16/src/libraries/core/Highscore.h 2016-11-21 15:10:07 UTC (rev 11304)
@@ -0,0 +1,24 @@
+
+
+#include <string>
+#include "core/config/Configurable.h"
+
+namespace orxonox
+{
+class _CoreExport Highscore : virtual public Configurable
+{
+ public:
+ Highscore(); // Constructor
+ void setConfigValues(); // Inherited function
+ void storeHighscore(std::string player, std::string level, int points);
+
+ static std::string getName(); // tolua_export
+
+
+ private:
+ std::string name_;
+ float version_;
+};
+
+
+}
\ No newline at end of file
Modified: code/branches/Highscore_HS16/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/Highscore_HS16/src/orxonox/CMakeLists.txt 2016-11-21 15:06:13 UTC (rev 11303)
+++ code/branches/Highscore_HS16/src/orxonox/CMakeLists.txt 2016-11-21 15:10:07 UTC (rev 11304)
@@ -45,6 +45,7 @@
ADD_SUBDIRECTORY(gamestates)
ADD_SUBDIRECTORY(gametypes)
ADD_SUBDIRECTORY(graphics)
+ADD_SUBDIRECTORY(highscore)
ADD_SUBDIRECTORY(infos)
ADD_SUBDIRECTORY(interfaces)
ADD_SUBDIRECTORY(items)
Added: code/branches/Highscore_HS16/src/orxonox/highscore/CMakeLists.txt
===================================================================
--- code/branches/Highscore_HS16/src/orxonox/highscore/CMakeLists.txt (rev 0)
+++ code/branches/Highscore_HS16/src/orxonox/highscore/CMakeLists.txt 2016-11-21 15:10:07 UTC (rev 11304)
@@ -0,0 +1,3 @@
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ HighscoreIO.cc
+)
Added: code/branches/Highscore_HS16/src/orxonox/highscore/HighscoreIO.cc
===================================================================
--- code/branches/Highscore_HS16/src/orxonox/highscore/HighscoreIO.cc (rev 0)
+++ code/branches/Highscore_HS16/src/orxonox/highscore/HighscoreIO.cc 2016-11-21 15:10:07 UTC (rev 11304)
@@ -0,0 +1,22 @@
+#include "HighscoreIO.h"
+
+#include <vector>
+#include "core/CoreIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
+
+
+namespace orxonox
+{
+ HighscoreIO::HighscoreIO()
+ {
+ RegisterObject(HighscoreIO);
+ this->setConfigValues();
+ }
+
+ void HighscoreIO::setConfigValues()
+ {
+
+ SetConfigValue(name_, "Orxonox").description("The name of the game");
+ }
+
+}
Added: code/branches/Highscore_HS16/src/orxonox/highscore/HighscoreIO.h
===================================================================
--- code/branches/Highscore_HS16/src/orxonox/highscore/HighscoreIO.h (rev 0)
+++ code/branches/Highscore_HS16/src/orxonox/highscore/HighscoreIO.h 2016-11-21 15:10:07 UTC (rev 11304)
@@ -0,0 +1,24 @@
+
+
+#include <string>
+#include "core/config/Configurable.h"
+
+namespace orxonox
+{
+class _CoreExport HighscoreIO : virtual public Configurable
+{
+ public:
+ HighscoreIO(); // Constructor
+ void setConfigValues(); // Inherited function
+ void storeHighscore(std::string player, std::string level, int points);
+
+ const std::string& getName()
+ { return this->name_; }
+
+ private:
+ std::string name_;
+ float version_;
+};
+
+
+}
\ No newline at end of file
More information about the Orxonox-commit
mailing list