diff options
| author | Max Horn | 2011-05-18 13:43:52 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-18 13:47:41 +0200 |
| commit | d85700bb948693d4270ea91779c442003ee4a70d (patch) | |
| tree | 3ab3cff5de47df86aa7f09a99f1072143c8ccd8e /engines | |
| parent | 904739cc00c2ce4bf9f6f7d14d8866f09494fb91 (diff) | |
| download | scummvm-rg350-d85700bb948693d4270ea91779c442003ee4a70d.tar.gz scummvm-rg350-d85700bb948693d4270ea91779c442003ee4a70d.tar.bz2 scummvm-rg350-d85700bb948693d4270ea91779c442003ee4a70d.zip | |
TINSEL: Revert commit 43ca9c86ab to fix bug #3303799
Commit 43ca9c86ab causes segfaults when trying to start a game in tinsel.
However, the code in question still should be investigated, as it
casts OBJECT** pointers to OBJECT*. Very fishy.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tinsel/background.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/tinsel/background.cpp b/engines/tinsel/background.cpp index a5b7198691..4f0623df6a 100644 --- a/engines/tinsel/background.cpp +++ b/engines/tinsel/background.cpp @@ -162,7 +162,7 @@ OBJECT *GetPlayfieldList(int which) { pPlayfield = pCurBgnd->fieldArray + which; // return the display list pointer for this playfield - return pPlayfield->pDispList; + return (OBJECT *)&pPlayfield->pDispList; } /** @@ -202,10 +202,10 @@ void DrawBackgnd() { pPlay->bMoved = true; // sort the display list for this background - just in case somebody has changed object Z positions - SortObjectList(pPlay->pDispList); + SortObjectList((OBJECT *)&pPlay->pDispList); // generate clipping rects for all objects that have moved etc. - FindMovingObjects(pPlay->pDispList, &ptWin, + FindMovingObjects((OBJECT *)&pPlay->pDispList, &ptWin, &pPlay->rcClip, false, pPlay->bMoved); // clear playfield moved flag @@ -232,7 +232,7 @@ void DrawBackgnd() { if (IntersectRectangle(rcPlayClip, pPlay->rcClip, *r)) // redraw all objects within this clipping rect - UpdateClipRect(pPlay->pDispList, + UpdateClipRect((OBJECT *)&pPlay->pDispList, &ptWin, &rcPlayClip); } } |