gnome-games r8661 - trunk/gnometris

[jclinton svn gnome org]

Author: jclinton
Date: Thu Feb  5 23:05:56 2009
New Revision: 8661
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8661&view=rev

Log:
Fix a possible source of a crasher when constructing the gaming field.

Modified:
   trunk/gnometris/blockops.cpp
   trunk/gnometris/tetris.cpp

Modified: trunk/gnometris/blockops.cpp
==============================================================================
--- trunk/gnometris/blockops.cpp	(original)
+++ trunk/gnometris/blockops.cpp	Thu Feb  5 23:05:56 2009
@@ -67,13 +67,13 @@
 	background(NULL),
 	foreground(NULL),
 	renderer(NULL),
+	themeID(-1),
 	blocknr(0),
 	rot(0),
 	color(0),
 	backgroundImage(NULL)
 {
 	field = new Block*[COLUMNS];
-	themeID = -1;
 
 	posx = COLUMNS / 2;
 	posy = 0;
@@ -87,8 +87,6 @@
 	g_signal_connect (w, "size_allocate", G_CALLBACK (resize), this);
 
 	gtk_widget_set_size_request (w, COLUMNS*190/LINES, 190);
-
-	emptyField();
 }
 
 BlockOps::~BlockOps()

Modified: trunk/gnometris/tetris.cpp
==============================================================================
--- trunk/gnometris/tetris.cpp	(original)
+++ trunk/gnometris/tetris.cpp	Thu Feb  5 23:05:56 2009
@@ -1329,6 +1329,8 @@
 	t->scoreFrame->resetScore();
 	t->paused = false;
 
+
+	t->field->emptyField();
 	t->field->generateFallingBlock();
 #ifndef HAVE_CLUTTER
 	t->field->redraw();