bug fixes from Overhaul:

- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
+6 -13
View File
@@ -1777,7 +1777,7 @@ void RefreshScreen(void *DummyVariable)
LPDIRECTDRAWSURFACE2 pTmpBuffer;
DDSURFACEDESC SurfaceDescription;
FILE *OutputFile;
UINT8 FileName[64];
CHAR8 FileName[64];
INT32 iIndex;
STRING512 DataDir;
STRING512 ExecDir;
@@ -1835,11 +1835,11 @@ void RefreshScreen(void *DummyVariable)
do
{
sprintf((char *) FileName, "SCREEN%03d.TGA", guiPrintFrameBufferIndex++);
sprintf( FileName, "SCREEN%03d.TGA", guiPrintFrameBufferIndex++);
}
while( (_access( (const char *)FileName, 0 )) != -1 );
while( (_access( FileName, 0 )) != -1 );
if ((OutputFile = fopen((const char *) FileName, "wb")) != NULL)
if ((OutputFile = fopen( FileName, "wb")) != NULL)
{
fprintf(OutputFile, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c", 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, LOBYTE(SCREEN_WIDTH), HIBYTE(SCREEN_WIDTH), LOBYTE(SCREEN_HEIGHT), HIBYTE(SCREEN_HEIGHT), 0x10, 0);
@@ -2789,7 +2789,7 @@ BOOLEAN HideMouseCursor(void)
///////////////////////////////////////////////////////////////////////////////////////////////////
BOOLEAN LoadCursorFile(PTR pFilename)
BOOLEAN LoadCursorFile(STR8 pFilename)
{
VOBJECT_DESC VideoObjectDescription;
@@ -2944,14 +2944,7 @@ HRESULT ReturnCode;
}
//Kaiden - Added for VC6 Compatibility
#if _MSC_VER <= 1200
template void FatalError<char const *>(char *, ...);
#endif
template void FatalError<char const *>(char const *, ...);
template <typename string1>
void FatalError( string1 pError, ...)
void FatalError( const STR8 pError, ...)
{
va_list argptr;