wok-next view foobillard/stuff/03_bugfixes @ rev 15147

jed: filter wrong error trigger
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Aug 15 13:01:55 2013 +0000 (2013-08-15)
parents
children
line source
1 Index: foobillard-3.0a/src/ball.c
2 ===================================================================
3 --- foobillard-3.0a.orig/src/ball.c 2006-10-12 16:42:39.000000000 +0200
4 +++ foobillard-3.0a/src/ball.c 2006-10-12 16:42:48.000000000 +0200
5 @@ -1821,6 +1821,7 @@
6 } else if( options_cuberef && cuberef_binds!=0 ){
7 glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]);
8 #ifdef GL_VERTEX_PROGRAM_NV
9 +#ifdef USE_BALL_FRESNEL
10 {
11 myvec cam_pos2;
12 // cam_pos2=vec_scale(vec_unit(vec_diff(cam_pos,balls.ball[i].r)),BALL_D/2.5);
13 @@ -1829,6 +1830,7 @@
14 BALL_D/2.0,BALL_D/2.5,0,0 );
15 }
16 #endif
17 +#endif
18 draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0);
19 }else{
20 draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0);
21 Index: foobillard-3.0a/src/evaluate_move.c
22 ===================================================================
23 --- foobillard-3.0a.orig/src/evaluate_move.c 2006-10-12 16:42:43.000000000 +0200
24 +++ foobillard-3.0a/src/evaluate_move.c 2006-10-12 16:42:48.000000000 +0200
25 @@ -385,6 +385,11 @@
26 int ball_out;
27 int other_player=(act_player==1)?0:1;
28 int b1hit = BM_get_1st_ball_hit(); if (b1hit>=8) b1hit=1;
29 + if(st.to_play==SN_DONE)
30 + {
31 + BM_reset_move_info();
32 + return;
33 + }
34
35 if( player[act_player].place_cue_ball ) player[act_player].place_cue_ball=0;
36 printf("EVAL start\n");