From 25952e5c50a3c9330339859cbba809a2a9312c06 Mon Sep 17 00:00:00 2001
From: Kriplo <Kriplo@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 31 Jan 2014 20:49:35 +0000
Subject: [PATCH] Brief: //dnl ch84 - Solve issues related to my recent editor
 fixes. Details: - Fix missing condition when using keyboard for load any map
 from listed profiles in CTRL+L list box. - Fix CTD during gWorldItems resize
 after adding certain amount of items.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Editor/LoadScreen.cpp    | 24 +++++++++++++++++++++++-
 Tactical/World Items.cpp | 16 ++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/Editor/LoadScreen.cpp b/Editor/LoadScreen.cpp
index a9fc2fb75..32febc587 100644
--- a/Editor/LoadScreen.cpp
+++ b/Editor/LoadScreen.cpp
@@ -903,6 +903,8 @@ void HandleMainKeyEvents( InputAtom *pEvent )
 				iCurrFileShown = iTotalFiles - 1;
 			else if( iTopFileShown < iCurrFileShown-7 )
 				iTopFileShown++;
+			else if( iTopFileShown > iCurrFileShown )//dnl ch84 290114
+				iTopFileShown = iCurrFileShown;
 			break;
 		case HOME:
 		case CTRL_HOME:
@@ -940,10 +942,30 @@ void HandleMainKeyEvents( InputAtom *pEvent )
 			curr = curr->pNext;
 			x++;
 		}
-		if( curr )	
+		if( curr )
 		{
 			SetInputFieldStringWith8BitString( 0, curr->FileInfo.zFileName );
 			swprintf( gzFilename, L"%S", curr->FileInfo.zFileName );
+			//dnl ch84 290114
+			if(ValidFilename())
+				SetInputFieldStringWith16BitString(0, gzFilename);
+			else
+			{
+				SetInputFieldStringWith16BitString(0, L"");
+				wcscpy(gzFilename, L"");
+			}
+#ifdef USE_VFS
+			gzProfileName[0] = 0;
+			while(curr = curr->pPrev)
+			{
+				if(curr->FileInfo.zFileName[0] == '<')
+				{
+					strcpy(gzProfileName, &curr->FileInfo.zFileName[2]);
+					gzProfileName[strlen(gzProfileName)-2] = 0;
+					break;
+				}
+			}
+#endif
 		}
 	}
 }
diff --git a/Tactical/World Items.cpp b/Tactical/World Items.cpp
index f0d73e0ef..2d6edc0e0 100644
--- a/Tactical/World Items.cpp	
+++ b/Tactical/World Items.cpp	
@@ -28,6 +28,9 @@
 	#include "map screen interface map inventory.h"	// added by Flugente
 #include "connect.h"
 #endif
+#ifdef JA2EDITOR//dnl ch84 290114
+#include "Item Statistics.h"
+#endif
 
 //Global dynamic array of all of the items in a loaded map.
 std::vector<WORLDITEM> gWorldItems;//dnl ch75 261013
@@ -451,8 +454,21 @@ void ResizeWorldItems(void)//dnl ch75 271013
 	guiNumWorldItems = gWorldItems.size();
 	if(guiNumWorldItems - GetNumUsedWorldItems() < 50)
 	{
+#ifdef JA2EDITOR//dnl ch84 290114
+		WORLDITEM *pwi, *pwinew;
+		if(!gWorldItems.empty())
+			pwi = &gWorldItems.front();
+#endif
 		gWorldItems.resize(guiNumWorldItems + 100);
 		guiNumWorldItems = gWorldItems.size();
+#ifdef JA2EDITOR//dnl ch84 290114
+		if(gpItem)
+		{
+			pwinew = &gWorldItems.front();
+			if(pwi != pwinew)
+				gpItem = (OBJECTTYPE *)((PSTR)pwinew + ((PSTR)gpItem - (PSTR)pwi));
+		}
+#endif
 	}
 #endif
 }