A little more work on FileArmorDAO.. almost done!

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

diff --git a/gameserv-2.0/libgameservcore/libgameservcore.vcproj b/gameserv-2.0/libgameservcore/libgameservcore.vcproj
index 596a8b769968f4c1b59b749aabf2fa161702ed08..99209b0772ace6c8f9e0c85389eb51449030cdf1 100644 (file)
--- a/gameserv-2.0/libgameservcore/libgameservcore.vcproj
+++ b/gameserv-2.0/libgameservcore/libgameservcore.vcproj
@@ -44,7 +44,7 @@
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;TIXML_USE_STL;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               RuntimeLibrary="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="4"\r

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/File/FileId.h b/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/File/FileId.h
index f7d3ac55bd759010f87d4a14ca85bf126a9ac7be..edc1fc76eaa1165d3a14bfce909470548bcc7cf5 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/File/FileId.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/File/FileId.h
@@ -22,4 +22,4 @@ namespace GameServ { namespace DataLayer { namespace File {
                ~FileId();\r
        };\r
 }}}\r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/gameserv-2.0/libgameservgldl/src/DataLayer/File/FileArmorDAO.cpp b/gameserv-2.0/libgameservgldl/src/DataLayer/File/FileArmorDAO.cpp
index af1179c8b1ccb008f2f83039de507896d8f6b9aa..3a3e92f923ac3fc6502b044e382ccd9b1cde9c81 100644 (file)
--- a/gameserv-2.0/libgameservgldl/src/DataLayer/File/FileArmorDAO.cpp
+++ b/gameserv-2.0/libgameservgldl/src/DataLayer/File/FileArmorDAO.cpp
@@ -162,4 +162,4 @@ void FileArmorDAO::LoadArmorCache(void)
                }\r
        }\r
        infile.close();\r
-}
\ No newline at end of file
+}\r

diff --git a/gameserv-2.0/libgameservgldl/src/DataLayer/File/FileId.cpp b/gameserv-2.0/libgameservgldl/src/DataLayer/File/FileId.cpp
index 5030de31ec8427a56d1207529f5ca76cc1b6cdb4..f95d8f1ef756d7248183829331e6872ff127b483 100644 (file)
--- a/gameserv-2.0/libgameservgldl/src/DataLayer/File/FileId.cpp
+++ b/gameserv-2.0/libgameservgldl/src/DataLayer/File/FileId.cpp
@@ -56,4 +56,4 @@ string FileId::GetItemNumberFromId(const string &Id)
        if (colon == string::npos)\r
                throw GameServException(str(format("Invalid Item ID %1%") % Id), __FILE__, __LINE__);\r
        return Id.substr(colon + 1);\r
-}
\ No newline at end of file
+}\r

diff --git a/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp b/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp
index e85195a4b90de5f506b982769fb7226f32ca8721..6a8af4e3d3fc3f7a7f384cc4fdc6eaf3ab1a9d17 100644 (file)
--- a/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp
+++ b/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp
@@ -1,5 +1,8 @@
 #include <GameServ/DataLayer/File/FilePlayerDAO.h>\r
 using GameServ::DataLayer::File::FilePlayerDAO;\r
+#include <GameServ/DataLayer/File/FileArmorDAO.h>\r
+using GameServ::DataLayer::File::FileArmorDAO;\r
+\r
 #include <GameServ/GameLayer/GameObjects/PlayerGO.h>\r
 using GameServ::GameLayer::GameObjects::PlayerGO;\r
 \r
@@ -24,6 +27,11 @@ using boost::lexical_cast;
 typedef boost::tokenizer<boost::char_separator<char> > \r
     tokenizer;\r
 \r
+#include <boost/date_time/posix_time/posix_time.hpp>\r
+using boost::posix_time::ptime;\r
+\r
+#include <time.h>\r
+\r
 #include <string>\r
 using std::string;\r
 \r
@@ -166,8 +174,24 @@ shared_ptr<PlayerGO> FilePlayerDAO::CreatePlayerFromLine(const string &line) con
        tok_iter++;\r
        spPlayer->Password((*tok_iter));\r
 \r
-       // TODO: Add weapons, armor, and items\r
+       \r
+       tok_iter++;\r
+       unsigned long int intlast = lexical_cast<unsigned long int>((*tok_iter));\r
+       time_t t = (time_t)intlast;\r
+       struct tm *tmlastlogin = localtime(&t);\r
+       spPlayer->LastLogin(boost::posix_time::ptime_from_tm(*tmlastlogin));\r
+\r
+       \r
+       // Weapon\r
+       tok_iter++;\r
+\r
+       // Armor\r
+       tok_iter++;\r
+       FileArmorDAO adao;\r
+       string armorid = FileId::CreateItemId(ItemTypes::Armor, (*tok_iter));\r
+       \r
 \r
+       \r
        return spPlayer;\r
 }\r
 \r