Finished some work on FilePlayerDAO

git-svn-id: https://svn.code.sf.net/p/gameservirc/code/trunk@509 bc333340-6410-0410-a689-9d09f3c113fa

diff --git a/gameserv-2.0/GameServ.sln b/gameserv-2.0/GameServ.sln
index 4687ff685220971c8a1dd64b4743fe0956401107..b4f6da9c7de81156fd9abb9cc08c816f302ade4b 100644 (file)
--- a/gameserv-2.0/GameServ.sln
+++ b/gameserv-2.0/GameServ.sln
@@ -1,6 +1,6 @@
 \r
-Microsoft Visual Studio Solution File, Format Version 9.00\r
-# Visual Studio 2005\r
+Microsoft Visual Studio Solution File, Format Version 10.00\r
+# Visual C++ Express 2008\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgameservgldl", "libgameservgldl\libgameservgldl.vcproj", "{3CED9BD5-BEAA-4C36-A735-AFF2B3F2CF42}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {279AA91C-8638-45E5-AAA3-988F74764A97} = {279AA91C-8638-45E5-AAA3-988F74764A97}\r

diff --git a/gameserv-2.0/libgameservcore/include/GameServ/Types.h b/gameserv-2.0/libgameservcore/include/GameServ/Types.h
index 845993810076457e5b765bbfc5fb087bcbcc313d..4554ba50aaac99169cdeb425185a47b177eb1203 100644 (file)
--- a/gameserv-2.0/libgameservcore/include/GameServ/Types.h
+++ b/gameserv-2.0/libgameservcore/include/GameServ/Types.h
@@ -10,18 +10,18 @@ namespace GameServ
 {              \r
        namespace Types\r
        {\r
-
-               //! Holds the exceptions related to types and their conversions
-               namespace Exceptions
-               {
-                       //! Generic type exception possibly due to conversion or improper usage
-                       class TypeException : public GameServException
-                       {
-                       public:
-                               TypeException(const string &ErrorMsg, const char *pFilename, int SourceLine);
-                               TypeException(const string &ErrorMsg);
-                               TypeException(void);
-                       };
+\r
+               //! Holds the exceptions related to types and their conversions\r
+               namespace Exceptions\r
+               {\r
+                       //! Generic type exception possibly due to conversion or improper usage\r
+                       class TypeException : public GameServException\r
+                       {\r
+                       public:\r
+                               TypeException(const string &ErrorMsg, const char *pFilename, int SourceLine);\r
+                               TypeException(const string &ErrorMsg);\r
+                               TypeException(void);\r
+                       };\r
                }\r
 \r
                class ItemTypes\r

diff --git a/gameserv-2.0/libgameservcore/libgameservcore.vcproj b/gameserv-2.0/libgameservcore/libgameservcore.vcproj
index 49d374813ba2abde58830523c88f2e216ded9869..596a8b769968f4c1b59b749aabf2fa161702ed08 100644 (file)
--- a/gameserv-2.0/libgameservcore/libgameservcore.vcproj
+++ b/gameserv-2.0/libgameservcore/libgameservcore.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="9.00"\r
        Name="libgameservcore"\r
        ProjectGUID="{279AA91C-8638-45E5-AAA3-988F74764A97}"\r
        RootNamespace="libgameservcore"\r
+       TargetFrameworkVersion="131072"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -45,7 +46,7 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -120,6 +121,8 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
@@ -140,9 +143,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/File/FilePlayerDAO.h b/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/File/FilePlayerDAO.h
index 63bd5689d1a6103bf765f6431dd14584af77c2e1..9143eba964384cd9a74e698b9c8ce2df7744de18 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/File/FilePlayerDAO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/File/FilePlayerDAO.h
@@ -37,6 +37,8 @@ namespace GameServ {  namespace DataLayer { namespace File
                virtual void Insert(shared_ptr<PlayerGO> spPlayer);\r
                virtual void Update(shared_ptr<PlayerGO> spPlayer);\r
 \r
+               virtual void SetFlags(shared_ptr<PlayerGO> spPlayer, const int &flags) const;\r
+\r
        private:\r
                //! Data file\r
                string mFilename;\r

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/IPlayerDAO.h b/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/IPlayerDAO.h
index d2c88b9a3879473bb9f08c26d4f6067b0c04edfb..391c8d7d20ed7a65ee5d61815ac7d9517296c3d7 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/IPlayerDAO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/IPlayerDAO.h
@@ -42,11 +42,11 @@ namespace GameServ { namespace DataLayer { namespace DataAccessObjects
                */\r
                virtual list<string> GetIdsByName(const string &Name) const = 0;\r
 \r
-               //! Function to quickly search to see if an Id exists or not
-               /*!
-               \param Id The Id of the game object to search for
-               \return true if the Id is valid and exists in the data, false otherwise
-               */
+               //! Function to quickly search to see if an Id exists or not\r
+               /*!\r
+               \param Id The Id of the game object to search for\r
+               \return true if the Id is valid and exists in the data, false otherwise\r
+               */\r
                virtual bool IdExists(const string &Id) const = 0;\r
 \r
                virtual void Insert(shared_ptr<PlayerGO> spPlayer) = 0;\r

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h
index 53c752750697fc52db7ab360c37d9cab899ad43b..2c168851ce0372e6f443e1d12a2452aa3bf5f03f 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/GameObjects/PlayerGO.h
@@ -47,7 +47,12 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
                //! Property get - Gold\r
                unsigned long int Gold(void) const;\r
                //! Property set - Gold\r
-               void Gold(const unsigned long int &gold);\r
+               void Gold(const unsigned long int &value);\r
+\r
+               //! Property get - Gold in the bank\r
+               unsigned long int Bank(void) const;\r
+               //! Property set - Gold in the bank\r
+               void Bank(const unsigned long int &value);\r
 \r
                //! Property get - Health\r
                int Health(void) const;\r
@@ -94,6 +99,11 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
                //! Undo the effects of an item\r
                void Undo(shared_ptr<ItemGO> spItem);\r
 \r
+               //! Property set - Password\r
+               void Password(const string &value);\r
+               //! Property get - Password\r
+               string Password(void) const;\r
+\r
                bool operator==(const PlayerGO &right) const;\r
                bool operator!=(const PlayerGO &right) const;\r
 \r
@@ -104,6 +114,7 @@ namespace GameServ { namespace GameLayer { namespace GameObjects
                int mLevel;\r
                unsigned long int mExperience;\r
                unsigned long int mGold;\r
+               unsigned long int mBank;\r
                int mHealth;\r
                int mMaxHealth;\r
                int mStrength;\r

diff --git a/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj b/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj
index 2bfe53ad8d97432bcc1bd6b5277c755d726e7354..db59a533cbd113459a81930cc14f426f9e7428ef 100644 (file)
--- a/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj
+++ b/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="9.00"\r
        Name="libgameservgldl"\r
        ProjectGUID="{3CED9BD5-BEAA-4C36-A735-AFF2B3F2CF42}"\r
        RootNamespace="libgameservgldl"\r
+       TargetFrameworkVersion="131072"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -45,7 +46,7 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -120,6 +121,8 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
@@ -140,9 +143,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r

diff --git a/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp b/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp
index 938548417c5d00cf4b46abfe5354f475417ceb24..e3b56be8c160e28814b774fdff1dc0abe63fd1ad 100644 (file)
--- a/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp
+++ b/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp
@@ -80,16 +80,41 @@ shared_ptr<PlayerGO> FilePlayerDAO::CreatePlayerFromLine(const string &line) con
 {\r
        shared_ptr<PlayerGO> spPlayer;\r
        spPlayer = shared_ptr<PlayerGO>(new PlayerGO());\r
-       boost::char_separator<char> sep("|", 0, boost::keep_empty_tokens);\r
+       boost::char_separator<char> sep(" ", 0, boost::keep_empty_tokens);\r
        tokenizer tokens(line, sep);\r
        tokenizer::iterator tok_iter = tokens.begin();\r
 \r
-       spPlayer->Name((*tok_iter));\r
+       spPlayer->Level(lexical_cast<int>((*tok_iter)));\r
+       tok_iter++;\r
+       spPlayer->Experience(lexical_cast<unsigned long int>((*tok_iter)));\r
+       tok_iter++;\r
+       spPlayer->Gold(lexical_cast<unsigned long int>((*tok_iter)));\r
+       tok_iter++;\r
+       spPlayer->Bank(lexical_cast<unsigned long int>((*tok_iter)));\r
+       tok_iter++;\r
+       spPlayer->Health(lexical_cast<int>((*tok_iter)));\r
+       tok_iter++;\r
+       spPlayer->MaxHealth(lexical_cast<int>((*tok_iter)));\r
+       tok_iter++;\r
+       spPlayer->Strength(lexical_cast<int>((*tok_iter)));\r
+       tok_iter++;\r
+       spPlayer->Defense(lexical_cast<int>((*tok_iter)));\r
+       tok_iter++;\r
+       spPlayer->ForestFights(lexical_cast<int>((*tok_iter)));\r
+       tok_iter++;\r
+       spPlayer->PlayerFights(lexical_cast<int>((*tok_iter)));\r
+       tok_iter++;\r
+       int flags = lexical_cast<int>((*tok_iter));\r
+       SetFlags(spPlayer, flags);\r
+       tok_iter++;\r
+       spPlayer->Password((*tok_iter));\r
 \r
        return spPlayer;\r
 }\r
 \r
+void FilePlayerDAO::SetFlags(shared_ptr<PlayerGO> spPlayer, const int &flags) const\r
+{\r
 \r
-\r
+}\r
 \r
 \r

diff --git a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
index a0386293cb2d63f06c2e9e5aed5bcd60d498bb8a..a6fd61e147328e5aa32195e3c8f6d20bca1bc4e2 100644 (file)
--- a/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
+++ b/gameserv-2.0/libgameservgldl/src/GameLayer/GameObjects/PlayerGO.cpp
@@ -67,6 +67,16 @@ void PlayerGO::Gold(const unsigned long int &value)
        mGold = value;\r
 }\r
 \r
+unsigned long int PlayerGO::Bank(void) const\r
+{\r
+       return mBank;\r
+}\r
+\r
+void PlayerGO::Bank(const unsigned long int &value)\r
+{\r
+       mBank = value;\r
+}\r
+\r
 int PlayerGO::Health(void) const\r
 {\r
        return mHealth;\r
@@ -163,6 +173,16 @@ void PlayerGO::Undo(shared_ptr<ItemGO> spItem)
        throw GameServException("Undefined function.", __FILE__, __LINE__);\r
 }\r
 \r
+void PlayerGO::Password(const string &value)\r
+{\r
+       mPassword = value;\r
+}\r
+\r
+string PlayerGO::Password(void) const\r
+{\r
+       return mPassword;\r
+}\r
+\r
 bool PlayerGO::operator !=(const PlayerGO &right) const\r
 {\r
        return !(*this == right);\r