default.diff

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>
-    >ExecuteMsg;
+    typedef IPC::Message<IPC::Id<COMMAND, EXECUTE>, std::string> ExecuteMsg;
     // CompleteMsg
     typedef IPC::SyncMessage<
         IPC::Message<IPC::Id<COMMAND, COMPLETE>, int, std::string, std::string>,
@@ -85,18 +83,14 @@ namespace VM {
     };
 
     // RegisterCvarMsg
-    typedef IPC::SyncMessage<
-        IPC::Message<IPC::Id<CVAR, REGISTER_CVAR>, std::string, std::string, int, std::string>
-    > RegisterCvarMsg;
+    typedef IPC::Message<IPC::Id<CVAR, REGISTER_CVAR>, std::string, std::string, int, std::string> RegisterCvarMsg;
     // GetCvarMsg
     typedef IPC::SyncMessage<
         IPC::Message<IPC::Id<CVAR, GET_CVAR>, std::string>,
         IPC::Reply<std::string>
     > GetCvarMsg;
     // SetCvarMsg
-    typedef IPC::SyncMessage<
-        IPC::Message<IPC::Id<CVAR, SET_CVAR>, std::string, std::string>
-    > SetCvarMsg;
+    typedef IPC::Message<IPC::Id<CVAR, SET_CVAR>, std::string, std::string> SetCvarMsg;
 
     enum VMCvarMessages {
         ON_VALUE_CHANGED
diff --git a/src/common/IPC.h b/src/common/IPC.h
index 83e3e06..05cbc8c 100644
--- a/src/common/IPC.h
+++ b/src/common/IPC.h
@@ -584,7 +584,7 @@ template<typename... T> struct Reply {
 };
 
 // Synchronous message which waits for a reply. The reply can contain data.
-template<typename Msg, typename Reply = Reply<>> struct SyncMessage {
+template<typename Msg, typename Reply> struct SyncMessage {
 	enum {
 		id = Msg::id
 	};
diff --git a/src/engine/server/g_api.h b/src/engine/server/g_api.h
index 21f8896..a65efa3 100644
--- a/src/engine/server/g_api.h
+++ b/src/engine/server/g_api.h
@@ -477,11 +477,13 @@ typedef enum
 
 // GameInitMsg
 typedef IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, GAME_INIT>, int, int, bool>
+	IPC::Message<IPC::Id<VM::QVM, GAME_INIT>, int, int, bool>,
+	IPC::Reply<>
 > GameInitMsg;
 // GameShutdownMsg
 typedef IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, GAME_SHUTDOWN>, bool>
+	IPC::Message<IPC::Id<VM::QVM, GAME_SHUTDOWN>, bool>,
+	IPC::Reply<>
 > GameShutdownMsg;
 // GameClientConnectMsg
 typedef IPC::SyncMessage<
@@ -490,25 +492,31 @@ typedef IPC::SyncMessage<
 > GameClientConnectMsg;
 // GameClientBeginMsg
 typedef IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, GAME_CLIENT_BEGIN>, int>
+	IPC::Message<IPC::Id<VM::QVM, GAME_CLIENT_BEGIN>, int>,
+	IPC::Reply<>
 > GameClientBeginMsg;
 // GameClientUserinfoChangedMsg
 typedef IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, GAME_CLIENT_USERINFO_CHANGED>, int>
+	IPC::Message<IPC::Id<VM::QVM, GAME_CLIENT_USERINFO_CHANGED>, int>,
+	IPC::Reply<>
 > GameClientUserinfoChangedMsg;
 // GameClientDisconnectMsg
 typedef IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, GAME_CLIENT_DISCONNECT>, int>
+	IPC::Message<IPC::Id<VM::QVM, GAME_CLIENT_DISCONNECT>, int>,
+	IPC::Reply<>
 > GameClientDisconnectMsg;
 // GameClientCommandMsg
 typedef IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, GAME_CLIENT_COMMAND>, int, std::string>
+	IPC::Message<IPC::Id<VM::QVM, GAME_CLIENT_COMMAND>, int, std::string>,
+	IPC::Reply<>
 > GameClientCommandMsg;
 // GameClientThinkMsg
 typedef IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, GAME_CLIENT_THINK>, int>
+	IPC::Message<IPC::Id<VM::QVM, GAME_CLIENT_THINK>, int>,
+	IPC::Reply<>
 > GameClientThinkMsg;
 // GameRunFrameMsg
 typedef IPC::SyncMessage<
-	IPC::Message<IPC::Id<VM::QVM, GAME_RUN_FRAME>, int>
+	IPC::Message<IPC::Id<VM::QVM, GAME_RUN_FRAME>, int>,
+	IPC::Reply<>
 > GameRunFrameMsg;