Merge pull request #1264 from DailyShana/patch-1

switch equip card

Merge pull request #1264 from DailyShana/patch-1
switch equip card
57ed46c3 · salix5 · 8c29097d · 8a47a96b · 57ed46c3
Commit 57ed46c3 authored Apr 17, 2015 by salix5
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

ocgcore/operations.cpp ocgcore/operations.cpp +1 -0

No files found.
--- a/ocgcore/operations.cpp
+++ b/ocgcore/operations.cpp
@@ -1038,6 +1038,7 @@ int32 field::equip(uint16 step, uint8 equip_player, card * equip_card, card * ta
 			return TRUE;
 		if(equip_card->equiping_target) {
 			equip_card->unequip();
+			equip_card->enable_field_effect(FALSE);
 			return FALSE;
 		}
 		if(equip_card->current.location == LOCATION_SZONE) {