1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes from Overhaul:

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
Editor/EditorItems.cpp
+16 -16
View File
@@ -221,8 +221,8 @@ void InitEditorItemsInfo(UINT32 uiItemType)
INT16 sWidth, sOffset, sStart;
INT16 i, x, y;
UINT16 usCounter;
INT16 pStr[ 100 ];//, pStr2[ 100 ];
UINT16 pItemName[SIZE_ITEM_NAME];
CHAR16 pStr[ 100 ];//, pStr2[ 100 ];
CHAR16 pItemName[SIZE_ITEM_NAME];
UINT8 ubBitDepth;
BOOLEAN fTypeMatch;
INT32 iEquipCount = 0;
@@ -366,8 +366,8 @@ void InitEditorItemsInfo(UINT32 uiItemType)
SetFontForeground( FONT_MCOLOR_WHITE );
SetFontDestBuffer( eInfo.uiBuffer, 0, 0, eInfo.sWidth, eInfo.sHeight, FALSE );
swprintf( (wchar_t *)pStr, (wchar_t *)L"%S", LockTable[ i ].ubEditorName );
DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, (STR16) pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED );
swprintf( pStr, L"%S", LockTable[ i ].ubEditorName );
DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED );
//Calculate the center position of the graphic in a 60 pixel wide area.
sWidth = hVObject->pETRLEObject[item->ubGraphicNum].usWidth;
@@ -474,46 +474,46 @@ void InitEditorItemsInfo(UINT32 uiItemType)
if( eInfo.uiItemType != TBAR_MODE_ITEM_TRIGGERS )
{
LoadItemInfo( usCounter, pItemName, NULL );
swprintf( (wchar_t *)pStr, (wchar_t *)L"%s", pItemName );
swprintf( pStr, L"%s", pItemName );
}
else
{
if( i == PRESSURE_ACTION_ID )
{
swprintf( (wchar_t *)pStr, (wchar_t *)L"Pressure Action" );
swprintf( pStr, L"Pressure Action" );
}
else if( i < 2 )
{
if( usCounter == SWITCH )
swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Trigger1" );
swprintf( pStr, L"Panic Trigger1" );
else
swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Action1" );
swprintf( pStr, L"Panic Action1" );
}
else if( i < 4 )
{
if( usCounter == SWITCH )
swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Trigger2" );
swprintf( pStr, L"Panic Trigger2" );
else
swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Action2" );
swprintf( pStr, L"Panic Action2" );
}
else if( i < 6 )
{
if( usCounter == SWITCH )
swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Trigger3" );
swprintf( pStr, L"Panic Trigger3" );
else
swprintf( (wchar_t *)pStr, (wchar_t *)L"Panic Action3" );
swprintf( pStr, L"Panic Action3" );
}
else
{
if( usCounter == SWITCH )
swprintf( (wchar_t *)pStr, (wchar_t *)L"Trigger%d", (i-4)/2 );
swprintf( pStr, L"Trigger%d", (i-4)/2 );
else
swprintf( (wchar_t *)pStr, (wchar_t *)L"Action%d", (i-4)/2 );
swprintf( pStr, L"Action%d", (i-4)/2 );
}
}
// WANNE: EDITOR?
DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, (STR16)pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED );
DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED );
//Calculate the center position of the graphic in a 60 pixel wide area.
sWidth = hVObject->pETRLEObject[item->ubGraphicNum].usWidth;
@@ -1616,7 +1616,7 @@ void DisplayItemStatistics()
{
BOOLEAN fUseSelectedItem;
INT16 usItemIndex;
UINT16 pItemName[SIZE_ITEM_NAME];
CHAR16 pItemName[SIZE_ITEM_NAME];
INVTYPE *pItem;
if( !eInfo.fActive )