check in LordHavoc's changes for him after cleaning up the mess of conflicts

[xonotic/darkplaces.git] / common.c

diff --git a/common.c b/common.c
index 43f5c6a95fc4a3d58d4fe04567ca7969907177c5..142af2dc594ca73936bca2c4ccf60b0ba210c679 100644 (file)
--- a/common.c
+++ b/common.c
@@ -1690,11 +1690,11 @@ byte *COM_LoadFile (char *path, int usehunk, qboolean quiet)
 //             if (!buf)
 //                     Sys_Error ("COM_LoadFile: not enough zone space for %s (size %i)", path, len);
 //             break;
-       case 3:
-               buf = Cache_Alloc (loadcache, len+1, base);
-               if (!buf)
-                       Sys_Error ("COM_LoadFile: not enough cache space for %s (size %i)", path, len);
-               break;
+//     case 3:
+//             buf = Cache_Alloc (loadcache, len+1, base);
+//             if (!buf)
+//                     Sys_Error ("COM_LoadFile: not enough cache space for %s (size %i)", path, len);
+//             break;
        case 5:
                buf = qmalloc (len+1);
                if (!buf)
@@ -1724,11 +1724,13 @@ byte *COM_LoadMallocFile (char *path, qboolean quiet)
        return COM_LoadFile (path, 5, quiet);
 }
 
+/*
 void COM_LoadCacheFile (char *path, struct cache_user_s *cu, qboolean quiet)
 {
        loadcache = cu;
        COM_LoadFile (path, 3, quiet);
 }
+*/
 
 /*
 =================