Object editor preserves use vanish when inserting an object.

hetuw · Jul 2, 2020 · 770e56e · 770e56e
1 parent 31dc07a
commit 770e56e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/documentation/changeLog.txt b/documentation/changeLog.txt
@@ -10,6 +10,8 @@ Version 346   ???
 --Forbid player flipping when a 0-speed object is held (like cast fishing
   pole).  Fixes #644
 
+--Object editor preserves use vanish when inserting an object.
+
 
 
 Server Fixes

diff --git a/gameSource/EditorObjectPage.cpp b/gameSource/EditorObjectPage.cpp
@@ -2651,6 +2651,16 @@ void EditorObjectPage::actionPerformed( GUIComponent *inTarget ) {
                     mCurrentObject.spriteParent[i + oldNumSprites] = 
                         pickedRecord->spriteParent[i] + oldNumSprites;
                     }
+
+                if( pickedRecord->numUses > 0 &&
+                    mNumUsesField.getInt() > 0 ) {
+
+                    mCurrentObject.spriteUseVanish[i + oldNumSprites] =
+                        pickedRecord->spriteUseVanish[i];
+
+                    mCurrentObject.spriteUseAppear[i + oldNumSprites] =
+                        pickedRecord->spriteUseAppear[i];
+                    }
                 }
             if( jumpPerSprite > 0 ) {
                 for( int i=0; i<pickedRecord->numSprites; i++ ) {