aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx/resource/res_pic.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-03-14 00:05:01 +0000
committerFilippos Karapetis2009-03-14 00:05:01 +0000
commitb78001f7ca1fb433ce3605fb141ecc18ad436d7c (patch)
tree3457526c72cfa1aedc2bacb958cefd202864efad /engines/sci/gfx/resource/res_pic.cpp
parentf5129b7cb7c4d66e81ba5e6971397b00182a2e61 (diff)
downloadscummvm-rg350-b78001f7ca1fb433ce3605fb141ecc18ad436d7c.tar.gz
scummvm-rg350-b78001f7ca1fb433ce3605fb141ecc18ad436d7c.tar.bz2
scummvm-rg350-b78001f7ca1fb433ce3605fb141ecc18ad436d7c.zip
Changed the "internal" variable inside gfxr_pic_t to priorityTable (cause that's what it is), and changed its type to int * to avoid unneeded casts
svn-id: r39375
Diffstat (limited to 'engines/sci/gfx/resource/res_pic.cpp')
-rw-r--r--engines/sci/gfx/resource/res_pic.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/sci/gfx/resource/res_pic.cpp b/engines/sci/gfx/resource/res_pic.cpp
index a52f877d5b..6ba8ec660a 100644
--- a/engines/sci/gfx/resource/res_pic.cpp
+++ b/engines/sci/gfx/resource/res_pic.cpp
@@ -183,7 +183,7 @@ gfxr_pic_t *gfxr_init_pic(gfx_mode_t *mode, int ID, int sci1) {
pic->undithered_buffer_size = pic->visual_map->index_xl * pic->visual_map->index_yl;
pic->undithered_buffer = NULL;
- pic->internal = NULL;
+ pic->priorityTable = NULL;
return pic;
}
@@ -1717,13 +1717,13 @@ void gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size,
int *pri_table;
p0printf("Explicit priority table @%d\n", pos);
- if (!pic->internal) {
- pic->internal = sci_malloc(16 * sizeof(int));
+ if (!pic->priorityTable) {
+ pic->priorityTable = (int*)sci_malloc(16 * sizeof(int));
} else {
- GFXERROR("pic->internal is not NULL (%p); this only occurs with overlaid pics, otherwise it's a bug", pic->internal);
+ GFXERROR("pic->priorityTable is not NULL (%p); this only occurs with overlaid pics, otherwise it's a bug", pic->priorityTable);
}
- pri_table = (int*)pic->internal;
+ pri_table = pic->priorityTable;
pri_table[0] = 0;
pri_table[15] = 190;
@@ -1739,13 +1739,13 @@ void gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size,
int nr;
int *pri_table;
- if (!pic->internal) {
- pic->internal = sci_malloc(16 * sizeof(int));
+ if (!pic->priorityTable) {
+ pic->priorityTable = (int*)sci_malloc(16 * sizeof(int));
} else {
- GFXERROR("pic->internal is not NULL (%p); possible memory corruption", pic->internal);
+ GFXERROR("pic->priorityTable is not NULL (%p); possible memory corruption", pic->priorityTable);
}
- pri_table = (int*)pic->internal;
+ pri_table = pic->priorityTable;
for (nr = 0; nr < 16; nr ++)
pri_table[nr] = SCI0_PRIORITY_BAND_FIRST_14_ZONES(nr);