Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge

Browse source
This commit is contained in:
kervala 2010-05-13 22:58:05 +02:00
commit 52ff2bb95c
9 changed files with 115 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/misc/static_map.h
View file

@ -144,7 +144,7 @@ public:
{
iterator __i = find(__k);
// The key MUST exist no automatic insertion done in this class
nlassert(__i != end())
nlassert(__i != end());
return (*__i).second;
}

2
code/ryzom/CMakeLists.txt
View file

@ -117,6 +117,6 @@ IF(WITH_TOOLS)
ENDIF(WITH_TOOLS)
IF(WITH_SERVER)
FIND_PACKAGE(MySQL)
FIND_PACKAGE(MySQL REQUIRED)
ADD_SUBDIRECTORY(server)
ENDIF(WITH_SERVER)

3
code/ryzom/server/src/CMakeLists.txt
View file

@ -1,5 +1,8 @@
ADD_SUBDIRECTORY(admin_modules)
ADD_SUBDIRECTORY(server_share)
ADD_SUBDIRECTORY(ai_share)
ADD_SUBDIRECTORY(gameplay_module_lib)
ADD_SUBDIRECTORY(pd_lib)
ADD_SUBDIRECTORY(frontend_service)
ADD_SUBDIRECTORY(entities_game_service)

27
code/ryzom/server/src/ai_share/CMakeLists.txt Normal file
View file

@ -0,0 +1,27 @@
FILE(GLOB SRC *.cpp *.h)
# Filter out the source files not actually compiled.
#LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ admin_modules.cpp)
IF(WIN32)
ADD_LIBRARY(ai_share STATIC ${SRC})
ELSE(WIN32)
ADD_LIBRARY(ai_share SHARED ${SRC})
ENDIF(WIN32)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ai_share ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELPACS_LIBRARY})
SET_TARGET_PROPERTIES(ai_share PROPERTIES VERSION ${NL_VERSION})
IF(WIN32)
SET_TARGET_PROPERTIES(ai_share
PROJECT_LABEL "Library: AI Share"
DEBUG_POSTFIX "_d"
RELEASE_POSTFIX "_r"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt"
LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ai_share LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)

21
code/ryzom/server/src/entities_game_service/CMakeLists.txt
View file

@ -1,7 +1,7 @@
FILE(GLOB SRC *.cpp *.h
backward_compatibility/*.h backward_compatibility/*.cpp
building_manager
character_structure
building_manager/*.h building_manager/*.cpp
character_structure/*.h character_structure/*.cpp
creature_manager/*.h creature_manager/*.cpp
egs_sheets/*.h egs_sheets/*.cpp
entity_manager/*.h entity_manager/*.cpp
@ -26,6 +26,8 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/egs_static_continent.h
${CMAKE_CURRENT_SOURCE_DIR}/shutdown_handler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/shutdown_handler.h
${CMAKE_CURRENT_SOURCE_DIR}/building_manager/room.cpp
${CMAKE_CURRENT_SOURCE_DIR}/building_manager/room.h
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/combat_bleed_effect.cpp
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/combat_bleed_effect.h
${CMAKE_CURRENT_SOURCE_DIR}/phrase_manager/combat_stun_effect.cpp
@ -41,7 +43,20 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.cpp
ADD_EXECUTABLE(entities_game_service ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(entities_game_service admin_modules game_share server_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELLIGO_LIBRARY})
TARGET_LINK_LIBRARIES(entities_game_service admin_modules
game_share
server_share
ai_share
pd_lib
gameplay_module_lib
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES}
${MYSQL_LIBRARIES}
${ZLIB_LIBRARIES}
${NELMISC_LIBRARY}
${NELNET_LIBRARY}
${NELGEORGES_LIBRARY}
${NELLIGO_LIBRARY})
IF(WIN32)
SET_TARGET_PROPERTIES(entities_game_service PROPERTIES

27
code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt Normal file
View file

@ -0,0 +1,27 @@
FILE(GLOB SRC *.cpp *.h)
# Filter out the source files not actually compiled.
#LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ admin_modules.cpp)
IF(WIN32)
ADD_LIBRARY(gameplay_module_lib STATIC ${SRC})
ELSE(WIN32)
ADD_LIBRARY(gameplay_module_lib SHARED ${SRC})
ENDIF(WIN32)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(gameplay_module_lib ${NELMISC_LIBRARY})
SET_TARGET_PROPERTIES(gameplay_module_lib PROPERTIES VERSION ${NL_VERSION})
IF(WIN32)
SET_TARGET_PROPERTIES(gameplay_module_lib
PROJECT_LABEL "Library: Gameplay Module"
DEBUG_POSTFIX "_d"
RELEASE_POSTFIX "_r"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt"
LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS gameplay_module_lib LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)

28
code/ryzom/server/src/pd_lib/CMakeLists.txt Normal file
View file

@ -0,0 +1,28 @@
FILE(GLOB SRC *.cpp *.h)
# Filter out the source files not actually compiled.
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/pd_string_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pd_string_manager.h)
IF(WIN32)
ADD_LIBRARY(pd_lib STATIC ${SRC})
ELSE(WIN32)
ADD_LIBRARY(pd_lib SHARED ${SRC})
ENDIF(WIN32)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(pd_lib ${NELMISC_LIBRARY})
SET_TARGET_PROPERTIES(pd_lib PROPERTIES VERSION ${NL_VERSION})
IF(WIN32)
SET_TARGET_PROPERTIES(pd_lib
PROJECT_LABEL "Library: PD Lib"
DEBUG_POSTFIX "_d"
RELEASE_POSTFIX "_r"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt"
LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS pd_lib LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)

9
code/ryzom/server/src/pd_lib/pds_types.h
View file

@ -333,6 +333,9 @@ inline bool isIntegerType(TDataType type)
CHECK_IS_INTEGER_TYPE(uint64)
CHECK_IS_INTEGER_TYPE(sint64)
CHECK_IS_INTEGER_TYPE(dimension)
default:
return false;
break;
}
return false;
@ -346,6 +349,9 @@ inline bool isFloatType(TDataType type)
{
CHECK_IS_FLOAT_TYPE(float)
CHECK_IS_FLOAT_TYPE(double)
default:
return false;
break;
}
return false;
@ -433,6 +439,9 @@ inline bool checkDataTypeCompatible(TDataType from, TDataType into)
case PDS_double:
return isIntegerType(into) || isFloatType(into);
break;
default:
return false;
break;
}
return false;

2
code/ryzom/server/src/server_share/CMakeLists.txt
View file

@ -10,7 +10,7 @@ ELSE(WIN32)
ENDIF(WIN32)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(server_share ${NELMISC_LIBRARY} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES})
TARGET_LINK_LIBRARIES(server_share ${NELMISC_LIBRARY} ${NELPACS_LIBRARY} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES})
SET_TARGET_PROPERTIES(server_share PROPERTIES VERSION ${NL_VERSION})
IF(WIN32)