Fix compilation. How ugly without templates. Yuck!

svn-id: r38228

5 files changed, 30 insertions, 30 deletions

diff --git a/engines/sci/gfx/gfx_resource.cpp b/engines/sci/gfx/gfx_resource.cpp
index 3c1bf50326..ed4a827916 100644
--- a/engines/sci/gfx/gfx_resource.cpp
+++ b/engines/sci/gfx/gfx_resource.cpp
@@ -224,7 +224,7 @@ gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode)
 #define FUNCNAME_LINEAR _gfx_xlate_pixmap_linear_1
 #define FUNCNAME_TRILINEAR _gfx_xlate_pixmap_trilinear_1
 #define COPY_BYTES 1
-#include "gfx_pixmap_scale.c"
+#include "gfx_pixmap_scale.cpp"
 #undef COPY_BYTES
 
 #define SIZETYPE guint16
@@ -232,7 +232,7 @@ gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode)
 #define FUNCNAME_LINEAR _gfx_xlate_pixmap_linear_2
 #define FUNCNAME_TRILINEAR _gfx_xlate_pixmap_trilinear_2
 #define COPY_BYTES 2
-#include "gfx_pixmap_scale.c"
+#include "gfx_pixmap_scale.cpp"
 #undef COPY_BYTES
 
 #ifdef WORDS_BIGENDIAN
@@ -244,7 +244,7 @@ gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode)
 #define FUNCNAME_LINEAR _gfx_xlate_pixmap_linear_3
 #define FUNCNAME_TRILINEAR _gfx_xlate_pixmap_trilinear_3
 #define COPY_BYTES 3
-#include "gfx_pixmap_scale.c"
+#include "gfx_pixmap_scale.cpp"
 #undef COPY_BYTES
 #ifdef WORDS_BIGENDIAN
 # undef EXTRA_BYTE_OFFSET
@@ -256,7 +256,7 @@ gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode)
 #define FUNCNAME_LINEAR _gfx_xlate_pixmap_linear_4
 #define FUNCNAME_TRILINEAR _gfx_xlate_pixmap_trilinear_4
 #define COPY_BYTES 4
-#include "gfx_pixmap_scale.c"
+#include "gfx_pixmap_scale.cpp"
 #undef COPY_BYTES
 #undef EXTRA_BYTE_OFFSET
 #undef SIZETYPE
diff --git a/engines/sci/gfx/gfx_support.cpp b/engines/sci/gfx/gfx_support.cpp
index 8a1e86e19f..5f6037a4e8 100644
--- a/engines/sci/gfx/gfx_support.cpp
+++ b/engines/sci/gfx/gfx_support.cpp
@@ -39,25 +39,25 @@ int gfx_crossblit_alpha_threshold = 128;
 
 #define DRAWLINE_FUNC _gfx_draw_line_buffer_1
 #define PIXELWIDTH 1
-#include "gfx_line.c"
+#include "gfx_line.cpp"
 #undef PIXELWIDTH
 #undef DRAWLINE_FUNC
 
 #define DRAWLINE_FUNC _gfx_draw_line_buffer_2
 #define PIXELWIDTH 2
-#include "gfx_line.c"
+#include "gfx_line.cpp"
 #undef PIXELWIDTH
 #undef DRAWLINE_FUNC
 
 #define DRAWLINE_FUNC _gfx_draw_line_buffer_3
 #define PIXELWIDTH 3
-#include "gfx_line.c"
+#include "gfx_line.cpp"
 #undef PIXELWIDTH
 #undef DRAWLINE_FUNC
 
 #define DRAWLINE_FUNC _gfx_draw_line_buffer_4
 #define PIXELWIDTH 4
-#include "gfx_line.c"
+#include "gfx_line.cpp"
 #undef PIXELWIDTH
 #undef DRAWLINE_FUNC
 
@@ -133,25 +133,25 @@ gfx_draw_box_pixmap_i(gfx_pixmap_t *pxm, rect_t box, int color)
 
 # define FUNCTION_NAME _gfx_crossblit_8
 # define BYTESPP 1
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_16
 # define BYTESPP 2
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_24
 # define BYTESPP 3
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_32
 # define BYTESPP 4
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 #define USE_PRIORITY
 
@@ -159,25 +159,25 @@ gfx_draw_box_pixmap_i(gfx_pixmap_t *pxm, rect_t box, int color)
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_8_P
 # define BYTESPP 1
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_16_P
 # define BYTESPP 2
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_24_P
 # define BYTESPP 3
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_32_P
 # define BYTESPP 4
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 #undef USE_PRIORITY
 #undef FUNCTION_NAME
@@ -192,25 +192,25 @@ gfx_draw_box_pixmap_i(gfx_pixmap_t *pxm, rect_t box, int color)
 #define REVERSE_ALPHA
 # define FUNCTION_NAME _gfx_crossblit_8_RA
 # define BYTESPP 1
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_16_RA
 # define BYTESPP 2
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_24_RA
 # define BYTESPP 3
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_32_RA
 # define BYTESPP 4
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 #define USE_PRIORITY
 
@@ -218,25 +218,25 @@ gfx_draw_box_pixmap_i(gfx_pixmap_t *pxm, rect_t box, int color)
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_8_P_RA
 # define BYTESPP 1
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_16_P_RA
 # define BYTESPP 2
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_24_P_RA
 # define BYTESPP 3
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 # undef FUNCTION_NAME
 # undef BYTESPP
 # define FUNCTION_NAME _gfx_crossblit_32_P_RA
 # define BYTESPP 4
-# include "gfx_crossblit.c"
+# include "gfx_crossblit.cpp"
 
 #undef USE_PRIORITY
 #undef FUNCTION_NAME
diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp
index a55265c7ef..6bb6d6f6f7 100644
--- a/engines/sci/gfx/resource/sci_pic_0.cpp
+++ b/engines/sci/gfx/resource/sci_pic_0.cpp
@@ -1221,8 +1221,8 @@ _gfxr_find_fill_point(gfxr_pic_t *pic, int min_x, int min_y, int max_x, int max_
 #define AUXBUF_FILL_HELPER _gfxr_auxbuf_fill_any_recursive
 #define AUXBUF_FILL _gfxr_auxbuf_fill_any
 #define DRAW_SCALED
-# include "sci_picfill_aux.c"
-# include "sci_picfill.c"
+# include "sci_picfill_aux.cpp"
+# include "sci_picfill.cpp"
 #undef DRAW_SCALED
 #undef AUXBUF_FILL
 #undef AUXBUF_FILL_HELPER
@@ -1236,8 +1236,8 @@ _gfxr_find_fill_point(gfxr_pic_t *pic, int min_x, int min_y, int max_x, int max_
 #define FILL_FUNCTION_RECURSIVE _gfxr_fill_1_recursive
 #define AUXBUF_FILL_HELPER _gfxr_auxbuf_fill_1_recursive
 #define AUXBUF_FILL _gfxr_auxbuf_fill_1
-# include "sci_picfill_aux.c"
-# include "sci_picfill.c"
+# include "sci_picfill_aux.cpp"
+# include "sci_picfill.cpp"
 #undef AUXBUF_FILL
 #undef AUXBUF_FILL_HELPER
 #undef FILL_FUNCTION_RECURSIVE
diff --git a/engines/sci/scicore/int_hashmap.cpp b/engines/sci/scicore/int_hashmap.cpp
index d170afd3d5..a0d7c75958 100644
--- a/engines/sci/scicore/int_hashmap.cpp
+++ b/engines/sci/scicore/int_hashmap.cpp
@@ -28,6 +28,6 @@
 #define BUILD_MAP_FUNCTIONS
 #include "sci/include/int_hashmap.h"
 
-#include "sci/scicore/hashmap.c"
+#include "sci/scicore/hashmap.cpp"
 
 DEFINE_FUNCTIONS(int)
diff --git a/engines/sci/scicore/reg_t_hashmap.cpp b/engines/sci/scicore/reg_t_hashmap.cpp
index bee5a8bcf2..5ab2395909 100644
--- a/engines/sci/scicore/reg_t_hashmap.cpp
+++ b/engines/sci/scicore/reg_t_hashmap.cpp
@@ -28,7 +28,7 @@
 #define BUILD_MAP_FUNCTIONS
 #include "sci/include/reg_t_hashmap.h"
 
-#include "sci/scicore/hashmap.c"
+#include "sci/scicore/hashmap.cpp"
 
 static inline int
 compare_reg_t (reg_t lhs, reg_t rhs)