change src structure

weizx208 · May 9, 2021 · eee736b · eee736b
1 parent 286d849
commit eee736b
Show file tree

Hide file tree

Showing 118 changed files with 6 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -95,19 +95,19 @@ ELSE()
     FILE(GLOB MIR2X_LOG_SRC_FILELIST
         ${CMAKE_SOURCE_DIR}/common/src/*.[hc]pp
         ${CMAKE_SOURCE_DIR}/client/src/*.[hc]pp
-        ${CMAKE_SOURCE_DIR}/server/monoserver/src/*.[hc]pp
+        ${CMAKE_SOURCE_DIR}/server/src/*.[hc]pp
     )
 
     FOREACH(LOG_SRC ${MIR2X_LOG_SRC_FILELIST})
         STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" LOG_SRC_BODY ${LOG_SRC})
         STRING(APPEND MIR2X_LOG_FILELIST "R\"DELIM(${LOG_SRC_BODY})DELIM\",\n")
     ENDFOREACH()
 
-    FILE(GLOB MIR2X_LOG_FL_FILELIST ${CMAKE_SOURCE_DIR}/server/monoserver/src/*.[fF][lL])
+    FILE(GLOB MIR2X_LOG_FL_FILELIST ${CMAKE_SOURCE_DIR}/server/src/*.[fF][lL])
     FOREACH(LOG_FL_SRC ${MIR2X_LOG_FL_FILELIST})
         GET_FILENAME_COMPONENT(FL_SRC_BASENAME ${LOG_FL_SRC} NAME_WE)
-        STRING(APPEND MIR2X_LOG_FILELIST "R\"DELIM(server/monoserver/src/${FL_SRC_BASENAME}.hpp)DELIM\",\n")
-        STRING(APPEND MIR2X_LOG_FILELIST "R\"DELIM(server/monoserver/src/${FL_SRC_BASENAME}.cpp)DELIM\",\n")
+        STRING(APPEND MIR2X_LOG_FILELIST "R\"DELIM(server/src/${FL_SRC_BASENAME}.hpp)DELIM\",\n")
+        STRING(APPEND MIR2X_LOG_FILELIST "R\"DELIM(server/src/${FL_SRC_BASENAME}.cpp)DELIM\",\n")
     ENDFOREACH()
 ENDIF()
 

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
@@ -1 +1 @@
-ADD_SUBDIRECTORY(monoserver)
+ADD_SUBDIRECTORY(src)
diff --git a/server/monoserver/CMakeLists.txt b/server/monoserver/CMakeLists.txt
diff --git a/server/monoserver/script/map/default.lua → server/script/map/default.lua b/server/monoserver/script/map/default.lua → server/script/map/default.lua
diff --git a/server/monoserver/script/map/比奇省皇宫.lua → server/script/map/比奇省皇宫.lua b/server/monoserver/script/map/比奇省皇宫.lua → server/script/map/比奇省皇宫.lua
diff --git a/server/monoserver/script/map/道馆.lua → server/script/map/道馆.lua b/server/monoserver/script/map/道馆.lua → server/script/map/道馆.lua
diff --git a/...onoserver/script/npc/include/teleport.lua → server/script/npc/include/teleport.lua b/...onoserver/script/npc/include/teleport.lua → server/script/npc/include/teleport.lua
diff --git a/server/monoserver/script/npc/比奇省.六面神石_上.lua → server/script/npc/比奇省.六面神石_上.lua b/server/monoserver/script/npc/比奇省.六面神石_上.lua → server/script/npc/比奇省.六面神石_上.lua
diff --git a/server/monoserver/script/npc/比奇省.六面神石_下.lua → server/script/npc/比奇省.六面神石_下.lua b/server/monoserver/script/npc/比奇省.六面神石_下.lua → server/script/npc/比奇省.六面神石_下.lua
diff --git a/server/monoserver/script/npc/比奇省.六面神石_右.lua → server/script/npc/比奇省.六面神石_右.lua b/server/monoserver/script/npc/比奇省.六面神石_右.lua → server/script/npc/比奇省.六面神石_右.lua
diff --git a/server/monoserver/script/npc/比奇省.六面神石_左.lua → server/script/npc/比奇省.六面神石_左.lua b/server/monoserver/script/npc/比奇省.六面神石_左.lua → server/script/npc/比奇省.六面神石_左.lua
diff --git a/server/monoserver/script/npc/比奇省.屠夫.lua → server/script/npc/比奇省.屠夫.lua b/server/monoserver/script/npc/比奇省.屠夫.lua → server/script/npc/比奇省.屠夫.lua
diff --git a/server/monoserver/script/npc/比奇省.铁匠.lua → server/script/npc/比奇省.铁匠.lua b/server/monoserver/script/npc/比奇省.铁匠.lua → server/script/npc/比奇省.铁匠.lua
diff --git a/...er/monoserver/script/npc/比奇省皇宫.怪物召唤商人.lua → server/script/npc/比奇省皇宫.怪物召唤商人.lua b/...er/monoserver/script/npc/比奇省皇宫.怪物召唤商人.lua → server/script/npc/比奇省皇宫.怪物召唤商人.lua
diff --git a/server/monoserver/script/npc/道馆.六面神石.lua → server/script/npc/道馆.六面神石.lua b/server/monoserver/script/npc/道馆.六面神石.lua → server/script/npc/道馆.六面神石.lua
diff --git a/server/monoserver/script/npc/道馆.怪物召唤商人.lua → server/script/npc/道馆.怪物召唤商人.lua b/server/monoserver/script/npc/道馆.怪物召唤商人.lua → server/script/npc/道馆.怪物召唤商人.lua
diff --git a/server/monoserver/script/npc/道馆.散财童子.lua → server/script/npc/道馆.散财童子.lua b/server/monoserver/script/npc/道馆.散财童子.lua → server/script/npc/道馆.散财童子.lua
diff --git a/server/monoserver/script/npc/道馆.数据库测试商人.lua → server/script/npc/道馆.数据库测试商人.lua b/server/monoserver/script/npc/道馆.数据库测试商人.lua → server/script/npc/道馆.数据库测试商人.lua
diff --git a/server/monoserver/script/npc/道馆.测试商人.lua → server/script/npc/道馆.测试商人.lua b/server/monoserver/script/npc/道馆.测试商人.lua → server/script/npc/道馆.测试商人.lua
diff --git a/server/monoserver/script/npc/道馆.物品展示商人.lua → server/script/npc/道馆.物品展示商人.lua b/server/monoserver/script/npc/道馆.物品展示商人.lua → server/script/npc/道馆.物品展示商人.lua
diff --git a/server/monoserver/script/npc/道馆.裁缝.lua → server/script/npc/道馆.裁缝.lua b/server/monoserver/script/npc/道馆.裁缝.lua → server/script/npc/道馆.裁缝.lua
diff --git a/server/monoserver/script/npc/道馆.铁匠.lua → server/script/npc/道馆.铁匠.lua b/server/monoserver/script/npc/道馆.铁匠.lua → server/script/npc/道馆.铁匠.lua
diff --git a/server/monoserver/src/CMakeLists.txt → server/src/CMakeLists.txt b/server/monoserver/src/CMakeLists.txt → server/src/CMakeLists.txt
@@ -46,5 +46,5 @@ ELSE()
 ENDIF()
 
 INSTALL(TARGETS monoserver DESTINATION server)
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/server/monoserver/script DESTINATION server)
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/server/script DESTINATION server)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/client/bin/Res/Map DESTINATION server)
diff --git a/server/monoserver/src/actordatapackage.hpp → server/src/actordatapackage.hpp b/server/monoserver/src/actordatapackage.hpp → server/src/actordatapackage.hpp
diff --git a/server/monoserver/src/actormonitor.hpp → server/src/actormonitor.hpp b/server/monoserver/src/actormonitor.hpp → server/src/actormonitor.hpp
diff --git a/server/monoserver/src/actormonitortable.cpp → server/src/actormonitortable.cpp b/server/monoserver/src/actormonitortable.cpp → server/src/actormonitortable.cpp
diff --git a/server/monoserver/src/actormonitortable.hpp → server/src/actormonitortable.hpp b/server/monoserver/src/actormonitortable.hpp → server/src/actormonitortable.hpp
diff --git a/server/monoserver/src/actormonitorwindow.fl → server/src/actormonitorwindow.fl b/server/monoserver/src/actormonitorwindow.fl → server/src/actormonitorwindow.fl
diff --git a/server/monoserver/src/actormsg.hpp → server/src/actormsg.hpp b/server/monoserver/src/actormsg.hpp → server/src/actormsg.hpp
diff --git a/server/monoserver/src/actormsgbuf.hpp → server/src/actormsgbuf.hpp b/server/monoserver/src/actormsgbuf.hpp → server/src/actormsgbuf.hpp
diff --git a/server/monoserver/src/actormsgpack.hpp → server/src/actormsgpack.hpp b/server/monoserver/src/actormsgpack.hpp → server/src/actormsgpack.hpp
diff --git a/server/monoserver/src/actorpod.cpp → server/src/actorpod.cpp b/server/monoserver/src/actorpod.cpp → server/src/actorpod.cpp
diff --git a/server/monoserver/src/actorpod.hpp → server/src/actorpod.hpp b/server/monoserver/src/actorpod.hpp → server/src/actorpod.hpp
diff --git a/server/monoserver/src/actorpool.cpp → server/src/actorpool.cpp b/server/monoserver/src/actorpool.cpp → server/src/actorpool.cpp
diff --git a/server/monoserver/src/actorpool.hpp → server/src/actorpool.hpp b/server/monoserver/src/actorpool.hpp → server/src/actorpool.hpp
diff --git a/server/monoserver/src/batchluamodule.cpp → server/src/batchluamodule.cpp b/server/monoserver/src/batchluamodule.cpp → server/src/batchluamodule.cpp
diff --git a/server/monoserver/src/batchluamodule.hpp → server/src/batchluamodule.hpp b/server/monoserver/src/batchluamodule.hpp → server/src/batchluamodule.hpp
diff --git a/server/monoserver/src/batmother.cpp → server/src/batmother.cpp b/server/monoserver/src/batmother.cpp → server/src/batmother.cpp
diff --git a/server/monoserver/src/batmother.hpp → server/src/batmother.hpp b/server/monoserver/src/batmother.hpp → server/src/batmother.hpp
diff --git a/server/monoserver/src/channel.cpp → server/src/channel.cpp b/server/monoserver/src/channel.cpp → server/src/channel.cpp
diff --git a/server/monoserver/src/channel.hpp → server/src/channel.hpp b/server/monoserver/src/channel.hpp → server/src/channel.hpp
diff --git a/server/monoserver/src/channpackq.cpp → server/src/channpackq.cpp b/server/monoserver/src/channpackq.cpp → server/src/channpackq.cpp
diff --git a/server/monoserver/src/channpackq.hpp → server/src/channpackq.hpp b/server/monoserver/src/channpackq.hpp → server/src/channpackq.hpp
diff --git a/server/monoserver/src/charobject.cpp → server/src/charobject.cpp b/server/monoserver/src/charobject.cpp → server/src/charobject.cpp
diff --git a/server/monoserver/src/charobject.hpp → server/src/charobject.hpp b/server/monoserver/src/charobject.hpp → server/src/charobject.hpp
diff --git a/server/monoserver/src/charobjectco.cpp → server/src/charobjectco.cpp b/server/monoserver/src/charobjectco.cpp → server/src/charobjectco.cpp
diff --git a/server/monoserver/src/commandinput.cpp → server/src/commandinput.cpp b/server/monoserver/src/commandinput.cpp → server/src/commandinput.cpp
diff --git a/server/monoserver/src/commandinput.hpp → server/src/commandinput.hpp b/server/monoserver/src/commandinput.hpp → server/src/commandinput.hpp
diff --git a/server/monoserver/src/commandluamodule.cpp → server/src/commandluamodule.cpp b/server/monoserver/src/commandluamodule.cpp → server/src/commandluamodule.cpp
diff --git a/server/monoserver/src/commandluamodule.hpp → server/src/commandluamodule.hpp b/server/monoserver/src/commandluamodule.hpp → server/src/commandluamodule.hpp
diff --git a/server/monoserver/src/commandwindow.fl → server/src/commandwindow.fl b/server/monoserver/src/commandwindow.fl → server/src/commandwindow.fl
diff --git a/server/monoserver/src/damagenode.cpp → server/src/damagenode.cpp b/server/monoserver/src/damagenode.cpp → server/src/damagenode.cpp
diff --git a/server/monoserver/src/damagenode.hpp → server/src/damagenode.hpp b/server/monoserver/src/damagenode.hpp → server/src/damagenode.hpp
diff --git a/server/monoserver/src/dbconst.cpp → server/src/dbconst.cpp b/server/monoserver/src/dbconst.cpp → server/src/dbconst.cpp
diff --git a/server/monoserver/src/dbconst.hpp → server/src/dbconst.hpp b/server/monoserver/src/dbconst.hpp → server/src/dbconst.hpp
diff --git a/server/monoserver/src/dbpod.hpp → server/src/dbpod.hpp b/server/monoserver/src/dbpod.hpp → server/src/dbpod.hpp
diff --git a/server/monoserver/src/delaycommand.hpp → server/src/delaycommand.hpp b/server/monoserver/src/delaycommand.hpp → server/src/delaycommand.hpp
diff --git a/server/monoserver/src/dispatcher.cpp → server/src/dispatcher.cpp b/server/monoserver/src/dispatcher.cpp → server/src/dispatcher.cpp
diff --git a/server/monoserver/src/dispatcher.hpp → server/src/dispatcher.hpp b/server/monoserver/src/dispatcher.hpp → server/src/dispatcher.hpp
diff --git a/server/monoserver/src/dropitem.hpp → server/src/dropitem.hpp b/server/monoserver/src/dropitem.hpp → server/src/dropitem.hpp
diff --git a/server/monoserver/src/dropitemconfig.cpp → server/src/dropitemconfig.cpp b/server/monoserver/src/dropitemconfig.cpp → server/src/dropitemconfig.cpp
diff --git a/server/monoserver/src/dropitemconfig.hpp → server/src/dropitemconfig.hpp b/server/monoserver/src/dropitemconfig.hpp → server/src/dropitemconfig.hpp
diff --git a/server/monoserver/src/dropitemconfig.inc → server/src/dropitemconfig.inc b/server/monoserver/src/dropitemconfig.inc → server/src/dropitemconfig.inc
diff --git a/server/monoserver/src/flinc.hpp → server/src/flinc.hpp b/server/monoserver/src/flinc.hpp → server/src/flinc.hpp
diff --git a/server/monoserver/src/fltableimpl.cpp → server/src/fltableimpl.cpp b/server/monoserver/src/fltableimpl.cpp → server/src/fltableimpl.cpp
diff --git a/server/monoserver/src/fltableimpl.hpp → server/src/fltableimpl.hpp b/server/monoserver/src/fltableimpl.hpp → server/src/fltableimpl.hpp
diff --git a/server/monoserver/src/friendtype.hpp → server/src/friendtype.hpp b/server/monoserver/src/friendtype.hpp → server/src/friendtype.hpp
diff --git a/server/monoserver/src/guard.cpp → server/src/guard.cpp b/server/monoserver/src/guard.cpp → server/src/guard.cpp
diff --git a/server/monoserver/src/guard.hpp → server/src/guard.hpp b/server/monoserver/src/guard.hpp → server/src/guard.hpp
diff --git a/server/monoserver/src/guardco.cpp → server/src/guardco.cpp b/server/monoserver/src/guardco.cpp → server/src/guardco.cpp
diff --git a/server/monoserver/src/main.cpp → server/src/main.cpp b/server/monoserver/src/main.cpp → server/src/main.cpp
diff --git a/server/monoserver/src/mainwindow.fl → server/src/mainwindow.fl b/server/monoserver/src/mainwindow.fl → server/src/mainwindow.fl
diff --git a/server/monoserver/src/monoserver.cpp → server/src/monoserver.cpp b/server/monoserver/src/monoserver.cpp → server/src/monoserver.cpp
diff --git a/server/monoserver/src/monoserver.hpp → server/src/monoserver.hpp b/server/monoserver/src/monoserver.hpp → server/src/monoserver.hpp
diff --git a/server/monoserver/src/monoserver.lua → server/src/monoserver.lua b/server/monoserver/src/monoserver.lua → server/src/monoserver.lua
diff --git a/server/monoserver/src/monster.cpp → server/src/monster.cpp b/server/monoserver/src/monster.cpp → server/src/monster.cpp
diff --git a/server/monoserver/src/monster.hpp → server/src/monster.hpp b/server/monoserver/src/monster.hpp → server/src/monster.hpp
diff --git a/server/monoserver/src/monsterco.cpp → server/src/monsterco.cpp b/server/monoserver/src/monsterco.cpp → server/src/monsterco.cpp
diff --git a/server/monoserver/src/monsterop.cpp → server/src/monsterop.cpp b/server/monoserver/src/monsterop.cpp → server/src/monsterop.cpp
diff --git a/server/monoserver/src/netdriver.cpp → server/src/netdriver.cpp b/server/monoserver/src/netdriver.cpp → server/src/netdriver.cpp
diff --git a/server/monoserver/src/netdriver.hpp → server/src/netdriver.hpp b/server/monoserver/src/netdriver.hpp → server/src/netdriver.hpp
diff --git a/server/monoserver/src/npchar.cpp → server/src/npchar.cpp b/server/monoserver/src/npchar.cpp → server/src/npchar.cpp
diff --git a/server/monoserver/src/npchar.hpp → server/src/npchar.hpp b/server/monoserver/src/npchar.hpp → server/src/npchar.hpp
diff --git a/server/monoserver/src/npchar.lua → server/src/npchar.lua b/server/monoserver/src/npchar.lua → server/src/npchar.lua
diff --git a/server/monoserver/src/npcharop.cpp → server/src/npcharop.cpp b/server/monoserver/src/npcharop.cpp → server/src/npcharop.cpp
diff --git a/server/monoserver/src/piranhaplant.cpp → server/src/piranhaplant.cpp b/server/monoserver/src/piranhaplant.cpp → server/src/piranhaplant.cpp
diff --git a/server/monoserver/src/piranhaplant.hpp → server/src/piranhaplant.hpp b/server/monoserver/src/piranhaplant.hpp → server/src/piranhaplant.hpp
diff --git a/server/monoserver/src/player.cpp → server/src/player.cpp b/server/monoserver/src/player.cpp → server/src/player.cpp
diff --git a/server/monoserver/src/player.hpp → server/src/player.hpp b/server/monoserver/src/player.hpp → server/src/player.hpp
diff --git a/server/monoserver/src/playerdb.cpp → server/src/playerdb.cpp b/server/monoserver/src/playerdb.cpp → server/src/playerdb.cpp
diff --git a/server/monoserver/src/playernet.cpp → server/src/playernet.cpp b/server/monoserver/src/playernet.cpp → server/src/playernet.cpp
diff --git a/server/monoserver/src/playerop.cpp → server/src/playerop.cpp b/server/monoserver/src/playerop.cpp → server/src/playerop.cpp
diff --git a/server/monoserver/src/podmonitortable.cpp → server/src/podmonitortable.cpp b/server/monoserver/src/podmonitortable.cpp → server/src/podmonitortable.cpp
diff --git a/server/monoserver/src/podmonitortable.hpp → server/src/podmonitortable.hpp b/server/monoserver/src/podmonitortable.hpp → server/src/podmonitortable.hpp
diff --git a/server/monoserver/src/podmonitorwindow.fl → server/src/podmonitorwindow.fl b/server/monoserver/src/podmonitorwindow.fl → server/src/podmonitorwindow.fl
diff --git a/server/monoserver/src/profilerwindow.fl → server/src/profilerwindow.fl b/server/monoserver/src/profilerwindow.fl → server/src/profilerwindow.fl
diff --git a/server/monoserver/src/receiver.cpp → server/src/receiver.cpp b/server/monoserver/src/receiver.cpp → server/src/receiver.cpp
diff --git a/server/monoserver/src/receiver.hpp → server/src/receiver.hpp b/server/monoserver/src/receiver.hpp → server/src/receiver.hpp
diff --git a/server/monoserver/src/scriptwindow.fl → server/src/scriptwindow.fl b/server/monoserver/src/scriptwindow.fl → server/src/scriptwindow.fl
diff --git a/server/monoserver/src/serverargparser.hpp → server/src/serverargparser.hpp b/server/monoserver/src/serverargparser.hpp → server/src/serverargparser.hpp
diff --git a/...r/monoserver/src/serverconfigurewindow.fl → server/src/serverconfigurewindow.fl b/...r/monoserver/src/serverconfigurewindow.fl → server/src/serverconfigurewindow.fl
diff --git a/server/monoserver/src/serverluamodule.cpp → server/src/serverluamodule.cpp b/server/monoserver/src/serverluamodule.cpp → server/src/serverluamodule.cpp
diff --git a/server/monoserver/src/serverluamodule.hpp → server/src/serverluamodule.hpp b/server/monoserver/src/serverluamodule.hpp → server/src/serverluamodule.hpp
diff --git a/server/monoserver/src/serverluamodule.lua → server/src/serverluamodule.lua b/server/monoserver/src/serverluamodule.lua → server/src/serverluamodule.lua
diff --git a/server/monoserver/src/servermap.cpp → server/src/servermap.cpp b/server/monoserver/src/servermap.cpp → server/src/servermap.cpp
diff --git a/server/monoserver/src/servermap.hpp → server/src/servermap.hpp b/server/monoserver/src/servermap.hpp → server/src/servermap.hpp
diff --git a/server/monoserver/src/servermapop.cpp → server/src/servermapop.cpp b/server/monoserver/src/servermapop.cpp → server/src/servermapop.cpp
diff --git a/server/monoserver/src/serverobject.cpp → server/src/serverobject.cpp b/server/monoserver/src/serverobject.cpp → server/src/serverobject.cpp
diff --git a/server/monoserver/src/serverobject.hpp → server/src/serverobject.hpp b/server/monoserver/src/serverobject.hpp → server/src/serverobject.hpp
diff --git a/server/monoserver/src/servicecore.cpp → server/src/servicecore.cpp b/server/monoserver/src/servicecore.cpp → server/src/servicecore.cpp
diff --git a/server/monoserver/src/servicecore.hpp → server/src/servicecore.hpp b/server/monoserver/src/servicecore.hpp → server/src/servicecore.hpp
diff --git a/server/monoserver/src/servicecorenet.cpp → server/src/servicecorenet.cpp b/server/monoserver/src/servicecorenet.cpp → server/src/servicecorenet.cpp
diff --git a/server/monoserver/src/servicecoreop.cpp → server/src/servicecoreop.cpp b/server/monoserver/src/servicecoreop.cpp → server/src/servicecoreop.cpp
diff --git a/server/monoserver/src/syncdriver.cpp → server/src/syncdriver.cpp b/server/monoserver/src/syncdriver.cpp → server/src/syncdriver.cpp
diff --git a/server/monoserver/src/syncdriver.hpp → server/src/syncdriver.hpp b/server/monoserver/src/syncdriver.hpp → server/src/syncdriver.hpp
diff --git a/server/monoserver/src/taodog.cpp → server/src/taodog.cpp b/server/monoserver/src/taodog.cpp → server/src/taodog.cpp
diff --git a/server/monoserver/src/taodog.hpp → server/src/taodog.hpp b/server/monoserver/src/taodog.hpp → server/src/taodog.hpp
diff --git a/server/monoserver/src/taoskeleton.hpp → server/src/taoskeleton.hpp b/server/monoserver/src/taoskeleton.hpp → server/src/taoskeleton.hpp
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ADD_SUBDIRECTORY(monoserver)
		ADD_SUBDIRECTORY(src)