[Scummvm-cvs-logs] SF.net SVN: scummvm:[46426] scummvm/trunk/engines/sci
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sun Dec 20 13:43:37 CET 2009
Revision: 46426
http://scummvm.svn.sourceforge.net/scummvm/?rev=46426&view=rev
Author: thebluegr
Date: 2009-12-20 12:43:36 +0000 (Sun, 20 Dec 2009)
Log Message:
-----------
Removed dead code
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kernel.h
scummvm/trunk/engines/sci/gfx/gfx_driver.h
scummvm/trunk/engines/sci/gfx/operations.h
Removed Paths:
-------------
scummvm/trunk/engines/sci/uinput.h
Modified: scummvm/trunk/engines/sci/engine/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.h 2009-12-20 07:10:32 UTC (rev 46425)
+++ scummvm/trunk/engines/sci/engine/kernel.h 2009-12-20 12:43:36 UTC (rev 46426)
@@ -30,7 +30,7 @@
#include "common/debug.h"
#include "common/rect.h"
-#include "sci/uinput.h"
+#include "sci/sci.h" // for USE_OLD_MUSIC_FUNCTIONS
#include "sci/vocabulary.h"
#include "sci/engine/vm_types.h" // for reg_t
#include "sci/engine/vm.h"
@@ -235,6 +235,7 @@
extern Common::Rect get_nsrect(EngineState *s, reg_t object, byte clip);
+#ifdef USE_OLD_MUSIC_FUNCTIONS
/******************** Misc functions ********************/
/**
@@ -243,6 +244,7 @@
void process_sound_events(EngineState *s);
/******************** Constants ********************/
+#endif
/* Maximum length of a savegame name (including terminator character) */
#define SCI_MAX_SAVENAME_LENGTH 0x24
Modified: scummvm/trunk/engines/sci/gfx/gfx_driver.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_driver.h 2009-12-20 07:10:32 UTC (rev 46425)
+++ scummvm/trunk/engines/sci/gfx/gfx_driver.h 2009-12-20 12:43:36 UTC (rev 46426)
@@ -30,7 +30,6 @@
#define SCI_GFX_GFX_DRIVER_H
#include "sci/gfx/gfx_system.h"
-#include "sci/uinput.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/gfx/operations.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.h 2009-12-20 07:10:32 UTC (rev 46425)
+++ scummvm/trunk/engines/sci/gfx/operations.h 2009-12-20 12:43:36 UTC (rev 46426)
@@ -34,7 +34,6 @@
#include "sci/gfx/gfx_tools.h"
#include "sci/gfx/gfx_system.h"
#endif
-#include "sci/uinput.h"
#include "common/list.h"
Deleted: scummvm/trunk/engines/sci/uinput.h
===================================================================
--- scummvm/trunk/engines/sci/uinput.h 2009-12-20 07:10:32 UTC (rev 46425)
+++ scummvm/trunk/engines/sci/uinput.h 2009-12-20 12:43:36 UTC (rev 46426)
@@ -1,118 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef SCI_UINPUT_H
-#define SCI_UINPUT_H
-
-namespace Sci {
-
-#if 0
-#define SCI_INPUT_DEFAULT_CLOCKTIME 100000
-#define SCI_INPUT_DEFAULT_REDRAWTIME 30000
-
-struct sci_event_t {
- short type;
- short data;
- short buckybits;
- short character; /* for keyboard events: 'data' after applying
- ** the effects of 'buckybits', e.g. if
- ** type == SCI_EVT_KEYBOARD
- ** data == 'a'
- ** buckybits == SCI_EVM_LSHIFT
- ** then
- ** character == 'A'
- ** For 'Alt', characters are interpreted by their
- ** PC keyboard scancodes.
- */
-};
-
-/*Values for type*/
-#define SCI_EVT_NONE 0
-#define SCI_EVT_MOUSE_PRESS (1<<0)
-#define SCI_EVT_MOUSE_RELEASE (1<<1)
-#define SCI_EVT_KEYBOARD (1<<2)
-#define SCI_EVT_JOYSTICK (1<<6)
-#define SCI_EVT_SAID (1<<7)
-/*Fake values for other events*/
-#define SCI_EVT_ERROR (1<<10)
-#define SCI_EVT_QUIT (1<<11)
-#define SCI_EVT_PEEK (1<<15)
-/* The QUIT event may be used to signal an external 'quit' command being
-** issued to the gfx driver. */
-#define SCI_EVT_ANY 0x7fff
-
-
-
-/* Keycodes of special keys: */
-#define SCI_K_ESC 27
-#define SCI_K_BACKSPACE 8
-#define SCI_K_ENTER 13
-#define SCI_K_TAB '\t'
-#define SCI_K_SHIFT_TAB (0xf << 8)
-
-#define SCI_K_HOME (71 << 8) // 7
-#define SCI_K_UP (72 << 8) // 8
-#define SCI_K_PGUP (73 << 8) // 9
-//
-#define SCI_K_LEFT (75 << 8) // 4
-#define SCI_K_CENTER (76 << 8) // 5
-#define SCI_K_RIGHT (77 << 8) // 6
-//
-#define SCI_K_END (79 << 8) // 1
-#define SCI_K_DOWN (80 << 8) // 2
-#define SCI_K_PGDOWN (81 << 8) // 3
-//
-#define SCI_K_INSERT (82 << 8) // 0
-#define SCI_K_DELETE (83 << 8) // .
-
-#define SCI_K_F1 (59<<8)
-#define SCI_K_F2 (60<<8)
-#define SCI_K_F3 (61<<8)
-#define SCI_K_F4 (62<<8)
-#define SCI_K_F5 (63<<8)
-#define SCI_K_F6 (64<<8)
-#define SCI_K_F7 (65<<8)
-#define SCI_K_F8 (66<<8)
-#define SCI_K_F9 (67<<8)
-#define SCI_K_F10 (68<<8)
-
-/*Values for buckybits */
-#define SCI_EVM_RSHIFT (1<<0)
-#define SCI_EVM_LSHIFT (1<<1)
-#define SCI_EVM_CTRL (1<<2)
-#define SCI_EVM_ALT (1<<3)
-#define SCI_EVM_SCRLOCK (1<<4)
-#define SCI_EVM_NUMLOCK (1<<5)
-#define SCI_EVM_CAPSLOCK (1<<6)
-#define SCI_EVM_INSERT (1<<7)
-
-#define SCI_EVM_NO_FOOLOCK (~(SCI_EVM_SCRLOCK | SCI_EVM_NUMLOCK | SCI_EVM_CAPSLOCK | SCI_EVM_INSERT))
-#define SCI_EVM_ALL 0xFF
-
-#endif
-
-} // End of namespace Sci
-
-#endif // SCI_UINPUT_H
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