Merge pull request #514 from DileSoft/network_stability

Network stability
KranX · Nov 17, 2021 · 4d6eb2a · 4d6eb2a
2 parents 12bc27e + f3f42d6
commit 4d6eb2a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/network.cpp b/src/network.cpp
@@ -728,9 +728,9 @@ int InputEventBuffer::next_event() {
 					ignore_event();
 					if(!lag_averaging_t0.empty()) {
 						int dt = (int)(SDL_GetTicks() - lag_averaging_t0.get());
-						if(dt > 100 && dt < 20000) {
-							average_lag = (dt + average_lag*3) >> 2;
-						}
+						// if(dt > 100 && dt < 20000) {
+							average_lag = dt;
+						// }
 					}
 				}
 				body_size = 0;

diff --git a/src/particle/light.cpp b/src/particle/light.cpp
@@ -209,10 +209,13 @@ int LightPoint::quant(void) {
 					int _x2 = ((x+R-j-2) & clip_mask_x)|1; 
 					j += 2;
 					//Sectors light around point (light under pulse)
-					llt  =  lt[_y] + _x;
-					llt1 =  lt[_y1] + _x;
-					llt2 = lt[_y]+_x2;
-					llt3 = lt[_y1]+_x2;
+					llt  =  lt[YCYCL(_y)] + XCYCL(_x);
+					llt1 =  lt[YCYCL(_y1)] + XCYCL(_x);
+					llt2 = lt[YCYCL(_y)]+XCYCL(_x2);
+					llt3 = lt[YCYCL(_y1)]+XCYCL(_x2);
+					if (!lt[YCYCL(_y)] || !lt[YCYCL(_y1)]) {
+						continue;
+					}
 					int r4=(R*2-dimR[j]-dimR[R-i]);
 					int r, first_shift;
 					if ( (*llt) < _z ){