Merge pull request #124 from goodwinxp/dev

Release 1.4
goodwinxp · Jan 6, 2018 · aef3ff5 · aef3ff5
2 parents d81d7dd + 344758f
commit aef3ff5
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 17 deletions.
diff --git a/Addons/AccuracyEffect/Common/version.h b/Addons/AccuracyEffect/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/Advert/Common/version.h b/Addons/Advert/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/BonusStart/Common/version.h b/Addons/BonusStart/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/ChatLog/Common/version.h b/Addons/ChatLog/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/DefenceFormula/Common/version.h b/Addons/DefenceFormula/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 
@@ -15,7 +15,7 @@
                                     "." STRINGIZE(VERSION_REVISION) \
                                     "." STRINGIZE(VERSION_BUILD)    \
 
-#define VER_PRODUCTNAME_STR         "<TODO>"
+#define VER_PRODUCTNAME_STR         "DefenceFormula"
 #define VER_PRODUCT_VERSION         VER_FILE_VERSION
 #define VER_PRODUCT_VERSION_STR     VER_FILE_VERSION_STR
 #define VER_ORIGINAL_FILENAME_STR   VER_PRODUCTNAME_STR ".dll"

diff --git a/Addons/EnchantChance/Common/version.h b/Addons/EnchantChance/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/GMCommands/Common/version.h b/Addons/GMCommands/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/LootExchange/Common/version.h b/Addons/LootExchange/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/MauExp/Common/version.h b/Addons/MauExp/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/PvpPotion/Common/version.h b/Addons/PvpPotion/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/RadiusDropLoot/Common/version.h b/Addons/RadiusDropLoot/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/ReplaceLootName/Common/version.h b/Addons/ReplaceLootName/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/ServerMemoryPatch/Common/version.h b/Addons/ServerMemoryPatch/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/StoneHP/Common/version.h b/Addons/StoneHP/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/Addons/VariousSettings/Common/version.h b/Addons/VariousSettings/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0
 

diff --git a/YorozuyaGS/CheatCommand/CheatCommand.cpp b/YorozuyaGS/CheatCommand/CheatCommand.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 
+#include <sstream>
 #include "CheatCommand.h"
 
 namespace GameServer
@@ -9,6 +10,7 @@ namespace GameServer
         void CCheatCommand::load()
         {
             enable_hook(&ATF::Global::AuthorityFilter, &CCheatCommand::AuthorityFilter);
+            enable_hook(&ATF::CMainThread::Init, &CCheatCommand::Init);
         }
 
         void CCheatCommand::unload()
@@ -50,5 +52,24 @@ namespace GameServer
             }
             return true;
         }
+
+        bool WINAPIV CCheatCommand::Init(
+            ATF::CMainThread * pObj,
+            ATF::Info::CMainThreadInit88_ptr next)
+        {
+            bool result = next(pObj);
+            if (result)
+            {
+                ATF::CLogFile* s_logCheat = (ATF::CLogFile *)0x1849ACC70L;
+
+                std::stringstream ss;
+                ss << "..\\ZoneServerLog\\ServiceLog\\Cheat" << ATF::Global::GetKorLocalTime();
+                ss << ".log";
+
+                s_logCheat->SetWriteLogFile((char *)ss.str().c_str(), TRUE, false, true, true);
+            }
+
+            return result;
+        }
     }
 }
diff --git a/YorozuyaGS/CheatCommand/CheatCommand.h b/YorozuyaGS/CheatCommand/CheatCommand.h
@@ -4,6 +4,7 @@
 #include "../../Common/Interfaces/ModuleInterface.h"
 
 #include <ATF/Global__GlobalInfo.hpp>
+#include <ATF/CMainThreadInfo.hpp>
 
 namespace GameServer
 {
@@ -21,11 +22,16 @@ namespace GameServer
             virtual void unload() override;
 
             virtual Yorozuya::Module::ModuleName_t get_name() override;
+
         private:
             static bool WINAPIV AuthorityFilter(
                 ATF::CHEAT_COMMAND* pCmd, 
                 ATF::CPlayer* pOne,
                 ATF::Global::Info::AuthorityFilter25_ptr next);
+
+            static bool WINAPIV Init(
+                ATF::CMainThread* pObj,
+                ATF::Info::CMainThreadInit88_ptr next);
         };
     };
 };
diff --git a/YorozuyaGS/Common/version.h b/YorozuyaGS/Common/version.h
@@ -4,7 +4,7 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               3
+#define VERSION_MINOR               4
 #define VERSION_REVISION            0
 #define VERSION_BUILD               0