Merge branch 'master' of github.com:fabiangreffrath/woof

fabiangreffrath · Jul 24, 2024 · cb53e63 · cb53e63
2 parents fa62ed2 + bf31da0
commit cb53e63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/g_game.c b/src/g_game.c
@@ -779,7 +779,7 @@ void G_BuildTiccmd(ticcmd_t* cmd)
   }
 
   // special buttons
-  if (sendpause)
+  if (sendpause && gameaction != ga_newgame)
     {
       sendpause = false;
       cmd->buttons = BT_SPECIAL | (BTS_PAUSE & BT_SPECIALMASK);

diff --git a/src/m_fixed.h b/src/m_fixed.h
@@ -30,7 +30,7 @@
 
   #define div64_32(a, b) _div64((a), (b), NULL)
 
-#elif defined(__GNUC__) && defined(_M_X64)
+#elif defined(__GNUC__) && defined(__x86_64__)
 
   inline static int32_t div64_32(int64_t a, int32_t b)
   {