PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2024-12-05 00:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

character: mark spritesheets loaded from bitmaps as shared, so the bitmaps don't get destroyed

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2019-06-25 05:12:04 +02:00
parent 8e49e5e2ee
commit 94de1c5975
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/character.c
View file

@ -192,6 +192,7 @@ SYMBOL_EXPORT void RegisterSpritesheet(struct Game* game, struct Character* char
snprintf(filename, 255, "sprites/%s/%s.ini", character->name, name);
ALLEGRO_CONFIG* config = al_load_config_file(GetDataFilePath(game, filename));
s = malloc(sizeof(struct Spritesheet));
s->shared = false;
s->name = strdup(name);
s->bitmap = NULL;
s->frame_count = strtolnull(al_get_config_value(config, "animation", "frames"), 0);
@ -337,6 +338,7 @@ SYMBOL_EXPORT void RegisterSpritesheetFromBitmap(struct Game* game, struct Chara
s->pivotY = 0.5;
s->offsetX = 0;
s->offsetY = 0;
s->shared = true;
s->frames = malloc(sizeof(struct SpritesheetFrame) * s->frame_count);
@ -426,7 +428,7 @@ SYMBOL_EXPORT void DestroyCharacter(struct Game* game, struct Character* charact
free(tmp->file);
}
for (int i = 0; i < tmp->frame_count; i++) {
if (tmp->frames[i].filepath) {
if (tmp->frames[i].filepath && !tmp->shared) {
RemoveBitmap(game, tmp->frames[i].filepath);
} else {
al_destroy_bitmap(tmp->frames[i].bitmap);
@ -438,7 +440,7 @@ SYMBOL_EXPORT void DestroyCharacter(struct Game* game, struct Character* charact
free(tmp->frames[i].filepath);
}
}
if (tmp->bitmap) {
if (tmp->bitmap && !tmp->shared) {
RemoveBitmap(game, tmp->filepath);
}
if (tmp->filepath) {

1
src/character.h
View file

@ -63,6 +63,7 @@ struct Spritesheet {
bool flipX;
bool flipY;
struct SpritesheetFrame* frames;
bool shared; /*!< Marks the spritesheet bitmaps as shared, so they won't be freed together with the spritesheet. */
int width;
int height;