Browse files

Moved game code to the dll.

Corrected an issue with shared_mutex usage on write operations in the event dispatcher
  • Loading branch information...
1 parent b48db2a commit f9b7fc3da5c53578b4631d7ca6383224486d8cea @apathyboy apathyboy committed Feb 16, 2013
Showing with 958 additions and 931 deletions.
  1. +0 −32 src/swganh/CMakeLists.txt
  2. +1 −0 src/swganh/app/CMakeLists.txt
  3. +3 −14 src/swganh/app/swganh_app.cc
  4. +14 −14 src/swganh/app/swganh_kernel_binding.h
  5. +0 −47 src/swganh/attributes/CMakeLists.txt
  6. +0 −47 src/swganh/badge/CMakeLists.txt
  7. +0 −47 src/swganh/equipment/CMakeLists.txt
  8. +2 −2 src/swganh/event_dispatcher.cc
  9. +0 −47 src/swganh/map/CMakeLists.txt
  10. +0 −47 src/swganh/player/CMakeLists.txt
  11. +0 −47 src/swganh/simulation/CMakeLists.txt
  12. 0 src/swganh/simulation/simulation_init.h
  13. +0 −47 src/swganh/social/CMakeLists.txt
  14. +0 −47 src/swganh/spawn/CMakeLists.txt
  15. +0 −47 src/swganh/static/CMakeLists.txt
  16. +0 −47 src/swganh/sui/CMakeLists.txt
  17. +0 −47 src/swganh/terrain/CMakeLists.txt
  18. +0 −47 src/swganh/weather/CMakeLists.txt
  19. +38 −2 src/swganh_core/CMakeLists.txt
  20. +48 −0 src/swganh_core/attributes/CMakeLists.txt
  21. 0 src/{swganh → swganh_core}/attributes/attribute_template_interface.h
  22. 0 src/{swganh → swganh_core}/attributes/attributes_binding.cc
  23. 0 src/{swganh → swganh_core}/attributes/attributes_binding.h
  24. +1 −1 src/swganh_core/attributes/attributes_get_batch_command.cc
  25. +1 −1 src/swganh_core/attributes/attributes_get_batch_command.h
  26. +5 −5 src/swganh_core/attributes/attributes_service.cc
  27. +2 −2 src/swganh_core/attributes/attributes_service.h
  28. 0 src/{swganh → swganh_core}/attributes/attributes_service_interface.h
  29. +1 −1 src/{swganh → swganh_core}/attributes/python_attributes_creator.cc
  30. 0 src/{swganh → swganh_core}/attributes/python_attributes_creator.h
  31. +48 −0 src/swganh_core/badge/CMakeLists.txt
  32. +1 −1 src/swganh_core/badge/badge_region.cc
  33. +2 −2 src/swganh_core/badge/badge_service.cc
  34. +2 −2 src/swganh_core/badge/badge_service.h
  35. +1 −1 src/{swganh → swganh_core}/badge/badge_service_binding.cc
  36. 0 src/{swganh → swganh_core}/badge/badge_service_binding.h
  37. 0 src/{swganh → swganh_core}/badge/badge_service_interface.h
  38. +1 −1 src/swganh_core/badge/request_badges_command.h
  39. 0 src/{swganh → swganh_core}/character/character_data.h
  40. +1 −1 src/{swganh → swganh_core}/character/character_provider_interface.h
  41. +7 −7 src/swganh_core/character/character_service.cc
  42. +1 −1 src/swganh_core/character/character_service.h
  43. 0 src/{swganh → swganh_core}/character/character_service_interface.h
  44. +1 −1 src/swganh_core/character/mysql_character_provider.cc
  45. +1 −1 src/swganh_core/character/mysql_character_provider.h
  46. +1 −0 src/{swganh → swganh_core}/chat/CMakeLists.txt
  47. +4 −4 src/swganh_core/chat/chat_service.cc
  48. +3 −3 src/swganh_core/chat/chat_service.h
  49. 0 src/{swganh → swganh_core}/chat/chat_service_binding.cc
  50. 0 src/{swganh → swganh_core}/chat/chat_service_binding.h
  51. 0 src/{swganh → swganh_core}/chat/chat_service_interface.h
  52. +1 −1 src/swganh_core/chat/spatial_chat_internal_command.h
  53. +2 −1 src/{swganh → swganh_core}/combat/CMakeLists.txt
  54. 0 src/{swganh → swganh_core}/combat/buff_events.h
  55. 0 src/{swganh → swganh_core}/combat/buff_interface.h
  56. +2 −2 src/swganh_core/combat/buff_manager.cc
  57. +1 −1 src/swganh_core/combat/buff_manager.h
  58. +1 −1 src/swganh_core/combat/combat_data.cc
  59. +1 −1 src/swganh_core/combat/combat_data.h
  60. +7 −7 src/swganh_core/combat/combat_service.cc
  61. +2 −2 src/swganh_core/combat/combat_service.h
  62. +1 −1 src/{swganh → swganh_core}/combat/combat_service_binding.cc
  63. +2 −2 src/{swganh → swganh_core}/combat/combat_service_binding.h
  64. +1 −1 src/{swganh → swganh_core}/combat/combat_service_interface.h
  65. 0 src/{swganh → swganh_core}/combat/python_buff_creator.cc
  66. 0 src/{swganh → swganh_core}/combat/python_buff_creator.h
  67. +1 −0 src/{swganh → swganh_core}/command/CMakeLists.txt
  68. +1 −1 src/{swganh → swganh_core}/command/base_combat_command.cc
  69. 0 src/{swganh → swganh_core}/command/base_combat_command.h
  70. 0 src/{swganh → swganh_core}/command/base_combat_command_binding.cc
  71. 0 src/{swganh → swganh_core}/command/base_combat_command_binding.h
  72. +1 −1 src/{swganh → swganh_core}/command/base_swg_command.cc
  73. 0 src/{swganh → swganh_core}/command/base_swg_command.h
  74. 0 src/{swganh → swganh_core}/command/command_binding.cc
  75. 0 src/{swganh → swganh_core}/command/command_binding.h
  76. +3 −3 src/swganh_core/command/command_factory.cc
  77. +1 −1 src/swganh_core/command/command_factory.h
  78. 0 src/{swganh → swganh_core}/command/command_factory_interface.h
  79. +3 −3 src/swganh_core/command/command_filter.cc
  80. 0 src/{swganh → swganh_core}/command/command_interface.h
  81. 0 src/{swganh → swganh_core}/command/command_properties.h
  82. 0 src/{swganh → swganh_core}/command/command_properties_binding.cc
  83. 0 src/{swganh → swganh_core}/command/command_properties_binding.h
  84. +1 −1 src/swganh_core/command/command_properties_manager.h
  85. 0 src/{swganh → swganh_core}/command/command_properties_manager_interface.h
  86. +3 −3 src/swganh_core/command/command_queue.cc
  87. +2 −2 src/swganh_core/command/command_queue.h
  88. 0 src/{swganh → swganh_core}/command/command_queue_interface.h
  89. +2 −2 src/swganh_core/command/command_queue_manager.cc
  90. +1 −1 src/swganh_core/command/command_queue_manager.h
  91. 0 src/{swganh → swganh_core}/command/command_queue_manager_interface.h
  92. +5 −5 src/swganh_core/command/command_service.cc
  93. +1 −1 src/swganh_core/command/command_service.h
  94. 0 src/{swganh → swganh_core}/command/command_service_binding.cc
  95. 0 src/{swganh → swganh_core}/command/command_service_binding.h
  96. 0 src/{swganh → swganh_core}/command/command_service_interface.h
  97. +1 −1 src/swganh_core/command/command_validator.cc
  98. +1 −1 src/swganh_core/command/command_validator.h
  99. 0 src/{swganh → swganh_core}/command/command_validator_interface.h
  100. 0 src/{swganh → swganh_core}/command/py_command.cc
  101. +2 −2 src/{swganh → swganh_core}/command/python_command_creator.cc
  102. 0 src/{swganh → swganh_core}/command/python_command_creator.h
  103. +1 −1 src/swganh_core/connection/connection_client.h
  104. 0 src/{swganh → swganh_core}/connection/connection_client_interface.h
  105. +3 −3 src/swganh_core/connection/connection_service.cc
  106. +1 −1 src/swganh_core/connection/connection_service.h
  107. +3 −3 src/{swganh → swganh_core}/connection/connection_service_interface.h
  108. 0 src/{swganh → swganh_core}/connection/providers/session_provider_interface.h
  109. +48 −0 src/swganh_core/equipment/CMakeLists.txt
  110. +1 −1 src/swganh_core/equipment/equipment_service.h
  111. +1 −1 src/{swganh → swganh_core}/equipment/equipment_service_binding.cc
  112. 0 src/{swganh → swganh_core}/equipment/equipment_service_binding.h
  113. 0 src/{swganh → swganh_core}/equipment/equipment_service_interface.h
  114. +1 −1 src/swganh_core/galaxy/galaxy_service.cc
  115. +1 −1 src/swganh_core/galaxy/galaxy_service.h
  116. +1 −1 src/{swganh → swganh_core}/galaxy/galaxy_service_interface.h
  117. +1 −1 src/swganh_core/galaxy/mysql_galaxy_provider.h
  118. 0 src/{swganh → swganh_core}/galaxy/providers/galaxy_provider_interface.h
  119. +1 −1 src/{swganh → swganh_core}/login/account.cc
  120. 0 src/{swganh → swganh_core}/login/account.h
  121. +2 −2 src/swganh_core/login/authentication_manager.cc
  122. +1 −1 src/swganh_core/login/authentication_manager.h
  123. +1 −1 src/{swganh → swganh_core}/login/authentication_manager_interface.h
  124. 0 src/{swganh → swganh_core}/login/encoders/encoder_interface.h
  125. 0 src/{swganh → swganh_core}/login/galaxy_status.h
  126. +1 −1 src/swganh_core/login/login_client.h
  127. 0 src/{swganh → swganh_core}/login/login_client_interface.h
  128. +3 −3 src/swganh_core/login/login_service.cc
  129. +1 −1 src/swganh_core/login/login_service.h
  130. +3 −3 src/{swganh → swganh_core}/login/login_service_interface.h
  131. +1 −1 src/swganh_core/login/mysql_account_provider.h
  132. +1 −1 src/swganh_core/login/mysql_session_provider.h
  133. +1 −1 src/{swganh → swganh_core}/login/providers/account_provider_interface.h
  134. +1 −1 src/swganh_core/login/sha512_encoder.h
  135. +48 −0 src/swganh_core/map/CMakeLists.txt
  136. +2 −2 src/swganh_core/map/map_service.cc
  137. +1 −1 src/swganh_core/map/map_service.h
  138. +1 −1 src/{swganh → swganh_core}/map/map_service_binding.cc
  139. 0 src/{swganh → swganh_core}/map/map_service_binding.h
  140. 0 src/{swganh → swganh_core}/map/map_service_interface.h
  141. +1 −1 src/swganh_core/messages/enumerate_character_id.h
  142. +2 −2 src/swganh_core/messages/login_client_token.cc
  143. +1 −1 src/swganh_core/messages/login_cluster_status.h
  144. +1 −1 src/swganh_core/messages/login_enum_cluster.cc
  145. +1 −1 src/swganh_core/messages/login_enum_cluster.h
  146. +1 −1 src/swganh_core/messages/sui_create_page_message.h
  147. +1 −1 src/swganh_core/messages/sui_update_page_message.h
  148. +1 −1 src/swganh_core/messages/system_message.cc
  149. 0 src/{swganh → swganh_core}/object/CMakeLists.txt
  150. +1 −1 src/{swganh → swganh_core}/object/container_interface.cc
  151. 0 src/{swganh → swganh_core}/object/container_interface.h
  152. +2 −2 src/swganh_core/object/creature/creature.cc
  153. 0 src/{swganh → swganh_core}/object/creature/creature_binding.h
  154. +1 −1 src/swganh_core/object/creature/creature_factory.cc
  155. 0 src/{swganh → swganh_core}/object/guild/guild_binding.h
  156. +1 −1 src/swganh_core/object/intangible/intangible_factory.cc
  157. +1 −1 src/swganh_core/object/object.cc
  158. +2 −2 src/swganh_core/object/object.h
  159. +7 −7 src/{swganh → swganh_core}/object/object_binding.cc
  160. +3 −3 src/{swganh → swganh_core}/object/object_binding.h
  161. +1 −1 src/swganh_core/object/object_controller.cc
  162. 0 src/{swganh → swganh_core}/object/object_controller_binding.h
  163. 0 src/{swganh → swganh_core}/object/object_controller_interface.h
  164. +2 −2 src/swganh_core/object/object_factory.cc
  165. +1 −1 src/swganh_core/object/object_factory.h
  166. 0 src/{swganh → swganh_core}/object/object_factory_interface.h
  167. +1 −1 src/swganh_core/object/object_manager.cc
  168. +2 −2 src/swganh_core/object/object_manager.h
  169. 0 src/{swganh → swganh_core}/object/object_message_builder_interface.h
  170. 0 src/{swganh → swganh_core}/object/permissions/container_permissions_interface.h
  171. +1 −1 src/swganh_core/object/permissions/creature_container_permission.cc
  172. +1 −1 src/swganh_core/object/permissions/creature_container_permission.h
  173. +1 −1 src/swganh_core/object/permissions/creature_permission.cc
  174. +1 −1 src/swganh_core/object/permissions/creature_permission.h
  175. +1 −1 src/swganh_core/object/permissions/default_permission.cc
  176. +1 −1 src/swganh_core/object/permissions/default_permission.h
  177. 0 src/{swganh → swganh_core}/object/permissions/permission_type.h
  178. +1 −1 src/swganh_core/object/permissions/ridable_permission.cc
  179. +1 −1 src/swganh_core/object/permissions/ridable_permission.h
  180. +1 −1 src/swganh_core/object/permissions/static_container_permission.cc
  181. +1 −1 src/swganh_core/object/permissions/static_container_permission.h
  182. +1 −1 src/swganh_core/object/permissions/world_cell_permission.cc
  183. +1 −1 src/swganh_core/object/permissions/world_cell_permission.h
  184. +1 −1 src/swganh_core/object/permissions/world_permission.cc
  185. +1 −1 src/swganh_core/object/permissions/world_permission.h
  186. +1 −1 src/{swganh → swganh_core}/object/player/player_binding.h
  187. +1 −1 src/swganh_core/object/player/player_factory.cc
  188. +1 −1 src/swganh_core/object/slot_container.h
  189. +1 −1 src/swganh_core/object/slot_exclusive.h
  190. 0 src/{swganh → swganh_core}/object/slot_interface.h
  191. +1 −1 src/{swganh → swganh_core}/object/tangible/tangible_binding.h
  192. +1 −1 src/swganh_core/object/tangible/tangible_factory.cc
  193. +1 −1 src/{swganh → swganh_core}/object/template_binding.h
  194. 0 src/{swganh → swganh_core}/object/template_interface.h
  195. +1 −1 src/swganh_core/object/waypoint/waypoint_factory.cc
  196. +48 −0 src/swganh_core/player/CMakeLists.txt
  197. +3 −3 src/swganh_core/player/player_service.cc
  198. +1 −1 src/swganh_core/player/player_service.h
  199. +1 −1 src/{swganh → swganh_core}/player/player_service_binding.cc
  200. 0 src/{swganh → swganh_core}/player/player_service_binding.h
  201. 0 src/{swganh → swganh_core}/player/player_service_interface.h
  202. +48 −0 src/swganh_core/simulation/CMakeLists.txt
  203. +2 −2 src/swganh_core/simulation/movement_manager.cc
  204. +1 −1 src/swganh_core/simulation/movement_manager.h
  205. 0 src/{swganh → swganh_core}/simulation/movement_manager_interface.h
  206. +1 −1 src/{swganh → swganh_core}/simulation/player_view_box.cc
  207. 0 src/{swganh → swganh_core}/simulation/player_view_box.h
  208. +2 −2 src/swganh_core/simulation/quadtree_spatial_provider.h
  209. +2 −2 src/swganh_core/simulation/scene.h
  210. 0 src/{swganh → swganh_core}/simulation/scene_interface.h
  211. +1 −1 src/swganh_core/simulation/scene_manager.cc
  212. +1 −1 src/swganh_core/simulation/scene_manager.h
  213. +1 −1 src/{swganh → swganh_core}/simulation/scene_manager_interface.h
  214. +40 −9 src/swganh_core/simulation/simulation_service.cc
  215. +1 −1 src/swganh_core/simulation/simulation_service.h
  216. +1 −1 src/{swganh → swganh_core}/simulation/simulation_service_binding.cc
  217. 0 src/{swganh → swganh_core}/simulation/simulation_service_binding.h
  218. +2 −2 src/{swganh → swganh_core}/simulation/simulation_service_interface.h
  219. +1 −1 src/{swganh → swganh_core}/simulation/spatial_provider_interface.h
  220. +48 −0 src/swganh_core/social/CMakeLists.txt
  221. 0 src/{swganh → swganh_core}/social/social_provider_interface.h
  222. +2 −2 src/swganh_core/social/social_service.cc
  223. +1 −1 src/swganh_core/social/social_service.h
  224. +1 −1 src/{swganh → swganh_core}/social/social_service_binding.cc
  225. 0 src/{swganh → swganh_core}/social/social_service_binding.h
  226. 0 src/{swganh → swganh_core}/social/social_service_interface.h
  227. +48 −0 src/swganh_core/spawn/CMakeLists.txt
  228. +1 −1 src/swganh_core/spawn/bundles/creature_bundle.h
  229. +1 −1 src/swganh_core/spawn/bundles/lair_bundle.h
  230. +1 −1 src/swganh_core/spawn/bundles/npc_factioned_bundle.h
  231. +1 −1 src/swganh_core/spawn/bundles/npc_neutral_bundle.h
  232. +1 −1 src/swganh_core/spawn/bundles/shuttle_bundle.h
  233. +1 −1 src/swganh_core/spawn/finite_state_machine.cc
  234. +1 −1 src/swganh_core/spawn/finite_state_machine.h
  235. 0 src/{swganh → swganh_core}/spawn/finite_state_machine_interface.h
  236. 0 src/{swganh → swganh_core}/spawn/fsm_bundle_interface.h
  237. +1 −1 src/{swganh → swganh_core}/spawn/fsm_controller.cc
  238. 0 src/{swganh → swganh_core}/spawn/fsm_controller.h
  239. 0 src/{swganh → swganh_core}/spawn/fsm_manager.cc
  240. 0 src/{swganh → swganh_core}/spawn/fsm_manager.h
  241. +1 −1 src/swganh_core/spawn/fsm_state.h
  242. 0 src/{swganh → swganh_core}/spawn/fsm_state_interface.cc
  243. 0 src/{swganh → swganh_core}/spawn/fsm_state_interface.h
  244. +1 −1 src/swganh_core/spawn/machines/creature.h
  245. +1 −1 src/swganh_core/spawn/machines/lair.h
  246. +1 −1 src/swganh_core/spawn/machines/npc_factioned.h
  247. +1 −1 src/swganh_core/spawn/machines/npc_neutral.h
  248. +1 −1 src/swganh_core/spawn/machines/shuttle.h
  249. 0 src/{swganh → swganh_core}/spawn/path_finding_unittest.cc
  250. +1 −1 src/swganh_core/spawn/spawn_service.cc
  251. +3 −3 src/swganh_core/spawn/spawn_service.h
  252. 0 src/{swganh → swganh_core}/spawn/spawn_service_binding.cc
  253. 0 src/{swganh → swganh_core}/spawn/spawn_service_binding.h
  254. 0 src/{swganh → swganh_core}/spawn/spawn_service_interface.h
  255. +48 −0 src/swganh_core/static/CMakeLists.txt
  256. 0 src/{swganh → swganh_core}/static/skill_manager.cc
  257. 0 src/{swganh → swganh_core}/static/skill_manager.h
  258. +3 −3 src/swganh_core/static/static_service.cc
  259. +2 −2 src/swganh_core/static/static_service.h
  260. +1 −1 src/{swganh → swganh_core}/static/static_service_binding.cc
  261. 0 src/{swganh → swganh_core}/static/static_service_binding.h
  262. 0 src/{swganh → swganh_core}/static/static_service_interface.h
  263. +48 −0 src/swganh_core/sui/CMakeLists.txt
  264. +1 −1 src/{swganh → swganh_core}/sui/python_radial_creator.cc
  265. 0 src/{swganh → swganh_core}/sui/python_radial_creator.h
  266. 0 src/{swganh → swganh_core}/sui/radial_binding.h
  267. 0 src/{swganh → swganh_core}/sui/radial_interface.h
  268. +6 −6 src/swganh_core/sui/sui_service.cc
  269. +1 −1 src/swganh_core/sui/sui_service.h
  270. +2 −2 src/{swganh → swganh_core}/sui/sui_service_binding.cc
  271. 0 src/{swganh → swganh_core}/sui/sui_service_binding.h
  272. 0 src/{swganh → swganh_core}/sui/sui_service_interface.h
  273. +1 −1 src/swganh_core/sui/sui_window.h
  274. 0 src/{swganh → swganh_core}/sui/sui_window_interface.h
  275. +48 −0 src/swganh_core/terrain/CMakeLists.txt
  276. +1 −1 src/swganh_core/terrain/terrain_service.h
  277. +1 −1 src/{swganh → swganh_core}/terrain/terrain_service_binding.cc
  278. +1 −1 src/{swganh → swganh_core}/terrain/terrain_service_binding.h
  279. 0 src/{swganh → swganh_core}/terrain/terrain_service_interface.h
  280. +48 −0 src/swganh_core/weather/CMakeLists.txt
  281. +1 −1 src/{swganh → swganh_core}/weather/weather_data.cc
  282. 0 src/{swganh → swganh_core}/weather/weather_data.h
  283. 0 src/{swganh → swganh_core}/weather/weather_provider_interface.h
  284. +2 −2 src/swganh_core/weather/weather_service.cc
  285. +4 −4 src/swganh_core/weather/weather_service.h
  286. +1 −1 src/{swganh → swganh_core}/weather/weather_service_binding.cc
  287. 0 src/{swganh → swganh_core}/weather/weather_service_binding.h
  288. 0 src/{swganh → swganh_core}/weather/weather_service_interface.h
  289. +36 −49 tools/cmake/ANHPlugin.cmake
View
32 src/swganh/CMakeLists.txt
@@ -2,40 +2,8 @@
set(ANH_PYTHON_BINDINGS "")
add_subdirectory(app)
-add_subdirectory(attributes)
-add_subdirectory(badge)
-add_subdirectory(chat)
-add_subdirectory(command)
-add_subdirectory(combat)
-add_subdirectory(equipment)
-add_subdirectory(map)
-add_subdirectory(object)
-add_subdirectory(player)
-add_subdirectory(social)
-add_subdirectory(simulation)
-add_subdirectory(static)
-add_subdirectory(sui)
-add_subdirectory(terrain)
add_subdirectory(utilities)
-add_subdirectory(weather)
-add_custom_target(
- swgpy ALL
- DEPENDS
- swgpy_app swgpy_command swgpy_chat swgpy_combat swgpy_object swgpy_social swgpy_simulation swgpy_utility
- COMMAND python "${CMAKE_SOURCE_DIR}/tools/swgpy/init_modules.py"
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$\(Configuration\)/swgpy"
- VERBATIM
-)
-set_target_properties(swgpy
- PROPERTIES
- FOLDER "cmake_targets"
-)
-
-set_target_properties(swgpy
- PROPERTIES
- FOLDER "cmake_targets"
-)
include(ANHExecutable)
AddANHExecutable(swganh
View
1 src/swganh/app/CMakeLists.txt
@@ -4,6 +4,7 @@ AddANHPythonBinding(app
PREFIX_NAME swgpy
DEPENDS
swganh_lib
+ swganh_core_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
17 src/swganh/app/swganh_app.cc
@@ -30,12 +30,6 @@
#include "swganh/app/swganh_kernel.h"
-#include "swganh/combat/combat_service_interface.h"
-#include "swganh/chat/chat_service_interface.h"
-#include "swganh/character/character_service_interface.h"
-#include "swganh/login/login_service_interface.h"
-#include "swganh/connection/connection_service_interface.h"
-#include "swganh/simulation/simulation_service_interface.h"
#include "swganh/scripting/utilities.h"
#include "version.h"
@@ -45,12 +39,6 @@ using namespace boost::program_options;
using namespace std;
using namespace swganh;
using namespace swganh::app;
-using namespace swganh::chat;
-using namespace swganh::login;
-using namespace swganh::character;
-using namespace swganh::connection;
-using namespace swganh::simulation;
-using namespace swganh::galaxy;
using swganh::plugin::RegistrationMap;
@@ -274,11 +262,12 @@ void SwganhApp::Start() {
kernel_->GetServiceManager()->Start();
+ kernel_->GetEventDispatcher()->Dispatch(std::make_shared<BaseEvent>("Core::ApplicationInitComplete"));
//Now that services are started, start the scenes.
- auto simulation_service = kernel_->GetServiceManager()->GetService<SimulationServiceInterface>("SimulationService");
+ //auto simulation_service = kernel_->GetServiceManager()->GetService<SimulationServiceInterface>("SimulationService");
//Ground Zones
- simulation_service->StartScene("corellia");
+ //simulation_service->StartScene("corellia");
//simulation_service->StartScene("dantooine");
//simulation_service->StartScene("dathomir");
//simulation_service->StartScene("endor");
View
28 src/swganh/app/swganh_kernel_binding.h
@@ -14,20 +14,20 @@
#include "swganh/event_dispatcher.h"
#include "swganh/app/kernel_interface.h"
#include "swganh/service/service_manager.h"
-#include "swganh/combat/combat_service_interface.h"
-#include "swganh/chat/chat_service_interface.h"
-#include "swganh/command/command_service_interface.h"
-#include "swganh/social/social_service_interface.h"
-#include "swganh/simulation/simulation_service_interface.h"
-#include "swganh/static/static_service_interface.h"
-#include "swganh/sui/sui_service_interface.h"
-#include "swganh/terrain/terrain_service_interface.h"
-#include "swganh/equipment/equipment_service_interface.h"
-#include "swganh/weather/weather_service_interface.h"
-#include "swganh/simulation/spatial_provider_interface.h"
-#include "swganh/player/player_service_interface.h"
-#include "swganh/badge/badge_service_interface.h"
-#include "swganh/map/map_service_interface.h"
+#include "swganh_core/combat/combat_service_interface.h"
+#include "swganh_core/chat/chat_service_interface.h"
+#include "swganh_core/command/command_service_interface.h"
+#include "swganh_core/social/social_service_interface.h"
+#include "swganh_core/simulation/simulation_service_interface.h"
+#include "swganh_core/static/static_service_interface.h"
+#include "swganh_core/sui/sui_service_interface.h"
+#include "swganh_core/terrain/terrain_service_interface.h"
+#include "swganh_core/equipment/equipment_service_interface.h"
+#include "swganh_core/weather/weather_service_interface.h"
+#include "swganh_core/simulation/spatial_provider_interface.h"
+#include "swganh_core/player/player_service_interface.h"
+#include "swganh_core/badge/badge_service_interface.h"
+#include "swganh_core/map/map_service_interface.h"
#include <boost/python.hpp>
View
47 src/swganh/attributes/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(attributes
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
47 src/swganh/badge/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(badge
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
47 src/swganh/equipment/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(equipment
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
4 src/swganh/event_dispatcher.cc
@@ -42,7 +42,7 @@ CallbackId EventDispatcher::Subscribe(EventType type, EventHandlerCallback callb
{
auto handler_id = GenerateCallbackId();
- boost::lock_guard<boost::shared_mutex> lg(event_handlers_mutex_);
+ boost::upgrade_lock<boost::shared_mutex> lg(event_handlers_mutex_);
auto find_iter = event_handlers_.find(type);
@@ -58,7 +58,7 @@ CallbackId EventDispatcher::Subscribe(EventType type, EventHandlerCallback callb
void EventDispatcher::Unsubscribe(EventType type, CallbackId identifier)
{
- boost::lock_guard<boost::shared_mutex> lg(event_handlers_mutex_);
+ boost::upgrade_lock<boost::shared_mutex> lg(event_handlers_mutex_);
auto event_type_iter = event_handlers_.find(type);
View
47 src/swganh/map/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(map
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
47 src/swganh/player/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(player
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
47 src/swganh/simulation/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(simulation
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
0 src/swganh/simulation/simulation_init.h
No changes.
View
47 src/swganh/social/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(social
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
47 src/swganh/spawn/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(spawn
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
47 src/swganh/static/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(static
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
47 src/swganh/sui/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(sui
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
47 src/swganh/terrain/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(terrain
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
47 src/swganh/weather/CMakeLists.txt
@@ -1,47 +0,0 @@
-include(ANHPythonBinding)
-
-AddANHPythonBinding(weather
- PREFIX_NAME swgpy
- DEPENDS
- swganh_lib
- ADDITIONAL_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- ${GLM_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
- ${PYTHON_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIR}
- ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
- DEBUG_LIBRARIES
- ${Boost_CHRONO_LIBRARY_DEBUG}
- ${Boost_DATE_TIME_LIBRARY_DEBUG}
- ${Boost_LOG_LIBRARY_DEBUG}
- ${Boost_FILESYSTEM_LIBRARY_DEBUG}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
- ${Boost_PYTHON3_LIBRARY_DEBUG}
- ${Boost_REGEX_LIBRARY_DEBUG}
- ${Boost_SYSTEM_LIBRARY_DEBUG}
- ${Boost_THREAD_LIBRARY_DEBUG}
- ${MYSQL_LIBRARY_DEBUG}
- ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
- ${PYTHON_LIBRARY}
- ${TBB_DEBUG_LIBRARIES}
- ${ZLIB_LIBRARY_DEBUG}
- OPTIMIZED_LIBRARIES
- ${Boost_CHRONO_LIBRARY_RELEASE}
- ${Boost_DATE_TIME_LIBRARY_RELEASE}
- ${Boost_LOG_LIBRARY_RELEASE}
- ${Boost_FILESYSTEM_LIBRARY_RELEASE}
- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
- ${Boost_PYTHON3_LIBRARY_RELEASE}
- ${Boost_REGEX_LIBRARY_RELEASE}
- ${Boost_SYSTEM_LIBRARY_RELEASE}
- ${Boost_THREAD_LIBRARY_RELEASE}
- ${MYSQL_LIBRARY_RELEASE}
- ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
- ${PYTHON_LIBRARY}
- ${TBB_LIBRARIES}
- ${ZLIB_LIBRARY_RELEASE}
-)
View
40 src/swganh_core/CMakeLists.txt
@@ -1,5 +1,41 @@
include(ANHPlugin)
+set(ANH_PYTHON_BINDINGS "")
+
+add_subdirectory(attributes)
+add_subdirectory(badge)
+add_subdirectory(chat)
+add_subdirectory(command)
+add_subdirectory(combat)
+add_subdirectory(equipment)
+add_subdirectory(map)
+add_subdirectory(object)
+add_subdirectory(player)
+add_subdirectory(social)
+add_subdirectory(simulation)
+add_subdirectory(static)
+add_subdirectory(sui)
+add_subdirectory(terrain)
+add_subdirectory(weather)
+
+add_custom_target(
+ swgpy ALL
+ DEPENDS
+ swgpy_app swgpy_command swgpy_chat swgpy_combat swgpy_object swgpy_social swgpy_simulation swgpy_utility
+ COMMAND python "${CMAKE_SOURCE_DIR}/tools/swgpy/init_modules.py"
+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$\(Configuration\)/swgpy"
+ VERBATIM
+)
+set_target_properties(swgpy
+ PROPERTIES
+ FOLDER "cmake_targets"
+)
+
+set_target_properties(swgpy
+ PROPERTIES
+ FOLDER "cmake_targets"
+)
+
AddANHPlugin(swganh_core
DEPENDS
swganh_lib
@@ -11,7 +47,7 @@ AddANHPlugin(swganh_core
${PYTHON_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
ADDITIONAL_LIBRARY_DIRS
- ${Boost_LIBRARY_DIRS}
+ ${Boost_LIBRARY_DIRS}
DEBUG_LIBRARIES
${Boost_CHRONO_LIBRARY_DEBUG}
${Boost_DATE_TIME_LIBRARY_DEBUG}
@@ -44,4 +80,4 @@ AddANHPlugin(swganh_core
${PYTHON_LIBRARY}
${TBB_LIBRARIES}
${ZLIB_LIBRARY_RELEASE}
-)
+)
View
48 src/swganh_core/attributes/CMakeLists.txt
@@ -0,0 +1,48 @@
+include(ANHPythonBinding)
+
+AddANHPythonBinding(attributes
+ PREFIX_NAME swgpy
+ DEPENDS
+ swganh_lib
+ swganh_core_lib
+ ADDITIONAL_INCLUDE_DIRS
+ ${Boost_INCLUDE_DIR}
+ ${GLM_INCLUDE_DIR}
+ ${MYSQL_INCLUDE_DIR}
+ ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
+ ${PYTHON_INCLUDE_DIR}
+ ${TBB_INCLUDE_DIRS}
+ ${ZLIB_INCLUDE_DIR}
+ ADDITIONAL_LIBRARY_DIRS
+ ${Boost_LIBRARY_DIRS}
+ DEBUG_LIBRARIES
+ ${Boost_CHRONO_LIBRARY_DEBUG}
+ ${Boost_DATE_TIME_LIBRARY_DEBUG}
+ ${Boost_LOG_LIBRARY_DEBUG}
+ ${Boost_FILESYSTEM_LIBRARY_DEBUG}
+ ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
+ ${Boost_PYTHON3_LIBRARY_DEBUG}
+ ${Boost_REGEX_LIBRARY_DEBUG}
+ ${Boost_SYSTEM_LIBRARY_DEBUG}
+ ${Boost_THREAD_LIBRARY_DEBUG}
+ ${MYSQL_LIBRARY_DEBUG}
+ ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
+ ${PYTHON_LIBRARY}
+ ${TBB_DEBUG_LIBRARIES}
+ ${ZLIB_LIBRARY_DEBUG}
+ OPTIMIZED_LIBRARIES
+ ${Boost_CHRONO_LIBRARY_RELEASE}
+ ${Boost_DATE_TIME_LIBRARY_RELEASE}
+ ${Boost_LOG_LIBRARY_RELEASE}
+ ${Boost_FILESYSTEM_LIBRARY_RELEASE}
+ ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
+ ${Boost_PYTHON3_LIBRARY_RELEASE}
+ ${Boost_REGEX_LIBRARY_RELEASE}
+ ${Boost_SYSTEM_LIBRARY_RELEASE}
+ ${Boost_THREAD_LIBRARY_RELEASE}
+ ${MYSQL_LIBRARY_RELEASE}
+ ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
+ ${PYTHON_LIBRARY}
+ ${TBB_LIBRARIES}
+ ${ZLIB_LIBRARY_RELEASE}
+)
View
0 ...attributes/attribute_template_interface.h → ...attributes/attribute_template_interface.h
File renamed without changes.
View
0 src/swganh/attributes/attributes_binding.cc → ...anh_core/attributes/attributes_binding.cc
File renamed without changes.
View
0 src/swganh/attributes/attributes_binding.h → ...ganh_core/attributes/attributes_binding.h
File renamed without changes.
View
2 src/swganh_core/attributes/attributes_get_batch_command.cc
@@ -12,7 +12,7 @@
#include "swganh_core/object/creature/creature.h"
#include "swganh_core/object/tangible/tangible.h"
-#include "swganh/simulation/simulation_service_interface.h"
+#include "swganh_core/simulation/simulation_service_interface.h"
#include "attributes_service.h"
View
2 src/swganh_core/attributes/attributes_get_batch_command.h
@@ -4,7 +4,7 @@
#include <memory>
-#include "swganh/command/base_swg_command.h"
+#include "swganh_core/command/base_swg_command.h"
namespace swganh {
namespace simulation {
View
10 src/swganh_core/attributes/attributes_service.cc
@@ -16,12 +16,12 @@
#include "swganh/app/swganh_kernel.h"
#include "swganh_core/object/creature/creature.h"
-#include "swganh/connection/connection_service_interface.h"
-#include "swganh/connection/connection_client_interface.h"
+#include "swganh_core/connection/connection_service_interface.h"
+#include "swganh_core/connection/connection_client_interface.h"
-#include "swganh/simulation/simulation_service_interface.h"
-#include "swganh/command/command_service_interface.h"
-#include "swganh/attributes/python_attributes_creator.h"
+#include "swganh_core/simulation/simulation_service_interface.h"
+#include "swganh_core/command/command_service_interface.h"
+#include "swganh_core/attributes/python_attributes_creator.h"
#include "swganh_core/connection/connection_client.h"
#include "swganh_core/messages/attribute_list_message.h"
View
4 src/swganh_core/attributes/attributes_service.h
@@ -9,8 +9,8 @@
#include "swganh/hash_string.h"
#include "swganh/scripting/python_script.h"
-#include "swganh/attributes/attributes_service_interface.h"
-#include "swganh/attributes/attribute_template_interface.h"
+#include "swganh_core/attributes/attributes_service_interface.h"
+#include "swganh_core/attributes/attribute_template_interface.h"
#include "swganh_core/messages/controllers/get_attributes_batch.h"
View
0 ...attributes/attributes_service_interface.h → ...attributes/attributes_service_interface.h
File renamed without changes.
View
2 ...h/attributes/python_attributes_creator.cc → ...e/attributes/python_attributes_creator.cc
@@ -4,7 +4,7 @@
#include <boost/python.hpp>
#include "swganh/app/swganh_kernel.h"
-#include "swganh/attributes/attribute_template_interface.h"
+#include "swganh_core/attributes/attribute_template_interface.h"
#include "swganh/scripting/utilities.h"
namespace bp = boost::python;
View
0 ...nh/attributes/python_attributes_creator.h → ...re/attributes/python_attributes_creator.h
File renamed without changes.
View
48 src/swganh_core/badge/CMakeLists.txt
@@ -0,0 +1,48 @@
+include(ANHPythonBinding)
+
+AddANHPythonBinding(badge
+ PREFIX_NAME swgpy
+ DEPENDS
+ swganh_lib
+ swganh_core_lib
+ ADDITIONAL_INCLUDE_DIRS
+ ${Boost_INCLUDE_DIR}
+ ${GLM_INCLUDE_DIR}
+ ${MYSQL_INCLUDE_DIR}
+ ${MYSQLCONNECTORCPP_INCLUDE_DIRS}
+ ${PYTHON_INCLUDE_DIR}
+ ${TBB_INCLUDE_DIRS}
+ ${ZLIB_INCLUDE_DIR}
+ ADDITIONAL_LIBRARY_DIRS
+ ${Boost_LIBRARY_DIRS}
+ DEBUG_LIBRARIES
+ ${Boost_CHRONO_LIBRARY_DEBUG}
+ ${Boost_DATE_TIME_LIBRARY_DEBUG}
+ ${Boost_LOG_LIBRARY_DEBUG}
+ ${Boost_FILESYSTEM_LIBRARY_DEBUG}
+ ${Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG}
+ ${Boost_PYTHON3_LIBRARY_DEBUG}
+ ${Boost_REGEX_LIBRARY_DEBUG}
+ ${Boost_SYSTEM_LIBRARY_DEBUG}
+ ${Boost_THREAD_LIBRARY_DEBUG}
+ ${MYSQL_LIBRARY_DEBUG}
+ ${MYSQLCONNECTORCPP_LIBRARY_DEBUG}
+ ${PYTHON_LIBRARY}
+ ${TBB_DEBUG_LIBRARIES}
+ ${ZLIB_LIBRARY_DEBUG}
+ OPTIMIZED_LIBRARIES
+ ${Boost_CHRONO_LIBRARY_RELEASE}
+ ${Boost_DATE_TIME_LIBRARY_RELEASE}
+ ${Boost_LOG_LIBRARY_RELEASE}
+ ${Boost_FILESYSTEM_LIBRARY_RELEASE}
+ ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}
+ ${Boost_PYTHON3_LIBRARY_RELEASE}
+ ${Boost_REGEX_LIBRARY_RELEASE}
+ ${Boost_SYSTEM_LIBRARY_RELEASE}
+ ${Boost_THREAD_LIBRARY_RELEASE}
+ ${MYSQL_LIBRARY_RELEASE}
+ ${MYSQLCONNECTORCPP_LIBRARY_RELEASE}
+ ${PYTHON_LIBRARY}
+ ${TBB_LIBRARIES}
+ ${ZLIB_LIBRARY_RELEASE}
+)
View
2 src/swganh_core/badge/badge_region.cc
@@ -2,7 +2,7 @@
// See file LICENSE or go to http://swganh.com/LICENSE
#include <swganh_core/badge/badge_region.h>
-#include <swganh/connection/connection_client_interface.h>
+#include <swganh_core/connection/connection_client_interface.h>
#include <swganh_core/messages/chat_system_message.h>
#include <swganh_core/messages/play_music_message.h>
View
4 src/swganh_core/badge/badge_service.cc
@@ -3,8 +3,8 @@
#include <swganh_core/badge/badge_service.h>
-#include <swganh/command/command_service_interface.h>
-#include <swganh/command/command_properties.h>
+#include <swganh_core/command/command_service_interface.h>
+#include <swganh_core/command/command_properties.h>
#include <cppconn/exception.h>
#include <cppconn/connection.h>
View
4 src/swganh_core/badge/badge_service.h
@@ -4,8 +4,8 @@
#include <bitset>
#include <swganh/app/swganh_kernel.h>
-#include <swganh/badge/badge_service_interface.h>
-#include <swganh/connection/connection_client_interface.h>
+#include <swganh_core/badge/badge_service_interface.h>
+#include <swganh_core/connection/connection_client_interface.h>
namespace swganh {
View
2 src/swganh/badge/badge_service_binding.cc → ...wganh_core/badge/badge_service_binding.cc
@@ -1,7 +1,7 @@
// This file is part of SWGANH which is released under the MIT license.
// See file LICENSE or go to http://swganh.com/LICENSE
-#include "swganh/badge/badge_service_binding.h"
+#include "swganh_core/badge/badge_service_binding.h"
BOOST_PYTHON_MODULE(py_badge)
{
View
0 src/swganh/badge/badge_service_binding.h → ...swganh_core/badge/badge_service_binding.h
File renamed without changes.
View
0 src/swganh/badge/badge_service_interface.h → ...ganh_core/badge/badge_service_interface.h
File renamed without changes.
View
2 src/swganh_core/badge/request_badges_command.h
@@ -4,7 +4,7 @@
#include <memory>
-#include "swganh/command/base_swg_command.h"
+#include "swganh_core/command/base_swg_command.h"
namespace swganh {
View
0 src/swganh/character/character_data.h → src/swganh_core/character/character_data.h
File renamed without changes.
View
2 .../character/character_provider_interface.h → .../character/character_provider_interface.h
@@ -6,7 +6,7 @@
#include <tuple>
#include <vector>
-#include "swganh/character/character_data.h"
+#include "swganh_core/character/character_data.h"
#include "swganh_core/messages/client_create_character.h"
namespace swganh {
View
14 src/swganh_core/character/character_service.cc
@@ -18,18 +18,18 @@
#include "swganh/service/service_manager.h"
-#include "swganh/login/login_service_interface.h"
-#include "swganh/login/login_client_interface.h"
-#include "swganh/login/account.h"
+#include "swganh_core/login/login_service_interface.h"
+#include "swganh_core/login/login_client_interface.h"
+#include "swganh_core/login/account.h"
-#include "swganh/character/character_provider_interface.h"
+#include "swganh_core/character/character_provider_interface.h"
-#include "swganh/connection/connection_service_interface.h"
-#include "swganh/connection/connection_client_interface.h"
+#include "swganh_core/connection/connection_service_interface.h"
+#include "swganh_core/connection/connection_client_interface.h"
#include "swganh_core/messages/heart_beat.h"
#include "swganh_core/messages/delete_character_reply_message.h"
-#include "swganh/character/character_data.h"
+#include "swganh_core/character/character_data.h"
#include "swganh_core/messages/client_create_character_success.h"
#include "swganh_core/messages/client_create_character_failed.h"
#include "swganh_core/messages/client_random_name_response.h"
View
2 src/swganh_core/character/character_service.h
@@ -6,7 +6,7 @@
#include <tuple>
#include <vector>
-#include "swganh/character/character_service_interface.h"
+#include "swganh_core/character/character_service_interface.h"
#include "swganh/app/swganh_kernel.h"
#include "swganh_core/messages/delete_character_message.h"
View
0 ...h/character/character_service_interface.h → ...e/character/character_service_interface.h
File renamed without changes.
View
2 src/swganh_core/character/mysql_character_provider.cc
@@ -26,7 +26,7 @@
#include <cppconn/sqlstring.h>
#include "swganh_core/messages/delete_character_reply_message.h"
-#include "swganh/character/character_data.h"
+#include "swganh_core/character/character_data.h"
#include "swganh_core/messages/delete_character_message.h"
#include "swganh_core/messages/client_create_character.h"
#include "swganh_core/messages/client_create_character_success.h"
View
2 src/swganh_core/character/mysql_character_provider.h
@@ -2,7 +2,7 @@
// See file LICENSE or go to http://swganh.com/LICENSE
#pragma once
-#include "swganh/character/character_provider_interface.h"
+#include "swganh_core/character/character_provider_interface.h"
#include "character_create.h"
namespace swganh {
View
1 src/swganh/chat/CMakeLists.txt → src/swganh_core/chat/CMakeLists.txt
@@ -4,6 +4,7 @@ AddANHPythonBinding(chat
PREFIX_NAME swgpy
DEPENDS
swganh_lib
+ swganh_core_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
8 src/swganh_core/chat/chat_service.cc
@@ -38,10 +38,10 @@
#include "swganh_core/messages/chat_delete_persistent_message.h"
#include "swganh_core/object/object.h"
-#include "swganh/connection/connection_client_interface.h"
-#include "swganh/connection/connection_service_interface.h"
-#include "swganh/command/command_service_interface.h"
-#include "swganh/simulation/simulation_service_interface.h"
+#include "swganh_core/connection/connection_client_interface.h"
+#include "swganh_core/connection/connection_service_interface.h"
+#include "swganh_core/command/command_service_interface.h"
+#include "swganh_core/simulation/simulation_service_interface.h"
#include "spatial_chat_internal_command.h"
View
6 src/swganh_core/chat/chat_service.h
@@ -6,9 +6,9 @@
#include <memory>
#include <string>
-#include "swganh/chat/chat_service_interface.h"
-#include "swganh/command/command_service_interface.h"
-#include "swganh/simulation/simulation_service_interface.h"
+#include "swganh_core/chat/chat_service_interface.h"
+#include "swganh_core/command/command_service_interface.h"
+#include "swganh_core/simulation/simulation_service_interface.h"
#include "swganh/app/swganh_kernel.h"
#include "swganh_core/messages/controllers/command_queue_enqueue.h"
View
0 src/swganh/chat/chat_service_binding.cc → src/swganh_core/chat/chat_service_binding.cc
File renamed without changes.
View
0 src/swganh/chat/chat_service_binding.h → src/swganh_core/chat/chat_service_binding.h
File renamed without changes.
View
0 src/swganh/chat/chat_service_interface.h → ...swganh_core/chat/chat_service_interface.h
File renamed without changes.
View
2 src/swganh_core/chat/spatial_chat_internal_command.h
@@ -4,7 +4,7 @@
#include <memory>
-#include "swganh/command/base_swg_command.h"
+#include "swganh_core/command/base_swg_command.h"
namespace swganh {
namespace chat {
View
3 src/swganh/combat/CMakeLists.txt → src/swganh_core/combat/CMakeLists.txt
@@ -3,7 +3,8 @@ include(ANHPythonBinding)
AddANHPythonBinding(combat
PREFIX_NAME swgpy
DEPENDS
- swganh_lib
+ swganh_lib
+ swganh_core_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
0 src/swganh/combat/buff_events.h → src/swganh_core/combat/buff_events.h
File renamed without changes.
View
0 src/swganh/combat/buff_interface.h → src/swganh_core/combat/buff_interface.h
File renamed without changes.
View
4 src/swganh_core/combat/buff_manager.cc
@@ -3,10 +3,10 @@
#include <swganh/logger.h>
-#include "swganh/combat/python_buff_creator.h"
+#include "swganh_core/combat/python_buff_creator.h"
#include "swganh_core/object/creature/creature.h"
-#include "swganh/combat/buff_events.h"
+#include "swganh_core/combat/buff_events.h"
#include "buff_manager.h"
#include <boost/python.hpp>
View
2 src/swganh_core/combat/buff_manager.h
@@ -9,7 +9,7 @@
#include <boost/thread/mutex.hpp>
#include <boost/asio/deadline_timer.hpp>
-#include <swganh/combat/buff_interface.h>
+#include <swganh_core/combat/buff_interface.h>
#include <swganh/app/swganh_kernel.h>
namespace swganh
View
2 src/swganh_core/combat/combat_data.cc
@@ -3,7 +3,7 @@
#include "combat_data.h"
-#include "swganh/command/base_combat_command.h"
+#include "swganh_core/command/base_combat_command.h"
#include "swganh/scripting/utilities.h"
using namespace swganh::combat;
View
2 src/swganh_core/combat/combat_data.h
@@ -10,7 +10,7 @@
#include <unordered_map>
#include <swganh/hash_string.h>
-#include "swganh/command/command_properties.h"
+#include "swganh_core/command/command_properties.h"
#include "swganh/scripting/utilities.h"
#include <boost/python.hpp>
View
14 src/swganh_core/combat/combat_service.cc
@@ -25,17 +25,17 @@
#include "swganh_core/object/tangible/tangible.h"
#include "swganh_core/object/weapon/weapon.h"
#include "swganh_core/object/player/player.h"
-#include "swganh/command/base_combat_command.h"
+#include "swganh_core/command/base_combat_command.h"
-#include "swganh/command/command_service_interface.h"
-#include "swganh/command/base_swg_command.h"
-#include "swganh/command/python_command_creator.h"
-#include "swganh/command/command_properties.h"
-#include "swganh/simulation/simulation_service_interface.h"
+#include "swganh_core/command/command_service_interface.h"
+#include "swganh_core/command/base_swg_command.h"
+#include "swganh_core/command/python_command_creator.h"
+#include "swganh_core/command/command_properties.h"
+#include "swganh_core/simulation/simulation_service_interface.h"
#include "swganh_core/equipment/equipment_service.h"
#include "swganh_core/static/static_service.h"
-#include "swganh/static/skill_manager.h"
+#include "swganh_core/static/skill_manager.h"
#include "swganh_core/messages/controllers/combat_action_message.h"
#include "swganh_core/messages/controllers/combat_spam_message.h"
View
4 src/swganh_core/combat/combat_service.h
@@ -26,14 +26,14 @@ namespace Concurrency {
#endif
-#include "swganh/combat/combat_service_interface.h"
+#include "swganh_core/combat/combat_service_interface.h"
#include "swganh_core/combat/buff_manager.h"
#include "swganh/random_generator.h"
#include "swganh/service/service_interface.h"
#include "swganh/app/swganh_kernel.h"
-#include "swganh/command/command_properties.h"
+#include "swganh_core/command/command_properties.h"
#include "swganh_core/messages/controllers/command_queue_enqueue.h"
namespace swganh {
View
2 src/swganh/combat/combat_service_binding.cc → ...anh_core/combat/combat_service_binding.cc
@@ -1,7 +1,7 @@
// This file is part of SWGANH which is released under the MIT license.
// See file LICENSE or go to http://swganh.com/LICENSE
-#include "swganh/combat/combat_service_binding.h"
+#include "swganh_core/combat/combat_service_binding.h"
BOOST_PYTHON_MODULE(py_combat)
{
View
4 src/swganh/combat/combat_service_binding.h → ...ganh_core/combat/combat_service_binding.h
@@ -7,8 +7,8 @@
#endif
#include "swganh/python_shared_ptr.h"
-#include "swganh/combat/combat_service_interface.h"
-#include "swganh/combat/buff_interface.h"
+#include "swganh_core/combat/combat_service_interface.h"
+#include "swganh_core/combat/buff_interface.h"
#include "swganh/scripting/utilities.h"
#include <boost/python.hpp>
View
2 src/swganh/combat/combat_service_interface.h → ...nh_core/combat/combat_service_interface.h
@@ -19,7 +19,7 @@
#include "swganh/service/service_interface.h"
#include "swganh/app/swganh_kernel.h"
-#include "swganh/command/command_properties.h"
+#include "swganh_core/command/command_properties.h"
#include "swganh_core/messages/controllers/command_queue_enqueue.h"
View
0 src/swganh/combat/python_buff_creator.cc → ...swganh_core/combat/python_buff_creator.cc
File renamed without changes.
View
0 src/swganh/combat/python_buff_creator.h → src/swganh_core/combat/python_buff_creator.h
File renamed without changes.
View
1 src/swganh/command/CMakeLists.txt → src/swganh_core/command/CMakeLists.txt
@@ -4,6 +4,7 @@ AddANHPythonBinding(command
PREFIX_NAME swgpy
DEPENDS
swganh_lib
+ swganh_core_lib
ADDITIONAL_INCLUDE_DIRS
${Boost_INCLUDE_DIR}
${GLM_INCLUDE_DIR}
View
2 src/swganh/command/base_combat_command.cc → ...wganh_core/command/base_combat_command.cc
@@ -11,7 +11,7 @@
#include "swganh/service/service_manager.h"
-#include "swganh/combat/combat_service_interface.h"
+#include "swganh_core/combat/combat_service_interface.h"
using swganh::combat::CombatServiceInterface;
using swganh::combat::CombatData;
View
0 src/swganh/command/base_combat_command.h → ...swganh_core/command/base_combat_command.h
File renamed without changes.
View
0 ...nh/command/base_combat_command_binding.cc → ...re/command/base_combat_command_binding.cc
File renamed without changes.
View
0 ...anh/command/base_combat_command_binding.h → ...ore/command/base_combat_command_binding.h
File renamed without changes.
View
2 src/swganh/command/base_swg_command.cc → src/swganh_core/command/base_swg_command.cc
@@ -7,7 +7,7 @@
#include "swganh/app/swganh_kernel.h"
#include "swganh_core/object/creature/creature.h"
-#include "swganh/simulation/simulation_service_interface.h"
+#include "swganh_core/simulation/simulation_service_interface.h"
using swganh::observer::ObserverInterface;
using swganh::command::BaseSwgCommand;
View
0 src/swganh/command/base_swg_command.h → src/swganh_core/command/base_swg_command.h
File renamed without changes.
View
0 src/swganh/command/command_binding.cc → src/swganh_core/command/command_binding.cc
File renamed without changes.
View
0 src/swganh/command/command_binding.h → src/swganh_core/command/command_binding.h
File renamed without changes.
View
6 src/swganh_core/command/command_factory.cc
@@ -6,9 +6,9 @@
#include "swganh/service/service_manager.h"
#include "swganh/app/swganh_kernel.h"
-#include "swganh/command/command_interface.h"
-#include "swganh/command/command_properties.h"
-#include "swganh/command/command_service_interface.h"
+#include "swganh_core/command/command_interface.h"
+#include "swganh_core/command/command_properties.h"
+#include "swganh_core/command/command_service_interface.h"
#include "swganh_core/messages/controllers/command_queue_enqueue.h"
#include "swganh/observer/observer_interface.h"
View
2 src/swganh_core/command/command_factory.h
@@ -6,7 +6,7 @@
#include <tuple>
#include <boost/thread/mutex.hpp>
-#include "swganh/command/command_factory_interface.h"
+#include "swganh_core/command/command_factory_interface.h"
namespace swganh {
namespace app {
View
0 ...wganh/command/command_factory_interface.h → ..._core/command/command_factory_interface.h
File renamed without changes.
View
6 src/swganh_core/command/command_filter.cc
@@ -3,9 +3,9 @@
#include "command_filter.h"
-#include "swganh/command/base_swg_command.h"
-#include "swganh/command/command_interface.h"
-#include "swganh/command/command_properties.h"
+#include "swganh_core/command/base_swg_command.h"
+#include "swganh_core/command/command_interface.h"
+#include "swganh_core/command/command_properties.h"
#include "swganh_core/object/creature/creature.h"
#include "swganh_core/object/tangible/tangible.h"
#include "swganh_core/object/player/player.h"
View
0 src/swganh/command/command_interface.h → src/swganh_core/command/command_interface.h
File renamed without changes.
View
0 src/swganh/command/command_properties.h → src/swganh_core/command/command_properties.h
File renamed without changes.
View
0 ...anh/command/command_properties_binding.cc → ...ore/command/command_properties_binding.cc
File renamed without changes.
View
0 ...ganh/command/command_properties_binding.h → ...core/command/command_properties_binding.h
File renamed without changes.
View
2 src/swganh_core/command/command_properties_manager.h
@@ -7,7 +7,7 @@
#include <boost/optional.hpp>
-#include "swganh/command/command_properties_manager_interface.h"
+#include "swganh_core/command/command_properties_manager_interface.h"
namespace swganh {
namespace tre {