-Fixed a bad bugfix in the menu router.

-Added read-only support for files outside of data/ to the new vm.

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

diff --git a/menu.c b/menu.c
index caaf255d909e62b4f397682cd617d35f17dd08a5..fc8d655125cf93a79cfdc162b9ff9ae53308ebed 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -4215,10 +4215,10 @@ void MR_Init()
                Cvar_SetValueQuick(&forceqmenu,1);
        // use -useqmenu for debugging proposes, cause it starts
        // the normal quake menu only the first time
-       else if(COM_CheckParm("-useqmenu"))
+       if(COM_CheckParm("-useqmenu"))
                MR_SetRouting (TRUE);
-       
-       MR_SetRouting (FALSE);
+       else 
+               MR_SetRouting (FALSE);
 }
 
 

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 2271956339e39ab0b72fbdd46bb5811ba301eaf5..6a7fc7d4721e1e0ce9aed945c029690195a6ee89 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -1746,6 +1746,9 @@ void VM_fopen(void)
                return;
        }
        VM_FILES[filenum] = FS_Open(va("data/%s", filename), modestring, false);
+       if (VM_FILES[filenum] == NULL && mode == 0)
+               VM_FILES[filenum] = FS_Open(va("%s", filename), modestring, false);
+
        if (VM_FILES[filenum] == NULL)
                PRVM_G_FLOAT(OFS_RETURN) = -1;
        else