- clean up redundancy

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__

source/sw/src/network.cpp

@@ -1238,7 +1238,7 @@ getpackets(void)
     PLAYERp pp;
     SW_PACKET tempinput;
 
-    timerUpdate();
+    timerUpdateClock();
 
     if (!CommEnabled)
         return;