mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-19 02:38:32 +00:00
Cleanup
svn-id: r38452
This commit is contained in:
parent
53ef1bd4fd
commit
143a539ee3
engines/sci
@ -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
|
||||
|
@ -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))
|
||||
|
@ -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 */
|
||||
|
@ -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 ***/
|
||||
|
Loading…
x
Reference in New Issue
Block a user