wok-6.x diff foobillard/stuff/03_bugfixes @ rev 13745
Up: mc, mhwaveedit, viewnior
author | Alexander Medvedev <devl547@gmail.com> |
---|---|
date | Mon Dec 31 12:03:41 2012 +0300 (2012-12-31) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/foobillard/stuff/03_bugfixes Mon Dec 31 12:03:41 2012 +0300 1.3 @@ -0,0 +1,36 @@ 1.4 +Index: foobillard-3.0a/src/ball.c 1.5 +=================================================================== 1.6 +--- foobillard-3.0a.orig/src/ball.c 2006-10-12 16:42:39.000000000 +0200 1.7 ++++ foobillard-3.0a/src/ball.c 2006-10-12 16:42:48.000000000 +0200 1.8 +@@ -1821,6 +1821,7 @@ 1.9 + } else if( options_cuberef && cuberef_binds!=0 ){ 1.10 + glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]); 1.11 + #ifdef GL_VERTEX_PROGRAM_NV 1.12 ++#ifdef USE_BALL_FRESNEL 1.13 + { 1.14 + myvec cam_pos2; 1.15 + // cam_pos2=vec_scale(vec_unit(vec_diff(cam_pos,balls.ball[i].r)),BALL_D/2.5); 1.16 +@@ -1829,6 +1830,7 @@ 1.17 + BALL_D/2.0,BALL_D/2.5,0,0 ); 1.18 + } 1.19 + #endif 1.20 ++#endif 1.21 + draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0); 1.22 + }else{ 1.23 + draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0); 1.24 +Index: foobillard-3.0a/src/evaluate_move.c 1.25 +=================================================================== 1.26 +--- foobillard-3.0a.orig/src/evaluate_move.c 2006-10-12 16:42:43.000000000 +0200 1.27 ++++ foobillard-3.0a/src/evaluate_move.c 2006-10-12 16:42:48.000000000 +0200 1.28 +@@ -385,6 +385,11 @@ 1.29 + int ball_out; 1.30 + int other_player=(act_player==1)?0:1; 1.31 + int b1hit = BM_get_1st_ball_hit(); if (b1hit>=8) b1hit=1; 1.32 ++ if(st.to_play==SN_DONE) 1.33 ++ { 1.34 ++ BM_reset_move_info(); 1.35 ++ return; 1.36 ++ } 1.37 + 1.38 + if( player[act_player].place_cue_ball ) player[act_player].place_cue_ball=0; 1.39 + printf("EVAL start\n");