|
@@ -32,13 +32,13 @@ namespace spine {
|
|
|
#endif
|
|
|
|
|
|
typedef struct _AttachmentLoaderVtable {
|
|
|
- Attachment* (*newAttachment) (AttachmentLoader* self, AttachmentType type, const char* name);
|
|
|
+ Attachment* (*newAttachment) (AttachmentLoader* self, Skin* skin, AttachmentType type, const char* name);
|
|
|
void (*dispose) (AttachmentLoader* self);
|
|
|
} _AttachmentLoaderVtable;
|
|
|
|
|
|
void _AttachmentLoader_init (AttachmentLoader* self, //
|
|
|
void (*dispose) (AttachmentLoader* self), //
|
|
|
- Attachment* (*newAttachment) (AttachmentLoader* self, AttachmentType type, const char* name)) {
|
|
|
+ Attachment* (*newAttachment) (AttachmentLoader* self, Skin* skin, AttachmentType type, const char* name)) {
|
|
|
CONST_CAST(_AttachmentLoaderVtable*, self->vtable) = NEW(_AttachmentLoaderVtable);
|
|
|
VTABLE(AttachmentLoader, self) ->dispose = dispose;
|
|
|
VTABLE(AttachmentLoader, self) ->newAttachment = newAttachment;
|
|
@@ -54,12 +54,12 @@ void AttachmentLoader_dispose (AttachmentLoader* self) {
|
|
|
VTABLE(AttachmentLoader, self) ->dispose(self);
|
|
|
}
|
|
|
|
|
|
-Attachment* AttachmentLoader_newAttachment (AttachmentLoader* self, AttachmentType type, const char* name) {
|
|
|
+Attachment* AttachmentLoader_newAttachment (AttachmentLoader* self, Skin* skin, AttachmentType type, const char* name) {
|
|
|
FREE(self->error1);
|
|
|
FREE(self->error2);
|
|
|
self->error1 = 0;
|
|
|
self->error2 = 0;
|
|
|
- return VTABLE(AttachmentLoader, self) ->newAttachment(self, type, name);
|
|
|
+ return VTABLE(AttachmentLoader, self) ->newAttachment(self, skin, type, name);
|
|
|
}
|
|
|
|
|
|
void _AttachmentLoader_setError (AttachmentLoader* self, const char* error1, const char* error2) {
|