Browse Source

HeadSpin.h is now the core header.

Rearrange some things so such that low-level CoreLib headers aren't quite
so crazy. For higher level stuff, you still need to include the
appropriate header.
Adam Johnson 13 years ago
parent
commit
be26b145df
  1. 2
      Sources/Plasma/Apps/plClient/plAllCreatables.cpp
  2. 2
      Sources/Plasma/Apps/plClient/plClient.cpp
  3. 4
      Sources/Plasma/Apps/plClient/plClient.h
  4. 2
      Sources/Plasma/Apps/plClient/winmain.cpp
  5. 1
      Sources/Plasma/Apps/plClientKey/plClientKey.cpp
  6. 2
      Sources/Plasma/Apps/plClientKey/plClientKey.h
  7. 2
      Sources/Plasma/Apps/plFileEncrypt/main.cpp
  8. 2
      Sources/Plasma/Apps/plFileSecure/main.cpp
  9. 4
      Sources/Plasma/Apps/plLogDecrypt/plLogDecrypt.cpp
  10. 2
      Sources/Plasma/Apps/plPageInfo/plAllCreatables.cpp
  11. 2
      Sources/Plasma/Apps/plPageInfo/plPageInfo.cpp
  12. 1
      Sources/Plasma/Apps/plPlasmaUpdate/main.cpp
  13. 1
      Sources/Plasma/Apps/plPlasmaUpdate/plManifest.cpp
  14. 2
      Sources/Plasma/Apps/plPlasmaUpdate/plManifest.h
  15. 1
      Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaServers.cpp
  16. 2
      Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaServers.h
  17. 1
      Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaUpdate.cpp
  18. 2
      Sources/Plasma/Apps/plPythonPack/PythonInterface.h
  19. 1
      Sources/Plasma/CoreLib/CMakeLists.txt
  20. 21
      Sources/Plasma/CoreLib/HeadSpin.cpp
  21. 4
      Sources/Plasma/CoreLib/HeadSpin.h
  22. 2
      Sources/Plasma/CoreLib/hsBitVector.cpp
  23. 2
      Sources/Plasma/CoreLib/hsBitVector.h
  24. 2
      Sources/Plasma/CoreLib/hsBounds.cpp
  25. 3
      Sources/Plasma/CoreLib/hsExceptionStack.h
  26. 2
      Sources/Plasma/CoreLib/hsExceptions.h
  27. 2
      Sources/Plasma/CoreLib/hsFastMath.cpp
  28. 2
      Sources/Plasma/CoreLib/hsGeometry3.h
  29. 10
      Sources/Plasma/CoreLib/hsMalloc.h
  30. 2
      Sources/Plasma/CoreLib/hsMatrix33.cpp
  31. 2
      Sources/Plasma/CoreLib/hsMatrix44.h
  32. 3
      Sources/Plasma/CoreLib/hsMemory.h
  33. 2
      Sources/Plasma/CoreLib/hsSTLStream.h
  34. 4
      Sources/Plasma/CoreLib/hsStlUtils.h
  35. 4
      Sources/Plasma/CoreLib/hsStream.cpp
  36. 2
      Sources/Plasma/CoreLib/hsStream.h
  37. 2
      Sources/Plasma/CoreLib/hsStringTokenizer.cpp
  38. 2
      Sources/Plasma/CoreLib/hsStringTokenizer.h
  39. 2
      Sources/Plasma/CoreLib/hsTemplates.cpp
  40. 2
      Sources/Plasma/CoreLib/hsTemplates.h
  41. 2
      Sources/Plasma/CoreLib/hsThread.cpp
  42. 6
      Sources/Plasma/CoreLib/hsThread.h
  43. 55
      Sources/Plasma/CoreLib/hsTypes.h
  44. 18
      Sources/Plasma/CoreLib/hsUtils.cpp
  45. 16
      Sources/Plasma/CoreLib/hsUtils.h
  46. 2
      Sources/Plasma/CoreLib/hsWide.h
  47. 54
      Sources/Plasma/CoreLib/hsWindowHndl.h
  48. 45
      Sources/Plasma/CoreLib/hsWindows.h
  49. 2
      Sources/Plasma/CoreLib/pcSmallRect.h
  50. 2
      Sources/Plasma/CoreLib/plGeneric.cpp
  51. 2
      Sources/Plasma/CoreLib/plLoadMask.cpp
  52. 2
      Sources/Plasma/CoreLib/plLoadMask.h
  53. 2
      Sources/Plasma/CoreLib/plRefCnt.h
  54. 2
      Sources/Plasma/CoreLib/plViewTransform.cpp
  55. 7
      Sources/Plasma/CoreLibExe/Pch.h
  56. 2
      Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp
  57. 2
      Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp
  58. 2
      Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.cpp
  59. 2
      Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp
  60. 2
      Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp
  61. 2
      Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp
  62. 4
      Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp
  63. 2
      Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp
  64. 2
      Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp
  65. 2
      Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
  66. 2
      Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp
  67. 2
      Sources/Plasma/FeatureLib/pfCCR/plCCRMgr.h
  68. 2
      Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp
  69. 2
      Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp
  70. 2
      Sources/Plasma/FeatureLib/pfCharacter/plPlayerModifier.cpp
  71. 2
      Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp
  72. 2
      Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp
  73. 2
      Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp
  74. 2
      Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp
  75. 2
      Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp
  76. 2
      Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp
  77. 2
      Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp
  78. 2
      Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp
  79. 2
      Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp
  80. 2
      Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp
  81. 2
      Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp
  82. 2
      Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp
  83. 2
      Sources/Plasma/FeatureLib/pfConsole/pfConsole.h
  84. 2
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
  85. 11
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.cpp
  86. 2
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.h
  87. 2
      Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
  88. 2
      Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp
  89. 2
      Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.h
  90. 2
      Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleContext.cpp
  91. 2
      Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleContext.h
  92. 4
      Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleEngine.h
  93. 2
      Sources/Plasma/FeatureLib/pfConsoleCore/pfUtilBase64.h
  94. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp
  95. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp
  96. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp
  97. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp
  98. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp
  99. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp
  100. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp
  101. Some files were not shown because too many files have changed in this diff Show More

2
Sources/Plasma/Apps/plClient/plAllCreatables.cpp

@ -39,5 +39,5 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsWindows.h"
#include "plAllCreatables.h"

2
Sources/Plasma/Apps/plClient/plClient.cpp

@ -41,8 +41,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#pragma warning(disable: 4284)
#include "HeadSpin.h"
#include "hsTypes.h"
#include "hsWindowHndl.h"
#include "plClient.h"
#include "hsStream.h"
#include "plResMgr/plResManager.h"

4
Sources/Plasma/Apps/plClient/plClient.h

@ -47,10 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//#define NEW_CAMERA_CODE
#include "hsWindowHndl.h"
#include "HeadSpin.h"
#include "hsBitVector.h"
#include "hsTemplates.h"
#include "hsUtils.h"
#include "hsStlUtils.h"
#include "pnKeyedObject/hsKeyedObject.h"
#include "pnKeyedObject/plUoid.h"

2
Sources/Plasma/Apps/plClient/winmain.cpp

@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "hsStream.h"
#include "hsUtils.h"
#include "plClient.h"
#include "plClientResMgr/plClientResMgr.h"
#include "plNetClient/plNetClientMgr.h"

1
Sources/Plasma/Apps/plClientKey/plClientKey.cpp

@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plClientKey.h"
#include "hsWindows.h"
typedef const uint32_t* (*GETKEY)();

2
Sources/Plasma/Apps/plClientKey/plClientKey.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plClientKey_h_inc
#define plClientKey_h_inc
#include "hsTypes.h"
#include "HeadSpin.h"
//
// For getting the "SafeDisc protected" encryption key in single player mode

2
Sources/Plasma/Apps/plFileEncrypt/main.cpp

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plFile/hsFiles.h"
#include "plFile/plEncryptedStream.h"
#include "pnProduct/pnProduct.h"
#include "hsUtils.h"
void EncryptFiles(const char* dir, const char* ext, bool encrypt);

2
Sources/Plasma/Apps/plFileSecure/main.cpp

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plFile/plFileUtils.h"
#include "plFile/plSecureStream.h"
#include "pnProduct/pnProduct.h"
#include "hsUtils.h"
#include <time.h>
#include <string>

4
Sources/Plasma/Apps/plLogDecrypt/plLogDecrypt.cpp

@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <cstdio>
#include <cstring>
#include "hsTypes.h"
#include "hsUtils.h"
#include "HeadSpin.h"
#include "plStatusLog/plEncryptLogLine.h"
void IProcessFile(const char *path)

2
Sources/Plasma/Apps/plPageInfo/plAllCreatables.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pnFactory/plCreator.h"

2
Sources/Plasma/Apps/plPageInfo/plPageInfo.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsUtils.h"
#include "hsTimer.h"
#include "plFile/hsFiles.h"
#include "plFile/plFileUtils.h"

1
Sources/Plasma/Apps/plPlasmaUpdate/main.cpp

@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "plPlasmaUpdate.h"
#include "jvCoreUtil.h"
#include "hsUtils.h"
int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
{

1
Sources/Plasma/Apps/plPlasmaUpdate/plManifest.cpp

@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "HeadSpin.h"
#include "hsUtils.h"
#include "plManifest.h"
#include "../plEncryption/plChecksum.h"

2
Sources/Plasma/Apps/plPlasmaUpdate/plManifest.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plManifest_h_inc
#define plManifest_h_inc
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plFileGrabber.h"
#include <vector>
#include <string>

1
Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaServers.cpp

@ -41,7 +41,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plPlasmaServers.h"
#include "hsStream.h"
#include "hsUtils.h"
bool plPlasmaServers::GetServerInfo()
{

2
Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaServers.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plPlasmaServers_h_inc
#define plPlasmaServers_h_inc
#include "hsTypes.h"
#include "HeadSpin.h"
#include <vector>
class plPlasmaServers

1
Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaUpdate.cpp

@ -53,7 +53,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../plUnifiedTime/plUnifiedTime.h"
#include "hsStream.h"
#include "plManifest.h"
#include "hsUtils.h"
#include "../plStatusLog/plStatusLog.h"
static plPlasmaUpdate* gInst = nil;

2
Sources/Plasma/Apps/plPythonPack/PythonInterface.h

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include <Python.h>
#include "hsTypes.h"
#include "HeadSpin.h"
#include <string>

1
Sources/Plasma/CoreLib/CMakeLists.txt

@ -68,7 +68,6 @@ set(CoreLib_HEADERS
hsTypes.h
hsUtils.h
hsWide.h
hsWindowHndl.h
hsWindows.h
pcSmallRect.h
plGeneric.h

21
Sources/Plasma/CoreLib/HeadSpin.cpp

@ -41,22 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "HeadSpin.h"
#include "hsRefCnt.h"
#include "hsUtils.h"
#include "hsStlUtils.h"
#include "hsExceptions.h"
#include <math.h>
#if HS_BUILD_FOR_WIN32
#ifdef _MSC_VER
# include <crtdbg.h> /* for _RPT_BASE */
#endif
# define WIN32_LEAN_AND_MEAN
# define WIN32_EXTRA_LEAN
# include <windows.h> // For OutputDebugString()
#endif
///////////////////////////////////////////////////////////////////////////
/////////////////// For Status Messages ///////////////////////////////////
///////////////////////////////////////////////////////////////////////////
@ -89,16 +78,10 @@ void hsDebugMessage (const char message[], long val)
{
char s[1024];
#if HS_BUILD_FOR_WIN32
#define strfmt _snprintf
#else
#define strfmt snprintf
#endif
if (val)
s[0] = strfmt(&s[1], 1022, "%s: %ld", message, val);
s[0] = snprintf(&s[1], 1022, "%s: %ld", message, val);
else
s[0] = strfmt(&s[1], 1022, "%s", message);
s[0] = snprintf(&s[1], 1022, "%s", message);
if (gHSDebugProc)
gHSDebugProc(&s[1]);

4
Sources/Plasma/CoreLib/HeadSpin.h

@ -46,9 +46,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
# define HS_DEBUGGING
#endif // defined(_DEBUG) || defined(UNIX_DENUG)
// Winsock2 compatibility; winsock2.h must always be included before windows.h =(
// Internal Headers
// These are only ever included here :)
#include "hsWindows.h"
#include "hsTypes.h"
#include "hsUtils.h"
#include "hsMalloc.h"
#endif

2
Sources/Plasma/CoreLib/hsBitVector.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsStream.h"
#include "hsBitVector.h"
#include "hsTemplates.h"

2
Sources/Plasma/CoreLib/hsBitVector.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef hsBitVector_inc
#define hsBitVector_inc
#include "hsTypes.h"
#include "HeadSpin.h"
template <class T> class hsTArray;
class hsStream;

2
Sources/Plasma/CoreLib/hsBounds.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsBounds.h"
#include "hsStream.h"

3
Sources/Plasma/CoreLib/hsExceptionStack.h

@ -42,8 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef hsExceptionStack_inc
#define hsExceptionStack_inc
#include "hsUtils.h"
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsTemplates.h"
class hsExceptionStackDestroyer;

2
Sources/Plasma/CoreLib/hsExceptions.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef hsExceptionDefined
#define hsExceptionDefined
#include "hsTypes.h"
#include "HeadSpin.h"
// #define HS_NO_EXCEPTIONS -- this will turn off execptions you might want
// to do it with -D or equivalent instead of here since who knows who includes this.

2
Sources/Plasma/CoreLib/hsFastMath.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsGeometry3.h"
#include "hsFastMath.h"

2
Sources/Plasma/CoreLib/hsGeometry3.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define hsGGeometry3Defined
#include "HeadSpin.h"
#include "hsUtils.h"
struct hsVector3;
struct hsPoint3;
struct hsScalarTriple;

10
Sources/Plasma/CoreLib/hsMalloc.h

@ -45,8 +45,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
#ifndef PLASMA20_SOURCES_PLASMA_CORELIB_HSMALLOC_H
#define PLASMA20_SOURCES_PLASMA_CORELIB_HSMALLOC_H
#ifdef _HSMALLOC_H
# error "Do not include hsMalloc.h directly--use HeadSpin.h"
#endif // _HSMALLOC_H
#define _HSMALLOC_H
#include "HeadSpin.h"
/****************************************************************************
@ -201,5 +205,3 @@ inline void CDECL operator delete (void *, void *) {}
#endif
#endif // ifdef __cplusplus
#endif // PLASMA20_SOURCES_PLASMA_CORELIB_HSMALLOC_H

2
Sources/Plasma/CoreLib/hsMatrix33.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsMatrix33.h"
#include "hsStream.h"

2
Sources/Plasma/CoreLib/hsMatrix44.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef HSMATRIX44_inc
#define HSMATRIX44_inc
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsGeometry3.h"
class hsQuat;

3
Sources/Plasma/CoreLib/hsMemory.h

@ -42,8 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef hsMemoryDefined
#define hsMemoryDefined
#include "hsTypes.h"
#include "hsMalloc.h"
#include "HeadSpin.h"
//#include "hsTemplates.h"
class HSMemory {

2
Sources/Plasma/CoreLib/hsSTLStream.h

@ -85,7 +85,7 @@ public:
#ifdef HS_BUILD_FOR_WIN32
#include "hsWindows.h"
class hsNamedPipeStream : public hsStream
{

4
Sources/Plasma/CoreLib/hsStlUtils.h

@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef hsStlUtils_h_inc
#define hsStlUtils_h_inc
#include "hsUtils.h"
//#include <xmemory>
#include "HeadSpin.h"
#include <functional>
#include <algorithm>
#include <string>

4
Sources/Plasma/CoreLib/hsStream.cpp

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <ctype.h>
#include "hsStream.h"
#include "hsMemory.h"
#include "hsUtils.h"
#include "hsTemplates.h"
#include "hsStlUtils.h"
@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <unistd.h>
#endif
#include "hsWindows.h"
#if HS_BUILD_FOR_WIN32
#include <io.h>
#endif

2
Sources/Plasma/CoreLib/hsStream.h

@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <stdarg.h> // Included for GCC 3.2.2+
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsMemory.h"
namespace hsPackFileSys {

2
Sources/Plasma/CoreLib/hsStringTokenizer.cpp

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// hsStringTokenizer.cpp
#include "hsStringTokenizer.h"
#include "hsUtils.h"
// String Tokenizer routines
hsStringTokenizer::hsStringTokenizer(const char *string, const char *seps) :

2
Sources/Plasma/CoreLib/hsStringTokenizer.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _hsStringTokenizer_Included_
#define _hsStringTokenizer_Included_
#include "hsTypes.h"
#include "HeadSpin.h"
#ifndef HS_BUILD_FOR_WIN32
#include <wchar.h>

2
Sources/Plasma/CoreLib/hsTemplates.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTemplates.h"
#include "hsUtils.h"
////////////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/CoreLib/hsTemplates.h

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsExceptions.h"
#include "hsMemory.h"
#include "hsRefCnt.h"
#include "hsUtils.h"
#include <stdarg.h>

2
Sources/Plasma/CoreLib/hsThread.cpp

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define CoreLib_Thread
#include "hsThread.h"
#include "hsUtils.h"
//////////////////////////////////////////////////////////////////////////////

6
Sources/Plasma/CoreLib/hsThread.h

@ -42,14 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef hsThread_Defined
#define hsThread_Defined
#include "hsTypes.h"
#include "HeadSpin.h"
typedef uint32_t hsMilliseconds;
#if HS_BUILD_FOR_WIN32
#include "hsWindows.h"
#elif HS_BUILD_FOR_UNIX
#ifdef HS_BUILD_FOR_UNIX
#include <pthread.h>
#include <semaphore.h>
// We can't wait with a timeout with semas

55
Sources/Plasma/CoreLib/hsTypes.h

@ -39,15 +39,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "HeadSpin.h"
#ifndef hsTypes_Defined
#define hsTypes_Defined
#ifdef _HSTYPES_H
# error "Do not include hsTypes.h directly--use HeadSpin.h"
#endif // _HSTYPES_H
#define _HSTYPES_H
/************************** Other Includes *****************************/
#include <cstdlib>
#include <cstdio>
#include <cstddef>
/************************** Basic Macros *****************************/
@ -123,7 +125,6 @@ typedef uint32_t hsGSeedValue;
/************************** Swap Macros *****************************/
#ifdef __cplusplus
inline uint16_t hsSwapEndian16(uint16_t value)
{
return (value >> 8) | (value << 8);
@ -203,7 +204,6 @@ typedef uint32_t hsGSeedValue;
a = b;
b = c;
}
#endif
/************************** Color32 Type *****************************/
@ -211,7 +211,6 @@ struct hsColor32 {
uint8_t b, g, r, a;
#ifdef __cplusplus
void SetARGB(uint8_t aa, uint8_t rr, uint8_t gg, uint8_t bb)
{
this->a = aa; this->r = rr; this->g = gg; this->b = bb;
@ -227,20 +226,11 @@ struct hsColor32 {
this->SetARGB(aa, rr, gg, bb);
}
#if 0
friend int operator==(const hsColor32& a, const hsColor32& b)
{
return *(uint32_t*)&a == *(uint32_t*)&b;
}
friend int operator!=(const hsColor32& a, const hsColor32& b) { return !(a == b); }
#else
int operator==(const hsColor32& aa) const
{
return *(uint32_t*)&aa == *(uint32_t*)this;
}
int operator!=(const hsColor32& aa) { return !(aa == *this); }
#endif
#endif
};
hsCTypeDefStruct(hsColor32)
@ -259,7 +249,8 @@ typedef hsColor32 hsRGBAColor32;
*
***/
#if _MSC_VER >= 7
#ifdef _MSC_VER
# define NULL_STMT __noop
#else
# define NULL_STMT ((void)0)
@ -386,20 +377,6 @@ void SWAP (T & a, T & b) {
#define AUTO_INIT_FUNC(name) namespace { struct name { name (); } name##_instance; } name::name ()
/****************************************************************************
*
* Calculate the address to the base of a structure given its type, and the
* address of a field within the structure.
*
* Example:
*
* CONTAINING_STRUCT(trans, INetTrans, m_trans);
*
***/
#define CONTAINING_STRUCT(a, t, f) ((t *) ((uint8_t *)(a) - (uintptr_t)(&((t *)0)->f)))
/****************************************************************************
*
* arrsize/marrsize
@ -418,18 +395,10 @@ void SWAP (T & a, T & b) {
/****************************************************************************
*
* offsetof/moffsetof
* offsetof returns the offset in bytes of a field inside a structure based on a type
* moffsetof returns the offset in bytes of a field inside a structure based on a variable
*
***/
#include <stddef.h>
#ifndef offsetof
#define offsetof(s,m) (size_t)&(((s *)0)->m)
#endif // ifndef offsetof
#define moffsetof(v,f) (((uint8_t *) &((v)->f)) - ((uint8_t *) v))
@ -474,10 +443,6 @@ void SWAP (T & a, T & b) {
/************************ Debug/Error Macros **************************/
#ifdef __cplusplus
extern "C" {
#endif
typedef void (*hsDebugMessageProc)(const char message[]);
extern hsDebugMessageProc gHSDebugProc;
#define HSDebugProc(m) { if (gHSDebugProc) gHSDebugProc(m); }
@ -552,9 +517,3 @@ void DebugMsgV (const char fmt[], va_list args);
#endif // PLASMA_EXTERNAL_RELEASE
#ifdef __cplusplus
}
#endif
#endif

18
Sources/Plasma/CoreLib/hsUtils.cpp

@ -39,20 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsUtils.h"
#if HS_BUILD_FOR_WIN32
extern "C" {
#endif
#include <stdio.h>
#include <stdarg.h>
#if HS_BUILD_FOR_WIN32
};
#endif
#if HS_BUILD_FOR_WIN32
#include <winsock2.h>
#include <windows.h>
#endif
#include "HeadSpin.h"
#include "hsStlUtils.h"
#include "hsTemplates.h"
#include <math.h>
@ -264,7 +252,7 @@ char* hsStrcpy(char dst[], const char src[])
return dst;
}
hsBool hsStrEQ(const char s1[], const char s2[])
bool hsStrEQ(const char s1[], const char s2[])
{
if (s1 && s2)
{
@ -277,7 +265,7 @@ hsBool hsStrEQ(const char s1[], const char s2[])
return (!s1 && !s2);
}
hsBool hsStrCaseEQ(const char* s1, const char* s2)
bool hsStrCaseEQ(const char* s1, const char* s2)
{
if (s1 && s2)
{

16
Sources/Plasma/CoreLib/hsUtils.h

@ -39,20 +39,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#ifndef hsUtils_Defined
#define hsUtils_Defined
#include "HeadSpin.h"
#ifdef _HSUTILS_H
# error "Do not include hsUtils.h directly--use HeadSpin.h"
#endif // _HSUTILS_H
#define _HSUTILS_H
#include <string.h>
#include "HeadSpin.h"
#include <ctype.h>
#include <stdarg.h>
int hsStrlen(const char src[]);
char* hsStrcpy(char dstOrNil[], const char src[]);
void hsStrcat(char dst[], const char src[]);
hsBool hsStrEQ(const char s1[], const char s2[]);
hsBool hsStrCaseEQ(const char* s1, const char* s2);
bool hsStrEQ(const char s1[], const char s2[]);
bool hsStrCaseEQ(const char* s1, const char* s2);
char* hsScalarToStr(float);
int hsRemove(const char* filename);
void hsCPathToMacPath(char* dst, char* fname);
@ -191,6 +192,3 @@ void hsRandSeed(int seed);
#define hsFopen(name, mode) fopen(name, mode)
char** DisplaySystemVersion();
#endif // hsUtils_Defined

2
Sources/Plasma/CoreLib/hsWide.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef hsWideDefined
#define hsWideDefined
#include "hsTypes.h"
#include "HeadSpin.h"
struct hsWide {
int32_t fHi;

54
Sources/Plasma/CoreLib/hsWindowHndl.h

@ -1,54 +0,0 @@
/*==LICENSE==*
CyanWorlds.com Engine - MMOG client, server and tools
Copyright (C) 2011 Cyan Worlds, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Additional permissions under GNU GPL version 3 section 7
If you modify this Program, or any covered work, by linking or
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
(or a modified version of those libraries),
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
licensors of this Program grant you additional
permission to convey the resulting work. Corresponding Source for a
non-source form of such a combination shall include the source code for
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
work.
You can contact Cyan Worlds, Inc. by email legal@cyan.com
or by snail mail at:
Cyan Worlds, Inc.
14617 N Newport Hwy
Mead, WA 99021
*==LICENSE==*/
#ifndef HSWINDOWHNDL_inc
#define HSWINDOWHNDL_inc
#include "HeadSpin.h"
// decide what hsWindowHndl is
#if HS_BUILD_FOR_WIN32
typedef struct HWND__ * hsWindowHndl;
#elif HS_BUILD_FOR_UNIX
typedef int* hsWindowHndl;
#endif
#endif

45
Sources/Plasma/CoreLib/hsWindows.h

@ -40,25 +40,34 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#if HS_BUILD_FOR_WIN32
// 4244: Conversion
// 4305: Truncation
// 4503: 'identifier' : decorated name length exceeded, name was truncated
// 4018: signed/unsigned mismatch
// 4786: 255 character debug limit
// 4284: STL template defined operator-> for a class it doesn't make sense for (int, etc)
// 4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
#ifdef _MSC_VER
# pragma warning( disable : 4305 4503 4018 4786 4284 4800)
#endif
#ifdef _HSWINDOWS_H
# error "Do not include hsWindows.h directly--use HeadSpin.h"
#endif // _HSWINDOWS_H
#define _HSWINDOWS_H
#ifndef __AFX_H__ // MFC apps won't let us include windows from here. =(
#ifndef MAXPLUGINCODE
#include <WinSock2.h>
#endif // MAXPLUGINCODE
#if HS_BUILD_FOR_WIN32
#include <Windows.h>
#endif // __AFX_H__
// 4244: Conversion
// 4305: Truncation
// 4503: 'identifier' : decorated name length exceeded, name was truncated
// 4018: signed/unsigned mismatch
// 4786: 255 character debug limit
// 4284: STL template defined operator-> for a class it doesn't make sense for (int, etc)
// 4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
# ifdef _MSC_VER
# pragma warning( disable : 4305 4503 4018 4786 4284 4800)
# endif // _MSC_VER
// Windows.h includes winsock.h (winsocks 1), so we need to manually include winsock2
// and tell Windows.h to only bring in modern headers
# ifndef MAXPLUGINCODE
# include <WinSock2.h>
# include <ws2tcpip.h>
# endif // MAXPLUGINCODE
# define WIN32_LEAN_AND_MEAN
# include <Windows.h>
typedef HWND hsWindowHndl;
#else
typedef int32_t* hsWindowHndl;
#endif // HS_BUILD_FOR_WIN32

2
Sources/Plasma/CoreLib/pcSmallRect.h

@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _pcSmallRect_h
#define _pcSmallRect_h
#include "hsTypes.h"
#include "HeadSpin.h"
class hsStream;
class pcSmallRect

2
Sources/Plasma/CoreLib/plGeneric.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsUtils.h"
#include "plGeneric.h"
plGeneric::plGeneric(): fType(kNull), fBoolVal(false), fIntVal(0), fFloatVal(0.0) {}

2
Sources/Plasma/CoreLib/plLoadMask.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plLoadMask.h"
#include "hsStream.h"
#include "hsTemplates.h"

2
Sources/Plasma/CoreLib/plLoadMask.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLoadMask_inc
#define plLoadMask_inc
#include "hsTypes.h"
#include "HeadSpin.h"
template <class T> class hsTArray;
class hsStream;

2
Sources/Plasma/CoreLib/plRefCnt.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plRefCnt_Defined
#define plRefCnt_Defined
#include "hsTypes.h"
#include "HeadSpin.h"
// plRef count addes refcount abilities to any plCreatable

2
Sources/Plasma/CoreLib/plViewTransform.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsBounds.h"
#include "hsStream.h"
#include "plViewTransform.h"

7
Sources/Plasma/CoreLibExe/Pch.h

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

2
Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsStlUtils.h"
#include "hsMatrix44.h"
#include "hsGeometry3.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plBlower.h"
#include "plgDispatch.h"
#include "hsFastMath.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plFilterCoordInterface.h"
#include "hsMatrix44.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plFollowMod.h"
#include "plgDispatch.h"
#include "pnNetCommon/plNetApp.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plLightModifier.h"
#include "plGLight/plLightInfo.h"
#include "plInterp/plController.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plLineFollowMod.h"
#include "plStereizer.h"
#include "plInterp/plAnimPath.h"

4
Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp

@ -42,14 +42,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <stdlib.h>
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plRandomCommandMod.h"
#include "pnSceneObject/plSceneObject.h"
#include "plMessage/plAnimCmdMsg.h"
#include "pnMessage/plEventCallbackMsg.h"
#include "plgDispatch.h"
#include "hsTimer.h"
#include "hsUtils.h"
static const float kRandNormalize = 1.f / 32767.f;

2
Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <math.h>
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plStereizer.h"
#include "plLineFollowMod.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plViewFaceModifier.h"
#include "plgDispatch.h"
#include "pnSceneObject/plSceneObject.h"

2
Sources/Plasma/FeatureLib/pfAudio/plListener.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsMatrix44.h"
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plListener.h"
#include "plgDispatch.h"
#include "plAudio/plAudioSystem.h"

2
Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plRandomSoundMod.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnSceneObject/plAudioInterface.h"

2
Sources/Plasma/FeatureLib/pfCCR/plCCRMgr.h

@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// Implementation for CCR commands
//
#include "hsTypes.h"
#include "HeadSpin.h"
// Error constants and conversion are outside of the CCR_RELEASE define,
// So that non-CCR code can report CCR errors, and the plCCRMgr can

2
Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pfCameraProxy.h"
#include "plVirtualCamNeu.h"
#include "plDrawable/plDrawableGenerator.h"

2
Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsGeometry3.h"
#include "plgDispatch.h"
#include "pnSceneObject/plDrawInterface.h"

2
Sources/Plasma/FeatureLib/pfCharacter/plPlayerModifier.cpp

@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//#include <hkgeometry/geomdef.h> // for havok Vertex
//
//
//#include "hsTypes.h"
//#include "HeadSpin.h"
//#include "../plInterp/plController.h"
//#include "plPlayerModifier.h"
//#include "hsTimer.h"

2
Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plANDConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "hsResMgr.h"

2
Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plActivatorConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "pnModifier/plLogicModBase.h"

2
Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plAnimationEventConditionalObject.h"
#include "pnInputCore/plKeyDef.h"
#include "plModifier/plSimpleModifier.h"

2
Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plControlEventConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "pnModifier/plLogicModBase.h"

2
Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plFacingConditionalObject.h"
#include "plgDispatch.h"
#include "pnModifier/plLogicModBase.h"

2
Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plKeyPressConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "pnModifier/plLogicModBase.h"

2
Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plLocalPlayerInBoxConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "pnModifier/plLogicModBase.h"

2
Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plLocalPlayerIntersectPlaneConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "pnModifier/plLogicModBase.h"

2
Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plORConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "hsResMgr.h"

2
Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plObjectInBoxConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "pnModifier/plLogicModBase.h"

2
Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plObjectIntersectPlaneConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "pnModifier/plLogicModBase.h"

2
Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plPickedConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "pnModifier/plLogicModBase.h"

2
Sources/Plasma/FeatureLib/pfConsole/pfConsole.h

@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _pfConsole_h
#define _pfConsole_h
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pnKeyedObject/hsKeyedObject.h"

2
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp

@ -162,7 +162,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStlUtils.h"
#include "hsTemplates.h"
#include "hsUtils.h"
#include "pfPython/cyPythonInterface.h"
#include "pfPython/plPythonSDLModifier.h"

11
Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.cpp

@ -46,20 +46,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//////////////////////////////////////////////////////////////////////////////
#include "pfConsoleDirSrc.h"
#include "HeadSpin.h"
#include "hsExceptions.h"
#ifdef HS_BUILD_FOR_WIN32
#define WIN32_EXTRA_LEAN
#define WIN32_LEAN_AND_MEAN
#ifndef _WINDOWS_H_ // redundant include guard to minimize compile times
#define _WINDOWS_H_
#include <windows.h>
#endif // _WINDOWS_H_
#include <winbase.h>
#include <sstream>

2
Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.h

@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _pfConsoleDirSrc_h
#define _pfConsoleDirSrc_h
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsStlUtils.h"
#include "pfConsoleCore/pfConsoleEngine.h"

2
Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp

@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plStatusLog/plStatusLog.h"
#include "pnMessage/plMessage.h"
#include "pnKeyedObject/plKey.h"
#include "hsWindows.h"
static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info);

2
Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp

@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//////////////////////////////////////////////////////////////////////////////
#include "pfConsoleCmd.h"
#include "hsUtils.h"
//////////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.h

@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _pfConsoleCmd_h
#define _pfConsoleCmd_h
#include "hsTypes.h"
#include "HeadSpin.h"
#include "hsBiExpander.h"

2
Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleContext.cpp

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
//////////////////////////////////////////////////////////////////////////////
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pfConsoleContext.h"

2
Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleContext.h

@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _pfConsoleContext_h
#define _pfConsoleContext_h
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pfConsoleCmd.h"

4
Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleEngine.h

@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _pfConsoleEngine_h
#define _pfConsoleEngine_h
#include "hsTypes.h"
#include "hsUtils.h"
#include "HeadSpin.h"
//// pfConsoleEngine Class Definition ////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfConsoleCore/pfUtilBase64.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef pfUtilBase64_inc
#define pfUtilBase64_inc
#include "hsTypes.h"
#include "HeadSpin.h"
/*****************************************************************************
*

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
//////////////////////////////////////////////////////////////////////////////
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pfGUIButtonMod.h"
#include "pfGUIDraggableMod.h"
#include "pfGameGUIMgr.h"

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp

@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
//////////////////////////////////////////////////////////////////////////////
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pfGUICheckBoxCtrl.h"
#include "pfGameGUIMgr.h"

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
//////////////////////////////////////////////////////////////////////////////
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pfGUIClickMapCtrl.h"
#include "pfGameGUIMgr.h"
#include "pfGUIDialogMod.h"

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
//////////////////////////////////////////////////////////////////////////////
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pfGUIControlHandlers.h"
#include "pfGUIControlMod.h"
#include "pfGUIDialogMod.h"

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
//////////////////////////////////////////////////////////////////////////////
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pfGUIControlMod.h"
#include "pfGameGUIMgr.h"
#include "pfGUIDialogMod.h"

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
//////////////////////////////////////////////////////////////////////////////
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pfGUICtrlGenerator.h"
#include "pfGameGUIMgr.h"
#include "pfGUIControlMod.h"

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
//////////////////////////////////////////////////////////////////////////////
#include "hsTypes.h"
#include "HeadSpin.h"
#include "pfGameGUIMgr.h"
#include "pfGUIDialogMod.h"
#include "pfGUIControlMod.h"

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

Loading…
Cancel
Save