--- a/weather.c	Wed Jul 23 16:49:10 2008 +0200
+++ b/weather.c	Wed Jul 23 17:14:38 2008 +0200
@@ -26,8 +26,8 @@
 float mean_hum[12] = {1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0};
 
 
+/* generates random number between -limit and +limit */
 float rand_limit(float limit) {
-	/* generates random number between -limit and +limit */
 	int r;
 
 	r = rand() / ( ((float) RAND_MAX + 1) / (2*limit) );
@@ -45,8 +45,9 @@
 			" select temp, sun, rain, wind, hum from weather "
 			" order by tick desc "
 			" limit %d "
-			, nlast);
-	db_query(query);
+			, nlast
+			);
+	stmt = db_query(query);
 	for (i = 0; i < nlast && sqlite3_step(stmt) == SQLITE_ROW; i++) {
 		lastw[i].temp = sqlite3_column_double(stmt, 0);
 		lastw[i].sun = sqlite3_column_double(stmt, 1);
@@ -55,19 +56,6 @@
 		lastw[i].hum = sqlite3_column_double(stmt, 4);
 	}
 	sqlite3_finalize(stmt);
-
-	/*
-	result = mysql_store_result(conn);
-	for (i = 0; i < nlast && (row = mysql_fetch_row(result)); i++) {
-		lastw[i].temp = atof(row[0]);
-		lastw[i].sun = atof(row[1]);
-		lastw[i].rain = atof(row[2]);
-		lastw[i].wind = atof(row[3]);
-		lastw[i].hum = atof(row[4]);
-	}
-	mysql_free_result(result);
-	*/
-
 }
 
 
@@ -86,10 +74,10 @@
 			" insert into weather "
 			" (tick, temp, sun, rain, wind, hum) "
 			" values ('%d', '%f', '%f', '%f', '%f', '%f') "
-			, gametime, w->temp, w->sun, w->rain, w->wind, w->hum);
-	/* puts(query); */
+			, gametime, w->temp, w->sun, w->rain, w->wind, w->hum
+			);
 	if (!db_update(query)) {
-		printf("error: weather insertion failed: %s\n", sqlite3_errmsg(db));
+		db_error("weather insertion");
 	}
 }