1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Editor Fixes (by Buggler)

Browse Source 
- Fixed unable to delete items in Merc Inventory Display screen
- Added keyboard hotkey item scrolling in Merc Inventory Selection screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5965 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-03-30 12:53:22 +00:00
parent 1435e4a679
commit 1aea5efd1b
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/editscreen.cpp
+8 -8
View File
@@ -2054,7 +2054,7 @@ void HandleKeyboardShortcuts( )
break; break;
case ',': case ',':
// item left scroll // item left scroll
if( iCurrentTaskbar == TASK_ITEMS ) if( iCurrentTaskbar == TASK_ITEMS || gubCurrMercMode == MERC_GETITEMMODE )
{ {
if( eInfo.sScrollIndex ) if( eInfo.sScrollIndex )
{ {
@@ -2080,7 +2080,7 @@ void HandleKeyboardShortcuts( )
break; break;
case '.': case '.':
// item right scroll // item right scroll
if( iCurrentTaskbar == TASK_ITEMS ) if( iCurrentTaskbar == TASK_ITEMS || gubCurrMercMode == MERC_GETITEMMODE )
{ {
if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) ) if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) )
{ {
@@ -2105,7 +2105,7 @@ void HandleKeyboardShortcuts( )
break; break;
case '<': case '<':
// item left scroll by page // item left scroll by page
if( iCurrentTaskbar == TASK_ITEMS ) if( iCurrentTaskbar == TASK_ITEMS || gubCurrMercMode == MERC_GETITEMMODE )
{ {
if( eInfo.sScrollIndex ) if( eInfo.sScrollIndex )
{ {
@@ -2124,7 +2124,7 @@ void HandleKeyboardShortcuts( )
break; break;
case '>': case '>':
// item right scroll by page // item right scroll by page
if( iCurrentTaskbar == TASK_ITEMS ) if( iCurrentTaskbar == TASK_ITEMS || gubCurrMercMode == MERC_GETITEMMODE )
{ {
if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) ) if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) )
{ {
@@ -2176,7 +2176,7 @@ void HandleKeyboardShortcuts( )
{ {
case ',': case ',':
// item left scroll // item left scroll
if( iCurrentTaskbar == TASK_ITEMS ) if( iCurrentTaskbar == TASK_ITEMS || gubCurrMercMode == MERC_GETITEMMODE )
{ {
if( eInfo.sScrollIndex ) if( eInfo.sScrollIndex )
{ {
@@ -2195,7 +2195,7 @@ void HandleKeyboardShortcuts( )
break; break;
case '.': case '.':
// item right scroll // item right scroll
if( iCurrentTaskbar == TASK_ITEMS ) if( iCurrentTaskbar == TASK_ITEMS || gubCurrMercMode == MERC_GETITEMMODE )
{ {
if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) ) if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) )
{ {
@@ -2213,7 +2213,7 @@ void HandleKeyboardShortcuts( )
break; break;
case '<': case '<':
// item left scroll by page // item left scroll by page
if( iCurrentTaskbar == TASK_ITEMS ) if( iCurrentTaskbar == TASK_ITEMS || gubCurrMercMode == MERC_GETITEMMODE )
{ {
if( eInfo.sScrollIndex ) if( eInfo.sScrollIndex )
{ {
@@ -2229,7 +2229,7 @@ void HandleKeyboardShortcuts( )
break; break;
case '>': case '>':
// item right scroll by page // item right scroll by page
if( iCurrentTaskbar == TASK_ITEMS ) if( iCurrentTaskbar == TASK_ITEMS || gubCurrMercMode == MERC_GETITEMMODE )
{ {
if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) ) if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) )
{ {
Tactical/Items.cpp
+8
View File
@@ -7677,12 +7677,20 @@ BOOLEAN CreateItem( UINT16 usItem, INT16 bStatus, OBJECTTYPE * pObj )
if ( GetItemFromRandomItem(usItem, &newitemfromrandom) ) if ( GetItemFromRandomItem(usItem, &newitemfromrandom) )
usItem = newitemfromrandom; usItem = newitemfromrandom;
#ifdef JA2EDITOR
// Buggler: usItem == 0 is technically an item too, so need to run code to delete existing item in editor/merc inventory mode
#else //non-editor version
if (usItem == 0) if (usItem == 0)
{ {
DebugBreakpoint(); DebugBreakpoint();
return( FALSE ); return( FALSE );
} }
#endif
if (Item[ usItem ].usItemClass == IC_GUN) if (Item[ usItem ].usItemClass == IC_GUN)
{ {
fRet = CreateGun( usItem, bStatus, pObj ); fRet = CreateGun( usItem, bStatus, pObj );