Created
July 30, 2016 21:23
-
-
Save comet0/5b81e0a214570adfd4d068eaf9c0b604 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: src/eve-common/python/PyRep.cpp | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-common/python/PyRep.cpp (revision 9499ec6bdb7f03ac3e02a99431d2397a749c7b54) | |
+++ src/eve-common/python/PyRep.cpp (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -1177,6 +1177,16 @@ | |
} | |
/* @note we should increase ref here.... but don't make it to complicated to use... for now... */ | |
+PyTuple * new_tuple(PyRep* arg1, PyRep* arg2, PyRep* arg3, PyRep* arg4) | |
+{ | |
+ PyTuple * res = new PyTuple(4); | |
+ res->SetItem(0, arg1); | |
+ res->SetItem(1, arg2); | |
+ res->SetItem(2, arg3); | |
+ res->SetItem(3, arg4); | |
+ return res; | |
+} | |
+ | |
PyTuple * new_tuple(PyRep* arg1, PyRep* arg2, PyRep* arg3) | |
{ | |
PyTuple * res = new PyTuple(3); | |
Index: src/eve-common/python/PyRep.h | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-common/python/PyRep.h (revision 9499ec6bdb7f03ac3e02a99431d2397a749c7b54) | |
+++ src/eve-common/python/PyRep.h (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -1033,6 +1033,7 @@ | |
PyTuple * new_tuple(PyRep* arg1); | |
PyTuple * new_tuple(PyRep* arg1, PyRep* arg2); | |
PyTuple * new_tuple(PyRep* arg1, PyRep* arg2, PyRep* arg3); | |
+PyTuple * new_tuple(PyRep* arg1, PyRep* arg2, PyRep* arg3, PyRep* arg4); | |
PyTuple *new_tuple001(PyRep *arg1); | |
PyDict *new_dict(PyRep *key1, PyRep *value1); | |
Index: src/eve-core/eve-core.h | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-core/eve-core.h (revision 9499ec6bdb7f03ac3e02a99431d2397a749c7b54) | |
+++ src/eve-core/eve-core.h (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -70,6 +70,7 @@ | |
#include <cstdlib> | |
#include <cstring> | |
#include <ctime> | |
+#include <iostream> | |
// Standard Template Library includes | |
#include <algorithm> | |
Index: src/eve-server/services/jumpTimers/JumpTimers.cpp | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-server/services/jumpTimers/JumpTimers.cpp (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
+++ src/eve-server/services/jumpTimers/JumpTimers.cpp (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -0,0 +1,46 @@ | |
+/* | |
+ ------------------------------------------------------------------------------------ | |
+ LICENSE: | |
+ ------------------------------------------------------------------------------------ | |
+ This file is part of EVEmu: EVE Online Server Emulator | |
+ Copyright 2006 - 2016 The EVEmu Team | |
+ For the latest information visit http://evemu.org | |
+ ------------------------------------------------------------------------------------ | |
+ This program is free software; you can redistribute it and/or modify it under | |
+ the terms of the GNU Lesser General Public License as published by the Free Software | |
+ Foundation; either version 2 of the License, or (at your option) any later | |
+ version. | |
+ | |
+ This program is distributed in the hope that it will be useful, but WITHOUT | |
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | |
+ | |
+ You should have received a copy of the GNU Lesser General Public License along with | |
+ this program; if not, write to the Free Software Foundation, Inc., 59 Temple | |
+ Place - Suite 330, Boston, MA 02111-1307, USA, or go to | |
+ http://www.gnu.org/copyleft/lesser.txt. | |
+ ------------------------------------------------------------------------------------ | |
+ Author: eve-moo | |
+ */ | |
+ | |
+ | |
+#include "eve-server.h" | |
+#include "JumpTimers.h" | |
+#include "PyBoundObject.h" | |
+#include "PyServiceCD.h" | |
+#include "PyServiceMgr.h" | |
+ | |
+PyCallable_Make_InnerDispatcher(JumpTimersService) | |
+ | |
+JumpTimersService::JumpTimersService() | |
+ : PyService("jumpTimers", new Dispatcher(this)) | |
+{ | |
+ PyCallable_REG_CALL(JumpTimersService, GetTimers) | |
+} | |
+ | |
+JumpTimersService::~JumpTimersService() { } | |
+ | |
+PyResult JumpTimersService::Handle_GetTimers(PyCallArgs &call) { | |
+ SysLog::Log("JumpTimersService", "Called GetTimers stub."); | |
+ return new_tuple(new PyNone(), new PyNone(), new PyNone(), new PyNone()); | |
+} | |
Index: src/eve-server/services/jumpTimers/JumpTimers.h | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-server/services/jumpTimers/JumpTimers.h (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
+++ src/eve-server/services/jumpTimers/JumpTimers.h (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -0,0 +1,46 @@ | |
+/* | |
+ ------------------------------------------------------------------------------------ | |
+ LICENSE: | |
+ ------------------------------------------------------------------------------------ | |
+ This file is part of EVEmu: EVE Online Server Emulator | |
+ Copyright 2006 - 2016 The EVEmu Team | |
+ For the latest information visit http://evemu.org | |
+ ------------------------------------------------------------------------------------ | |
+ This program is free software; you can redistribute it and/or modify it under | |
+ the terms of the GNU Lesser General Public License as published by the Free Software | |
+ Foundation; either version 2 of the License, or (at your option) any later | |
+ version. | |
+ | |
+ This program is distributed in the hope that it will be useful, but WITHOUT | |
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | |
+ | |
+ You should have received a copy of the GNU Lesser General Public License along with | |
+ this program; if not, write to the Free Software Foundation, Inc., 59 Temple | |
+ Place - Suite 330, Boston, MA 02111-1307, USA, or go to | |
+ http://www.gnu.org/copyleft/lesser.txt. | |
+ ------------------------------------------------------------------------------------ | |
+ Author: eve-moo | |
+ */ | |
+ | |
+#ifndef __EVEMOO_SERVICES_JUMPTIMERS_H_INCL__ | |
+#define __EVEMOO_SERVICES_JUMPTIMERS_H_INCL__ | |
+ | |
+#include "PyService.h" | |
+ | |
+class PyRep; | |
+ | |
+class JumpTimersService : public PyService | |
+{ | |
+public: | |
+ JumpTimersService(); | |
+ virtual ~JumpTimersService(); | |
+ | |
+ PyCallable_DECL_CALL(GetTimers) | |
+ | |
+protected: | |
+ class Dispatcher; | |
+ | |
+}; | |
+ | |
+#endif | |
Index: src/eve-server/services/shipKillCounter/ShipKillCounter.cpp | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-server/services/shipKillCounter/ShipKillCounter.cpp (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
+++ src/eve-server/services/shipKillCounter/ShipKillCounter.cpp (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -0,0 +1,47 @@ | |
+/* | |
+ ------------------------------------------------------------------------------------ | |
+ LICENSE: | |
+ ------------------------------------------------------------------------------------ | |
+ This file is part of EVEmu: EVE Online Server Emulator | |
+ Copyright 2006 - 2016 The EVEmu Team | |
+ For the latest information visit http://evemu.org | |
+ ------------------------------------------------------------------------------------ | |
+ This program is free software; you can redistribute it and/or modify it under | |
+ the terms of the GNU Lesser General Public License as published by the Free Software | |
+ Foundation; either version 2 of the License, or (at your option) any later | |
+ version. | |
+ | |
+ This program is distributed in the hope that it will be useful, but WITHOUT | |
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | |
+ | |
+ You should have received a copy of the GNU Lesser General Public License along with | |
+ this program; if not, write to the Free Software Foundation, Inc., 59 Temple | |
+ Place - Suite 330, Boston, MA 02111-1307, USA, or go to | |
+ http://www.gnu.org/copyleft/lesser.txt. | |
+ ------------------------------------------------------------------------------------ | |
+ Author: Cometo | |
+*/ | |
+ | |
+ | |
+#include "eve-server.h" | |
+#include "ShipKillCounter.h" | |
+#include "PyBoundObject.h" | |
+#include "PyServiceCD.h" | |
+#include "PyServiceMgr.h" | |
+ | |
+PyCallable_Make_InnerDispatcher(ShipKillCounterService) | |
+ | |
+ShipKillCounterService::ShipKillCounterService() | |
+ : PyService("shipKillCounter", new Dispatcher(this)) | |
+{ | |
+ PyCallable_REG_CALL(ShipKillCounterService, GetItemKillCountPlayer) | |
+} | |
+ | |
+ShipKillCounterService::~ShipKillCounterService() { | |
+} | |
+ | |
+PyResult ShipKillCounterService::Handle_GetItemKillCountPlayer(PyCallArgs &call) { | |
+ SysLog::Log("ShipKillCounterService", "Called GetItemKillCountPlayer stub."); | |
+ return new PyInt(0); | |
+} | |
Index: src/eve-server/services/shipKillCounter/ShipKillCounter.h | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-server/services/shipKillCounter/ShipKillCounter.h (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
+++ src/eve-server/services/shipKillCounter/ShipKillCounter.h (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -0,0 +1,46 @@ | |
+/* | |
+ ------------------------------------------------------------------------------------ | |
+ LICENSE: | |
+ ------------------------------------------------------------------------------------ | |
+ This file is part of EVEmu: EVE Online Server Emulator | |
+ Copyright 2006 - 2016 The EVEmu Team | |
+ For the latest information visit http://evemu.org | |
+ ------------------------------------------------------------------------------------ | |
+ This program is free software; you can redistribute it and/or modify it under | |
+ the terms of the GNU Lesser General Public License as published by the Free Software | |
+ Foundation; either version 2 of the License, or (at your option) any later | |
+ version. | |
+ | |
+ This program is distributed in the hope that it will be useful, but WITHOUT | |
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | |
+ | |
+ You should have received a copy of the GNU Lesser General Public License along with | |
+ this program; if not, write to the Free Software Foundation, Inc., 59 Temple | |
+ Place - Suite 330, Boston, MA 02111-1307, USA, or go to | |
+ http://www.gnu.org/copyleft/lesser.txt. | |
+ ------------------------------------------------------------------------------------ | |
+ Author: Cometo | |
+*/ | |
+ | |
+#ifndef __EVEMOO_SERVICES_SHIPKILLCOUNTER_H_INCL__ | |
+#define __EVEMOO_SERVICES_SHIPKILLCOUNTER_H_INCL__ | |
+ | |
+#include "PyService.h" | |
+ | |
+class PyRep; | |
+ | |
+class ShipKillCounterService: public PyService | |
+{ | |
+public: | |
+ ShipKillCounterService(); | |
+ virtual ~ShipKillCounterService(); | |
+ | |
+ PyCallable_DECL_CALL(GetItemKillCountPlayer) | |
+ | |
+protected: | |
+ class Dispatcher; | |
+ | |
+}; | |
+ | |
+#endif | |
Index: src/eve-server/services/shipSkinMgr/ShipSkinMgr.cpp | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-server/services/shipSkinMgr/ShipSkinMgr.cpp (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
+++ src/eve-server/services/shipSkinMgr/ShipSkinMgr.cpp (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -0,0 +1,47 @@ | |
+/* | |
+ ------------------------------------------------------------------------------------ | |
+ LICENSE: | |
+ ------------------------------------------------------------------------------------ | |
+ This file is part of EVEmu: EVE Online Server Emulator | |
+ Copyright 2006 - 2016 The EVEmu Team | |
+ For the latest information visit http://evemu.org | |
+ ------------------------------------------------------------------------------------ | |
+ This program is free software; you can redistribute it and/or modify it under | |
+ the terms of the GNU Lesser General Public License as published by the Free Software | |
+ Foundation; either version 2 of the License, or (at your option) any later | |
+ version. | |
+ | |
+ This program is distributed in the hope that it will be useful, but WITHOUT | |
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | |
+ | |
+ You should have received a copy of the GNU Lesser General Public License along with | |
+ this program; if not, write to the Free Software Foundation, Inc., 59 Temple | |
+ Place - Suite 330, Boston, MA 02111-1307, USA, or go to | |
+ http://www.gnu.org/copyleft/lesser.txt. | |
+ ------------------------------------------------------------------------------------ | |
+ Author: Cometo | |
+*/ | |
+ | |
+ | |
+#include "eve-server.h" | |
+#include "ShipSkinMgr.h" | |
+#include "PyBoundObject.h" | |
+#include "PyServiceCD.h" | |
+#include "PyServiceMgr.h" | |
+ | |
+PyCallable_Make_InnerDispatcher(ShipSkinMgrService) | |
+ | |
+ShipSkinMgrService::ShipSkinMgrService() | |
+ : PyService("shipSkinMgr", new Dispatcher(this)) | |
+{ | |
+ PyCallable_REG_CALL(ShipSkinMgrService, GetAppliedSkinMaterialSetID) | |
+} | |
+ | |
+ShipSkinMgrService::~ShipSkinMgrService() { | |
+} | |
+ | |
+PyResult ShipSkinMgrService::Handle_GetAppliedSkinMaterialSetID(PyCallArgs &call) { | |
+ SysLog::Log("ShipSkinMgrService", "Called GetAppliedSkinMaterialSetID stub."); | |
+ return new PyNone(); | |
+} | |
Index: src/eve-server/services/shipSkinMgr/ShipSkinMgr.h | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-server/services/shipSkinMgr/ShipSkinMgr.h (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
+++ src/eve-server/services/shipSkinMgr/ShipSkinMgr.h (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -0,0 +1,46 @@ | |
+/* | |
+ ------------------------------------------------------------------------------------ | |
+ LICENSE: | |
+ ------------------------------------------------------------------------------------ | |
+ This file is part of EVEmu: EVE Online Server Emulator | |
+ Copyright 2006 - 2016 The EVEmu Team | |
+ For the latest information visit http://evemu.org | |
+ ------------------------------------------------------------------------------------ | |
+ This program is free software; you can redistribute it and/or modify it under | |
+ the terms of the GNU Lesser General Public License as published by the Free Software | |
+ Foundation; either version 2 of the License, or (at your option) any later | |
+ version. | |
+ | |
+ This program is distributed in the hope that it will be useful, but WITHOUT | |
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | |
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | |
+ | |
+ You should have received a copy of the GNU Lesser General Public License along with | |
+ this program; if not, write to the Free Software Foundation, Inc., 59 Temple | |
+ Place - Suite 330, Boston, MA 02111-1307, USA, or go to | |
+ http://www.gnu.org/copyleft/lesser.txt. | |
+ ------------------------------------------------------------------------------------ | |
+ Author: Cometo | |
+*/ | |
+ | |
+#ifndef __EVEMOO_SERVICES_SHIPSKINMGR_H_INCL__ | |
+#define __EVEMOO_SERVICES_SHIPSKINMGR_H_INCL__ | |
+ | |
+#include "PyService.h" | |
+ | |
+class PyRep; | |
+ | |
+class ShipSkinMgrService: public PyService | |
+{ | |
+public: | |
+ ShipSkinMgrService(); | |
+ virtual ~ShipSkinMgrService(); | |
+ | |
+ PyCallable_DECL_CALL(GetAppliedSkinMaterialSetID) | |
+ | |
+protected: | |
+ class Dispatcher; | |
+ | |
+}; | |
+ | |
+#endif | |
Index: src/eve-server/CMakeLists.txt | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-server/CMakeLists.txt (revision 9499ec6bdb7f03ac3e02a99431d2397a749c7b54) | |
+++ src/eve-server/CMakeLists.txt (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -472,13 +472,19 @@ | |
"${TARGET_INCLUDE_DIR}/services/eventLog/EventLogService.h" | |
"${TARGET_INCLUDE_DIR}/services/crestAPI/CrestAPIService.h" | |
"${TARGET_INCLUDE_DIR}/services/bounty/BountyProxy.h" | |
+ "${TARGET_INCLUDE_DIR}/services/jumpTimers/jumpTimers.h" | |
+ "${TARGET_INCLUDE_DIR}/services/shipSkinMgr/ShipSkinMgr.h" | |
+ "${TARGET_INCLUDE_DIR}/services/shipKillCounter/ShipKillCounter.h" | |
- ) | |
+ ) | |
SET(services_SOURCE | |
"${TARGET_SOURCE_DIR}/services/lscProxy/LscProxyService.cpp" | |
"${TARGET_SOURCE_DIR}/services/eventLog/EventLogService.cpp" | |
"${TARGET_SOURCE_DIR}/services/crestAPI/CrestAPIService.cpp" | |
"${TARGET_SOURCE_DIR}/services/bounty/BountyProxy.cpp" | |
+ "${TARGET_SOURCE_DIR}/services/jumpTimers/JumpTimers.cpp" | |
+ "${TARGET_SOURCE_DIR}/services/shipSkinMgr/ShipSkinMgr.cpp" | |
+ "${TARGET_SOURCE_DIR}/services/shipKillCounter/ShipKillCounter.cpp" | |
- ) | |
+ ) | |
######################## | |
# Setup the executable # | |
Index: src/eve-server/eve-server.cpp | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/eve-server/eve-server.cpp (revision 9499ec6bdb7f03ac3e02a99431d2397a749c7b54) | |
+++ src/eve-server/eve-server.cpp (revision 5b2ef08ded975f75c9f80700ba8656e6304162ae) | |
@@ -159,6 +159,9 @@ | |
#include "services/eventLog/EventLogService.h" | |
#include "services/crestAPI/CrestAPIService.h" | |
#include "services/bounty/BountyProxy.h" | |
+#include "services/jumpTimers/JumpTimers.h" | |
+#include "services/shipSkinMgr/ShipSkinMgr.h" | |
+#include "services/shipKillCounter/ShipKillCounter.h" | |
// service manager | |
#include "PyServiceMgr.h" | |
@@ -386,6 +389,9 @@ | |
PyServiceMgr::RegisterService(new EventLogService()); | |
PyServiceMgr::RegisterService(new CrestAPIService()); | |
PyServiceMgr::RegisterService(new BountyProxyService()); | |
+ PyServiceMgr::RegisterService(new JumpTimersService()); | |
+ PyServiceMgr::RegisterService(new ShipSkinMgrService()); | |
+ PyServiceMgr::RegisterService(new ShipKillCounterService()); | |
SysLog::Log("Server Init", "Priming cached objects."); | |
PyServiceMgr::cache_service->PrimeCache(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment