diff --git a/engine/client/cl_ui.c b/engine/client/cl_ui.c index 2559e6d5..ec39a35f 100644 --- a/engine/client/cl_ui.c +++ b/engine/client/cl_ui.c @@ -234,7 +234,7 @@ int VMUI_fopen (char *name, int *handle, int fmode, int owner) int i; if (!handle) - return FS_FLocateFile(name, FSLFRT_LENGTH, NULL); + return FS_FLocateFile(name, FSLFRT_IFFOUND, NULL); *handle = 0; diff --git a/engine/client/m_items.c b/engine/client/m_items.c index f73db82d..c79ed0db 100644 --- a/engine/client/m_items.c +++ b/engine/client/m_items.c @@ -1367,11 +1367,21 @@ void M_Menu_Main_f (void) MC_AddPicture(mainm, 68, 173, "pics/m_main_quit"); mainm->selecteditem = (menuoption_t *) - MC_AddConsoleCommand (mainm, 68, 13, "", "menu_single\n"); - MC_AddConsoleCommand (mainm, 68, 53, "", "menu_multi\n"); - MC_AddConsoleCommand (mainm, 68, 93, "", "menu_options\n"); - MC_AddConsoleCommand (mainm, 68, 133, "", "menu_video\n"); - MC_AddConsoleCommand (mainm, 68, 173, "", "menu_quit\n"); + b = MC_AddConsoleCommand (mainm, 68, 13, "", "menu_single\n"); + b->common.width = 12*20; + b->common.height = 20; + b = MC_AddConsoleCommand (mainm, 68, 53, "", "menu_multi\n"); + b->common.width = 12*20; + b->common.height = 20; + b = MC_AddConsoleCommand (mainm, 68, 93, "", "menu_options\n"); + b->common.width = 12*20; + b->common.height = 20; + b = MC_AddConsoleCommand (mainm, 68, 133, "", "menu_video\n"); + b->common.width = 12*20; + b->common.height = 20; + b = MC_AddConsoleCommand (mainm, 68, 173, "", "menu_quit\n"); + b->common.width = 12*20; + b->common.height = 20; mainm->cursoritem = (menuoption_t *)MC_AddCursor(mainm, 42, 13); } diff --git a/engine/common/common.h b/engine/common/common.h index d3f6321e..1b2e55b9 100644 --- a/engine/common/common.h +++ b/engine/common/common.h @@ -299,7 +299,7 @@ int COM_FOpenWriteFile (char *filename, FILE **file); void COM_CloseFile (FILE *h); #define COM_FDepthFile(filename,ignorepacks) FS_FLocateFile(filename,ignorepacks?FSLFRT_DEPTH_OSONLY:FSLFRT_DEPTH_ANYPATH, NULL) -#define COM_FCheckExists(filename) (FS_FLocateFile(filename,FSLFRT_LENGTH, NULL)>0) +#define COM_FCheckExists(filename) FS_FLocateFile(filename,FSLFRT_IFFOUND, NULL) typedef struct vfsfile_s { diff --git a/engine/common/fs.c b/engine/common/fs.c index 984bf46b..05ceb3f5 100644 --- a/engine/common/fs.c +++ b/engine/common/fs.c @@ -1464,7 +1464,10 @@ out: } else Con_Printf("Failed\n"); -*/ if (returntype == FSLFRT_LENGTH) +*/ + if (returntype == FSLFRT_IFFOUND) + return len != -1; + else if (returntype == FSLFRT_LENGTH) return len; else return depth;