Skip to content

Commit

Permalink
Merge pull request #210 from EvidentlyCube/image-overlays-starting-in…
Browse files Browse the repository at this point in the history
…-future

Created Image Overlays get their time from the same source now as the…
  • Loading branch information
mrimer committed Oct 19, 2020
2 parents 9581d4b + 94daacd commit 101677f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DROD/DrodScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ void CDrodScreen::ProcessImageEvents(
return;

const UINT currentTurn = pGame ? pGame->wTurnNo : 0;
const Uint32 dwNow = SDL_GetTicks();
const Uint32 dwNow = CScreen::dwCurrentTicks;

const CAttachableObject *pObj = CueEvents.GetFirstPrivateData(cid);
while (pObj)
Expand Down
2 changes: 1 addition & 1 deletion DROD/RoomWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2225,7 +2225,7 @@ void CRoomWidget::DisplayPersistingImageOverlays(CCueEvents& CueEvents)
}

const UINT currentTurn = this->pCurrentGame->wTurnNo;
const Uint32 dwNow = SDL_GetTicks();
const Uint32 dwNow = CScreen::dwCurrentTicks;

for (vector<CImageOverlay>::const_iterator it=this->pCurrentGame->persistingImageOverlays.begin();
it!=this->pCurrentGame->persistingImageOverlays.end(); ++it)
Expand Down

0 comments on commit 101677f

Please sign in to comment.