wok-6.x diff foobillard/stuff/snooker_draw.patch @ rev 14278

merge
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Apr 06 15:17:50 2013 +0200 (2013-04-06)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/foobillard/stuff/snooker_draw.patch	Sat Apr 06 15:17:50 2013 +0200
     1.3 @@ -0,0 +1,48 @@
     1.4 +Index: src/evaluate_move.c
     1.5 +===================================================================
     1.6 +--- src/evaluate_move.c	(revision 6)
     1.7 ++++ src/evaluate_move.c	(working copy)
     1.8 +@@ -602,6 +602,11 @@
     1.9 +             player[act_player].winner=0;
    1.10 +             player[other_player].winner=1;
    1.11 +         }
    1.12 ++        if(player[act_player].score==player[other_player].score) {
    1.13 ++            player[act_player].winner=1;
    1.14 ++            player[other_player].winner=1;
    1.15 ++        }
    1.16 ++
    1.17 +     }
    1.18 + 
    1.19 +     printf("EVAL done\n");
    1.20 +Index: src/billard3d.c
    1.21 +===================================================================
    1.22 +--- src/billard3d.c	(revision 6)
    1.23 ++++ src/billard3d.c	(working copy)
    1.24 +@@ -1760,8 +1760,17 @@
    1.25 +                   options_gamemode==options_gamemode_tournament &&
    1.26 +                   (player[0].winner || player[1].winner) )
    1.27 +                {
    1.28 +-                   tournament_evaluate_last_match( &tournament_state );
    1.29 +-                   tournament_state.wait_for_next_match=1;
    1.30 ++                   if ( player[0].winner == player[1].winner )
    1.31 ++                   { // Draw
    1.32 ++                       restart_game_common();
    1.33 ++                       player[act_player].winner=0;
    1.34 ++                       player[other_player].winner=0;
    1.35 ++                   }
    1.36 ++                   else
    1.37 ++                   {
    1.38 ++                       tournament_evaluate_last_match( &tournament_state );
    1.39 ++                       tournament_state.wait_for_next_match=1;
    1.40 ++                   }
    1.41 +                }
    1.42 +            } else {
    1.43 +                int old_cueball_ind;
    1.44 +@@ -3654,6 +3663,7 @@
    1.45 +     create_walls( &walls );
    1.46 +     create_scene( &balls );
    1.47 +     g_shot_due=1;
    1.48 ++    snooker_state.to_play=SN_PLAY_RED;
    1.49 + }
    1.50 + 
    1.51 +