From 198ed4535747b4e5b80a0190add4777a9b315835 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 20 Jun 2020 10:58:47 +0200
Subject: [PATCH] - clean up redundancy

---
 source/build/include/timer.h | 5 -----
 source/sw/src/network.cpp    | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/source/build/include/timer.h b/source/build/include/timer.h
index a4d8cd389..942e06d30 100644
--- a/source/build/include/timer.h
+++ b/source/build/include/timer.h
@@ -18,9 +18,4 @@ uint32_t timerGetTicks(void);
 
 void (*timerSetCallback(void (*callback)(void)))(void);
 
-inline void timerUpdate() // to avoid merge conflicts when the other games get updated.
-{
-	timerUpdateClock();
-}
-
 #endif // timer_h__
diff --git a/source/sw/src/network.cpp b/source/sw/src/network.cpp
index af412722e..d11aa913d 100644
--- a/source/sw/src/network.cpp
+++ b/source/sw/src/network.cpp
@@ -1238,7 +1238,7 @@ getpackets(void)
     PLAYERp pp;
     SW_PACKET tempinput;
 
-    timerUpdate();
+    timerUpdateClock();
 
     if (!CommEnabled)
         return;