Attachment 3036 Details for Bug 7970 – Patch for last type of piece

[patch] Patch for last type of piece

openalchemist-last-piece.diff (text/plain), 1008 bytes, created by Nicolas Salguero on 2012-11-04 12:18:33 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Salguero

Created: 2012-11-04 12:18:33 CET

Size: 1008 bytes

patch

obsolete

>diff -Naur openalchemist-0.4-src.old/src/Board.cpp openalchemist-0.4-src/src/Board.cpp
>--- openalchemist-0.4-src.old/src/Board.cpp	2010-04-25 15:12:34.000000000 +0200
>+++ openalchemist-0.4-src/src/Board.cpp	2012-11-02 23:26:01.009494969 +0100
>@@ -349,8 +349,9 @@
> 	_choose_new_piece_coords(new_piece, detected_pieces);
> 
> 	// Determining the new piece number
>-	new_piece.piece_number =
>-		_p_board[detected_pieces[0].x][detected_pieces[0].y]->get_piece_number() + 1;
>+	int piece_number =
>+		_p_board[detected_pieces[0].x][detected_pieces[0].y]->get_piece_number();
>+	new_piece.piece_number = piece_number + 1;
> 	if (new_piece.piece_number >= NUMBER_OF_PIECES)
> 	{
> 		new_piece.piece_number = NUMBER_OF_PIECES - 1;
>@@ -360,7 +361,7 @@
> 	_unlock_piece(new_piece);
> 
> 	// We add the my_new piece except if we have aligned 3 last elements
>-	if (new_piece.piece_number != NUMBER_OF_PIECES - 1)
>+	if (piece_number != NUMBER_OF_PIECES - 1)
> 		_list_to_create.insert(_list_to_create.end(), Coords(&new_piece));
> 
> }

diff -Naur openalchemist-0.4-src.old/src/Board.cpp openalchemist-0.4-src/src/Board.cpp
--- openalchemist-0.4-src.old/src/Board.cpp	2010-04-25 15:12:34.000000000 +0200
+++ openalchemist-0.4-src/src/Board.cpp	2012-11-02 23:26:01.009494969 +0100
@@ -349,8 +349,9 @@
 	_choose_new_piece_coords(new_piece, detected_pieces);
 
 	// Determining the new piece number
-	new_piece.piece_number =
-		_p_board[detected_pieces[0].x][detected_pieces[0].y]->get_piece_number() + 1;
+	int piece_number =
+		_p_board[detected_pieces[0].x][detected_pieces[0].y]->get_piece_number();
+	new_piece.piece_number = piece_number + 1;
 	if (new_piece.piece_number >= NUMBER_OF_PIECES)
 	{
 		new_piece.piece_number = NUMBER_OF_PIECES - 1;
@@ -360,7 +361,7 @@
 	_unlock_piece(new_piece);
 
 	// We add the my_new piece except if we have aligned 3 last elements
-	if (new_piece.piece_number != NUMBER_OF_PIECES - 1)
+	if (piece_number != NUMBER_OF_PIECES - 1)
 		_list_to_create.insert(_list_to_create.end(), Coords(&new_piece));
 
 }

Actions: View | Diff

Attachments on bug 7970: 3036