diff options
| author | Filippos Karapetis | 2009-02-17 23:12:29 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-02-17 23:12:29 +0000 |
| commit | 143a539ee3f2b4563866833089e2415bdd8691bb (patch) | |
| tree | 23e2bbdf9e3c4f9f2f5d6a0d9c241038b4c185fb | |
| parent | 53ef1bd4fd6d588e460db54995d8aa24f30b6513 (diff) | |
| download | scummvm-rg350-143a539ee3f2b4563866833089e2415bdd8691bb.tar.gz scummvm-rg350-143a539ee3f2b4563866833089e2415bdd8691bb.tar.bz2 scummvm-rg350-143a539ee3f2b4563866833089e2415bdd8691bb.zip | |
Cleanup
svn-id: r38452
| -rw-r--r-- | engines/sci/gfx/gfx_driver.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/gfx/operations.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/include/gfx_driver.h | 14 | ||||
| -rw-r--r-- | engines/sci/include/gfx_system.h | 10 |
4 files changed, 0 insertions, 31 deletions
diff --git a/engines/sci/gfx/gfx_driver.cpp b/engines/sci/gfx/gfx_driver.cpp index 453af11f9b..aed180a2df 100644 --- a/engines/sci/gfx/gfx_driver.cpp +++ b/engines/sci/gfx/gfx_driver.cpp @@ -521,10 +521,6 @@ scummvm_usec_sleep(struct _gfx_driver *drv, long usecs) { gfx_driver_t gfx_driver_scummvm = { - "ScummVM", - "0.1", - SCI_GFX_DRIVER_MAGIC, - SCI_GFX_DRIVER_VERSION, NULL, 0, 0, 0, // flags here diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index edcf76f6dd..0bf4954b83 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -1540,9 +1540,6 @@ _gfxop_set_pointer(gfx_state_t *state, gfx_pixmap_t *pxm) { 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)) diff --git a/engines/sci/include/gfx_driver.h b/engines/sci/include/gfx_driver.h index fc6d4a0025..27327f9733 100644 --- a/engines/sci/include/gfx_driver.h +++ b/engines/sci/include/gfx_driver.h @@ -74,22 +74,8 @@ typedef enum { ** 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 */ diff --git a/engines/sci/include/gfx_system.h b/engines/sci/include/gfx_system.h index 07888b832f..33bfcf64cf 100644 --- a/engines/sci/include/gfx_system.h +++ b/engines/sci/include/gfx_system.h @@ -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 ***/ |