diff --git a/Editor/Editor Taskbar Utils.cpp b/Editor/Editor Taskbar Utils.cpp index 7e6afe4e..90f4145e 100644 --- a/Editor/Editor Taskbar Utils.cpp +++ b/Editor/Editor Taskbar Utils.cpp @@ -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) diff --git a/Editor/EditorItems.cpp b/Editor/EditorItems.cpp index f9f12d32..e8a19937 100644 --- a/Editor/EditorItems.cpp +++ b/Editor/EditorItems.cpp @@ -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 ); } } } diff --git a/Editor/Item Statistics.cpp b/Editor/Item Statistics.cpp index 5458b9c6..516a6d51 100644 --- a/Editor/Item Statistics.cpp +++ b/Editor/Item Statistics.cpp @@ -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 ); } diff --git a/SaveLoadScreen.cpp b/SaveLoadScreen.cpp index 33a2e7f5..1f06c5ae 100644 --- a/SaveLoadScreen.cpp +++ b/SaveLoadScreen.cpp @@ -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 ) { diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index 116dcf70..94076c92 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -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;