From 839a89afdf54d0f6cc319af7d5d38be62ff424a9 Mon Sep 17 00:00:00 2001 From: lordjaxom Date: Tue, 28 Dec 2004 01:54:02 +0000 Subject: - animated bitmaps now honor the global "now" timestamp --- bitmap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bitmap.c') diff --git a/bitmap.c b/bitmap.c index c600a47..a75a407 100644 --- a/bitmap.c +++ b/bitmap.c @@ -1,5 +1,5 @@ /* - * $Id: bitmap.c,v 1.2 2004/12/21 20:26:25 lordjaxom Exp $ + * $Id: bitmap.c,v 1.3 2004/12/28 01:54:02 lordjaxom Exp $ */ #include "bitmap.h" @@ -90,18 +90,18 @@ cText2SkinBitmap::~cText2SkinBitmap() { mBitmaps.clear(); } -cBitmap &cText2SkinBitmap::Get(uint &UpdateIn) { +cBitmap &cText2SkinBitmap::Get(uint &UpdateIn, uint Now) { if (mBitmaps.size() == 1) return *mBitmaps[0]; - time_t upd, cur = time_ms(); + time_t upd; int diff; if (mLastGet == 0) { - mLastGet = cur; + mLastGet = Now; upd = mDelay; - } else if ((diff = cur - mLastGet) >= mDelay) { + } else if ((diff = Now - mLastGet) >= mDelay) { mCurrent = (mCurrent + 1) % mBitmaps.size(); - mLastGet = cur; + mLastGet = Now; upd = mDelay - diff > 1 ? mDelay - diff : 1; } else { upd = mDelay - diff; -- cgit v1.2.3