RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

limit badness from fiddling with the clock

This commit is contained in:
David Rose 2009-03-03 22:32:44 +00:00
parent 941c9ba732
commit 9dad4e33d2
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
panda/src/express/trueClock.cxx
View File

@ -272,8 +272,8 @@ correct_time(double time) {
++_error_count;
// If both are negative, we call it 0. If one is negative, we
// trust the other one. If both are nonnegative, we trust the
// smaller of the two.
// trust the other one (up to paranoid_clock_jump_error). If both
// are nonnegative, we trust the smaller of the two.
double time_adjust = 0.0;
double tod_adjust = 0.0;
@ -283,12 +283,16 @@ correct_time(double time) {
tod_adjust = -tod_delta;
} else if (time_delta < 0.0 || (tod_delta >= 0.0 && tod_delta < time_delta)) {
// Trust tod.
time_adjust = (tod_delta - time_delta);
// Trust tod, up to a point.
double new_tod_delta = min(tod_delta, paranoid_clock_jump_error);
time_adjust = new_tod_delta - time_delta;
tod_adjust = new_tod_delta - tod_delta;
} else {
// Trust time.
tod_adjust = (time_delta - tod_delta);
// Trust time, up to a point.
double new_time_delta = min(time_delta, paranoid_clock_jump_error);
time_adjust = new_time_delta - time_delta;
tod_adjust = new_time_delta - tod_delta;
}
_time_offset += time_adjust;