--- a/weather.c	Wed Jul 23 11:41:38 2008 +0200
+++ b/weather.c	Wed Jul 23 15:19:45 2008 +0200
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-
 #include "db.h"
 #include "game.h"
 
@@ -88,41 +87,18 @@
 			" (tick, temp, sun, rain, wind, hum) "
 			" values ('%d', '%f', '%f', '%f', '%f', '%f') "
 			, gametime, w->temp, w->sun, w->rain, w->wind, w->hum);
-	db_query(query);
-	puts(query);
-	if (sqlite3_step(stmt) == SQLITE_DONE) {
-		printf("weather successful inserted\n");
-	} else {
+	/* puts(query); */
+	if (!db_update(query)) {
 		printf("error: weather insertion failed: %s\n", sqlite3_errmsg(db));
 	}
 }
 
 
-int main(int argc, char* argv[]) {
-	printf("  --> weather\n");
-
-	/* init */
-	if (argc != 2) {
-		printf("usage: %s <database>\n", argv[0]);
-		exit(1);
-	}
-	database = argv[1];
-
-	db_connect();
-	read_time();
-
-	srand((unsigned int) time(NULL));
-
-
+void weather(void) {
 	struct weather w;
 	struct weather lastn[Nlast];
 
 	getlastweather(lastn, Nlast);
 	genweather(&w, lastn, Nlast, May);
 	setweather(&w);
-
-	db_close();
-
-	printf("  --< weather\n");
-	return 0;
 }