sync ocgcore/processor.cpp

Classes/gframe/sound_manager.cpp

@@ -152,7 +152,7 @@ void SoundManager::StopBGM() {
 bool SoundManager::PlayChant(unsigned int code) {
     CardData cd;
     if(dataManager.GetData(code, &cd) && (cd.alias != 0))
-        code=cd.alias;
+        code = cd.alias;
 
 	if(ChantsList.count(code)) {
 		if (bgm) {

Classes/ocgcore/processor.cpp

@@ -2466,6 +2466,10 @@ int32 field::process_battle_command(uint16 step) {
 			core.attacker->set_status(STATUS_ATTACK_CANCELED, FALSE);
 			core.attacker->attack_controler = core.attacker->current.controler;
 			core.pre_field[0] = core.attacker->fieldid_r;
+			if(core.chain_attack && core.chain_attacker_id != core.attacker->fieldid) {
+				core.chain_attack = FALSE;
+				core.chain_attacker_id = 0;
+			}
 			effect_set eset;
 			filter_player_effect(infos.turn_player, EFFECT_ATTACK_COST, &eset, FALSE);
 			core.attacker->filter_effect(EFFECT_ATTACK_COST, &eset);
@@ -2598,10 +2602,6 @@ int32 field::process_battle_command(uint16 step) {
 	case 7: {
 		if(!core.units.begin()->arg1) {
 			core.phase_action = TRUE;
-			if(core.chain_attack && core.chain_attacker_id != core.attacker->fieldid) {
-				core.chain_attack = FALSE;
-				core.chain_attacker_id = 0;
-			}
 			core.attack_state_count[infos.turn_player]++;
 			check_card_counter(core.attacker, 5, infos.turn_player);
 			core.attacker->attack_announce_count++;