Changes were made to allow compilation in Carbide C++ 2.7 and the Nokia S60v5 SDK. Important code from the OpenGL ES 1.1 backend was commented out since it prevented compilation

This commit is contained in:
Dante Leoncini 2026-05-01 07:16:02 -03:00
parent 558f1b9f32
commit 33a8324d08
48 changed files with 486 additions and 295 deletions

View file

@ -84,7 +84,11 @@ public:
inline float GetTimeLeft() { return hierarchy->totalLength - currentTime; }
static CAnimBlendAssociation *FromLink(CAnimBlendLink *l) {
return (CAnimBlendAssociation*)((uint8*)l - offsetof(CAnimBlendAssociation, link));
#ifdef S60V5
return (CAnimBlendAssociation*)((uint8*)l - OFFSET_OF(CAnimBlendAssociation, link));
#else
return (CAnimBlendAssociation*)((uint8*)l - offsetof(CAnimBlendAssociation, link));
#endif
}
};

View file

@ -30,4 +30,4 @@ public:
void MoveMemory(bool onlyone = false);
};
VALIDATE_SIZE(CAnimBlendHierarchy, 0x28);
VALIDATE_SIZE(CAnimBlendHierarchy, 0x28);

View file

@ -207,4 +207,4 @@ enum AnimationId
ANIM_STD_PHONE_TALK,
ANIM_STD_NUM
};
};