More work on getting this to compile.

This commit is contained in:
Ryan C. Gordon 2016-03-30 11:00:01 -04:00
parent 4f061d916c
commit 8ea00b12d2
6 changed files with 15 additions and 2 deletions

View File

@ -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);

View File

@ -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. */

View File

@ -1,6 +1,6 @@
/* Copyright (c) 2002-2012 Croteam Ltd. All rights reserved. */
#include "stdh.h"
#include "Engine/StdH.h"
#include <Engine/Graphics/GfxLibrary.h>
#include <Engine/Graphics/ViewPort.h>

View File

@ -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
}

View File

@ -12,6 +12,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <errno.h>
#define INVALID_SOCKET -1
#define SOCKET_ERROR -1
#define closesocket close

View File

@ -230,6 +230,8 @@ extern INDEX inp_bForceJoystickPolling;
extern INDEX inp_bAutoDisableJoysticks;
INDEX wed_bUseGenericTextureReplacement = FALSE;
extern void RendererInfo(void);
extern void ClearRenderer(void);