Fixed the dark opengl screenshots and video mode not being initialized.

2 files changed, 5 insertions, 3 deletions

diff --git a/TODO b/TODO
index 773e838..24caf6a 100644
--- a/TODO
+++ b/TODO
@@ -4,11 +4,11 @@
 [DONE] [11/25/01] CD Audio.
 [DONE] [12/05/01] Menus.
 [DONE] [12/05/01] Progress bar.
-* Make vidmodes work.
+[DONE] [12/06/01] Make vidmodes work.
 * Debug "pure virtual method called"
+* Command line options.
 * Proper file loading/saving (ignore case, search certain directories) and
   config handling (~/.avp/{ge, re, ad, md, pd}/?)
-* Command line options.
 * Joystick support.
 * GL_EXT_secondary_color
 * Revisit sound code. (Try AL_PITCH support, etc)
diff --git a/src/main.c b/src/main.c
index 2e36f9b..4e0572f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -94,7 +94,7 @@ unsigned char *GetScreenShot24(int *width, int *height)
 	
 	if (surface->flags & SDL_OPENGL) {
 		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-		glReadPixels(0, 0, surface->w, surface->h, GL_RGB, GL_BYTE, buf);
+		glReadPixels(0, 0, surface->w, surface->h, GL_RGB, GL_UNSIGNED_BYTE, buf);
 	} else {
 		unsigned char *ptrd;
 		unsigned short int *ptrs;
@@ -339,6 +339,8 @@ int InitSDL()
 			return -1;
 	}
 	
+	LoadDeviceAndVideoModePreferences();
+	
 	surface = NULL;
 	
 	return 0;