X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=fs.c;h=e18216eb20c0a7bab6e29df4fb30bb0a1feaabe6;hp=c2207f08e7260a22130bb06a1e54395bafa12a9d;hb=fc5d617b1c0f09ccdeebcf9724f536b598e258f5;hpb=46534e46c82c4a8e3822cbdf2b43a260a14f0f30 diff --git a/fs.c b/fs.c index c2207f08..e18216eb 100644 --- a/fs.c +++ b/fs.c @@ -22,7 +22,13 @@ Boston, MA 02111-1307, USA */ -#include "quakedef.h" +#ifdef __APPLE__ +// include SDL for IPHONEOS code +# include +# if TARGET_OS_IPHONE +# include +# endif +#endif #include #include @@ -37,6 +43,8 @@ # include #endif +#include "quakedef.h" + #include "fs.h" #include "wad.h" @@ -188,6 +196,8 @@ typedef struct #define QFILE_FLAG_DEFLATED (1 << 1) /// file is actually already loaded data #define QFILE_FLAG_DATA (1 << 2) +/// real file will be removed on close +#define QFILE_FLAG_REMOVE (1 << 3) #define FILE_BUFF_SIZE 2048 typedef struct @@ -215,6 +225,8 @@ struct qfile_s ztoolkit_t* ztk; ///< For zipped files. const unsigned char *data; ///< For data files. + + const char *filename; ///< Kept around for QFILE_FLAG_REMOVE, unused otherwise }; @@ -232,6 +244,7 @@ typedef struct pk3_endOfCentralDir_s unsigned int cdir_size; ///< size of the central directory unsigned int cdir_offset; ///< with respect to the starting disk number unsigned short comment_size; + fs_offset_t prepended_garbage; } pk3_endOfCentralDir_t; @@ -327,6 +340,7 @@ const char *const fs_checkgamedir_missing = "missing"; char fs_userdir[MAX_OSPATH]; char fs_gamedir[MAX_OSPATH]; char fs_basedir[MAX_OSPATH]; +static pack_t *fs_selfpack = NULL; // list of active game directories (empty if not running a mod) int fs_numgamedirs = 0; @@ -527,6 +541,8 @@ qboolean PK3_GetEndOfCentralDir (const char *packfile, int packhandle, pk3_endOf eocd->cdir_size = LittleLong (eocd->cdir_size); eocd->cdir_offset = LittleLong (eocd->cdir_offset); eocd->comment_size = LittleShort (eocd->comment_size); + eocd->prepended_garbage = filesize - (ind + ZIP_END_CDIR_SIZE) - eocd->cdir_offset - eocd->cdir_size; // this detects "SFX" zip files + eocd->cdir_offset += eocd->prepended_garbage; Mem_Free (buffer); @@ -620,7 +636,7 @@ int PK3_BuildFileList (pack_t *pack, const pk3_endOfCentralDir_t *eocd) flags = PACKFILE_FLAG_DEFLATED; else flags = 0; - offset = BuffLittleLong (&ptr[42]); + offset = BuffLittleLong (&ptr[42]) + eocd->prepended_garbage; packsize = BuffLittleLong (&ptr[20]); realsize = BuffLittleLong (&ptr[24]); @@ -661,24 +677,16 @@ FS_LoadPackPK3 Create a package entry associated with a PK3 file ==================== */ -pack_t *FS_LoadPackPK3 (const char *packfile) +pack_t *FS_LoadPackPK3FromFD (const char *packfile, int packhandle, qboolean silent) { - int packhandle; pk3_endOfCentralDir_t eocd; pack_t *pack; int real_nb_files; -#if _MSC_VER >= 1400 - _sopen_s(&packhandle, packfile, O_RDONLY | O_BINARY, _SH_DENYNO, _S_IREAD | _S_IWRITE); -#else - packhandle = open (packfile, O_RDONLY | O_BINARY); -#endif - if (packhandle < 0) - return NULL; - if (! PK3_GetEndOfCentralDir (packfile, packhandle, &eocd)) { - Con_Printf ("%s is not a PK3 file\n", packfile); + if(!silent) + Con_Printf ("%s is not a PK3 file\n", packfile); close(packhandle); return NULL; } @@ -722,6 +730,18 @@ pack_t *FS_LoadPackPK3 (const char *packfile) Con_DPrintf("Added packfile %s (%i files)\n", packfile, real_nb_files); return pack; } +pack_t *FS_LoadPackPK3 (const char *packfile) +{ + int packhandle; +#if _MSC_VER >= 1400 + _sopen_s(&packhandle, packfile, O_RDONLY | O_BINARY, _SH_DENYNO, _S_IREAD | _S_IWRITE); +#else + packhandle = open (packfile, O_RDONLY | O_BINARY); +#endif + if (packhandle < 0) + return NULL; + return FS_LoadPackPK3FromFD(packfile, packhandle, false); +} /* @@ -860,7 +880,7 @@ void FS_Path_f (void) if (s->pack) { if(s->pack->vpack) - Con_Printf("%s (virtual pack)\n", s->pack->filename); + Con_Printf("%sdir (virtual pack)\n", s->pack->filename); else Con_Printf("%s (%i files)\n", s->pack->filename, s->pack->numfiles); } @@ -998,6 +1018,7 @@ static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname, searchpath_t *search; pack_t *pak = NULL; const char *ext = FS_FileExtension(pakfile); + size_t l; for(search = fs_searchpaths; search; search = search->next) { @@ -1012,7 +1033,7 @@ static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname, if(already_loaded) *already_loaded = false; - if(FS_SysFileType(pakfile) == FS_FILETYPE_DIRECTORY) + if(!strcasecmp(ext, "pk3dir")) pak = FS_LoadPackVirtual (pakfile); else if(!strcasecmp(ext, "pak")) pak = FS_LoadPackPAK (pakfile); @@ -1067,7 +1088,19 @@ static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname, } search->pack = pak; if(pak->vpack) + { dpsnprintf(search->filename, sizeof(search->filename), "%s/", pakfile); + // if shortname ends with "pk3dir", strip that suffix to make it just "pk3" + // same goes for the name inside the pack structure + l = strlen(pak->shortname); + if(l >= 7) + if(!strcasecmp(pak->shortname + l - 7, ".pk3dir")) + pak->shortname[l - 3] = 0; + l = strlen(pak->filename); + if(l >= 7) + if(!strcasecmp(pak->filename + l - 7, ".pk3dir")) + pak->filename[l - 3] = 0; + } return true; } else @@ -1147,17 +1180,7 @@ void FS_AddGameDirectory (const char *dir) // add any PK3 package in the directory for (i = 0;i < list.numstrings;i++) { - if (!strcasecmp(FS_FileExtension(list.strings[i]), "pk3")) - { - FS_AddPack_Fullpath(list.strings[i], list.strings[i] + strlen(dir), NULL, false); - } - } - - // add any virtual packs in the directory - for (i = 0;i < list.numstrings;i++) - { - if (!strcasecmp(FS_FileExtension(list.strings[i]), "dir") || (!strcasecmp(FS_FileExtension(list.strings[i]), "d")) - // we don't want precedence of .d vs .dir, but use the name as primary key + if (!strcasecmp(FS_FileExtension(list.strings[i]), "pk3") || !strcasecmp(FS_FileExtension(list.strings[i]), "pk3dir")) { FS_AddPack_Fullpath(list.strings[i], list.strings[i] + strlen(dir), NULL, false); } @@ -1248,7 +1271,7 @@ void FS_ClearSearchPath (void) { searchpath_t *search = fs_searchpaths; fs_searchpaths = search->next; - if (search->pack) + if (search->pack && search->pack != fs_selfpack) { if(!search->pack->vpack) { @@ -1264,6 +1287,18 @@ void FS_ClearSearchPath (void) } } +static void FS_AddSelfPack(void) +{ + if(fs_selfpack) + { + searchpath_t *search; + search = (searchpath_t *)Mem_Alloc(fs_mempool, sizeof(searchpath_t)); + search->next = fs_searchpaths; + search->pack = fs_selfpack; + fs_searchpaths = search; + } +} + /* ================ @@ -1274,10 +1309,17 @@ void FS_Rescan (void) { int i; qboolean fs_modified = false; + qboolean reset = false; char gamedirbuf[MAX_INPUTLINE]; + if (fs_searchpaths) + reset = true; FS_ClearSearchPath(); + // automatically activate gamemode for the gamedirs specified + if (reset) + COM_ChangeGameTypeForGameDirs(); + // add the game-specific paths // gamedirname1 (typically id1) FS_AddGameHierarchy (gamedirname1); @@ -1310,6 +1352,9 @@ void FS_Rescan (void) } Cvar_SetQuick(&cvar_fs_gamedir, gamedirbuf); // so QC or console code can query it + // add back the selfpack as new first item + FS_AddSelfPack(); + // set the default screenshot name to either the mod name or the // gamemode screenshot name if (strcmp(com_modname, gamedirname1)) @@ -1325,18 +1370,31 @@ void FS_Rescan (void) unlink (va("%s/qconsole.log", fs_gamedir)); // look for the pop.lmp file and set registered to true if it is found - if ((gamemode == GAME_NORMAL || gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE) && !FS_FileExists("gfx/pop.lmp")) + if (FS_FileExists("gfx/pop.lmp")) + Cvar_Set ("registered", "1"); + switch(gamemode) { - if (fs_modified) - Con_Print("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n"); + case GAME_NORMAL: + case GAME_HIPNOTIC: + case GAME_ROGUE: + if (!registered.integer) + { + if (fs_modified) + Con_Print("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n"); + else + Con_Print("Playing shareware version.\n"); + } else - Con_Print("Playing shareware version.\n"); - } - else - { - Cvar_Set ("registered", "1"); - if (gamemode == GAME_NORMAL || gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE) Con_Print("Playing registered version.\n"); + break; + case GAME_STEELSTORM: + if (registered.integer) + Con_Print("Playing registered version.\n"); + else + Con_Print("Playing shareware version.\n"); + break; + default: + break; } // unload all wads so that future queries will return the new data @@ -1355,6 +1413,8 @@ FS_ChangeGameDirs */ extern void Host_SaveConfig (void); extern void Host_LoadConfig_f (void); +extern qboolean vid_opened; +extern void VID_Stop(void); qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean complain, qboolean failmissing) { int i; @@ -1403,14 +1463,21 @@ qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean // reinitialize filesystem to detect the new paks FS_Rescan(); - // exec the new config - Host_LoadConfig_f(); + if (cls.demoplayback) + { + CL_Disconnect_f(); + cls.demonum = 0; + } // unload all sounds so they will be reloaded from the new files as needed S_UnloadAllSounds_f(); - // reinitialize renderer (this reloads hud/console background/etc) - R_Modules_Restart(); + // close down the video subsystem, it will start up again when the config finishes... + VID_Stop(); + vid_opened = false; + + // restart the video subsystem after the config is executed + Cbuf_InsertText("\nloadconfig\nvid_restart\n\n"); return true; } @@ -1458,7 +1525,6 @@ void FS_GameDir_f (void) FS_ChangeGameDirs(numgamedirs, gamedirs, true, true); } -static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean nonblocking); static const char *FS_SysCheckGameDir(const char *gamedir) { static char buf[8192]; @@ -1574,6 +1640,58 @@ static void FS_ListGameDirs(void) } } +/* +================ +FS_Init_SelfPack +================ +*/ +void FS_Init_SelfPack (void) +{ + PK3_OpenLibrary (); + fs_mempool = Mem_AllocPool("file management", 0, NULL); + if(com_selffd >= 0) + { + fs_selfpack = FS_LoadPackPK3FromFD(com_argv[0], com_selffd, true); + if(fs_selfpack) + { + char *buf, *q; + const char *p; + FS_AddSelfPack(); + buf = (char *) FS_LoadFile("darkplaces.opt", tempmempool, true, NULL); + if(buf) + { + const char **new_argv; + int i = 0; + int args_left = 256; + new_argv = (const char **)Mem_Alloc(fs_mempool, sizeof(*com_argv) * (com_argc + args_left + 2)); + if(com_argc == 0) + { + new_argv[0] = "dummy"; + com_argc = 1; + } + else + { + memcpy((char *)(&new_argv[0]), &com_argv[0], sizeof(*com_argv) * com_argc); + } + p = buf; + while(COM_ParseToken_Console(&p)) + { + if(i >= args_left) + break; + q = (char *)Mem_Alloc(fs_mempool, strlen(com_token) + 1); + strlcpy(q, com_token, strlen(com_token) + 1); + new_argv[com_argc + i] = q; + ++i; + } + new_argv[i+com_argc] = NULL; + com_argv = new_argv; + com_argc = com_argc + i; + } + Mem_Free(buf); + } + } +} + /* ================ FS_Init @@ -1589,7 +1707,9 @@ void FS_Init (void) size_t homedirlen; #endif #endif +#ifndef __IPHONEOS__ char *homedir; +#endif #ifdef WIN32 const char* dllnames [] = @@ -1601,8 +1721,15 @@ void FS_Init (void) // don't care for the result; if it fails, %USERPROFILE% will be used instead #endif - fs_mempool = Mem_AllocPool("file management", 0, NULL); + *fs_basedir = 0; + *fs_userdir = 0; + *fs_gamedir = 0; +#ifdef __IPHONEOS__ + // fs_basedir is "" by default, to utilize this you can simply add your gamedir to the Resources in xcode + // fs_userdir stores configurations to the Documents folder of the app + strlcpy(fs_userdir, "../Documents/", sizeof(fs_userdir)); +#else // Add the personal game directory if((i = COM_CheckParm("-userdir")) && i < com_argc - 1) { @@ -1690,8 +1817,7 @@ void FS_Init (void) } #endif #endif - - PK3_OpenLibrary (); +#endif // -basedir // Overrides the system supplied base directory (under GAMENAME) @@ -1779,16 +1905,9 @@ void FS_Shutdown (void) #endif } -/* -==================== -FS_SysOpen - -Internal function used to create a qfile_t and open the relevant non-packed file on disk -==================== -*/ -static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean nonblocking) +int FS_SysOpenFD(const char *filepath, const char *mode, qboolean nonblocking) { - qfile_t* file; + int handle; int mod, opt; unsigned int ind; @@ -1809,7 +1928,7 @@ static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean non break; default: Con_Printf ("FS_SysOpen(%s, %s): invalid mode\n", filepath, mode); - return NULL; + return -1; } for (ind = 1; mode[ind] != '\0'; ind++) { @@ -1830,25 +1949,40 @@ static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean non if (nonblocking) opt |= O_NONBLOCK; - file = (qfile_t *)Mem_Alloc (fs_mempool, sizeof (*file)); - memset (file, 0, sizeof (*file)); - file->ungetc = EOF; - #if _MSC_VER >= 1400 - _sopen_s(&file->handle, filepath, mod | opt, _SH_DENYNO, _S_IREAD | _S_IWRITE); + _sopen_s(&handle, filepath, mod | opt, _SH_DENYNO, _S_IREAD | _S_IWRITE); #else - file->handle = open (filepath, mod | opt, 0666); + handle = open (filepath, mod | opt, 0666); #endif + return handle; +} + +/* +==================== +FS_SysOpen + +Internal function used to create a qfile_t and open the relevant non-packed file on disk +==================== +*/ +qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean nonblocking) +{ + qfile_t* file; + + file = (qfile_t *)Mem_Alloc (fs_mempool, sizeof (*file)); + file->ungetc = EOF; + file->handle = FS_SysOpenFD(filepath, mode, nonblocking); if (file->handle < 0) { Mem_Free (file); return NULL; } + file->filename = Mem_strdup(fs_mempool, filepath); + file->real_length = lseek (file->handle, 0, SEEK_END); // For files opened in append mode, we start at the end of the file - if (mod & O_APPEND) + if (mode[0] == 'a') file->position = file->real_length; else lseek (file->handle, 0, SEEK_SET); @@ -2310,6 +2444,14 @@ int FS_Close (qfile_t* file) if (close (file->handle)) return EOF; + if (file->filename) + { + if (file->flags & QFILE_FLAG_REMOVE) + remove(file->filename); + + Mem_Free((void *) file->filename); + } + if (file->ztk) { qz_inflateEnd (&file->ztk->zstream); @@ -2320,6 +2462,10 @@ int FS_Close (qfile_t* file) return 0; } +void FS_RemoveOnClose(qfile_t* file) +{ + file->flags |= QFILE_FLAG_REMOVE; +} /* ==================== @@ -2823,9 +2969,11 @@ FS_WriteFile The filename will be prefixed by the current game directory ============ */ -qboolean FS_WriteFile (const char *filename, void *data, fs_offset_t len) +qboolean FS_WriteFileInBlocks (const char *filename, const void *const *data, const fs_offset_t *len, size_t count) { qfile_t *file; + size_t i; + fs_offset_t lentotal; file = FS_OpenRealFile(filename, "wb", false); if (!file) @@ -2834,12 +2982,21 @@ qboolean FS_WriteFile (const char *filename, void *data, fs_offset_t len) return false; } - Con_DPrintf("FS_WriteFile: %s (%u bytes)\n", filename, (unsigned int)len); - FS_Write (file, data, len); + lentotal = 0; + for(i = 0; i < count; ++i) + lentotal += len[i]; + Con_DPrintf("FS_WriteFile: %s (%u bytes)\n", filename, (unsigned int)lentotal); + for(i = 0; i < count; ++i) + FS_Write (file, data[i], len[i]); FS_Close (file); return true; } +qboolean FS_WriteFile (const char *filename, const void *data, fs_offset_t len) +{ + return FS_WriteFileInBlocks(filename, &data, &len, 1); +} + /* ============================================================================= @@ -3316,7 +3473,12 @@ void FS_Which_f(void) return; } if (sp->pack) - Con_Printf("%s is in package %s\n", filename, sp->pack->shortname); + { + if(sp->pack->vpack) + Con_Printf("%s is in virtual package %sdir\n", filename, sp->pack->shortname); + else + Con_Printf("%s is in package %s\n", filename, sp->pack->shortname); + } else Con_Printf("%s is file %s%s\n", filename, sp->filename, filename); }