mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-11-04 00:26:39 +00:00 
			
		
		
		
	Merge pull request #2307 from akortunov/loadfix
Reset old record, if its ID does not match with ID of new record
This commit is contained in:
		
						commit
						bf64b3ec87
					
				
					 2 changed files with 2 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -51,6 +51,7 @@
 | 
			
		|||
    Bug #4916: Specular power (shininess) material parameter is ignored when shaders are used.
 | 
			
		||||
    Bug #4922: Werewolves can not attack if the transformation happens during attack
 | 
			
		||||
    Bug #4927: Spell effect having both a skill and an attribute assigned is a fatal error
 | 
			
		||||
    Bug #4932: Invalid records matching when loading save with edited plugin
 | 
			
		||||
    Bug #4938: Strings from subrecords with actually empty headers can't be empty
 | 
			
		||||
    Bug #4942: Hand-to-Hand attack type is chosen randomly when "always use best attack" is turned off
 | 
			
		||||
    Bug #4947: Player character doesn't use lip animation
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -133,7 +133,7 @@ namespace
 | 
			
		|||
        {
 | 
			
		||||
            for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
 | 
			
		||||
                iter!=collection.mList.end(); ++iter)
 | 
			
		||||
                if (iter->mRef.getRefNum()==state.mRef.mRefNum)
 | 
			
		||||
                if (iter->mRef.getRefNum()==state.mRef.mRefNum && iter->mRef.getRefId() == state.mRef.mRefID)
 | 
			
		||||
                {
 | 
			
		||||
                    // overwrite existing reference
 | 
			
		||||
                    iter->load (state);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue