From 1e29983d8e1b29adb75d478454be79dce7a113b4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 7 Mar 2009 16:14:20 +0000
Subject: Replaced getInt16, getUInt16 and putInt16

svn-id: r39189
---
 engines/sci/gfx/resource/sci_pal_1.cpp |  2 +-
 engines/sci/gfx/resource/sci_pic_0.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/sci/gfx/resource')

diff --git a/engines/sci/gfx/resource/sci_pal_1.cpp b/engines/sci/gfx/resource/sci_pal_1.cpp
index fdd11e2474..c448550655 100644
--- a/engines/sci/gfx/resource/sci_pal_1.cpp
+++ b/engines/sci/gfx/resource/sci_pal_1.cpp
@@ -45,7 +45,7 @@ gfx_pixmap_color_t *gfxr_read_pal11(int id, int *colors_nr, byte *resource, int
 	int entry_size = 0;
 	gfx_pixmap_color_t *retval;
 	byte *pal_data = resource + 37;
-	int _colors_nr = *colors_nr = getUInt16(resource + 29);
+	int _colors_nr = *colors_nr = READ_LE_UINT16(resource + 29);
 	int i;
 
 	switch (format) {
diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp
index 85c246dc4e..f4f0027b3d 100644
--- a/engines/sci/gfx/resource/sci_pic_0.cpp
+++ b/engines/sci/gfx/resource/sci_pic_0.cpp
@@ -1735,8 +1735,8 @@ void gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size,
 			goto end_op_loop;
 
 			case PIC_SCI1_OPX_PRIORITY_TABLE_EQDIST: {
-				int first = getInt16(resource + pos);
-				int last = getInt16(resource + pos + 2);
+				int first = (int16)READ_LE_UINT16(resource + pos);
+				int last = (int16)READ_LE_UINT16(resource + pos + 2);
 				int nr;
 				int *pri_table;
 
@@ -1778,10 +1778,10 @@ end_op_loop: {}
 
 void gfxr_draw_pic11(gfxr_pic_t *pic, int flags, int default_palette, int size, byte *resource,
 					 gfxr_pic0_params_t *style, int resid, gfx_pixmap_color_t *static_pal, int static_pal_nr) {
-	int has_bitmap = getUInt16(resource + 4);
-	int vector_data_ptr = getUInt16(resource + 16);
-	int palette_data_ptr = getUInt16(resource + 28);
-	int bitmap_data_ptr = getUInt16(resource + 32);
+	int has_bitmap = READ_LE_UINT16(resource + 4);
+	int vector_data_ptr = READ_LE_UINT16(resource + 16);
+	int palette_data_ptr = READ_LE_UINT16(resource + 28);
+	int bitmap_data_ptr = READ_LE_UINT16(resource + 32);
 	int sci_titlebar_size = style->pic_port_bounds.y;
 	//gfx_mode_t *mode;
 	gfx_pixmap_t *view = NULL;
-- 
cgit v1.2.3