Comment 9 for bug 1457425

I created a branch. It is based on trunk so problematic savegames are not compatible, but I tested these changes on old trunk a savegames went fine.

The bottom line is that battle (if both opponents have not started to fight in 90 secdonds) is cancelled.