From 0e57f95595396adf15d44163b33fdcc70fcdeb96 Mon Sep 17 00:00:00 2001 From: molivier Date: Wed, 17 Nov 2004 08:40:05 +0000 Subject: [PATCH] Give priority to unpacked files over packed files (the old AKVERSION behaviour) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4763 d7cf8633-e32d-0410-b094-e92efae38249 --- fs.c | 14 ++------------ todo | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/fs.c b/fs.c index 49ca69bf..a4224b25 100644 --- a/fs.c +++ b/fs.c @@ -786,14 +786,6 @@ void FS_AddGameDirectory (char *dir) strlcpy (fs_gamedir, dir, sizeof (fs_gamedir)); -#ifndef AKVERSION - // add the directory to the search path - search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); - strlcpy (search->filename, dir, sizeof (search->filename)); - search->next = fs_searchpaths; - fs_searchpaths = search; -#endif - list = listdirectory(dir); // add any PAK package in the directory @@ -835,14 +827,12 @@ void FS_AddGameDirectory (char *dir) } freedirectory(list); -// Unpacked files have the priority over packed files if AKVERSION is defined -#ifdef AKVERSION - // add the directory to the search path + // Add the directory to the search path + // (unpacked files have the priority over packed files) search = Mem_Alloc(pak_mempool, sizeof(searchpath_t)); strlcpy (search->filename, dir, sizeof (search->filename)); search->next = fs_searchpaths; fs_searchpaths = search; -#endif } diff --git a/todo b/todo index bb31a939..898a4893 100644 --- a/todo +++ b/todo @@ -35,7 +35,6 @@ 0 darkplaces loading: add hud_clearprecache and hud_precachepic commands to preload pics by name, these get reloaded by r_restart as well, mods can put a lot of these commands in their default.cfg to precache needed hud art (Tomaz) 0 darkplaces loading: check for out of bounds lump data ranges in maps (FrikaC) 0 darkplaces loading: check for truncated sound files (FrikaC) -0 darkplaces loading: make files override pak and pk3 archives, as it's really what people expect, hopefully this won't break any broken mods (Stribbs) 0 darkplaces loading: test zlib support with entirely pk3'd id1 data (should crash because of zlib not being setup early enough - fix this) (Mabus) 0 darkplaces memory: add Mem_AllocNoClear function, and use it where possible, if developer is on it should clear with random garbage 0 darkplaces optimize: Collision_TraceBrushBrush should compare enterfrac changes to realfraction and skip out if further, also leavefrac (Vic) @@ -389,6 +388,7 @@ d darkplaces input: allow typing characters > 128 into console to allow Latin1 f d darkplaces input: key repeat should work in menus, for example scrolling quickly through options (Up2nOgOoD) d darkplaces loading: clear stainmaps on map restart/change based on cl_stainmapsclearonload cvar (John Truex) d darkplaces loading: fix bumpmapping, there's something quite mixed up about the svectors and tvectors (Randi) +d darkplaces loading: make files override pak and pk3 archives, as it's really what people expect, hopefully this won't break any broken mods (Stribbs) d darkplaces loading: make hl map loading halve the lightmap samples, to fit hl's 0-1 range into quake's 0-2 range (KrimZon) d darkplaces loading: make it only reload rtlights when current map changes, not when restarting renderer or reloading same map (Stribbs) d darkplaces loading: make sky work without a valid size (just treat it as single layer clouds or non-animated) (tell Vermeulen) -- 2.39.2