Merge branch 'master' of https://github.com/ptitSeb/Serious-Engine

Sources/Engine/Base/CRC.h

@@ -64,7 +64,7 @@ inline void CRC_AddFLOAT(ULONG &ulCRC, FLOAT f)
 // add memory block to a CRC value
 inline void CRC_AddBlock(ULONG &ulCRC, UBYTE *pubBlock, ULONG ulSize)
 {
-  for( INDEX i=0; i<ulSize; i++) CRC_AddBYTE( ulCRC, pubBlock[i]);
+  for( INDEX i=0; (ULONG)i<ulSize; i++) CRC_AddBYTE( ulCRC, pubBlock[i]);
 };
 
 // end crc calculation

Sources/Engine/Base/SDL/SDLInput.cpp

@@ -724,7 +724,7 @@ void CInput::GetInput(BOOL bPreScan)
     // clear button's buffer
     memset( inp_ubButtonsBuffer, 0, sizeof( inp_ubButtonsBuffer));
 
-    Uint8 *keystate = SDL_GetKeyboardState(NULL);
+    const Uint8 *keystate = SDL_GetKeyboardState(NULL);
     // for each Key
     for (INDEX iKey=0; iKey<ARRAYCOUNT(_akcKeys); iKey++) {
       const KeyConversion &kc = _akcKeys[iKey];

Sources/Engine/Engine.cpp

@@ -128,13 +128,6 @@ BOOL APIENTRY DllMain( HANDLE hModule, DWORD  ul_reason_for_call, LPVOID lpReser
 static void DetectCPU(void)
 {
   char strVendor[12+1] = { 0 };
-#if (defined USE_PORTABLE_C)  // rcg10072001
-  CPrintF(TRANSV("  (No CPU detection in this binary.)\n"));
-  #ifdef PLATFORM_PANDORA
-  sys_iCPUMHz = 400;    // conservative, ARM -> x86 cpu translation is not 1 to 1.
-  #endif
-
-#else
   strVendor[12] = 0;
   ULONG ulTFMS = 0;
   ULONG ulFeatures = 0;
@@ -221,8 +214,11 @@ static void DetectCPU(void)
   sys_iCPUStepping = iStepping;
   sys_bCPUHasMMX = bMMX!=0;
   sys_bCPUHasCMOV = bCMOV!=0;
+#ifdef PLATFORM_PANDORA
+  sys_iCPUMHz = 400;    // conservative, ARM -> x86 cpu translation is not 1 to 1.
+#else
   sys_iCPUMHz = INDEX(_pTimer->tm_llCPUSpeedHZ/1E6);
-
+#endif
   if( !bMMX) FatalError( TRANS("MMX support required but not present!"));
 }
 

Sources/SeriousSam/SeriousSam.cpp

@@ -33,7 +33,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <Engine/CurrentVersion.h>
 #include <GameMP/Game.h>
 #define DECL_DLL
+#ifdef FIRST_ENCOUNTER
+#include <Entities/Global.h>
+#else
 #include <EntitiesMP/Global.h>
+#endif
 #include "resource.h"
 #include "SplashScreen.h"
 #include "MainWindow.h"

Sources/SeriousSam/StdH.h

@@ -34,11 +34,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define DECL_DLL 
 #endif
 
+#ifdef FIRST_ENCOUNTER
+#include <Entities/Global.h>
+#include <Entities/Common/Common.h>
+#include <Entities/Common/GameInterface.h>
+#include <Entities/WorldLink.h>
+#include <Entities/Player.h>
+#else
 #include <EntitiesMP/Global.h>
 #include <EntitiesMP/Common/Common.h>
 #include <EntitiesMP/Common/GameInterface.h>
 #include <EntitiesMP/WorldLink.h>
 #include <EntitiesMP/Player.h>
+#endif
 #undef DECL_DLL
 
 #include "SeriousSam.h"