summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-06-08 23:40:57 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-06-08 23:40:57 +0000
commitad12251785f1154f7c9ce8cc099fc3e4087a4f0d (patch)
tree82fe1539750f01e5ee4da82124dec1bbffd9631d /src/emu
parent13c37d16c5fb832ee7892d5c9241af7f87d50bb7 (diff)
Remove stray bitmap_free's.
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/crsshair.c6
-rw-r--r--src/emu/rendlay.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/emu/crsshair.c b/src/emu/crsshair.c
index ccda97d9b54..6c674059ee0 100644
--- a/src/emu/crsshair.c
+++ b/src/emu/crsshair.c
@@ -155,8 +155,7 @@ static void create_bitmap(running_machine *machine, int player)
rgb_t color = crosshair_colors[player];
/* if we have a bitmap for this player, kill it */
- if (global.bitmap[player] != NULL)
- bitmap_free(global.bitmap[player]);
+ global_free(global.bitmap[player]);
if (global.name[player][0] != 0)
{
@@ -268,8 +267,7 @@ static void crosshair_exit(running_machine *machine)
render_texture_free(global.texture[player]);
global.texture[player] = NULL;
- if (global.bitmap[player] != NULL)
- bitmap_free(global.bitmap[player]);
+ global_free(global.bitmap[player]);
global.bitmap[player] = NULL;
}
}
diff --git a/src/emu/rendlay.c b/src/emu/rendlay.c
index d1055df8628..5fda2726c65 100644
--- a/src/emu/rendlay.c
+++ b/src/emu/rendlay.c
@@ -1881,7 +1881,7 @@ static bitmap_t *load_component_bitmap(const char *dirname, const char *file, co
/* load the alpha bitmap if specified */
if (render_load_png(OPTION_ARTPATH, dirname, alphafile, bitmap, hasalpha) == NULL)
{
- bitmap_free(bitmap);
+ global_free(bitmap);
bitmap = NULL;
}