Mercurial > MadButterfly
diff src/shift.c @ 826:94041f085797
Merge from main stream
author | Thinker K.F. Li <thinker@codemud.net> |
---|---|
date | Tue, 14 Sep 2010 05:55:30 +0800 |
parents | 586e50f82c1f |
children |
line wrap: on
line diff
--- a/src/shift.c Tue Sep 14 05:44:48 2010 +0800 +++ b/src/shift.c Tue Sep 14 05:55:30 2010 +0800 @@ -1,3 +1,5 @@ +// -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 4; -*- +// vim: sw=4:ts=8:sts=4 #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -45,7 +47,7 @@ coord_t *coord; float ratio; - + MB_TIMEVAL_CP(&diff, now); MB_TIMEVAL_DIFF(&diff, &shift->start_time); ratio = comp_mb_timeval_ratio(&diff, shift->playing_time);