OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Merge branch 'master' into asyncfixes

Browse Source
This commit is contained in:
Adam Johnson
2011-04-28 21:26:54 -04:00
parent ea5ceb6f34 c76c39b277
commit e109e77cff
302 changed files with 2109 additions and 3688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -9,7 +9,7 @@ find_package(OpenAL REQUIRED)
find_package(PythonLibs REQUIRED) find_package(PythonLibs REQUIRED)
find_package(EXPAT REQUIRED) find_package(EXPAT REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(PHYSX REQUIRED) #TODO: Not required if we aren't building the client find_package(PhysX REQUIRED) #TODO: Not required if we aren't building the client
find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the client find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the client
find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client
find_package(Speex REQUIRED) #TODO: Not required if we aren't building the client find_package(Speex REQUIRED) #TODO: Not required if we aren't building the client
@ -69,10 +69,21 @@ if(PLASMA_TARGETS STREQUAL "Ethereal")
add_definitions(-DSTREAM_LOGGER) add_definitions(-DSTREAM_LOGGER)
endif(PLASMA_TARGETS STREQUAL "Ethereal") endif(PLASMA_TARGETS STREQUAL "Ethereal")
include(TestBigEndian)
test_big_endian(BIG_ENDIAN)
if(BIG_ENDIAN)
add_definitions(-DBIG_ENDIAN)
else()
add_definitions(-DLITTLE_ENDIAN)
endif()
if(MSVC) if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_definitions(-D_SCL_SECURE_NO_WARNINGS)
endif(MSVC) endif(MSVC)
#TODO: Make the OpenSSL includes less promiscuous so this isn't needed
include_directories(${OPENSSL_INCLUDE_DIR})
add_subdirectory(Sources/Plasma) add_subdirectory(Sources/Plasma)
add_subdirectory(Sources/Tools) add_subdirectory(Sources/Tools)

12
Sources/Plasma/Apps/plClient/CMakeLists.txt
View File

@ -93,6 +93,9 @@ set(plClient_RESOURCES
add_executable(plClient WIN32 ${plClient_SOURCES} ${plClient_HEADERS} add_executable(plClient WIN32 ${plClient_SOURCES} ${plClient_HEADERS}
${plClient_TEXT} ${plClient_RESOURCES}) ${plClient_TEXT} ${plClient_RESOURCES})
if(PLASMA_EXTERNAL_RELEASE)
set_target_properties(plClient PROPERTIES OUTPUT_NAME "UruExplorer")
endif(PLASMA_EXTERNAL_RELEASE)
target_link_libraries(plClient CoreLib) target_link_libraries(plClient CoreLib)
target_link_libraries(plClient CoreLibExe) target_link_libraries(plClient CoreLibExe)
target_link_libraries(plClient pfAnimation) target_link_libraries(plClient pfAnimation)
@ -184,8 +187,13 @@ target_link_libraries(plClient pnTimer)
target_link_libraries(plClient pnUtils) target_link_libraries(plClient pnUtils)
target_link_libraries(plClient pnUtilsExe) target_link_libraries(plClient pnUtilsExe)
target_link_libraries(plClient debug ${PYTHON_DEBUG_LIBRARY}) if(PYTHON_DEBUG_LIBRARY)
target_link_libraries(plClient optimized ${PYTHON_LIBRARY}) target_link_libraries(plClient debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(plClient optimized ${PYTHON_LIBRARY})
else()
target_link_libraries(plClient ${PYTHON_LIBRARY})
endif()
target_link_libraries(plClient ${OPENAL_LIBRARY}) target_link_libraries(plClient ${OPENAL_LIBRARY})
target_link_libraries(plClient ${OPENSSL_LIBRARIES}) target_link_libraries(plClient ${OPENSSL_LIBRARIES})
target_link_libraries(plClient ${EXPAT_LIBRARY}) target_link_libraries(plClient ${EXPAT_LIBRARY})

31
Sources/Plasma/Apps/plClient/res/plClient.rc
View File

@ -2,15 +2,9 @@
// //
#include "resource.h" #include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS #define WIN32_LEAN_AND_MEAN
///////////////////////////////////////////////////////////////////////////// #include <windows.h>
// #define IDC_STATIC (-1) // all static controls
// Generated from the TEXTINCLUDE 2 resource.
//
#include <afxres.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources // English (U.S.) resources
@ -34,27 +28,10 @@ END
2 TEXTINCLUDE 2 TEXTINCLUDE
BEGIN BEGIN
"#include <afxres.h>\r\n" "\r\n"
"\0" "\0"
END END
3 TEXTINCLUDE
BEGIN
"#define _AFX_NO_SPLITTER_RESOURCES\r\n"
"#define _AFX_NO_OLE_RESOURCES\r\n"
"#define _AFX_NO_TRACKER_RESOURCES\r\n"
"#define _AFX_NO_PROPERTY_RESOURCES\r\n"
"\r\n"
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
"#ifdef _WIN32\r\n"
"LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r\n"
"#pragma code_page(1252)\r\n"
"#endif //_WIN32\r\n"
"#endif\r\n"
"\r\n"
"CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""plClient.exe.manifest""\0"
END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED

13
Sources/Plasma/Apps/plPlasmaInstaller/plPlasmaInstaller.rc
View File

@ -2,15 +2,9 @@
// //
#include "resource.h" #include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS #define WIN32_LEAN_AND_MEAN
///////////////////////////////////////////////////////////////////////////// #include <windows.h>
// #define IDC_STATIC (-1) // all static controls
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources // English (U.S.) resources
@ -91,7 +85,6 @@ END
2 TEXTINCLUDE DISCARDABLE 2 TEXTINCLUDE DISCARDABLE
BEGIN BEGIN
"#include ""afxres.h""\r\n"
"\0" "\0"
END END

13
Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaUpdate.rc
View File

@ -2,15 +2,9 @@
// //
#include "resource.h" #include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS #define WIN32_LEAN_AND_MEAN
///////////////////////////////////////////////////////////////////////////// #include <windows.h>
// #define IDC_STATIC (-1) // all static controls
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources // English (U.S.) resources
@ -100,7 +94,6 @@ END
2 TEXTINCLUDE 2 TEXTINCLUDE
BEGIN BEGIN
"#include ""afxres.h""\r\n"
"\0" "\0"
END END

9
Sources/Plasma/Apps/plPythonPack/CMakeLists.txt
View File

@ -14,8 +14,13 @@ set(plPythonPack_HEADERS
add_executable(plPythonPack ${plPythonPack_SOURCES} ${plPythonPack_HEADERS}) add_executable(plPythonPack ${plPythonPack_SOURCES} ${plPythonPack_HEADERS})
target_link_libraries(plPythonPack CoreLib CoreLibExe plFile) target_link_libraries(plPythonPack CoreLib CoreLibExe plFile)
target_link_libraries(plPythonPack debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(plPythonPack optimized ${PYTHON_LIBRARY}) if(PYTHON_DEBUG_LIBRARY)
target_link_libraries(plPythonPack debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(plPythonPack optimized ${PYTHON_LIBRARY})
else()
target_link_libraries(plPythonPack ${PYTHON_LIBRARY})
endif()
source_group("Source Files" FILES ${plPythonPack_SOURCES}) source_group("Source Files" FILES ${plPythonPack_SOURCES})
source_group("Header Files" FILES ${plPythonPack_HEADERS}) source_group("Header Files" FILES ${plPythonPack_HEADERS})

3
Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt
View File

@ -29,6 +29,9 @@ set(plUruLauncher_RESOURCES
add_executable(plUruLauncher WIN32 ${plUruLauncher_SOURCES} ${plUruLauncher_HEADERS} add_executable(plUruLauncher WIN32 ${plUruLauncher_SOURCES} ${plUruLauncher_HEADERS}
${plUruLauncher_RESOURCES}) ${plUruLauncher_RESOURCES})
if(PLASMA_EXTERNAL_RELEASE)
set_target_properties(plUruLauncher PROPERTIES OUTPUT_NAME UruLauncher)
endif(PLASMA_EXTERNAL_RELEASE)
target_link_libraries(plUruLauncher CoreLib) target_link_libraries(plUruLauncher CoreLib)
target_link_libraries(plUruLauncher CoreLibExe) target_link_libraries(plUruLauncher CoreLibExe)
target_link_libraries(plUruLauncher pfConsoleCore) target_link_libraries(plUruLauncher pfConsoleCore)

18
Sources/Plasma/Apps/plUruLauncher/plUruLauncher.rc
View File

@ -2,15 +2,9 @@
// //
#include "resource.h" #include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS #define WIN32_LEAN_AND_MEAN
///////////////////////////////////////////////////////////////////////////// #include <windows.h>
// #define IDC_STATIC (-1) // all static controls
// Generated from the TEXTINCLUDE 2 resource.
//
#include <afxres.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources // English (U.S.) resources
@ -33,12 +27,6 @@ BEGIN
END END
2 TEXTINCLUDE 2 TEXTINCLUDE
BEGIN
"#include <afxres.h>\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN BEGIN
"\r\n" "\r\n"
"\0" "\0"

1
Sources/Plasma/CoreLib/CMakeLists.txt
View File

@ -74,6 +74,7 @@ set(CoreLib_HEADERS
hsScalar.h hsScalar.h
hsStlSortUtils.h hsStlSortUtils.h
hsSTLStream.h hsSTLStream.h
hsStlUtils.h
hsStream.h hsStream.h
hsStringTokenizer.h hsStringTokenizer.h
hsTemplates.h hsTemplates.h

2
Sources/Plasma/CoreLib/hsMalloc.h
View File

@ -159,7 +159,7 @@ inline void __cdecl operator delete (void *, void *) {}
#ifdef __cplusplus #ifdef __cplusplus
#if !defined(HS_NO_TYPEINFO) #if !defined(HS_NO_TYPEINFO)
#include <typeinfo.h> #include <typeinfo>
#endif #endif
#endif // ifdef __cplusplus #endif // ifdef __cplusplus

1
Sources/Plasma/CoreLib/hsUtils.h
View File

@ -50,6 +50,7 @@ char * hsFormatStrV(const char * fmt, va_list args); // You are responsible f
#define strnicmp _strnicmp #define strnicmp _strnicmp
#define wcsicmp _wcsicmp #define wcsicmp _wcsicmp
#define wcsnicmp _wcsnicmp #define wcsnicmp _wcsnicmp
#define strlwr _strlwr
#else #else
#define stricmp strcasecmp #define stricmp strcasecmp
#define strnicmp strncasecmp #define strnicmp strncasecmp

2
Sources/Plasma/CoreLibExe/CMakeLists.txt
View File

@ -1,5 +1,7 @@
add_definitions(-D_LIB) add_definitions(-D_LIB)
include_directories("../../Plasma/CoreLib")
set(CoreLibExe_SOURCES set(CoreLibExe_SOURCES
hsExeError.cpp hsExeError.cpp
hsExeMalloc.cpp hsExeMalloc.cpp

16
Sources/Plasma/CoreLibExe/Pch.h
View File

@ -36,14 +36,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#pragma warning(push, 3) #pragma warning(push, 3)
#include "../CoreLib/HeadSpin.h" #include "HeadSpin.h"
#include "../CoreLib/hsConfig.h" #include "hsConfig.h"
#include "../CoreLib/hsTypes.h" #include "hsTypes.h"
#include "../CoreLib/hsWindows.h" #include "hsWindows.h"
#include "../CoreLib/hsMalloc.h" #include "hsMalloc.h"
#include "../CoreLib/hsCritSect.h" #include "hsCritSect.h"
#include "../CoreLib/hsUtils.h" #include "hsUtils.h"
#include "../CoreLib/hsWindows.h" #include "hsWindows.h"
#pragma warning(pop) #pragma warning(pop)

5
Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt
View File

@ -3,11 +3,6 @@ include_directories("../../NucleusLib")
include_directories("../../NucleusLib/inc") include_directories("../../NucleusLib/inc")
include_directories("../../PubUtilLib") include_directories("../../PubUtilLib")
include_directories(${OPENSSL_INCLUDE_DIR})
# this is in the vcproj, but it seems silly for animation...
# find_package(OpenSSL REQUIRED)
set(pfAnimation_SOURCES set(pfAnimation_SOURCES
pfObjectFlocker.cpp pfObjectFlocker.cpp
plAnimDebugList.cpp plAnimDebugList.cpp

1
Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt
View File

@ -5,7 +5,6 @@ include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib) include_directories(../../PubUtilLib)
#include_directories(../../PubUtilLib/inc) #include_directories(../../PubUtilLib/inc)
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENAL_INCLUDE_DIR})
set(pfAudio_SOURCES set(pfAudio_SOURCES

2
Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt
View File

@ -4,8 +4,6 @@ include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc) include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib) include_directories(../../PubUtilLib)
include_directories(${OPENSSL_INCLUDE_DIR})
set(pfCamera_SOURCES set(pfCamera_SOURCES
pfCameraProxy.cpp pfCameraProxy.cpp
plCameraBrain.cpp plCameraBrain.cpp

2
Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt
View File

@ -4,8 +4,6 @@ include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc) include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib) include_directories(../../PubUtilLib)
include_directories(${OPENSSL_INCLUDE_DIR})
set(pfCharacter_SOURCES set(pfCharacter_SOURCES
pfMarkerInfo.cpp pfMarkerInfo.cpp
pfMarkerMgr.cpp pfMarkerMgr.cpp

1
Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt
View File

@ -4,7 +4,6 @@ include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc) include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib) include_directories(../../PubUtilLib)
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENAL_INCLUDE_DIR})
include_directories(${PYTHON_INCLUDE_DIR}) include_directories(${PYTHON_INCLUDE_DIR})

2
Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp
View File

@ -68,7 +68,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plAvatar/plArmatureEffects.h" #include "plAvatar/plArmatureEffects.h"
#include "plAvatar/plAvTaskSeek.h" #include "plAvatar/plAvTaskSeek.h"
//#include "../plHavok1/plSimulationMgr.h" //#include "plHavok1/plSimulationMgr.h"
#include "pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
#include "plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "plDrawable/plInstanceDrawInterface.h" #include "plDrawable/plInstanceDrawInterface.h"

16
Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCommandsCore.cpp
View File

@ -61,14 +61,6 @@ void PrintStringF(void pfun(const char *),const char * fmt, ...)
* *
***/ ***/
//TODO: Fix Plasma to use OpenSSL's byte order (or better yet, to use OpenSSL),
// so this hack isn't needed
static void swap_key_bytes(byte keyData[])
{
for (size_t i = 0; i < (kNetDiffieHellmanKeyBits / 16); ++i)
std::swap(keyData[i], keyData[ (kNetDiffieHellmanKeyBits / 8) - i - 1 ]);
}
//============================================================================ //============================================================================
// Server group // Server group
PF_CONSOLE_GROUP(Server) PF_CONSOLE_GROUP(Server)
@ -159,7 +151,6 @@ PF_CONSOLE_CMD(
Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0], Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
kNetDiffieHellmanKeyBits / 8, kAuthDhNData); kNetDiffieHellmanKeyBits / 8, kAuthDhNData);
swap_key_bytes(kAuthDhNData);
} }
//============================================================================ //============================================================================
@ -178,7 +169,6 @@ PF_CONSOLE_CMD(
Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0], Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
kNetDiffieHellmanKeyBits / 8, kAuthDhXData); kNetDiffieHellmanKeyBits / 8, kAuthDhXData);
swap_key_bytes(kAuthDhXData);
} }
@ -214,7 +204,6 @@ PF_CONSOLE_CMD(
Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0], Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
kNetDiffieHellmanKeyBits / 8, kCsrDhNData); kNetDiffieHellmanKeyBits / 8, kCsrDhNData);
swap_key_bytes(kCsrDhNData);
} }
//============================================================================ //============================================================================
@ -233,7 +222,6 @@ PF_CONSOLE_CMD(
Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0], Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
kNetDiffieHellmanKeyBits / 8, kCsrDhXData); kNetDiffieHellmanKeyBits / 8, kCsrDhXData);
swap_key_bytes(kCsrDhXData);
} }
@ -257,7 +245,6 @@ PF_CONSOLE_CMD(
Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0], Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
kNetDiffieHellmanKeyBits / 8, kGameDhNData); kNetDiffieHellmanKeyBits / 8, kGameDhNData);
swap_key_bytes(kGameDhNData);
} }
//============================================================================ //============================================================================
@ -276,7 +263,6 @@ PF_CONSOLE_CMD(
Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0], Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
kNetDiffieHellmanKeyBits / 8, kGameDhXData); kNetDiffieHellmanKeyBits / 8, kGameDhXData);
swap_key_bytes(kGameDhXData);
} }
@ -312,7 +298,6 @@ PF_CONSOLE_CMD(
Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0], Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
kNetDiffieHellmanKeyBits / 8, kGateKeeperDhNData); kNetDiffieHellmanKeyBits / 8, kGateKeeperDhNData);
swap_key_bytes(kGateKeeperDhNData);
} }
//============================================================================ //============================================================================
@ -331,5 +316,4 @@ PF_CONSOLE_CMD(
Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0], Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
kNetDiffieHellmanKeyBits / 8, kGateKeeperDhXData); kNetDiffieHellmanKeyBits / 8, kGateKeeperDhXData);
swap_key_bytes(kGateKeeperDhXData);
} }

9
Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleEngine.cpp
View File

@ -41,6 +41,7 @@ const Int32 pfConsoleEngine::fMaxNumParams = 16;
static const char kTokenSeparators[] = " =\r\n\t,"; static const char kTokenSeparators[] = " =\r\n\t,";
static const char kTokenGrpSeps[] = " =\r\n._\t,"; static const char kTokenGrpSeps[] = " =\r\n._\t,";
//WARNING: Potentially increments the pointer passed to it.
static char *console_strtok( char *&line, hsBool haveCommand ) static char *console_strtok( char *&line, hsBool haveCommand )
{ {
char *begin = line; char *begin = line;
@ -461,6 +462,7 @@ hsBool pfConsoleEngine::FindPartialCmd( char *line, hsBool findAgain, hsBool pr
static pfConsoleCmd *lastCmd = nil; static pfConsoleCmd *lastCmd = nil;
static pfConsoleCmdGroup *lastGroup = nil, *lastParentGroup = nil; static pfConsoleCmdGroup *lastGroup = nil, *lastParentGroup = nil;
static char newStr[ 256 ]; static char newStr[ 256 ];
static char *originalLine = line;
/// Repeat search /// Repeat search
@ -525,13 +527,12 @@ hsBool pfConsoleEngine::FindPartialCmd( char *line, hsBool findAgain, hsBool pr
if( preserveParams ) if( preserveParams )
{ {
/// Preserve the rest of the string after the matched command /// Preserve the rest of the string after the matched command
ptr = strtok( nil, "\0" ); if( line != nil )
if( ptr != nil ) strcat( newStr, line );
strcat( newStr, ptr );
} }
// Copy back! // Copy back!
strcpy( line, newStr ); strcpy( originalLine, newStr );
return true; return true;
} }

2
Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt
View File

@ -4,8 +4,6 @@ include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc) include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib) include_directories(../../PubUtilLib)
include_directories(${OPENSSL_INCLUDE_DIR})
set(pfGameMgr_SOURCES set(pfGameMgr_SOURCES
pfGameMgr.cpp pfGameMgr.cpp
BlueSpiral/pfGmBlueSpiral.cpp BlueSpiral/pfGmBlueSpiral.cpp

2
Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt
View File

@ -4,8 +4,6 @@ include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc) include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib) include_directories(../../PubUtilLib)
include_directories(${OPENSSL_INCLUDE_DIR})
set(pfJournalBook_SOURCES set(pfJournalBook_SOURCES
pfJournalBook.cpp pfJournalBook.cpp
) )

13
Sources/Plasma/FeatureLib/pfLoginDialog/pfLoginDialog.rc
View File

@ -2,15 +2,9 @@
// //
#include "resource.h" #include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS #define WIN32_LEAN_AND_MEAN
///////////////////////////////////////////////////////////////////////////// #include <windows.h>
// #define IDC_STATIC (-1) // all static controls
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources // English (U.S.) resources
@ -34,7 +28,6 @@ END
2 TEXTINCLUDE DISCARDABLE 2 TEXTINCLUDE DISCARDABLE
BEGIN BEGIN
"#include ""afxres.h""\r\n"
"\0" "\0"
END END

1
Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt
View File

@ -7,7 +7,6 @@ include_directories(../../)
include_directories(${PYTHON_INCLUDE_DIR}) include_directories(${PYTHON_INCLUDE_DIR})
include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENAL_INCLUDE_DIR})
include_directories(${OPENSSL_INCLUDE_DIR})
set(pfPython_SOURCES set(pfPython_SOURCES
cyAccountManagement.cpp cyAccountManagement.cpp

2
Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGameGlue.cpp
View File

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyBlueSpiralGame.h" #include "pyBlueSpiralGame.h"
#include <python.h> #include <Python.h>
#include "../../pyEnum.h" #include "../../pyEnum.h"
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyBlueSpiralMsg.h" #include "pyBlueSpiralMsg.h"
#include "../../pyEnum.h" #include "../../pyEnum.h"
#include <python.h> #include <Python.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //

2
Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGameGlue.cpp
View File

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyClimbingWallGame.h" #include "pyClimbingWallGame.h"
#include <python.h> #include <Python.h>
#include "../../pyEnum.h" #include "../../pyEnum.h"
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsgGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyClimbingWallMsg.h" #include "pyClimbingWallMsg.h"
#include "../../pyEnum.h" #include "../../pyEnum.h"
#include <python.h> #include <Python.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //

2
Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGameGlue.cpp
View File

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyHeekGame.h" #include "pyHeekGame.h"
#include <python.h> #include <Python.h>
#include "../../pyEnum.h" #include "../../pyEnum.h"
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsgGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyHeekMsg.h" #include "pyHeekMsg.h"
#include "../../pyEnum.h" #include "../../pyEnum.h"
#include <python.h> #include <Python.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //

2
Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGameGlue.cpp
View File

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyMarkerGame.h" #include "pyMarkerGame.h"
#include <python.h> #include <Python.h>
#include "../../pyEnum.h" #include "../../pyEnum.h"
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsgGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyMarkerMsg.h" #include "pyMarkerMsg.h"
#include "../../pyEnum.h" #include "../../pyEnum.h"
#include <python.h> #include <Python.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //

2
Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGameGlue.cpp
View File

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyTTTGame.h" #include "pyTTTGame.h"
#include <python.h> #include <Python.h>
#include "../../pyEnum.h" #include "../../pyEnum.h"
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsgGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyTTTMsg.h" #include "pyTTTMsg.h"
#include "../../pyEnum.h" #include "../../pyEnum.h"
#include <python.h> #include <Python.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //

2
Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGameGlue.cpp
View File

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyVarSyncGame.h" #include "pyVarSyncGame.h"
#include <python.h> #include <Python.h>
#include "../../pyEnum.h" #include "../../pyEnum.h"
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsgGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyVarSyncMsg.h" #include "pyVarSyncMsg.h"
#include "../../pyEnum.h" #include "../../pyEnum.h"
#include <python.h> #include <Python.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //

2
Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../pyGlueHelpers.h" #include "../pyGlueHelpers.h"
#include "../pyKey.h" #include "../pyKey.h"

2
Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyGameCli.h" #include "pyGameCli.h"
#include "../pyEnum.h" #include "../pyEnum.h"
#include <python.h> #include <Python.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //

2
Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../pyGlueHelpers.h" #include "../pyGlueHelpers.h"
class pyGameCliMsg class pyGameCliMsg

2
Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsgGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyGameCliMsg.h" #include "pyGameCliMsg.h"
#include "../pyEnum.h" #include "../pyEnum.h"
#include <python.h> #include <Python.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //

2
Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h
View File

@ -36,7 +36,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <python.h> #include <Python.h>
#include "../pyGlueHelpers.h" #include "../pyGlueHelpers.h"
class pyGameMgrMsg class pyGameMgrMsg

2
Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsgGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyGameMgrMsg.h" #include "pyGameMgrMsg.h"
#include "../pyEnum.h" #include "../pyEnum.h"
#include <python.h> #include <Python.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //

2
Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h
View File

@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// PURPOSE: Python wrapper for account management functions // PURPOSE: Python wrapper for account management functions
// //
#include <python.h> #include <Python.h>
#include "hsTypes.h" #include "hsTypes.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"

2
Sources/Plasma/FeatureLib/pfPython/cyAnimation.h
View File

@ -36,7 +36,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyKey.h" #include "pyKey.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class cyAnimation class cyAnimation

2
Sources/Plasma/FeatureLib/pfPython/cyAnimationGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "cyAnimation.h" #include "cyAnimation.h"
#include "hsUtils.h" #include "hsUtils.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptAnimation, cyAnimation); PYTHON_CLASS_DEFINITION(ptAnimation, cyAnimation);

2
Sources/Plasma/FeatureLib/pfPython/cyAvatar.h
View File

@ -37,7 +37,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsBitVector.h" #include "hsBitVector.h"
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"

2
Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp
View File

@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plAvatar/plAvBrainHuman.h" #include "plAvatar/plAvBrainHuman.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptAvatar, cyAvatar); PYTHON_CLASS_DEFINITION(ptAvatar, cyAvatar);

2
Sources/Plasma/FeatureLib/pfPython/cyCamera.h
View File

@ -37,7 +37,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
class pyKey; class pyKey;
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class cyCamera class cyCamera

2
Sources/Plasma/FeatureLib/pfPython/cyCameraGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "cyCamera.h" #include "cyCamera.h"
#include "pyKey.h" #include "pyKey.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptCamera, cyCamera); PYTHON_CLASS_DEFINITION(ptCamera, cyCamera);

2
Sources/Plasma/FeatureLib/pfPython/cyDraw.h
View File

@ -36,7 +36,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTemplates.h" #include "hsTemplates.h"
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class cyDraw class cyDraw

2
Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "cyDraw.h" #include "cyDraw.h"
#include "pyKey.h" #include "pyKey.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptDraw, cyDraw); PYTHON_CLASS_DEFINITION(ptDraw, cyDraw);

2
Sources/Plasma/FeatureLib/pfPython/cyInputInterface.h
View File

@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// PURPOSE: Class wrapper to map InputInterface functions to plasma2 message // PURPOSE: Class wrapper to map InputInterface functions to plasma2 message
// //
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class plInputInterface; class plInputInterface;

2
Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h" #include "HeadSpin.h"
#include "cyInputInterface.h" #include "cyInputInterface.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptInputInterface, cyInputInterface); PYTHON_CLASS_DEFINITION(ptInputInterface, cyInputInterface);

2
Sources/Plasma/FeatureLib/pfPython/cyMisc.h
View File

@ -41,7 +41,7 @@ class pyColor;
class pyAgeInfoStruct; class pyAgeInfoStruct;
class pyPoint3; class pyPoint3;
#include <python.h> #include <Python.h>
#include "hsTypes.h" #include "hsTypes.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "pnUtils/pnUtils.h" #include "pnUtils/pnUtils.h"

2
Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp
View File

@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsUtils.h" #include "hsUtils.h"
#include <python.h> #include <Python.h>
PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtGetAgeName, "DEPRECIATED - use ptDniInfoSource instead") PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtGetAgeName, "DEPRECIATED - use ptDniInfoSource instead")
{ {

2
Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plResMgr\plLocalization.h" #include "plResMgr\plLocalization.h"
#include "plMessage\plLOSRequestMsg.h" #include "plMessage\plLOSRequestMsg.h"
#include <python.h> #include <Python.h>
PYTHON_GLOBAL_METHOD_DEFINITION(PtYesNoDialog, args, "Params: selfkey,dialogMessage\nThis will display a Yes/No dialog to the user with the text dialogMessage\n" PYTHON_GLOBAL_METHOD_DEFINITION(PtYesNoDialog, args, "Params: selfkey,dialogMessage\nThis will display a Yes/No dialog to the user with the text dialogMessage\n"
"This dialog _has_ to be answered by the user.\n" "This dialog _has_ to be answered by the user.\n"

2
Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp
View File

@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyKey.h" #include "pyKey.h"
#include "pySceneObject.h" #include "pySceneObject.h"
#include <python.h> #include <Python.h>
PYTHON_GLOBAL_METHOD_DEFINITION(PtSendPetitionToCCR, args, "Params: message,reason=0,title=\"\"\nSends a petition with a message to the CCR group") PYTHON_GLOBAL_METHOD_DEFINITION(PtSendPetitionToCCR, args, "Params: message,reason=0,title=\"\"\nSends a petition with a message to the CCR group")
{ {

2
Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp
View File

@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "NucleusLib/inc/plPipeline.h" #include "NucleusLib/inc/plPipeline.h"
#include "pnNetBase/pnNetBase.h" #include "pnNetBase/pnNetBase.h"
#include <python.h> #include <Python.h>
PYTHON_GLOBAL_METHOD_DEFINITION(PtRequestLOSScreen, args, "Params: selfKey,ID,xPos,yPos,distance,what,reportType\nRequest a LOS check from a point on the screen") PYTHON_GLOBAL_METHOD_DEFINITION(PtRequestLOSScreen, args, "Params: selfKey,ID,xPos,yPos,distance,what,reportType\nRequest a LOS check from a point on the screen")
{ {

2
Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h
View File

@ -37,7 +37,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
class pyKey; class pyKey;
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class cyParticleSys class cyParticleSys

2
Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "cyParticleSys.h" #include "cyParticleSys.h"
#include "pyKey.h" #include "pyKey.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptParticle, cyParticleSys); PYTHON_CLASS_DEFINITION(ptParticle, cyParticleSys);

2
Sources/Plasma/FeatureLib/pfPython/cyPhysics.h
View File

@ -36,7 +36,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTemplates.h" #include "hsTemplates.h"
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyPoint3; class pyPoint3;

2
Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp
View File

@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyGeometry3.h" #include "pyGeometry3.h"
#include "pyMatrix44.h" #include "pyMatrix44.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptPhysics, cyPhysics); PYTHON_CLASS_DEFINITION(ptPhysics, cyPhysics);

2
Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h
View File

@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
#include "hsTypes.h" #include "hsTypes.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <python.h> #include <Python.h>
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE) #if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
#include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h" #include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h"

2
Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h
View File

@ -38,7 +38,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include <python.h> #include <Python.h>
#include "plPythonParameter.h" #include "plPythonParameter.h"

2
Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h
View File

@ -33,7 +33,7 @@ class plSimpleStateVariable;
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "plModifier/plSDLModifier.h" #include "plModifier/plSDLModifier.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"

2
Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifierGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPythonSDLModifier.h" #include "plPythonSDLModifier.h"
#include "pyKey.h" #include "pyKey.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptSDL, pySDLModifier); PYTHON_CLASS_DEFINITION(ptSDL, pySDLModifier);

13
Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp
View File

@ -107,7 +107,18 @@ const char * pyAgeInfoStruct::GetAgeInstanceGuid() const
void pyAgeInfoStruct::SetAgeInstanceGuid( const char * guid ) void pyAgeInfoStruct::SetAgeInstanceGuid( const char * guid )
{ {
fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) ); if ( guid[0] == '@' )
{
// if it starts with an @ then do a meta kind of GUID
std::string curInst = fAgeInfo.GetAgeInstanceName();
std::string y = curInst + guid;
plUUID instanceGuid;
CryptDigest(kCryptMd5, instanceGuid.fData , y.length(), y.c_str());
fAgeInfo.SetAgeInstanceGuid(&instanceGuid);
}
else
fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) );
} }
Int32 pyAgeInfoStruct::GetAgeSequenceNumber() const Int32 pyAgeInfoStruct::GetAgeSequenceNumber() const

2
Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h
View File

@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "plNetCommon/plNetServerSessionInfo.h" #include "plNetCommon/plNetServerSessionInfo.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStructGlue.cpp
View File

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyAgeInfoStruct.h" #include "pyAgeInfoStruct.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptAgeInfoStruct, pyAgeInfoStruct); PYTHON_CLASS_DEFINITION(ptAgeInfoStruct, pyAgeInfoStruct);

2
Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h
View File

@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetCommon/plNetServerSessionInfo.h" #include "plNetCommon/plNetServerSessionInfo.h"
#include "pyAgeInfoStruct.h" #include "pyAgeInfoStruct.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStructGlue.cpp
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyAgeLinkStruct.h" #include "pyAgeLinkStruct.h"
#include "pySpawnPointInfo.h" #include "pySpawnPointInfo.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptAgeLinkStruct, pyAgeLinkStruct); PYTHON_CLASS_DEFINITION(ptAgeLinkStruct, pyAgeLinkStruct);

2
Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h
View File

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyVaultNode; class pyVaultNode;

2
Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp
View File

@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyAgeInfoStruct.h" #include "pyAgeInfoStruct.h"
#include "pySDL.h" #include "pySDL.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptAgeVault, pyAgeVault); PYTHON_CLASS_DEFINITION(ptAgeVault, pyAgeVault);

2
Sources/Plasma/FeatureLib/pfPython/pyAlarm.h
View File

@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <python.h> #include <Python.h>
struct pyAlarm; struct pyAlarm;
class pyAlarmMgr class pyAlarmMgr

2
Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h
View File

@ -34,7 +34,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyAudioControl class pyAudioControl

2
Sources/Plasma/FeatureLib/pfPython/pyAudioControlGlue.cpp
View File

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyAudioControl.h" #include "pyAudioControl.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptAudioControl, pyAudioControl); PYTHON_CLASS_DEFINITION(ptAudioControl, pyAudioControl);

2
Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp
View File

@ -26,4 +26,4 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyCCRMgr.h" #include "pyCCRMgr.h"
#include "pyAgeLinkStruct.h" #include "pyAgeLinkStruct.h"
#include <python.h> #include <Python.h>

2
Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp
View File

@ -25,4 +25,4 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyCCRMgr.h" #include "pyCCRMgr.h"
#include <python.h> #include <Python.h>

2
Sources/Plasma/FeatureLib/pfPython/pyCluster.h
View File

@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyKey.h" #include "pyKey.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/pyClusterGlue.cpp
View File

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyCluster.h" #include "pyCluster.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptCluster, pyCluster); PYTHON_CLASS_DEFINITION(ptCluster, pyCluster);

2
Sources/Plasma/FeatureLib/pfPython/pyColor.h
View File

@ -34,7 +34,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsColorRGBA.h" #include "hsColorRGBA.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyColor class pyColor

2
Sources/Plasma/FeatureLib/pfPython/pyColorGlue.cpp
View File

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pyColor.h" #include "pyColor.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptColor, pyColor); PYTHON_CLASS_DEFINITION(ptColor, pyColor);

2
Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.h
View File

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _pyCritterBrain_h_ #ifndef _pyCritterBrain_h_
#define _pyCritterBrain_h_ #define _pyCritterBrain_h_
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
#include "pyKey.h" #include "pyKey.h"

2
Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp
View File

@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plMessage/plAIMsg.h" #include "plMessage/plAIMsg.h"
#include <python.h> #include <Python.h>
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //

2
Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h
View File

@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class plDniCoordinateInfo; class plDniCoordinateInfo;

2
Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp
View File

@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyGeometry3.h" #include "pyGeometry3.h"
#include "plVault/plDniCoordinateInfo.h" #include "plVault/plDniCoordinateInfo.h"
#include <python.h> #include <Python.h>
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptDniCoordinates, pyDniCoordinates); PYTHON_CLASS_DEFINITION(ptDniCoordinates, pyDniCoordinates);

2
Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h
View File

@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <python.h> #include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyDniCoordinates; class pyDniCoordinates;

Some files were not shown because too many files have changed in this diff Show More