From: Laszlo T. <ave...@us...> - 2006-10-17 15:58:24
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/GAMImporter In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9381 Modified Files: GAMImp.cpp Log Message: iwd2: fixed quick item loading problem (caused abort) Index: GAMImp.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/GAMImporter/GAMImp.cpp,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** GAMImp.cpp 2 Sep 2006 10:30:52 -0000 1.85 --- GAMImp.cpp 17 Oct 2006 15:58:19 -0000 1.86 *************** *** 328,331 **** --- 328,341 ---- str->Seek( 1, GEM_CURRENT_POS); + for (i = 0; i < 3; i++) { + str->ReadWord( &pcInfo.QuickItemSlot[i] ); + } + for (i = 0; i < 3; i++) { + str->ReadWord( &tmpWord ); + SanityCheck( pcInfo.QuickItemSlot[i], tmpWord, "item"); + pcInfo.QuickItemHeader[i]=tmpWord; + } + pcInfo.QuickItemHeader[3]=0xffff; + pcInfo.QuickItemHeader[4]=0xffff; //innates, we spare some memory and time by storing them in the //same place *************** *** 339,352 **** } } - for (i = 0; i < 3; i++) { - str->ReadWord( &pcInfo.QuickItemSlot[i] ); - } - for (i = 0; i < 3; i++) { - str->ReadWord( &tmpWord ); - SanityCheck( pcInfo.QuickItemSlot[i], tmpWord, "item"); - pcInfo.QuickItemHeader[i]=tmpWord; - } - pcInfo.QuickItemHeader[3]=0xffff; - pcInfo.QuickItemHeader[4]=0xffff; //QuickSlots are customisable in iwd2 and GemRB //thus we adopt the iwd2 style actor info --- 349,352 ---- |