Cleanup, disabled additional sync - possibility of deadlock

Former-commit-id: 522965b

Author: mwydmuch

src/vizdoom/src/d_net.cpp

@@ -1906,9 +1906,9 @@ void TryRunTics (void)
 				 "=======real: %i  avail: %i  game: %i\n",
 				 realtics, availabletics, counts);
 
-	//VIZDOOM_CODE	
+	//VIZDOOM_CODE
 	vizNetticsSum = netticsSum;
-	if(*viz_controlled && !*viz_async){
+	if(*viz_controlled && !*viz_async && netgame){
 		int syncCount;
 		do {
 			syncCount = 0;
@@ -1959,8 +1959,7 @@ void TryRunTics (void)
 	lastglobalrecvtime = I_GetTime (false); //Update the last time the game tic'd over
 
 	//VIZDOOM_CODE
-	//if(*viz_controlled && *viz_async) VIZ_AsyncStartTic();
-	//vizMakeNetUpdate = false;
+	if(*viz_controlled && *viz_async) VIZ_AsyncStartTic();
 
 	// run the count tics
 	if (counts > 0)
@@ -1984,16 +1983,10 @@ void TryRunTics (void)
 			gametic++;
 
 			NetUpdate ();	// check for new console commands
-
-//			if(!*viz_async && counts > 0) {
-//				VIZ_Tic();
-//			}
 		}
 		P_PredictPlayer(&players[consoleplayer]);
 		if(!*viz_controlled || !*viz_nosound) S_UpdateSounds (players[consoleplayer].camera);	// move positional sounds
 	}
-
-//	vizMakeNetUpdate = true;
 }
 
 void Net_CheckLastReceived (int counts)

src/vizdoom/src/viz_main.cpp

@@ -115,32 +115,27 @@ CCMD(viz_set_seed){
 
 int vizNetticsSum = -1;
 int vizNodesInSync[VIZ_MAX_PLAYERS];
+int vizNodesLastSync[VIZ_MAX_PLAYERS];
 
 int vizSavedTime = 0;
 bool vizFreeze = false;
-int lastGameTic = 0;
-bool vizBlockNetUpdate = false;
 int (*_I_GetTime)(bool);
 int (*_I_WaitForTic)(int);
 void (*_I_FreezeTime)(bool);
 
 int vizTime = 0;
 bool vizNextTic = false;
 bool vizUpdate = false;
-bool vizMakeNetUpdate = true;
 unsigned int vizLastUpdate = 0;
 
 int VIZ_GetTime(bool saveMS){
-    //if(saveMS) vizSavedTime = vizTime;
+    if(saveMS) vizSavedTime = vizTime;
     return vizTime;
 }
 
 int VIZ_WaitForTic(int tic){
-//    while(vizTime < tic){
-//        VIZ_Tic();
-//    }
     if(*viz_allow_input) _I_WaitForTic(tic);
-    //if(tic > vizTime) vizTime = tic;
+    if(tic > vizTime) vizTime = tic;
     return VIZ_GetTime(false);
 }
 
@@ -167,7 +162,6 @@ void VIZ_Init(){
         vizUpdate = true;
 
         if(!*viz_async) {
-            lastGameTic = gametic;
             vizTime = gametic + 1;
             _I_GetTime = I_GetTime;
             _I_WaitForTic = I_WaitForTic;
@@ -206,10 +200,6 @@ void VIZ_Tic(){
     VIZ_DebugMsg(4, VIZ_FUNC, "rngseed: %d, use_staticrng: %d, staticrngseed: %d", rngseed, use_staticrng, staticrngseed);
 
     VIZ_InterruptionPoint();
-    if(!vizMakeNetUpdate){
-        vizMakeNetUpdate = true;
-        return;
-    }
 
     if (*viz_controlled){
         if(vizUpdate) {

src/vizdoom/src/viz_main.h

@@ -28,9 +28,9 @@
 extern int vizTime;
 extern int vizNetticsSum;
 extern int vizNodesInSync[VIZ_MAX_PLAYERS];
+extern int vizNodesLastSync[VIZ_MAX_PLAYERS];
 extern bool vizNextTic;
 extern bool vizUpdate;
-extern bool vizMakeNetUpdate;
 extern unsigned int vizLastUpdate;
 
 void VIZ_Init();