New filesystem

Makefile

@@ -262,6 +262,8 @@ RCOMMONDIR=$(MOUNT_DIR)/renderercommon
 RGL1DIR=$(MOUNT_DIR)/renderergl1
 RGL2DIR=$(MOUNT_DIR)/renderergl2
 CMDIR=$(MOUNT_DIR)/qcommon
+FSDIR=$(MOUNT_DIR)/filesystem
+FSDIR_FSCORE=$(MOUNT_DIR)/filesystem/fscore
 SDLDIR=$(MOUNT_DIR)/sdl
 ASMDIR=$(MOUNT_DIR)/asm
 SYSDIR=$(MOUNT_DIR)/sys
@@ -828,6 +830,10 @@ ifneq ($(BUILD_DATA_PK3),0)
     $(B)/$(BASEGAME)/data-$(VERSION).pk3
 endif
 
+ifneq ($(NEW_FILESYSTEM),0)
+  BASE_CFLAGS += -DNEW_FILESYSTEM
+endif
+
 ifeq ($(USE_OPENAL),1)
   CLIENT_CFLAGS += -DUSE_OPENAL
   ifeq ($(USE_OPENAL_DLOPEN),1)
@@ -1833,7 +1839,28 @@ Q3OBJ = \
   $(B)/client/sdl_snd.o \
   \
   $(B)/client/con_log.o \
-  $(B)/client/sys_main.o
+  $(B)/client/sys_main.o \
+  \
+  $(B)/client/fsc_cache.o \
+  $(B)/client/fsc_crosshair.o \
+  $(B)/client/fsc_gameparse.o \
+  $(B)/client/fsc_iteration.o \
+  $(B)/client/fsc_main.o \
+  $(B)/client/fsc_md4.o \
+  $(B)/client/fsc_misc.o \
+  $(B)/client/fsc_os.o \
+  $(B)/client/fsc_pk3.o \
+  $(B)/client/fsc_sha256.o \
+  $(B)/client/fsc_shader.o \
+  $(B)/client/fs_commands.o \
+  $(B)/client/fs_download.o \
+  $(B)/client/fs_fileio.o \
+  $(B)/client/fs_filelist.o \
+  $(B)/client/fs_lookup.o \
+  $(B)/client/fs_main.o \
+  $(B)/client/fs_misc.o \
+  $(B)/client/fs_reference.o \
+  $(B)/client/fs_trusted_vms.o
 
 ifdef MINGW
   Q3OBJ += \
@@ -2351,7 +2378,28 @@ Q3DOBJ = \
   $(B)/ded/null_snddma.o \
   \
   $(B)/ded/con_log.o \
-  $(B)/ded/sys_main.o
+  $(B)/ded/sys_main.o \
+  \
+  $(B)/ded/fsc_cache.o \
+  $(B)/ded/fsc_crosshair.o \
+  $(B)/ded/fsc_gameparse.o \
+  $(B)/ded/fsc_iteration.o \
+  $(B)/ded/fsc_main.o \
+  $(B)/ded/fsc_md4.o \
+  $(B)/ded/fsc_misc.o \
+  $(B)/ded/fsc_os.o \
+  $(B)/ded/fsc_pk3.o \
+  $(B)/ded/fsc_sha256.o \
+  $(B)/ded/fsc_shader.o \
+  $(B)/ded/fs_commands.o \
+  $(B)/ded/fs_download.o \
+  $(B)/ded/fs_fileio.o \
+  $(B)/ded/fs_filelist.o \
+  $(B)/ded/fs_lookup.o \
+  $(B)/ded/fs_main.o \
+  $(B)/ded/fs_misc.o \
+  $(B)/ded/fs_reference.o \
+  $(B)/ded/fs_trusted_vms.o
 
 ifeq ($(ARCH),x86)
   Q3DOBJ += \
@@ -2646,6 +2694,11 @@ $(B)/client/%.o: $(SDIR)/%.c
 $(B)/client/%.o: $(CMDIR)/%.c
 	$(DO_CC)
 
+$(B)/client/%.o: $(FSDIR)/%.cpp
+	$(DO_CXX)
+$(B)/client/%.o: $(FSDIR_FSCORE)/%.cpp
+	$(DO_CXX)
+
 $(B)/client/%.o: $(CDIR)/%.cpp
 	$(DO_CXX)
 
@@ -2754,6 +2807,11 @@ $(B)/ded/%.o: $(SDIR)/%.cpp
 $(B)/ded/%.o: $(CMDIR)/%.c
 	$(DO_DED_CC)
 
+$(B)/ded/%.o: $(FSDIR)/%.cpp
+	$(DO_DED_CXX)
+$(B)/ded/%.o: $(FSDIR_FSCORE)/%.cpp
+	$(DO_DED_CXX)
+
 $(B)/ded/%.o: $(CMDIR)/%.cpp
 	$(DO_DED_CXX)
 

src/client/cl_avi.cpp

@@ -608,7 +608,16 @@ bool CL_CloseAVI( void )
   // Write index
 
   // Open the temp index file
+#ifdef NEW_FILESYSTEM
+  indexSize = 0;
+  { char path[FS_MAX_PATH];
+    if(fs_generate_path_writedir(FS_GetCurrentGameDir(), idxFileName,
+              0, FS_ALLOW_SLASH, path, sizeof(path)))
+      afd.idxF = fs_direct_read_handle_open(0, path, (unsigned int *)&indexSize); }
+  if(indexSize <= 0)
+#else
   if( ( indexSize = FS_FOpenFileRead( idxFileName, &afd.idxF, true ) ) <= 0 )
+#endif
   {
     FS_FCloseFile( afd.f );
     return false;

src/client/cl_cgame.cpp

@@ -384,6 +384,9 @@ void CL_ShutdownCGame( void ) {
 		return;
 	}
 	VM_Call( cls.cgame, CG_SHUTDOWN );
+#ifdef NEW_FILESYSTEM
+	fs_close_owner_handles(FS_HANDLEOWNER_CGAME);
+#endif
 	VM_Free( cls.cgame );
 	cls.cgame = NULL;
 }
@@ -459,17 +462,33 @@ intptr_t CL_CgameSystemCalls( intptr_t *args )
             Cmd_LiteralArgsBuffer( (char*)VMA(1), args[2] );
             return 0;
         case CG_FS_FOPENFILE:
+#ifdef NEW_FILESYSTEM
+			return FS_FOpenFileByModeOwner( (const char*)VMA(1), (fileHandle_t*)VMA(2), (FS_Mode)args[3], FS_HANDLEOWNER_CGAME );
+#else
             return FS_FOpenFileByMode( (const char*)VMA(1), (fileHandle_t*)VMA(2), (FS_Mode)args[3] );
+#endif
         case CG_FS_READ:
+#ifdef NEW_FILESYSTEM
+			if(fs_handle_get_owner(args[3]) != FS_HANDLEOWNER_CGAME) return 0;
+#endif
             FS_Read( VMA(1), args[2], args[3] );
             return 0;
         case CG_FS_WRITE:
+#ifdef NEW_FILESYSTEM
+			if(fs_handle_get_owner(args[3]) != FS_HANDLEOWNER_CGAME) return 0;
+#endif
             FS_Write( VMA(1), args[2], args[3] );
             return 0;
         case CG_FS_FCLOSEFILE:
+#ifdef NEW_FILESYSTEM
+			if(fs_handle_get_owner(args[1]) != FS_HANDLEOWNER_CGAME) return 0;
+#endif
             FS_FCloseFile( args[1] );
             return 0;
         case CG_FS_SEEK:
+#ifdef NEW_FILESYSTEM
+			if(fs_handle_get_owner(args[1]) != FS_HANDLEOWNER_CGAME) return 0;
+#endif
             return FS_Seek( (fileHandle_t)args[1], args[2], (FS_Origin)args[3] );
         case CG_FS_GETFILELIST:
             return FS_GetFileList( (const char*)VMA(1), (const char*)VMA(2), (char*)VMA(3), args[4] );
@@ -786,14 +805,22 @@ void CL_InitCGame( void ) {
 	mapname = Info_ValueForKey( info, "mapname" );
 	Com_sprintf( cl.mapname, sizeof( cl.mapname ), "maps/%s.bsp", mapname );
 
+#ifdef NEW_FILESYSTEM
+	// Give the map pk3 slightly higher precedence in the filesystem to help
+	// load the correct textures and such
+	fs_register_current_map(cl.mapname);
+#endif
+
 	// load the dll or bytecode
 	interpret = (vmInterpret_t)Cvar_VariableValue("vm_cgame");
+#ifndef NEW_FILESYSTEM
 	if(cl_connectedToPureServer)
 	{
 		// if sv_pure is set we only allow qvms to be loaded
 		if(interpret != VMI_COMPILED && interpret != VMI_BYTECODE)
 			interpret = VMI_COMPILED;
 	}
+#endif
 
 	cls.cgame = VM_Create( "cgame", CL_CgameSystemCalls, interpret );
 	if ( !cls.cgame ) {

src/client/cl_curl.cpp

@@ -259,6 +259,10 @@ void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
 	CL_cURL_Cleanup();
 	Q_strncpyz(clc.downloadURL, remoteURL, sizeof(clc.downloadURL));
 	Q_strncpyz(clc.downloadName, localName, sizeof(clc.downloadName));
+#ifdef NEW_FILESYSTEM
+	if(!clc.activeCURLNotGameRelated) Com_sprintf(clc.downloadTempName, sizeof(clc.downloadTempName), "download.temp");
+	else
+#endif
 	Com_sprintf(clc.downloadTempName, sizeof(clc.downloadTempName),
 		"%s.tmp", localName);
 
@@ -347,18 +351,34 @@ void CL_cURL_PerformDownload(void)
 		return;
 	}
 	FS_FCloseFile(clc.download);
+#ifdef NEW_FILESYSTEM
+	clc.download = 0;
+#endif
 	if(msg->msg == CURLMSG_DONE && msg->data.result == CURLE_OK) {
+#ifdef NEW_FILESYSTEM
+		if(!clc.activeCURLNotGameRelated) fs_finalize_download();
+		else
+#endif
 		FS_SV_Rename(clc.downloadTempName, clc.downloadName, false);
 		clc.downloadRestart = true;
 	}
 	else {
 		long code;
 
 		qcurl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &code);	
+#ifdef NEW_FILESYSTEM
+		Com_Printf("Download Error: %s Code: %ld URL: %s\n",
+			qcurl_easy_strerror(msg->data.result), code, clc.downloadURL);
+#else
 		Com_Error(ERR_DROP, "Download Error: %s Code: %ld URL: %s",
 			qcurl_easy_strerror(msg->data.result),
 			code, clc.downloadURL);
+#endif
 	}
 
+#ifdef NEW_FILESYSTEM
+	if(clc.activeCURLNotGameRelated) CL_cURL_Shutdown();
+	else
+#endif
 	CL_NextDownload();
 }