Amanieu

diff --git a/src/engine/framework/FileSystem.cpp b/src/engine/framework/FileSystem.cpp
index b5680f5..8f07a99 100644
--- a/src/engine/framework/FileSystem.cpp
+++ b/src/engine/framework/FileSystem.cpp
@@ -2418,8 +2418,9 @@ const char* FS_LoadedPaks()
 	static char info[BIG_INFO_STRING];
 	info[0] = '\0';
 	for (const FS::PakInfo& x: FS::PakPath::GetLoadedPaks()) {
+		// If we have a pk3dir, don't allow clients to connect
 		if (!x.checksum)

Amanieu

--- 1	2014-02-15 13:33:58.360191787 +0100
+++ 2	2014-02-15 13:34:06.070281930 +0100
@@ -1,46 +1,46 @@
-
+# BasedOnStyle:  Google
 ---
 ...
-AccessModifierOffset: -4
+AccessModifierOffset: -1
 AlignEscapedNewlinesLeft: true

Amanieu

diff --git a/src/common/IPC.h b/src/common/IPC.h
index f2af815..0706646 100644
--- a/src/common/IPC.h
+++ b/src/common/IPC.h
@@ -119,6 +119,13 @@ public:
 
 	void Close();
 
+	OSHandleType ReleaseHandle()
+	{

Amanieu

diff --git a/src/engine/framework/VirtualMachine.cpp b/src/engine/framework/VirtualMachine.cpp
index b2fe6c7..2ec2493 100644
--- a/src/engine/framework/VirtualMachine.cpp
+++ b/src/engine/framework/VirtualMachine.cpp
@@ -134,7 +134,7 @@ static std::pair<IPC::OSHandleType, IPC::Socket> InternalLoadModule(std::pair<IP
 	PROCESS_INFORMATION processInfo;
 	memset(&startupInfo, 0, sizeof(startupInfo));
 	startupInfo.cb = sizeof(startupInfo);
-	if (!CreateProcessW(NULL, &wcmdline[0], NULL, NULL, TRUE, CREATE_SUSPENDED | CREATE_BREAKAWAY_FROM_JOB | DETACHED_PROCESS, NULL, NULL, &startupInfo, &processInfo)) {
+	if (!CreateProcessW(NULL, &wcmdline[0], NULL, NULL, TRUE, CREATE_SUSPENDED | CREATE_BREAKAWAY_FROM_JOB | DETACHED_PROCESS, "", NULL, &startupInfo, &processInfo)) {

Amanieu

diff --git a/src/common/IPC.h b/src/common/IPC.h
index d494e2f..f9b60d2 100644
--- a/src/common/IPC.h
+++ b/src/common/IPC.h
@@ -496,7 +496,7 @@ template<> struct SerializeTraits<SharedMemory> {
 };
 
 // Message ID to indicate an RPC return
-const uint32_t ID_RETURN = 0xffffffffu;
+const uint32_t ID_RETURN = 0xffffffff;

Amanieu

diff --git a/src/common/CommonSyscalls.h b/src/common/CommonSyscalls.h
index 680207d..32d1ee4 100644
--- a/src/common/CommonSyscalls.h
+++ b/src/common/CommonSyscalls.h
@@ -67,9 +67,7 @@ namespace VM {
     };
 
     // ExecuteMsg
-    typedef IPC::SyncMessage<
-        IPC::Message<IPC::Id<COMMAND, EXECUTE>, std::string>

Amanieu

diff --git a/src/engine/framework/FileSystem.cpp b/src/engine/framework/FileSystem.cpp
index 84b8a0b..4622773 100644
--- a/src/engine/framework/FileSystem.cpp
+++ b/src/engine/framework/FileSystem.cpp
@@ -648,27 +648,26 @@ namespace Path {
 
 bool IsValid(Str::StringRef path, bool allowDir)
 {
-	bool nonAlphaNum = true;
+	char prev = '/';

Amanieu

diff --git a/src/engine/framework/FileSystem.cpp b/src/engine/framework/FileSystem.cpp
index 95287e0..1a60afd 100644
--- a/src/engine/framework/FileSystem.cpp
+++ b/src/engine/framework/FileSystem.cpp
@@ -2398,7 +2398,9 @@ int FS_GetFileList(const char* path, const char* extension, char* listBuf, int b
 		return 0;
 
 	int numFiles;
-	char** list = FS_ListFiles(path, extension, &numFiles);
+	char buffer[1024] = "game/";

Amanieu

diff --git a/src/engine/framework/FileSystem.cpp b/src/engine/framework/FileSystem.cpp
index 95287e0..361e27e 100644
--- a/src/engine/framework/FileSystem.cpp
+++ b/src/engine/framework/FileSystem.cpp
@@ -2397,21 +2397,42 @@ int FS_GetFileList(const char* path, const char* extension, char* listBuf, int b
 	if (!strcmp(path, "$modlist"))
 		return 0;
 
-	int numFiles;
-	char** list = FS_ListFiles(path, extension, &numFiles);

Amanieu

AccessModifierOffset: -4
AlignEscapedNewlinesLeft: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
BinPackParameters: true
BreakBeforeBinaryOperators: false