SCI: replaced get_int_16 by READ_LE_UINT16, and got rid of inverse_16

svn-id: r39212

6 files changed, 17 insertions, 25 deletions

diff --git a/engines/sci/gfx/gfx_resource.h b/engines/sci/gfx/gfx_resource.h
index c508971c74..584a2a7e64 100644
--- a/engines/sci/gfx/gfx_resource.h
+++ b/engines/sci/gfx/gfx_resource.h
@@ -298,10 +298,6 @@ gfx_pixmap_t *gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode);
 ** the mode has a byte depth of more than 1.
 */
 
-static inline int get_int_16(const byte *offset) {
-	return ((int) offset[0] | (((int) offset[1]) << 8));
-}
-
 } // End of namespace Sci
 
 #endif // SCI_GFX_GFX_RESOURCE_H
diff --git a/engines/sci/gfx/resource/sci_font.cpp b/engines/sci/gfx/resource/sci_font.cpp
index 9813c1350d..c208fe16f0 100644
--- a/engines/sci/gfx/resource/sci_font.cpp
+++ b/engines/sci/gfx/resource/sci_font.cpp
@@ -77,8 +77,8 @@ gfx_bitmap_font_t *gfxr_read_font(int id, byte *resource, int size) {
 		return NULL;
 	}
 
-	font->chars_nr = chars_nr = get_int_16(resource + FONT_MAXCHAR_OFFSET);
-	font->line_height = max_height = get_int_16(resource + FONT_HEIGHT_OFFSET);
+	font->chars_nr = chars_nr = READ_LE_UINT16(resource + FONT_MAXCHAR_OFFSET);
+	font->line_height = max_height = READ_LE_UINT16(resource + FONT_HEIGHT_OFFSET);
 
 	if (chars_nr < 0 || chars_nr > 256 || max_height < 0) {
 		if (chars_nr < 0 || chars_nr > 256)
@@ -99,7 +99,7 @@ gfx_bitmap_font_t *gfxr_read_font(int id, byte *resource, int size) {
 	font->widths = (int*)sci_malloc(sizeof(int) * chars_nr);
 
 	for (i = 0; i < chars_nr; i++) {
-		int offset = get_int_16(resource + (i << 1) + 6);
+		int offset = READ_LE_UINT16(resource + (i << 1) + 6);
 
 		if (offset >= size) {
 			GFXERROR("Font %04x: Error: Character 0x%02x is at offset 0x%04x (beyond 0x%04x)\n", id, i, offset, size);
@@ -128,7 +128,7 @@ gfx_bitmap_font_t *gfxr_read_font(int id, byte *resource, int size) {
 	font->data = (byte *)sci_calloc(font->char_size, chars_nr);
 
 	for (i = 0; i < chars_nr; i++) {
-		int offset = get_int_16(resource + (i << 1) + 6);
+		int offset = READ_LE_UINT16(resource + (i << 1) + 6);
 
 		if (calc_char(font->data + (font->char_size * i), font->row_size, max_height, resource + offset, size - offset)) {
 			GFXERROR("Problem occured in font %04x, char %d/%d\n", id, i, chars_nr);
diff --git a/engines/sci/gfx/resource/sci_resmgr.cpp b/engines/sci/gfx/resource/sci_resmgr.cpp
index 645f24fb2f..97ecfb3d1d 100644
--- a/engines/sci/gfx/resource/sci_resmgr.cpp
+++ b/engines/sci/gfx/resource/sci_resmgr.cpp
@@ -241,8 +241,8 @@ gfx_pixmap_t *gfxr_interpreter_get_cursor(gfx_resstate_t *state, int nr, void *i
 	retval->color_key = GFX_CURSOR_TRANSPARENT;
 
 	if (state->version != SCI_VERSION_0) {
-		retval->xoffset = get_int_16(resource);
-		retval->yoffset = get_int_16(resource + 2);
+		retval->xoffset = READ_LE_UINT16(resource);
+		retval->yoffset = READ_LE_UINT16(resource + 2);
 	} else if (resource[3]) // center
 		retval->xoffset = retval->yoffset = CURSOR_SIZE / 2;
 	else
@@ -252,8 +252,8 @@ gfx_pixmap_t *gfxr_interpreter_get_cursor(gfx_resstate_t *state, int nr, void *i
 
 	data = retval->index_data;
 	for (line = 0; line < 16; line++) {
-		int mask_a = get_int_16(resource + (line << 1));
-		int mask_b = get_int_16(resource + 32 + (line << 1));
+		int mask_a = READ_LE_UINT16(resource + (line << 1));
+		int mask_b = READ_LE_UINT16(resource + 32 + (line << 1));
 		int i;
 
 		for (i = 0; i < 16; i++) {
diff --git a/engines/sci/gfx/resource/sci_view_0.cpp b/engines/sci/gfx/resource/sci_view_0.cpp
index aa99b534f5..8a9c4c024a 100644
--- a/engines/sci/gfx/resource/sci_view_0.cpp
+++ b/engines/sci/gfx/resource/sci_view_0.cpp
@@ -33,8 +33,8 @@
 namespace Sci {
 
 gfx_pixmap_t *gfxr_draw_cel0(int id, int loop, int cel, byte *resource, int size, gfxr_view_t *view, int mirrored) {
-	int xl = get_int_16(resource);
-	int yl = get_int_16(resource + 2);
+	int xl = READ_LE_UINT16(resource);
+	int yl = READ_LE_UINT16(resource + 2);
 	int xhot = ((signed char *)resource)[4];
 	int yhot = ((signed char *)resource)[5];
 	int color_key = resource[6];
@@ -122,7 +122,7 @@ gfx_pixmap_t *gfxr_draw_cel0(int id, int loop, int cel, byte *resource, int size
 
 static int gfxr_draw_loop0(gfxr_loop_t *dest, int id, int loop, byte *resource, int offset, int size, gfxr_view_t *view, int mirrored) {
 	int i;
-	int cels_nr = get_int_16(resource + offset);
+	int cels_nr = READ_LE_UINT16(resource + offset);
 
 	if (READ_LE_UINT16(resource + offset + 2)) {
 		GFXWARN("View %02x:(%d): Gray magic %04x in loop, expected white\n", id, loop, READ_LE_UINT16(resource + offset + 2));
@@ -170,7 +170,7 @@ gfxr_view_t *gfxr_draw_view0(int id, byte *resource, int size, int palette) {
 	gfxr_view_t *view;
 	int mirror_bitpos = 1;
 	int mirror_bytepos = V0_MIRROR_LIST_OFFSET;
-	int palette_ofs = get_int_16(resource + 6);
+	int palette_ofs = READ_LE_UINT16(resource + 6);
 
 	if (size < V0_FIRST_LOOP_OFFSET + 8) {
 		GFXERROR("Attempt to draw empty view %04x\n", id);
diff --git a/engines/sci/gfx/resource/sci_view_1.cpp b/engines/sci/gfx/resource/sci_view_1.cpp
index d013721735..b9f5477bd1 100644
--- a/engines/sci/gfx/resource/sci_view_1.cpp
+++ b/engines/sci/gfx/resource/sci_view_1.cpp
@@ -230,8 +230,8 @@ static int decompress_sci_view_amiga(int id, int loop, int cel, byte *resource,
 }
 
 gfx_pixmap_t *gfxr_draw_cel1(int id, int loop, int cel, int mirrored, byte *resource, int size, gfxr_view_t *view, int amiga_game) {
-	int xl = get_int_16(resource);
-	int yl = get_int_16(resource + 2);
+	int xl = READ_LE_UINT16(resource);
+	int yl = READ_LE_UINT16(resource + 2);
 	int xhot = (int8) resource[4];
 	int yhot = (uint8) resource[5];
 	int pos = 8;
@@ -274,7 +274,7 @@ gfx_pixmap_t *gfxr_draw_cel1(int id, int loop, int cel, int mirrored, byte *reso
 
 static int gfxr_draw_loop1(gfxr_loop_t *dest, int id, int loop, int mirrored, byte *resource, int offset, int size, gfxr_view_t *view, int amiga_game) {
 	int i;
-	int cels_nr = get_int_16(resource + offset);
+	int cels_nr = READ_LE_UINT16(resource + offset);
 
 	if (READ_LE_UINT16(resource + offset + 2)) {
 		GFXWARN("View %02x:(%d): Gray magic %04x in loop, expected white\n", id, loop, READ_LE_UINT16(resource + offset + 2));
diff --git a/engines/sci/scicore/vocab.cpp b/engines/sci/scicore/vocab.cpp
index 3955952b98..b7a9401300 100644
--- a/engines/sci/scicore/vocab.cpp
+++ b/engines/sci/scicore/vocab.cpp
@@ -154,10 +154,6 @@ const char *vocab_get_any_group_word(int group, word_t **words, int words_nr) {
 	return "{invalid}";
 }
 
-static inline unsigned int inverse_16(unsigned int foo) {
-	return (((foo & 0xff) << 8) | ((foo & 0xff00) >> 8));
-}
-
 suffix_t **vocab_get_suffices(ResourceManager *resmgr, int *suffices_nr) {
 	int counter = 0;
 	suffix_t **suffices;
@@ -191,10 +187,10 @@ suffix_t **vocab_get_suffices(ResourceManager *resmgr, int *suffices_nr) {
 
 		suffices[counter]->alt_suffix_length = alt_len;
 		suffices[counter]->word_suffix_length = word_len;
-		suffices[counter]->class_mask = inverse_16((int16)READ_LE_UINT16(resource->data + seeker)); // Inverse endianness
+		suffices[counter]->class_mask = (int16)READ_BE_UINT16(resource->data + seeker);
 
 		seeker += word_len + 4;
-		suffices[counter]->result_class = inverse_16((int16)READ_LE_UINT16(resource->data + seeker));
+		suffices[counter]->result_class = (int16)READ_BE_UINT16(resource->data + seeker);
 		seeker += 3; // Next entry
 
 		++counter;