Miroirs/c-urs_-toil-s
1
0
Fork 0
mirror of https://github.com/gwenhael-le-moine/c-urs_-toil-s.git synced 2024-12-27 09:58:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

get_pos returns an array; use switch_actor on click

Browse source
This commit is contained in:
Gwenhael Le Moine 2011-07-16 11:44:36 +02:00
parent a97729493a
commit cc34d45d15
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
star.js/js/star.js
View file

@ -65,7 +65,7 @@ function initialize_a_star( dom_container, level_index ) {
function get_pos( actor ) { function get_pos( actor ) {
var p = state.board.indexOf( actor, state.board ); var p = state.board.indexOf( actor, state.board );
var pos = { }; var pos = [ ];
pos[ 1 ] = Math.floor( p / level_infos.width ); /* y */ pos[ 1 ] = Math.floor( p / level_infos.width ); /* y */
pos[ 0 ] = p - ( pos[ 1 ] * level_infos.width ); /* x */ pos[ 0 ] = p - ( pos[ 1 ] * level_infos.width ); /* x */
@ -79,7 +79,6 @@ function initialize_a_star( dom_container, level_index ) {
function set_cell( x, y, value ) { function set_cell( x, y, value ) {
var p = x + ( y * level_infos.width ); var p = x + ( y * level_infos.width );
state.board = [ state.board.substring( 0, p ), value, state.board.substring( p+1, state.board.length ) ].join( '' ); state.board = [ state.board.substring( 0, p ), value, state.board.substring( p+1, state.board.length ) ].join( '' );
return state;
} }
function draw_cell( sprite, x, y ) { function draw_cell( sprite, x, y ) {
@ -99,7 +98,6 @@ function initialize_a_star( dom_container, level_index ) {
draw_cell( ( state.moving == cell.BALL ) ? assets.sprites.ball_selected : assets.sprites.ball, ball_pos[ 0 ], ball_pos[ 1 ] ); draw_cell( ( state.moving == cell.BALL ) ? assets.sprites.ball_selected : assets.sprites.ball, ball_pos[ 0 ], ball_pos[ 1 ] );
// redraw cube // redraw cube
draw_cell( ( state.moving == cell.CUBE ) ? assets.sprites.cube_selected : assets.sprites.cube, cube_pos[ 0 ], cube_pos[ 1 ] ); draw_cell( ( state.moving == cell.CUBE ) ? assets.sprites.cube_selected : assets.sprites.cube, cube_pos[ 0 ], cube_pos[ 1 ] );
return state;
} }
function won_or_not( ) { function won_or_not( ) {
@ -202,6 +200,7 @@ function initialize_a_star( dom_container, level_index ) {
state.distance_travelled++; /* increment distance_travelled */ state.distance_travelled++; /* increment distance_travelled */
} }
update_infos( ); update_infos( );
return path; return path;
} }
@ -222,7 +221,8 @@ function initialize_a_star( dom_container, level_index ) {
// We're inside the board // We're inside the board
if ( click.x == notmovingpos[0] && click.y == notmovingpos[1] ) { if ( click.x == notmovingpos[0] && click.y == notmovingpos[1] ) {
state.moving = ( state.moving != cell.BALL ) ? cell.BALL : cell.CUBE; // state.moving = ( state.moving != cell.BALL ) ? cell.BALL : cell.CUBE;
switch_actor( );
} else if ( click.x == movingpos[0] ) { } else if ( click.x == movingpos[0] ) {
if ( click.y > movingpos[1] ) { if ( click.y > movingpos[1] ) {
make_a_move( direction.DOWN ); make_a_move( direction.DOWN );