diff options
author | Vincent Hamm | 2007-04-28 22:31:55 +0000 |
---|---|---|
committer | Vincent Hamm | 2007-04-28 22:31:55 +0000 |
commit | fe8d2a8e7f899858784464550423f0deb5470f6c (patch) | |
tree | 7483ffa768fa6271cf9263253673588815315b74 /engines/cruise/various.cpp | |
parent | 339c39f8b7dcc2d245ba936f332592490f0bac3d (diff) | |
download | scummvm-rg350-fe8d2a8e7f899858784464550423f0deb5470f6c.tar.gz scummvm-rg350-fe8d2a8e7f899858784464550423f0deb5470f6c.tar.bz2 scummvm-rg350-fe8d2a8e7f899858784464550423f0deb5470f6c.zip |
More cleanup
Few bug fix
svn-id: r26666
Diffstat (limited to 'engines/cruise/various.cpp')
-rw-r--r-- | engines/cruise/various.cpp | 115 |
1 files changed, 0 insertions, 115 deletions
diff --git a/engines/cruise/various.cpp b/engines/cruise/various.cpp index e6a659c5ec..2b3aa6855f 100644 --- a/engines/cruise/various.cpp +++ b/engines/cruise/various.cpp @@ -39,68 +39,6 @@ int16 readB16(void *ptr) { return temp; } -void freeObject(cellStruct *objPtr) { - if (objPtr) { - /* if(objPtr->next) - * free(objPtr->next); */ - - //free(objPtr); - } -} - -void removeObjectFromList(int ovlNumber, int objectIdx, cellStruct *objPtr, - int backgroundPlane, int arg) { - cellStruct *currentObj = objPtr->next; - cellStruct *previous; - - while (currentObj) { - cellStruct *si; - - si = currentObj; - - if ((si->overlay == ovlNumber || ovlNumber == -1) && - (si->idx == objectIdx || objectIdx == -1) && - (si->type == arg || arg == -1) && - (si->backgroundPlane == backgroundPlane - || backgroundPlane == -1)) { - si->type = -1; - } - - currentObj = si->next; - } - - previous = objPtr; - currentObj = objPtr->next; - - while (currentObj) { - cellStruct *si; - - si = currentObj; - - if (si->type == -1) { - cellStruct *dx; - previous->next = si->next; - - dx = si->next; - - if (!si->next) { - dx = objPtr; - } - - dx->prev = si->prev; - - freeObject(si); - - free(si); - - currentObj = dx; - } else { - currentObj = si->next; - previous = si; - } - } -} - char *getText(int textIndex, int overlayIndex) { if (!overlayTable[overlayIndex].ovlData) { return NULL; @@ -114,57 +52,4 @@ char *getText(int textIndex, int overlayIndex) { string; } -void createTextObject(int overlayIdx, int oldVar8, cellStruct *pObject, - int scriptNumber, int scriptOverlayNumber, int backgroundPlane, - int16 color, int oldVar2, int oldVar4, int oldVar6) { - - char *ax; - cellStruct *savePObject = pObject; - cellStruct *cx; - - cellStruct *pNewElement; - cellStruct *si = pObject->next; - cellStruct *var_2; - - while (si) { - pObject = si; - si = si->next; - } - - var_2 = si; - - pNewElement = (cellStruct *) malloc(sizeof(cellStruct)); - - pNewElement->next = pObject->next; - pObject->next = pNewElement; - - pNewElement->idx = oldVar8; - pNewElement->type = 5; - pNewElement->backgroundPlane = backgroundPlane; - pNewElement->overlay = overlayIdx; - pNewElement->field_A = oldVar6; - pNewElement->field_C = oldVar4; - pNewElement->spriteIdx = oldVar2; - pNewElement->color = color; - pNewElement->freeze = 0; - pNewElement->field_16 = scriptNumber; - pNewElement->field_18 = scriptOverlayNumber; - pNewElement->gfxPtr = NULL; - - if (var_2) { - cx = var_2; - } else { - cx = savePObject; - } - - pNewElement->prev = cx->prev; - cx->prev = pNewElement; - - ax = getText(oldVar8, overlayIdx); - - if (ax) { - pNewElement->gfxPtr = renderText(oldVar2, (uint8 *) ax); - } -} - } // End of namespace Cruise |