diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
commit | c02976460621a16b172e3e33432d5790f3ed6117 (patch) | |
tree | c438b11c18e36170fd5ee7c767adda3f948e45bb /extra/foobillard/snooker_draw.patch | |
parent | 79f56eaaa1e752a2f67072051b612acf5c648f69 (diff) | |
parent | ae08410274473c5ab78d300ea2365c4b1070cc61 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/bdf-unifont/PKGBUILD
extra/convmv/PKGBUILD
extra/cowsay/PKGBUILD
extra/curl/PKGBUILD
extra/dbus-qt3/PKGBUILD
extra/emovix/PKGBUILD
extra/foobillard/PKGBUILD
extra/gnome-spell/PKGBUILD
extra/libssh2/PKGBUILD
extra/mkbootcd/PKGBUILD
extra/mozilla-common/PKGBUILD
extra/ndesk-dbus-glib/PKGBUILD
extra/xfwm4-themes/PKGBUILD
Diffstat (limited to 'extra/foobillard/snooker_draw.patch')
-rw-r--r-- | extra/foobillard/snooker_draw.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/extra/foobillard/snooker_draw.patch b/extra/foobillard/snooker_draw.patch deleted file mode 100644 index 1d45e9498..000000000 --- a/extra/foobillard/snooker_draw.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: src/evaluate_move.c -=================================================================== ---- src/evaluate_move.c (revision 6) -+++ src/evaluate_move.c (working copy) -@@ -602,6 +602,11 @@ - player[act_player].winner=0; - player[other_player].winner=1; - } -+ if(player[act_player].score==player[other_player].score) { -+ player[act_player].winner=1; -+ player[other_player].winner=1; -+ } -+ - } - - printf("EVAL done\n"); -Index: src/billard3d.c -=================================================================== ---- src/billard3d.c (revision 6) -+++ src/billard3d.c (working copy) -@@ -1760,8 +1760,17 @@ - options_gamemode==options_gamemode_tournament && - (player[0].winner || player[1].winner) ) - { -- tournament_evaluate_last_match( &tournament_state ); -- tournament_state.wait_for_next_match=1; -+ if ( player[0].winner == player[1].winner ) -+ { // Draw -+ restart_game_common(); -+ player[act_player].winner=0; -+ player[other_player].winner=0; -+ } -+ else -+ { -+ tournament_evaluate_last_match( &tournament_state ); -+ tournament_state.wait_for_next_match=1; -+ } - } - } else { - int old_cueball_ind; -@@ -3654,6 +3663,7 @@ - create_walls( &walls ); - create_scene( &balls ); - g_shot_due=1; -+ snooker_state.to_play=SN_PLAY_RED; - } - - |