Merged pull request "Sync with Q2PRO: Misc": NVIDIA#359

res2k · Nov 21, 2023 · f29281a · f29281a
2 parents 426c36b + 76bfef7
commit f29281a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/client/main.c b/src/client/main.c
@@ -1085,7 +1085,7 @@ static void CL_Reconnect_f(void)
     SCR_UpdateScreen();
 }
 
-#ifdef USE_UI
+#if USE_UI
 /*
 =================
 CL_SendStatusRequest

diff --git a/src/server/commands.c b/src/server/commands.c
@@ -784,7 +784,7 @@ void SV_PrintMiscInfo(void)
                sv_client->min_ping, AVG_PING(sv_client), sv_client->max_ping);
     Com_Printf("PL server to client  %.2f%% (approx)\n", PL_S2C(sv_client));
     Com_Printf("PL client to server  %.2f%%\n", PL_C2S(sv_client));
-#ifdef USE_PACKETDUP
+#if USE_PACKETDUP
     Com_Printf("packetdup            %d\n", sv_client->numpackets - 1);
 #endif
     Com_Printf("timescale            %.3f\n", sv_client->timescale);

diff --git a/src/server/mvd/parse.c b/src/server/mvd/parse.c
@@ -359,8 +359,7 @@ static void MVD_UnicastPrint(mvd_t *mvd, bool reliable, mvd_player_t *player)
             continue;
         }
         // decide if message should be routed or not
-        target = (mvd->flags & MVF_NOMSGS) ? mvd->dummy :
-                 client->target ? client->target : mvd->dummy;
+        target = (client->target && !(mvd->flags & MVF_NOMSGS)) ? client->target : mvd->dummy;
         if (target == player) {
             cl->AddMessage(cl, data, length, reliable);
         }

diff --git a/src/unix/hunk.c b/src/unix/hunk.c
@@ -81,8 +81,10 @@ void Hunk_End(memhunk_t *hunk)
     newsize = ALIGN(hunk->cursize, pagesize);
 
     if (newsize < hunk->maxsize) {
-#ifdef __linux__
+#if defined(__linux__)
         void *buf = mremap(hunk->base, hunk->maxsize, newsize, 0);
+#elif defined(__NetBSD__)
+        void *buf = mremap(hunk->base, hunk->maxsize, NULL, newsize, 0);
 #else
         void *unmap_base = (byte *)hunk->base + newsize;
         size_t unmap_len = hunk->maxsize - newsize;

diff --git a/src/unix/system.c b/src/unix/system.c
@@ -167,7 +167,7 @@ static void kill_handler(int signum)
 {
     tty_shutdown_input();
 
-#if USE_CLIENT && USE_REF
+#if USE_REF
     if (vid.fatal_shutdown)
         vid.fatal_shutdown();
 #endif
@@ -321,7 +321,7 @@ void Sys_Error(const char *error, ...)
 		    get_sdl_window());
 #endif
 
-#if USE_CLIENT && USE_REF
+#if USE_REF
     if (vid.fatal_shutdown)
         vid.fatal_shutdown();
 #endif