[Gemrb-commits] gemrb/gemrb/plugins/ITMImporter ITMImp.cpp,1.16,1.17

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/ITMImporter
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6163/plugins/ITMImporter

Modified Files:
	ITMImp.cpp 
Log Message:
major update since the cvs failure


Index: ITMImp.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/ITMImporter/ITMImp.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ITMImp.cpp	10 Jul 2005 17:07:15 -0000	1.16
--- ITMImp.cpp	22 May 2006 16:39:26 -0000	1.17
***************
*** 148,176 ****
  		return NULL;
  	}
- /*
- 	DataStream* bamfile;
- 	AnimationMgr* bam;
- 
- 	if (s->ItemIcon[0]) {
- 		bamfile = core->GetResourceMgr()->GetResource( s->ItemIcon, IE_BAM_CLASS_ID );
- 		bam = ( AnimationMgr * ) core->GetInterface( IE_BAM_CLASS_ID );
- 		bam->Open( bamfile );
- 		s->ItemIconBAM = bam;
- 	}
- 
- 	if (s->GroundIcon[0]) {
- 		bamfile = core->GetResourceMgr()->GetResource( s->GroundIcon, IE_BAM_CLASS_ID );
- 		bam = ( AnimationMgr * ) core->GetInterface( IE_BAM_CLASS_ID );
- 		bam->Open( bamfile );
- 		s->GroundIconBAM = bam;
- 	}
- 
- 	if (s->CarriedIcon[0] && core->HasFeature(GF_HAS_DESC_ICON) ) {
- 		bamfile = core->GetResourceMgr()->GetResource( s->CarriedIcon, IE_BAM_CLASS_ID );
- 		bam = ( AnimationMgr * ) core->GetInterface( IE_BAM_CLASS_ID );
- 		bam->Open( bamfile );
- 		s->CarriedIconBAM = bam;
- 	}
- */
  	return s;
  }
--- 148,151 ----
***************
*** 204,210 ****
  		str->ReadWord( &eh->MeleeAnimation[i] );
  	}
! 	str->ReadWord( &eh->BowArrowQualifier );
! 	str->ReadWord( &eh->CrossbowBoltQualifier );
! 	str->ReadWord( &eh->MiscProjectileQualifier );
  
  	//48 is the size of the feature block
--- 179,192 ----
  		str->ReadWord( &eh->MeleeAnimation[i] );
  	}
! 	ieWord tmp;
! 
! 	i = 0;
! 	str->ReadWord( &tmp ); //arrow
! 	if (tmp) i|=PROJ_ARROW;
! 	str->ReadWord( &tmp ); //xbow
! 	if (tmp) i|=PROJ_BOLT;
! 	str->ReadWord( &tmp ); //bullet
! 	if (tmp) i|=PROJ_BULLET;
! 	eh->ProjectileQualifier=i;
  
  	//48 is the size of the feature block