diff options
author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /engines/cruise/cell.cpp | |
parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/cruise/cell.cpp')
-rw-r--r-- | engines/cruise/cell.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/engines/cruise/cell.cpp b/engines/cruise/cell.cpp index b7cef41764..46539463b8 100644 --- a/engines/cruise/cell.cpp +++ b/engines/cruise/cell.cpp @@ -129,15 +129,12 @@ void createTextObject(cellStruct *pObject, int overlayIdx, int messageIdx, int x cellStruct *pNewElement; cellStruct *si = pObject->next; - cellStruct *var_2; while (si) { pObject = si; si = si->next; } - var_2 = si; - pNewElement = (cellStruct *) MemAlloc(sizeof(cellStruct)); memset(pNewElement, 0, sizeof(cellStruct)); @@ -157,11 +154,7 @@ void createTextObject(cellStruct *pObject, int overlayIdx, int messageIdx, int x pNewElement->parentOverlay = parentOvl; pNewElement->gfxPtr = NULL; - if (var_2) { - cx = var_2; - } else { - cx = savePObject; - } + cx = savePObject; pNewElement->prev = cx->prev; cx->prev = pNewElement; |