Simplified and re-enabled the debug code that shows pixmaps on screen and moved sciprintf() to tools.cpp

svn-id: r40542

1 files changed, 1 insertions, 24 deletions

diff --git a/engines/sci/scicore/sciconsole.h b/engines/sci/scicore/sciconsole.h
index 1f3a4d2d5a..b2060143aa 100644
--- a/engines/sci/scicore/sciconsole.h
+++ b/engines/sci/scicore/sciconsole.h
@@ -35,6 +35,7 @@
 #include "common/scummsys.h"
 
 #include "sci/tools.h"
+#include "sci/engine/state.h"
 #include "sci/engine/vm_types.h"
 
 #define SCI_CONSOLE
@@ -54,15 +55,6 @@ typedef int (*ConCommand)(EngineState *s, const Common::Array<cmd_param_t> &cmdP
 
 /*** FUNCTION DEFINITIONS ***/
 
-void con_set_pixmap_callback(void(*callback)(gfx_pixmap_t *));
-/* Sets the console pixmap callback
-** Parameters: (void -> gfx_pixmap_t *) callback: The closure to invoke after
-**                                      a pixmap has been provided to be
-**                                      published in the on-screen console
-** This sets a single callback function to be used after sciprintf()
-** is used.
-*/
-
 void con_init();
 /* Initializes the command parser
 ** Parameters: (void)
@@ -116,21 +108,6 @@ int con_hook_command(ConCommand command, const char *name, const char *param, co
 ** as no element beyond strlen(cmd_params[x].str)+1 is accessed.
 */
 
-int con_can_handle_pixmaps();
-/* Determines whether the console supports pixmap inserts
-** Returns   : (int) non-zero iff pixmap inserts are supported
-*/
-
-int con_insert_pixmap(gfx_pixmap_t *pixmap);
-/* Inserts a pixmap into the console history buffer
-** Parameters: (gfx_pixmap_t *) pixmap: The pixmap to insert
-** Returns   : (int) 0 on success, non-zero if no receiver for
-**                   the pixmap could not be found
-** The pixmap must be unique; it is freed by the console on demand.
-** Use gfx_clone_pixmap() if neccessary.
-** If the pixmap could not be inserted, the called must destroy it
-*/
-
 int con_hook_page(const char *topic, const char *body);
 /* Hooks a general information page to the manual page system
 ** Parameters: (const char *) topic: The topic name