diff --git a/Sources/Engine/Base/Stream.h b/Sources/Engine/Base/Stream.h index 7c03fcf..ee8cd42 100644 --- a/Sources/Engine/Base/Stream.h +++ b/Sources/Engine/Base/Stream.h @@ -164,6 +164,7 @@ public: inline CTStream &operator>>(SWORD &sw) { Read_t(&sw, sizeof(sw)); return *this; } // throw char * inline CTStream &operator>>(SBYTE &sb) { Read_t(&sb, sizeof(sb)); return *this; } // throw char * inline CTStream &operator>>(BOOL &b) { Read_t( &b, sizeof( b)); return *this; } // throw char * + inline CTStream &operator>>(__int64 &i64) { Read_t( &i64, sizeof(i64)); return *this; } // throw char * /* Write an object into stream. */ inline CTStream &operator<<(const float &f) { Write_t( &f, sizeof( f)); return *this; } // throw char * inline CTStream &operator<<(const double &d) { Write_t( &d, sizeof( d)); return *this; } // throw char * @@ -174,6 +175,7 @@ public: inline CTStream &operator<<(const SWORD &sw) { Write_t(&sw, sizeof(sw)); return *this; } // throw char * inline CTStream &operator<<(const SBYTE &sb) { Write_t(&sb, sizeof(sb)); return *this; } // throw char * inline CTStream &operator<<(const BOOL &b) { Write_t( &b, sizeof( b)); return *this; } // throw char * + inline CTStream &operator<<(const __int64 &i64) { Write_t( &i64, sizeof(i64)); return *this; } // throw char * // CTFileName reading/writing ENGINE_API friend CTStream &operator>>(CTStream &strmStream, CTFileName &fnmFileName); diff --git a/Sources/Engine/Base/Types.h b/Sources/Engine/Base/Types.h index 1c7254b..a014d51 100644 --- a/Sources/Engine/Base/Types.h +++ b/Sources/Engine/Base/Types.h @@ -200,6 +200,7 @@ typedef unsigned int UINT; typedef signed long int WPARAM; typedef signed long int LPARAM; typedef signed short int SHORT; + typedef unsigned short int USHORT; typedef void *HWND; /* !!! FIXME this sucks. */ typedef void *HINSTANCE; /* !!! FIXME this sucks. */ diff --git a/Sources/Engine/Graphics/Gfx_wrapper.cpp b/Sources/Engine/Graphics/Gfx_wrapper.cpp index c0555d1..d64ce42 100644 --- a/Sources/Engine/Graphics/Gfx_wrapper.cpp +++ b/Sources/Engine/Graphics/Gfx_wrapper.cpp @@ -1,6 +1,6 @@ /* Copyright (c) 2002-2012 Croteam Ltd. All rights reserved. */ -#include "stdh.h" +#include "Engine/StdH.h" #include #include diff --git a/Sources/Engine/Graphics/ViewPort.cpp b/Sources/Engine/Graphics/ViewPort.cpp index 6334447..70daaec 100644 --- a/Sources/Engine/Graphics/ViewPort.cpp +++ b/Sources/Engine/Graphics/ViewPort.cpp @@ -205,10 +205,16 @@ void CViewPort::CloseCanvas( BOOL bRelease/*=FALSE*/) } #endif // SE1_D3D // destroy window - if( vp_hWnd!=NULL && IsWindow(vp_hWnd)) { + +#ifdef PLATFORM_WINDOWS + if( vp_hWnd!=NULL && IsWindow(vp_hWnd)) { BOOL bRes = DestroyWindow(vp_hWnd); ASSERT(bRes); } +#else + STUBBED("do something here when ported to SDL2"); +#endif + // mark vp_hWnd = NULL; #ifdef SE1_D3D @@ -249,6 +255,7 @@ void CViewPort::Resize(void) SetAsRenderTarget_D3D(this); } #endif +#endif } diff --git a/Sources/Engine/Network/CommunicationInterface.h b/Sources/Engine/Network/CommunicationInterface.h index f37c3d5..b007609 100644 --- a/Sources/Engine/Network/CommunicationInterface.h +++ b/Sources/Engine/Network/CommunicationInterface.h @@ -12,6 +12,7 @@ #include #include #include +#include #define INVALID_SOCKET -1 #define SOCKET_ERROR -1 #define closesocket close diff --git a/Sources/Engine/Network/Network.cpp b/Sources/Engine/Network/Network.cpp index 6c0f42e..80db711 100644 --- a/Sources/Engine/Network/Network.cpp +++ b/Sources/Engine/Network/Network.cpp @@ -230,6 +230,8 @@ extern INDEX inp_bForceJoystickPolling; extern INDEX inp_bAutoDisableJoysticks; INDEX wed_bUseGenericTextureReplacement = FALSE; + + extern void RendererInfo(void); extern void ClearRenderer(void);