wok annotate foobillard/stuff/03_bugfixes @ rev 19687

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