[Scummvm-cvs-logs] SF.net SVN: scummvm:[38228] scummvm/trunk/engines/sci
sev at users.sourceforge.net
sev at users.sourceforge.net
Sun Feb 15 12:44:14 CET 2009
Revision: 38228
http://scummvm.svn.sourceforge.net/scummvm/?rev=38228&view=rev
Author: sev
Date: 2009-02-15 11:44:14 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Fix compilation. How ugly without templates. Yuck!
Modified Paths:
--------------
scummvm/trunk/engines/sci/gfx/gfx_resource.cpp
scummvm/trunk/engines/sci/gfx/gfx_support.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp
scummvm/trunk/engines/sci/scicore/int_hashmap.cpp
scummvm/trunk/engines/sci/scicore/reg_t_hashmap.cpp
Modified: scummvm/trunk/engines/sci/gfx/gfx_resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resource.cpp 2009-02-15 11:39:07 UTC (rev 38227)
+++ scummvm/trunk/engines/sci/gfx/gfx_resource.cpp 2009-02-15 11:44:14 UTC (rev 38228)
@@ -224,7 +224,7 @@
#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 @@
#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 @@
#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 @@
#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
Modified: scummvm/trunk/engines/sci/gfx/gfx_support.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_support.cpp 2009-02-15 11:39:07 UTC (rev 38227)
+++ scummvm/trunk/engines/sci/gfx/gfx_support.cpp 2009-02-15 11:44:14 UTC (rev 38228)
@@ -39,25 +39,25 @@
#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 @@
# 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 @@
# 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 @@
#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 @@
# 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
Modified: scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp 2009-02-15 11:39:07 UTC (rev 38227)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp 2009-02-15 11:44:14 UTC (rev 38228)
@@ -1221,8 +1221,8 @@
#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 @@
#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
Modified: scummvm/trunk/engines/sci/scicore/int_hashmap.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/int_hashmap.cpp 2009-02-15 11:39:07 UTC (rev 38227)
+++ scummvm/trunk/engines/sci/scicore/int_hashmap.cpp 2009-02-15 11:44:14 UTC (rev 38228)
@@ -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)
Modified: scummvm/trunk/engines/sci/scicore/reg_t_hashmap.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/reg_t_hashmap.cpp 2009-02-15 11:39:07 UTC (rev 38227)
+++ scummvm/trunk/engines/sci/scicore/reg_t_hashmap.cpp 2009-02-15 11:44:14 UTC (rev 38228)
@@ -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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list