diff options
| author | Steven Fuller <relnev@icculus.org> | 2014-12-25 12:00:00 +0100 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 03:45:24 +0200 |
| commit | 22475d6d94e96056d1550dca00b32d00e3821649 (patch) | |
| tree | 175dbbc8da0704d493fe3cb6024d8117c4f1b27b /src/kshape.c | |
| parent | 819e239f23b0c515f32fe0ec8350bdfd8d64c9e9 (diff) | |
Import icculus.org release (2014-12-25)
Diffstat (limited to 'src/kshape.c')
| -rw-r--r-- | src/kshape.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/kshape.c b/src/kshape.c index 7107c0b..a17d305 100644 --- a/src/kshape.c +++ b/src/kshape.c @@ -3015,8 +3015,11 @@ void CreateTxAnimUVArray(int *txa_data, int *uv_array, int *shapeitemptr) /* The sequence # will have been copied across by the control block */ - sequence = *txa_data++; - + sequence = *txa_data; + + // SBF: 64HACK - skip over the rest of the int* + txa_data = (int *)((intptr_t) txa_data + sizeof(int *)); + #if 0 textprint("sequence = %d\n", sequence); #endif @@ -4027,7 +4030,7 @@ void AddShape(DISPLAYBLOCK *dptr, VIEWDESCRIPTORBLOCK *VDB_Ptr) { if (dptr->ObStrategyBlock->I_SBtype==I_BehaviourInanimateObject) { - INANIMATEOBJECT_STATUSBLOCK* objStatPtr = dptr->ObStrategyBlock->SBdataptr; + INANIMATEOBJECT_STATUSBLOCK* objStatPtr = (INANIMATEOBJECT_STATUSBLOCK*) dptr->ObStrategyBlock->SBdataptr; if(objStatPtr->typeId==IOT_FieldCharge) { |