projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed some global variables from function parameters
[rocksndiamonds.git]
/
src
/
libgame
/
image.c
diff --git
a/src/libgame/image.c
b/src/libgame/image.c
index 16b4574dab2022311cca9d25931efb07c16f56c5..76d9b183b730b1ef85511a101d869038b18aa8c9 100644
(file)
--- a/
src/libgame/image.c
+++ b/
src/libgame/image.c
@@
-351,11
+351,11
@@
void CreateImageWithSmallImages(int pos, int zoom_factor, int tile_size)
setString(&img_info->leveldir, leveldir_current->identifier);
}
setString(&img_info->leveldir, leveldir_current->identifier);
}
-
static void CreateImageTexturesExt(int pos, boolean force
)
+
void CreateImageTextures(int pos
)
{
ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
{
ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
- if (img_info == NULL ||
(img_info->contains_textures && !force)
)
+ if (img_info == NULL ||
img_info->contains_textures
)
return;
CreateBitmapTextures(img_info->bitmaps);
return;
CreateBitmapTextures(img_info->bitmaps);
@@
-363,14
+363,25
@@
static void CreateImageTexturesExt(int pos, boolean force)
img_info->contains_textures = TRUE;
}
img_info->contains_textures = TRUE;
}
-void
Creat
eImageTextures(int pos)
+void
Fre
eImageTextures(int pos)
{
{
- CreateImageTexturesExt(pos, FALSE);
+ ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
+
+ if (img_info == NULL || !img_info->contains_textures)
+ return;
+
+ FreeBitmapTextures(img_info->bitmaps);
+
+ img_info->contains_textures = FALSE;
}
}
-void
ReCreateImageTextures(int pos
)
+void
FreeAllImageTextures(
)
{
{
- CreateImageTexturesExt(pos, TRUE);
+ int num_images = getImageListSize();
+ int i;
+
+ for (i = 0; i < num_images; i++)
+ FreeImageTextures(i);
}
void ScaleImage(int pos, int zoom_factor)
}
void ScaleImage(int pos, int zoom_factor)