todo item done: GAME_FNIGGIUM minimum resolution of 640x480

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3695 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/menu.c b/menu.c
index 7c6aa2942ab123d4f485e1bfe115cc8e91b83689..4ba5a30ae042fcb56e27979c5d320ac82dac7b93 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -2150,6 +2150,8 @@ int video_cursor_table[] = {56, 68, 80, 100};
 // note: if modes are added to the beginning of this list, update the
 // video_resolution = x; in M_Menu_Video_f below
 unsigned short video_resolutions[][2] = {{320,240}, {400,300}, {512,384}, {640,480}, {800,600}, {1024,768}, {1152,864}, {1280,960}, {1280,1024}, {1600,1200}, {1792,1344}, {1920,1440}, {2048,1536}, {0,0}};
+// this is the number of the 640x480 mode in the list
+#define VID_640 3
 #define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
 int video_resolution;
 
@@ -2173,11 +2175,11 @@ void M_Menu_Video_f (void)
                        break;
        }
 
-       // Default to 800x600 if we didn't find it
+       // Default to VID_640 if we didn't find it
        if (video_resolution == VID_RES_COUNT)
        {
                // may need to update this number if mode list changes
-               video_resolution = 4;
+               video_resolution = VID_640;
                Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution][0]);
                Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution][1]);
        }
@@ -2226,10 +2228,10 @@ void M_Menu_Video_AdjustSliders (int dir)
                case 0:
                {
                        int new_resolution = video_resolution + dir;
-                       if (new_resolution < 0)
+                       if (gamemode == GAME_FNIGGIUM ? new_resolution < VID_640 : new_resolution < 0)
                                video_resolution = VID_RES_COUNT - 1;
                        else if (new_resolution > VID_RES_COUNT)
-                               video_resolution = 0;
+                               video_resolution = gamemode == GAME_FNIGGIUM ? VID_640 : 0;
                        else
                                video_resolution = new_resolution;
 

diff --git a/todo b/todo
index e1e2af9623b31ac45cf45b99adb6d9465c92fb93..7e5f4f5d382d95e7a5d43da9e463bab62c288f6c 100644 (file)
--- a/todo
+++ b/todo
@@ -1,6 +1,7 @@
 - todo: difficulty ratings are: 0 = trivial, 1 = easy, 2 = easy-moderate, 3 = moderate, 4 = moderate-hard, 5 = hard, 6 = hard++, 7 = nightmare, d = done, -n = done but have not notified the people who asked for it, f = failed
 -n darkplaces: GAME_FNIGGIUM: "data" directory (not "id1" at all)
 -n darkplaces: GAME_FNIGGIUM: 22050/44100 khz sound default
+-n darkplaces: GAME_FNIGGIUM: minimum resolution: 640x480
 -n darkplaces: add PF_copyentity error checking for copying to world (yummyluv)
 -n darkplaces: add airborn blood images to the particlefont which would look like a cloud of droplets (Vermeulen)
 -n darkplaces: add bullet hole decals to the particlefont (Vermeulen)
@@ -35,7 +36,6 @@
 -n darkplaces: typing ip in join game menu should show 'trying' and 'no response' after a while, or 'no network' if networking is not initialized (yummyluv)
 -n dpmod: make grapple off-hand (joe hill)
 0 darkplaces: GAME_FNIGGIUM: console doesn't show unless you manually pull it down
-0 darkplaces: GAME_FNIGGIUM: minimum resolution: 640x480
 0 darkplaces: GAME_FNIGGIUM: startup loading screen (gfx/loadback.tga or whatever)
 0 darkplaces: add DP_GFX_QUAKE3MODELTAGS, DP_GFX_SKINFILES, and any other new extensions to the wiki
 0 darkplaces: add DP_LITSUPPORT extension and document it
@@ -236,6 +236,7 @@
 2 hmap: hlight is not properly figuring out the origin of rotating objects - it should take the "origin" key (FrikaC)
 3 LordHavoc: read up on dynamic visibility
 3 darkplaces: .loc support and other team messaging capabilities (sublim3)
+3 darkplaces: add .psk (ut2003) model support (Kazashi)
 3 darkplaces: add DP_ENT_COLORSHELL which puts a Q2-style colored shell on a model (Supajoe)
 3 darkplaces: add DP_SV_CRATEPHYSICS (NotoriousRay, SeienAbunae)
 3 darkplaces: add OpenGL Extensions menu to enable/disable various features (zombie_13)