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
This commit is contained in:
Kriplo
2014-01-31 20:49:35 +00:00
parent bf451b0697
commit 25952e5c50
2 changed files with 39 additions and 1 deletions
+16
View File
@@ -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
}