[Scummvm-cvs-logs] SF.net SVN: scummvm:[38452] scummvm/trunk/engines/sci
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Feb 18 00:12:29 CET 2009
Revision: 38452
http://scummvm.svn.sourceforge.net/scummvm/?rev=38452&view=rev
Author: thebluegr
Date: 2009-02-17 23:12:29 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sci/gfx/gfx_driver.cpp
scummvm/trunk/engines/sci/gfx/operations.cpp
scummvm/trunk/engines/sci/include/gfx_driver.h
scummvm/trunk/engines/sci/include/gfx_system.h
Modified: scummvm/trunk/engines/sci/gfx/gfx_driver.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_driver.cpp 2009-02-17 22:53:09 UTC (rev 38451)
+++ scummvm/trunk/engines/sci/gfx/gfx_driver.cpp 2009-02-17 23:12:29 UTC (rev 38452)
@@ -521,10 +521,6 @@
gfx_driver_t
gfx_driver_scummvm = {
- "ScummVM",
- "0.1",
- SCI_GFX_DRIVER_MAGIC,
- SCI_GFX_DRIVER_VERSION,
NULL,
0, 0,
0, // flags here
Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp 2009-02-17 22:53:09 UTC (rev 38451)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp 2009-02-17 23:12:29 UTC (rev 38452)
@@ -1540,9 +1540,6 @@
draw_old = state->mouse_pointer != NULL;
- if (draw_old && state->mouse_pointer->colors_nr > 2)
- draw_old = 1;
-
if (!draw_old
&& state->mouse_pointer
&& (state->driver->capabilities & GFX_CAPABILITY_POINTER_PIXMAP_REGISTRY))
Modified: scummvm/trunk/engines/sci/include/gfx_driver.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_driver.h 2009-02-17 22:53:09 UTC (rev 38451)
+++ scummvm/trunk/engines/sci/include/gfx_driver.h 2009-02-17 23:12:29 UTC (rev 38452)
@@ -74,22 +74,8 @@
** must use a reasonable default value.
*/
-#define SCI_GFX_DRIVER_VERSION 0
-#define SCI_GFX_DRIVER_MAGIC 0xf001337
-
typedef struct _gfx_driver { /* Graphics driver */
- const char *name; /* Graphics driver name. Unique identifier, should consist of
- ** lower-case (where applicable) alphanumerics
- */
-
- const char *version; /* Free-form version description (for informative purposes
- ** only)
- */
-
- int sci_driver_magic; /* SCI_GFX_DRIVER_MAGIC */
- int sci_driver_version; /* SCI_GFX_DRIVER_VERSION */
-
gfx_mode_t *mode; /* Currently active mode, NULL if no mode is active */
int pointer_x, pointer_y; /* Mouse pointer position */
Modified: scummvm/trunk/engines/sci/include/gfx_system.h
===================================================================
--- scummvm/trunk/engines/sci/include/gfx_system.h 2009-02-17 22:53:09 UTC (rev 38451)
+++ scummvm/trunk/engines/sci/include/gfx_system.h 2009-02-17 23:12:29 UTC (rev 38452)
@@ -35,15 +35,6 @@
#define GFX_DEBUG
/* General output macros */
-#ifdef __GNUC__
-# define GFXERROR gfxprintf("GFX Error: %s, %s() L%d:", __FILE__, __FUNCTION__, __LINE__); sciprintf
-# define GFXWARN gfxprintf("GFX Warning: %s, %s() L%d:", __FILE__, __FUNCTION__, __LINE__); sciprintf
-# ifdef GFX_DEBUG
-# define GFXDEBUG gfxprintf("GFX-debug: %s, %s() L%d:", __FILE__, __FUNCTION__, __LINE__); sciprintf
-# else /* !GFX_DEBUG */
-# define GFXDEBUG if (0) printf
-# endif /* !GFX_DEBUG */
-#else /* !__GNUC__ */
# define GFXERROR gfxprintf("GFX Error: %s, L%d:", __FILE__, __LINE__); sciprintf
# define GFXWARN gfxprintf("GFX Warning: %s, L%d:", __FILE__, __LINE__); sciprintf
# ifdef GFX_DEBUG
@@ -51,7 +42,6 @@
# else /* !GFX_DEBUG */
# define GFXDEBUG if (0) printf
# endif /* !GFX_DEBUG */
-#endif /* !__GNUC__ */
/***********************/
/*** Data structures ***/
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