|
@@ -101,7 +101,7 @@ static int string_starts_with(const char *str, const char *needle) {
|
|
static char *string_copy(const char *str) {
|
|
static char *string_copy(const char *str) {
|
|
if (str == NULL) return NULL;
|
|
if (str == NULL) return NULL;
|
|
int len = strlen(str);
|
|
int len = strlen(str);
|
|
- char *tmp = (char *)malloc(len + 1);
|
|
|
|
|
|
+ char *tmp = (char *) malloc(len + 1);
|
|
strncpy(tmp, str, len);
|
|
strncpy(tmp, str, len);
|
|
tmp[len] = '\0';
|
|
tmp[len] = '\0';
|
|
return tmp;
|
|
return tmp;
|
|
@@ -1082,7 +1082,7 @@ spAttachment *spSkeletonBinary_readAttachment(spSkeletonBinary *self, _dataInput
|
|
spSkeletonData *skeletonData, int /*bool*/ nonessential) {
|
|
spSkeletonData *skeletonData, int /*bool*/ nonessential) {
|
|
int flags = readByte(input);
|
|
int flags = readByte(input);
|
|
const char *name = (flags & 8) != 0 ? readStringRef(input, skeletonData) : attachmentName;
|
|
const char *name = (flags & 8) != 0 ? readStringRef(input, skeletonData) : attachmentName;
|
|
- spAttachmentType type = (spAttachmentType)(flags & 0x7);
|
|
|
|
|
|
+ spAttachmentType type = (spAttachmentType) (flags & 0x7);
|
|
|
|
|
|
switch (type) {
|
|
switch (type) {
|
|
case SP_ATTACHMENT_REGION: {
|
|
case SP_ATTACHMENT_REGION: {
|
|
@@ -1420,7 +1420,7 @@ spSkeletonData *spSkeletonBinary_readSkeletonData(spSkeletonBinary *self, const
|
|
data->shearX = readFloat(input);
|
|
data->shearX = readFloat(input);
|
|
data->shearY = readFloat(input);
|
|
data->shearY = readFloat(input);
|
|
data->length = readFloat(input) * self->scale;
|
|
data->length = readFloat(input) * self->scale;
|
|
- data->inherit = (spInherit)readVarint(input, 1);
|
|
|
|
|
|
+ data->inherit = (spInherit) readVarint(input, 1);
|
|
data->skinRequired = readBoolean(input);
|
|
data->skinRequired = readBoolean(input);
|
|
if (nonessential) {
|
|
if (nonessential) {
|
|
readColor(input, &data->color.r, &data->color.g, &data->color.b, &data->color.a);
|
|
readColor(input, &data->color.r, &data->color.g, &data->color.b, &data->color.a);
|
|
@@ -1542,9 +1542,9 @@ spSkeletonData *spSkeletonBinary_readSkeletonData(spSkeletonBinary *self, const
|
|
data->bones[ii] = skeletonData->bones[readVarint(input, 1)];
|
|
data->bones[ii] = skeletonData->bones[readVarint(input, 1)];
|
|
data->target = skeletonData->slots[readVarint(input, 1)];
|
|
data->target = skeletonData->slots[readVarint(input, 1)];
|
|
int flags = readByte(input);
|
|
int flags = readByte(input);
|
|
- data->positionMode = (spPositionMode)(flags & 1);
|
|
|
|
- data->spacingMode = (spSpacingMode)((flags >> 1) & 3);
|
|
|
|
- data->rotateMode = (spRotateMode)((flags >> 3) & 3);
|
|
|
|
|
|
+ data->positionMode = (spPositionMode) (flags & 1);
|
|
|
|
+ data->spacingMode = (spSpacingMode) ((flags >> 1) & 3);
|
|
|
|
+ data->rotateMode = (spRotateMode) ((flags >> 3) & 3);
|
|
if ((flags & 128) != 0) data->offsetRotation = readFloat(input);
|
|
if ((flags & 128) != 0) data->offsetRotation = readFloat(input);
|
|
data->position = readFloat(input);
|
|
data->position = readFloat(input);
|
|
if (data->positionMode == SP_POSITION_MODE_FIXED) data->position *= self->scale;
|
|
if (data->positionMode == SP_POSITION_MODE_FIXED) data->position *= self->scale;
|