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

Fixes / Improvements (by Buggler)

Browse Source 
- Display Item Index No in Map Editor
- Hotkey for squad 11-20 in tactical set the same as strategic screen
- Hotkey previous/next page in save screen changed to PgUp/PgDn

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5924 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-03-16 14:26:51 +00:00
parent db6b0cb917
commit 05600adf33
5 changed files with 86 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/Editor Taskbar Utils.cpp
+11
View File
@@ -856,6 +856,15 @@ void RenderSelectedItemBlownUp()
mprintf( xp, yp, pStr );
SetFontForeground( FONT_YELLOW );
}
else
{
// Display item index no
xp = sScreenX + 2;
yp += 10;
SetFont( BLOCKFONTNARROW );
SetFontForeground( FONT_LTGREEN );
mprintf( xp, yp, L"%d", Item[ gpItem->usItem ].uiIndex );
}
//Count the number of items in the current pool, and display that.
i = 0;
@@ -868,6 +877,8 @@ void RenderSelectedItemBlownUp()
}
xp = sScreenX;
yp = sScreenY + 10;
SetFont( FONT10ARIAL );
SetFontForeground( FONT_YELLOW );
mprintf( xp, yp, L"%d", i );
//If the item is hidden, render a blinking H (just like DG)
Editor/EditorItems.cpp
+14 -6
View File
@@ -677,22 +677,30 @@ void RenderEditorItemsInfo()
}
}
}
//draw the numbers of each visible item that currently resides in the world.
//draw item index no & the numbers of each visible item that currently resides in the world.
maxIndex = min( maxIndex, eInfo.sNumItems-1 );
for( i = minIndex; i <= maxIndex; i++ )
{
x = iScreenWidthOffset + (i/2 - eInfo.sScrollIndex)*60 + 110;
y = 2 * iScreenHeightOffset + 360 + (i % 2) * 40;
SetFont( BLOCKFONTNARROW );
SetFontForeground( FONT_LTGREEN );
SetFontShadow( FONT_NEARBLACK );
// item index no
mprintf( x + 12, y + 18, L"%d", eInfo.pusItemIndex[ i ] );
// numbers of each visible item
usNumItems = CountNumberOfEditorPlacementsInWorld( i, &usQuantity );
if( usNumItems )
{
x = iScreenWidthOffset + (i/2 - eInfo.sScrollIndex)*60 + 110;
y = 2 * iScreenHeightOffset + 360 + (i % 2) * 40;
SetFont( FONT10ARIAL );
SetFontForeground( FONT_YELLOW );
SetFontShadow( FONT_NEARBLACK );
if( usNumItems == usQuantity )
mprintf( x + 12, y + 4, L"%d", usNumItems );
mprintf( x + 10, y + 4, L"%d", usNumItems );
else
mprintf( x + 12, y + 4, L"%d(%d)", usNumItems, usQuantity );
mprintf( x + 10, y + 4, L"%d(%d)", usNumItems, usQuantity );
}
}
}
Editor/Item Statistics.cpp
+3 -3
View File
@@ -654,6 +654,9 @@ void UpdateItemStatsPanel()
}
if( gpEditingItemPool )
{
mprintf( iScreenWidthOffset + 587, 2 * iScreenHeightOffset + 366, pUpdateItemStatsPanelText[25] );
mprintf( iScreenWidthOffset + 609, 2 * iScreenHeightOffset + 366, pUpdateItemStatsPanelText[26] );
mprintf( iScreenWidthOffset + 630, 2 * iScreenHeightOffset + 366, pUpdateItemStatsPanelText[27] );
INT32 iPercent = 100 - gWorldItems[ gpEditingItemPool->iItemIndex ].ubNonExistChance;
if( iPercent == 100 )
SetFontForeground( FONT_YELLOW );
@@ -662,9 +665,6 @@ void UpdateItemStatsPanel()
else
SetFontForeground( FONT_RED );
mprintf( iScreenWidthOffset + 512, 2 * iScreenHeightOffset + 444, pUpdateItemStatsPanelText[24] );
mprintf( iScreenWidthOffset + 587, 2 * iScreenHeightOffset + 366, pUpdateItemStatsPanelText[25] );
mprintf( iScreenWidthOffset + 609, 2 * iScreenHeightOffset + 366, pUpdateItemStatsPanelText[26] );
mprintf( iScreenWidthOffset + 630, 2 * iScreenHeightOffset + 366, pUpdateItemStatsPanelText[27] );
}
InvalidateRegion( iScreenWidthOffset + 477, 2 * iScreenHeightOffset + 362, 161, 97 );
}
SaveLoadScreen.cpp
+2 -2
View File
@@ -1069,7 +1069,7 @@ void GetSaveLoadScreenUserInput()
MoveSelectionUpOrDown( FALSE );
break;
case ',':
case PGUP:
// previous page, LEFTARROW not used due to interference with textbox navigation
if ( PAGE_SLOT > 0 )
{
@@ -1097,7 +1097,7 @@ void GetSaveLoadScreenUserInput()
}
break;
case '.':
case PGDN:
// next page, RIGHTARROW not used due to interference with textbox navigation
if ( PAGE_SLOT < MAX_PAGE_SLOT )
{
Tactical/Turn Based Input.cpp
+56 -23
View File
@@ -2477,10 +2477,64 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
case '9':
ChangeCurrentSquad( 8 );
break;
case '0':
ChangeCurrentSquad( 9 );
break;
case '!':
ChangeCurrentSquad( 10 );
break;
case '@':
ChangeCurrentSquad( 11 );
break;
case '#':
ChangeCurrentSquad( 12 );
break;
case '$':
ChangeCurrentSquad( 13 );
break;
case '%':
ChangeCurrentSquad( 14 );
break;
case '^':
ChangeCurrentSquad( 15 );
break;
case '&':
ChangeCurrentSquad( 16 );
break;
case '*':
if ( fCtrl )
{
if ( gTacticalStatus.uiFlags & RED_ITEM_GLOW_ON )
{
gTacticalStatus.uiFlags &= (~RED_ITEM_GLOW_ON );
}
else
{
gTacticalStatus.uiFlags |= RED_ITEM_GLOW_ON;
}
}
else
ChangeCurrentSquad( 17 );
break;
case '(':
ChangeCurrentSquad( 18 );
break;
case ')':
ChangeCurrentSquad( 19 );
break;
case 'x':
if ( !fCtrl && !fAlt )
@@ -3390,12 +3444,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
}
break;
case '$':
break;
case 'k':
if( fAlt )
{
@@ -3659,21 +3707,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
}
break;
case '*':
if ( gTacticalStatus.uiFlags & RED_ITEM_GLOW_ON )
{
gTacticalStatus.uiFlags &= (~RED_ITEM_GLOW_ON );
}
else
{
gTacticalStatus.uiFlags |= RED_ITEM_GLOW_ON;
}
break;
// swap sungoggles and nightgoggles
case 'N':
SOLDIERTYPE *pTeamSoldier;