mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
- code cleanup mostly from Brent Johnson (Nonomori), a very few from me
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -4092,7 +4092,7 @@ void DrawDialogBox( INT32 iDlgBox )
|
||||
|
||||
//------------------------------------------------------------------------------------------------------
|
||||
|
||||
template INT32 CreateCheckBoxButton<char const *>(INT16, INT16, char *, INT16, GUI_CALLBACK);
|
||||
// template INT32 CreateCheckBoxButton<char const *>(INT16, INT16, char *, INT16, GUI_CALLBACK);
|
||||
template INT32 CreateCheckBoxButton<char const *>(INT16, INT16, char const *, INT16, GUI_CALLBACK);
|
||||
template <typename string3>
|
||||
INT32 CreateCheckBoxButton( INT16 x, INT16 y, string3 filename, INT16 Priority, GUI_CALLBACK ClickCallback )
|
||||
|
||||
@@ -494,7 +494,7 @@ template void _FailMessage<char const *, char const *>(char const *, unsigned in
|
||||
template void _FailMessage<int, char const *>(int, unsigned int, char const *);
|
||||
template void _FailMessage<int, char *>(int, unsigned int, char *);
|
||||
template void _FailMessage<char *, char *>(char *, unsigned int, char *);
|
||||
template void _FailMessage<char *, char *>(unsigned char *, unsigned int, char *);
|
||||
// template void _FailMessage<char *, char *>(unsigned char *, unsigned int, char *);
|
||||
template void _FailMessage<unsigned char *, char const *>(unsigned char *, unsigned int, char const *);
|
||||
template <typename type1, typename type2>
|
||||
void _FailMessage( type1 pString, UINT32 uiLineNum, type2 pSourceFile )
|
||||
|
||||
@@ -118,7 +118,7 @@ UINT8 gbPixelDepth = PIXEL_DEPTH;
|
||||
|
||||
INT32 FAR PASCAL WindowProcedure(HWND hWindow, UINT16 Message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
static fRestore = FALSE;
|
||||
static BOOLEAN fRestore = FALSE;
|
||||
|
||||
if(gfIgnoreMessages)
|
||||
return(DefWindowProc(hWindow, Message, wParam, lParam));
|
||||
|
||||
@@ -1207,7 +1207,7 @@ BOOLEAN fRemoved;
|
||||
FileClose(hFile);
|
||||
|
||||
strcpy(pSampleList[uiSample].pName, pFilename);
|
||||
strupr(pSampleList[uiSample].pName);
|
||||
_strupr(pSampleList[uiSample].pName);
|
||||
pSampleList[uiSample].uiSize=uiSize;
|
||||
pSampleList[uiSample].uiFlags|=SAMPLE_ALLOCATED;
|
||||
return(uiSample);
|
||||
|
||||
@@ -2963,7 +2963,7 @@ HRESULT ReturnCode;
|
||||
return(TRUE);
|
||||
}
|
||||
|
||||
template void FatalError<char const *>(char *, ...);
|
||||
// template void FatalError<char const *>(char *, ...);
|
||||
template void FatalError<char const *>(char const *, ...);
|
||||
template <typename string1>
|
||||
void FatalError( string1 pError, ...)
|
||||
|
||||
Reference in New Issue
Block a user