1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes (by Moa)

Browse Source 
-SGP debugging now works again (corrected some typos and one missing include).
-Memmory debugging works again (wrong types corrected)
-Laptop screen heigth macro and all references is now usable. (was 'C: y + A' 'D: B - C' which translates to 'D: B - y + A' instead of 'D: B - y - A')
-Laptop screens do not need to rerender as often then before as the laptop screen width/heigth macros works now and invalidating screen will do the trick -> almost no render calls neccessary.
-MercProfile.ubMiscFlag was used instead of .ubMiscFlag2 -> enter sector action schedule for soldiers which dont need to be insertered is now canceled as intended

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6509 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-10-19 12:47:53 +00:00
parent 8e17fb3fd2
commit 73be285e09
18 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Standard Gaming Platform/Button System.cpp
+5
View File
@@ -152,6 +152,11 @@ UINT16 GetWidthOfButtonPic( UINT16 usButtonPicID, INT32 iSlot )
return ButtonPictures[ usButtonPicID ].vobj->pETRLEObject[ iSlot ].usWidth;
}
UINT16 GetHeightOfButtonPic( UINT16 usButtonPicID, INT32 iSlot )
{
return ButtonPictures[ usButtonPicID ].vobj->pETRLEObject[ iSlot ].usHeight;
}
HVOBJECT GenericButtonGrayed[MAX_GENERIC_PICS];
HVOBJECT GenericButtonOffNormal[MAX_GENERIC_PICS];
HVOBJECT GenericButtonOffHilite[MAX_GENERIC_PICS];
Standard Gaming Platform/Button System.h
+1
View File
@@ -360,6 +360,7 @@ void DrawCheckBoxButtonOn( INT32 iButtonID );
void DrawCheckBoxButtonOff( INT32 iButtonID );
extern UINT16 GetWidthOfButtonPic( UINT16 usButtonPicID, INT32 iSlot );
extern UINT16 GetHeightOfButtonPic( UINT16 usButtonPicID, INT32 iSlot );
#endif
Standard Gaming Platform/MemMan.cpp
+11 -11
View File
@@ -510,8 +510,8 @@ PTR MemAllocXDebug( UINT32 size, const STR8 szCodeString, INT32 iLineNum, void *
{
PTR ptr;
UINT16 usLength;
UINT8 str[70];
UINT8 *pStr;
CHAR8 str[70];
STR8 pStr;
if( !size )
{
@@ -553,7 +553,7 @@ PTR MemAllocXDebug( UINT32 size, const STR8 szCodeString, INT32 iLineNum, void *
usLength = strlen( str ) + 1;
gpMemoryTail->pCode = (UINT8*)malloc( usLength );
memset( gpMemoryTail->pCode, 0, usLength );
strcpy( gpMemoryTail->pCode, str );
strcpy( (STR8)gpMemoryTail->pCode, str );
//record the size
gpMemoryTail->uiSize = size;
@@ -617,8 +617,8 @@ PTR MemReallocXDebug( PTR ptr, UINT32 size, const STR8 szCodeString, INT32 iLine
MEMORY_NODE *curr;
PTR ptrNew;
UINT16 usLength;
UINT8 str[70];
UINT8 *pStr;
CHAR8 str[70];
STR8 pStr;
if( !ptr && size )
{
@@ -654,7 +654,7 @@ PTR MemReallocXDebug( PTR ptr, UINT32 size, const STR8 szCodeString, INT32 iLine
usLength = strlen( str ) + 1;
curr->pCode = (UINT8*)malloc( usLength );
memset( curr->pCode, 0, usLength );
strcpy( curr->pCode, str );
strcpy( (STR8)curr->pCode, str );
}
else
{
@@ -672,13 +672,13 @@ typedef struct DUMPFILENAME
UINT8 str[70];
}DUMPFILENAME;
void DumpMemoryInfoIntoFile( UINT8 *filename, BOOLEAN fAppend )
void DumpMemoryInfoIntoFile( CHAR8 *filename, BOOLEAN fAppend )
{
MEMORY_NODE *curr;
FILE *fp;
DUMPFILENAME *pCode;
UINT32 *puiCounter, *puiSize;
UINT8 tempCode[ 70 ];
CHAR8 tempCode[ 70 ];
UINT32 i, uiUniqueID, uiTotalKbWasted = 0, uiBytesRemainder = 0;
BOOLEAN fFound;
@@ -712,11 +712,11 @@ void DumpMemoryInfoIntoFile( UINT8 *filename, BOOLEAN fAppend )
curr = gpMemoryHead;
while( curr )
{
strcpy( tempCode, curr->pCode );
strcpy( tempCode, (CHAR8*)curr->pCode );
fFound = FALSE;
for( i = 0; i < uiUniqueID; i++ )
{
if( !_stricmp( tempCode, pCode[i].str ) )
if( !_stricmp( tempCode, (CHAR8*)pCode[i].str ) )
{ //same string
fFound = TRUE;
(puiCounter[ i ])++;
@@ -726,7 +726,7 @@ void DumpMemoryInfoIntoFile( UINT8 *filename, BOOLEAN fAppend )
}
if( !fFound )
{
strcpy( pCode[i].str, tempCode );
strcpy( (CHAR8*)pCode[i].str, tempCode );
(puiSize[ i ]) += curr->uiSize;
(puiCounter[ i ])++;
uiUniqueID++;
Standard Gaming Platform/MemMan.h
+1 -1
View File
@@ -58,7 +58,7 @@ extern void ShutdownMemoryManager( void );
//This is the most effective way to debug memory leaks. Each memory leak will be recorded in a linked
//list containing a string referring to the location in code the memory was allocated in addition to
//the number of occurrences. The shutdown code will report all unhandled memory with exact location allocated.
void DumpMemoryInfoIntoFile( UINT8 *filename, BOOLEAN fAppend );
void DumpMemoryInfoIntoFile( CHAR8 *filename, BOOLEAN fAppend );
BOOLEAN _AddAndRecordMemAlloc( UINT32 size, UINT32 uiLineNum, UINT8 *pSourceFile );
#define MemAlloc( size ) MemAllocXDebug( (size), __FILE__, __LINE__, NULL )
#define MemFree( ptr ) MemFreeXDebug( (ptr), __FILE__, __LINE__, NULL )