From b31da5aec3838e5c831fe58afc7593ee3f7e5d4e Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Wed, 4 Nov 2020 18:32:24 +0100
Subject: [PATCH] Reorder nthread.h

---
 Source/nthread.cpp | 52 +++++++++++++++++++++++-----------------------
 Source/nthread.h   |  7 -------
 2 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index 776629608..682458af2 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -107,6 +107,32 @@ BOOL nthread_recv_turns(BOOL *pfSendAsync)
 	}
 }
 
+static unsigned int __stdcall nthread_handler(void *data)
+{
+	int delta;
+	BOOL received;
+
+	if (nthread_should_run) {
+		while (1) {
+			sgMemCrit.Enter();
+			if (!nthread_should_run)
+				break;
+			nthread_send_and_recv_turn(0, 0);
+			if (nthread_recv_turns(&received))
+				delta = last_tick - GetTickCount();
+			else
+				delta = 50;
+			sgMemCrit.Leave();
+			if (delta > 0)
+				Sleep(delta);
+			if (!nthread_should_run)
+				return 0;
+		}
+		sgMemCrit.Leave();
+	}
+	return 0;
+}
+
 void nthread_set_turn_upper_bit()
 {
 	turn_upper_bit = 0x80000000;
@@ -168,32 +194,6 @@ void nthread_start(BOOL set_turn_upper_bit)
 	}
 }
 
-unsigned int __stdcall nthread_handler(void *data)
-{
-	int delta;
-	BOOL received;
-
-	if (nthread_should_run) {
-		while (1) {
-			sgMemCrit.Enter();
-			if (!nthread_should_run)
-				break;
-			nthread_send_and_recv_turn(0, 0);
-			if (nthread_recv_turns(&received))
-				delta = last_tick - GetTickCount();
-			else
-				delta = 50;
-			sgMemCrit.Leave();
-			if (delta > 0)
-				Sleep(delta);
-			if (!nthread_should_run)
-				return 0;
-		}
-		sgMemCrit.Leave();
-	}
-	return 0;
-}
-
 void nthread_cleanup()
 {
 	nthread_should_run = FALSE;
diff --git a/Source/nthread.h b/Source/nthread.h
index bcd4a1874..2bfd9135b 100644
--- a/Source/nthread.h
+++ b/Source/nthread.h
@@ -9,26 +9,19 @@
 extern BYTE sgbNetUpdateRate;
 extern DWORD gdwMsgLenTbl[MAX_PLRS];
 extern DWORD gdwDeltaBytesSec;
-extern BOOLEAN nthread_should_run;
 extern DWORD gdwTurnsInTransit;
 extern int glpMsgTbl[MAX_PLRS];
-extern unsigned int glpNThreadId;
 extern int turn_upper_bit;
-extern BOOLEAN sgbThreadIsRunning;
 extern DWORD gdwLargestMsgSize;
 extern DWORD gdwNormalMsgSize;
-extern int last_tick;
 
 void nthread_terminate_game(const char *pszFcn);
 DWORD nthread_send_and_recv_turn(DWORD cur_turn, int turn_delta);
 BOOL nthread_recv_turns(BOOL *pfSendAsync);
 void nthread_set_turn_upper_bit();
 void nthread_start(BOOL set_turn_upper_bit);
-unsigned int __stdcall nthread_handler(void *data);
 void nthread_cleanup();
 void nthread_ignore_mutex(BOOL bStart);
 BOOL nthread_has_500ms_passed(BOOL unused);
 
-/* rdata */
-
 #endif /* __NTHREAD_H__ */