X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgame.c;fp=src%2Fgame.c;h=f7306d69495d76d3f0c33658bd8d595830771cfc;hb=d5f45e3128c537f272615cf76242e1dfebccdee7;hp=caff54ab70a9e07ff317c51f0f08c7ed2f0844e4;hpb=dd7ce87b0ad2b8a1b4758bcc9354e993b71c8599;p=raydungeon

diff --git a/src/game.c b/src/game.c
index caff54a..f7306d6 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,30 +1,48 @@
 #include <stdlib.h>
 #include <string.h>
 #include <GL/gl.h>
+#include <GL/glu.h>
 #include "game.h"
+#include "options.h"
 
 int mouse_x, mouse_y, mouse_state[3];
+int mouse_grabbed;
+unsigned int modkeys;
 int win_width, win_height;
 float win_aspect;
+int fullscr;
+
+long time_msec;
 
 struct game_screen *cur_scr;
 
 /* available screens */
-extern struct game_screen scr_menu, scr_game, scr_map;
+extern struct game_screen scr_menu, scr_game, scr_map, scr_lvled;
 #define MAX_SCREENS	4
 static struct game_screen *screens[MAX_SCREENS];
 static int num_screens;
 
 
-int game_init(void)
+int game_init(int argc, char **argv)
 {
 	int i;
 	char *start_scr_name;
 
+	load_options(GAME_CFG_FILE);
+	if(parse_options(argc, argv) == -1) {
+		return -1;
+	}
+	game_resize(opt.xres, opt.yres);
+	game_vsync(opt.vsync);
+	if(opt.fullscreen) {
+		game_fullscreen(1);
+	}
+
 	/* initialize screens */
 	screens[num_screens++] = &scr_menu;
 	screens[num_screens++] = &scr_game;
 	screens[num_screens++] = &scr_map;
+	screens[num_screens++] = &scr_lvled;
 
 	start_scr_name = getenv("START_SCREEN");
 
@@ -32,15 +50,19 @@ int game_init(void)
 		if(screens[i]->init() == -1) {
 			return -1;
 		}
+	}
+
+	glClearColor(0.1, 0.1, 0.1, 1);
+
+	for(i=0; i<num_screens; i++) {
 		if(screens[i]->name && start_scr_name && strcmp(screens[i]->name, start_scr_name) == 0) {
 			game_chscr(screens[i]);
+			break;
 		}
 	}
 	if(!cur_scr) {
 		game_chscr(&scr_game);	/* TODO: scr_menu */
 	}
-
-	glClearColor(0.3, 0.3, 0.3, 1);
 	return 0;
 }
 
@@ -48,6 +70,8 @@ void game_shutdown(void)
 {
 	int i;
 
+	save_options(GAME_CFG_FILE);
+
 	for(i=0; i<num_screens; i++) {
 		if(screens[i]->destroy) {
 			screens[i]->destroy();
@@ -57,7 +81,7 @@ void game_shutdown(void)
 
 void game_display(void)
 {
-	glClear(GL_COLOR_BUFFER_BIT);
+	time_msec = game_getmsec();
 
 	if(cur_scr) {
 		cur_scr->display();
@@ -85,6 +109,15 @@ void game_keyboard(int key, int press)
 		case 27:
 			game_quit();
 			break;
+
+		case '\n':
+		case '\r':
+			if(modkeys & GKEY_MOD_ALT) {
+		case GKEY_F11:
+				game_fullscreen(-1);
+				return;
+			}
+			break;
 		}
 	}
 
@@ -108,24 +141,28 @@ void game_mouse(int bn, int st, int x, int y)
 
 void game_motion(int x, int y)
 {
-	mouse_x = x;
-	mouse_y = y;
-
 	if(cur_scr && cur_scr->motion) {
 		cur_scr->motion(x, y);
 	}
+	mouse_x = x;
+	mouse_y = y;
 }
 
 void game_chscr(struct game_screen *scr)
 {
+	struct game_screen *prev = cur_scr;
+
 	if(!scr) return;
 
 	if(scr->start && scr->start() == -1) {
 		return;
 	}
+	if(scr->reshape) {
+		scr->reshape(win_width, win_height);
+	}
 
-	if(cur_scr && cur_scr->stop) {
-		cur_scr->stop();
+	if(prev && prev->stop) {
+		prev->stop();
 	}
 	cur_scr = scr;
 }