fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Just fixed raz0's pair of bugs (for q3 and q2)

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1903 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-01-28 19:34:21 +00:00
parent fdb5cf3aff
commit 213b04fc7d
4 changed files with 21 additions and 8 deletions

2
engine/client/cl_ui.c
View file

@ -234,7 +234,7 @@ int VMUI_fopen (char *name, int *handle, int fmode, int owner)
int i; int i;
if (!handle) if (!handle)
return FS_FLocateFile(name, FSLFRT_LENGTH, NULL); return FS_FLocateFile(name, FSLFRT_IFFOUND, NULL);
*handle = 0; *handle = 0;

20
engine/client/m_items.c
View file

@ -1367,11 +1367,21 @@ void M_Menu_Main_f (void)
MC_AddPicture(mainm, 68, 173, "pics/m_main_quit"); MC_AddPicture(mainm, 68, 173, "pics/m_main_quit");
mainm->selecteditem = (menuoption_t *) mainm->selecteditem = (menuoption_t *)
MC_AddConsoleCommand (mainm, 68, 13, "", "menu_single\n"); b = MC_AddConsoleCommand (mainm, 68, 13, "", "menu_single\n");
MC_AddConsoleCommand (mainm, 68, 53, "", "menu_multi\n"); b->common.width = 12*20;
MC_AddConsoleCommand (mainm, 68, 93, "", "menu_options\n"); b->common.height = 20;
MC_AddConsoleCommand (mainm, 68, 133, "", "menu_video\n"); b = MC_AddConsoleCommand (mainm, 68, 53, "", "menu_multi\n");
MC_AddConsoleCommand (mainm, 68, 173, "", "menu_quit\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); mainm->cursoritem = (menuoption_t *)MC_AddCursor(mainm, 42, 13);
} }

2
engine/common/common.h
View file

@ -299,7 +299,7 @@ int COM_FOpenWriteFile (char *filename, FILE **file);
void COM_CloseFile (FILE *h); void COM_CloseFile (FILE *h);
#define COM_FDepthFile(filename,ignorepacks) FS_FLocateFile(filename,ignorepacks?FSLFRT_DEPTH_OSONLY:FSLFRT_DEPTH_ANYPATH, NULL) #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 { typedef struct vfsfile_s {

5
engine/common/fs.c
View file

@ -1464,7 +1464,10 @@ out:
} }
else else
Con_Printf("Failed\n"); Con_Printf("Failed\n");
*/ if (returntype == FSLFRT_LENGTH) */
if (returntype == FSLFRT_IFFOUND)
return len != -1;
else if (returntype == FSLFRT_LENGTH)
return len; return len;
else else
return depth; return depth;