widelands

Merge lp:~ab-tools/widelands/ships-devisionbyzero into lp:widelands

  1. ships-devisionbyzero
  2. Merge into trunk
Proposed by Andreas Breitschopp
Status: Merged
Merged at revision: 6398
Proposed branch: lp:~ab-tools/widelands/ships-devisionbyzero
Merge into: lp:widelands
Diff against target: 15 lines (+5/-0)
1 file modified
src/logic/ship.cc (+5/-0)
To merge this branch: bzr merge lp:~ab-tools/widelands/ships-devisionbyzero
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+108948@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/ship.cc'
2--- src/logic/ship.cc 2012-02-15 21:25:34 +0000
3+++ src/logic/ship.cc 2012-06-06 14:04:30 +0000
4@@ -314,6 +314,11 @@
5 totalprob += prob[dir];
6 }
7
8+ if (totalprob == 0) {
9+ start_task_idle(game, descr().main_animation(), 1500);
10+ return;
11+ }
12+
13 unsigned int rnd = game.logic_rand() % totalprob;
14 Direction dir = 0;
15 while (rnd >= prob[dir]) {

Subscribers

People subscribed via source and target branches

to status/vote changes: