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

Fix: it was still possible to resolve random items in the map editor

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-10-11 19:17:13 +00:00
parent 02085a8422
commit 9e058edf5e
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Inventory Choosing.cpp
+1 -1
View File
@@ -1042,7 +1042,7 @@ void ChooseWeaponForSoldierCreateStruct( SOLDIERCREATE_STRUCT *pp, INT8 bWeaponC
if ( GetItemFromRandomItem(usGunIndex, &newitemfromrandom) ) if ( GetItemFromRandomItem(usGunIndex, &newitemfromrandom) )
usGunIndex = newitemfromrandom; usGunIndex = newitemfromrandom;
// if item is still radnom, use default gun -> GLOCK 17 // if item is still random, use default gun -> GLOCK 17
if ( Item[usGunIndex].randomitem > 0 ) if ( Item[usGunIndex].randomitem > 0 )
usGunIndex = GLOCK_17; usGunIndex = GLOCK_17;
Tactical/Item Types.cpp
-3
View File
@@ -1332,9 +1332,6 @@ OBJECTTYPE& OBJECTTYPE::operator=(const OLD_OBJECTTYPE_101& src)
if ( GetItemFromRandomItem(src.usItem, &newitemfromrandom) ) if ( GetItemFromRandomItem(src.usItem, &newitemfromrandom) )
this->usItem = newitemfromrandom; this->usItem = newitemfromrandom;
if ( Item[this->usItem].randomitem > 0 )
this->usItem = NONE;
//and now the big change, the union //and now the big change, the union
//copy the old data, making sure not to write over, since the old size is actually 9 bytes //copy the old data, making sure not to write over, since the old size is actually 9 bytes
if (ubNumberOfObjects == 1) { if (ubNumberOfObjects == 1) {
Tactical/Items.cpp
+9 -7
View File
@@ -7661,13 +7661,10 @@ BOOLEAN CreateItem( UINT16 usItem, INT16 bStatus, OBJECTTYPE * pObj )
return( FALSE ); return( FALSE );
} }
// Flugente: random items - not while editing! // Flugente: random items
if ( guiCurrentScreen != EDIT_SCREEN ) UINT16 newitemfromrandom = 0;
{ if ( GetItemFromRandomItem(usItem, &newitemfromrandom) )
UINT16 newitemfromrandom = 0; usItem = newitemfromrandom;
if ( GetItemFromRandomItem(usItem, &newitemfromrandom) )
usItem = newitemfromrandom;
}
if (usItem == 0) if (usItem == 0)
{ {
@@ -14762,6 +14759,11 @@ BOOLEAN GetItemFromRandomItem( UINT16 usRandomItem, UINT16* pusNewItem )
{ {
*pusNewItem = 0; *pusNewItem = 0;
// no random item solving in the map editor
#ifdef JA2EDITOR
return FALSE;
#endif
// is this a random item? // is this a random item?
if ( Item[usRandomItem].randomitem > 0 ) if ( Item[usRandomItem].randomitem > 0 )
{ {