[Scummvm-cvs-logs] SF.net SVN: scummvm:[45176] scummvm/trunk
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sat Oct 17 01:29:00 CEST 2009
Revision: 45176
http://scummvm.svn.sourceforge.net/scummvm/?rev=45176&view=rev
Author: thebluegr
Date: 2009-10-16 23:29:00 +0000 (Fri, 16 Oct 2009)
Log Message:
-----------
Moved sci_ffs() inside iterator.cpp, the only place where it's actually used, and removed tools.*. Also, removed all the unused includes to tools.h from several places
Modified Paths:
--------------
scummvm/trunk/dists/msvc8/sci.vcproj
scummvm/trunk/dists/msvc9/sci.vcproj
scummvm/trunk/engines/sci/engine/grammar.cpp
scummvm/trunk/engines/sci/engine/message.cpp
scummvm/trunk/engines/sci/engine/segment.cpp
scummvm/trunk/engines/sci/gfx/gfx_system.h
scummvm/trunk/engines/sci/gfx/res_font.cpp
scummvm/trunk/engines/sci/gfx/res_pic.cpp
scummvm/trunk/engines/sci/gui/gui.cpp
scummvm/trunk/engines/sci/gui/gui_animate.cpp
scummvm/trunk/engines/sci/gui/gui_cursor.cpp
scummvm/trunk/engines/sci/gui/gui_font.cpp
scummvm/trunk/engines/sci/gui/gui_gfx.cpp
scummvm/trunk/engines/sci/gui/gui_palette.cpp
scummvm/trunk/engines/sci/gui/gui_picture.cpp
scummvm/trunk/engines/sci/gui/gui_screen.cpp
scummvm/trunk/engines/sci/gui/gui_transitions.cpp
scummvm/trunk/engines/sci/gui/gui_view.cpp
scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
scummvm/trunk/engines/sci/gui32/gui32.cpp
scummvm/trunk/engines/sci/module.mk
scummvm/trunk/engines/sci/resource.cpp
scummvm/trunk/engines/sci/sci.cpp
scummvm/trunk/engines/sci/sfx/core.cpp
scummvm/trunk/engines/sci/sfx/iterator.cpp
scummvm/trunk/engines/sci/sfx/seq/gm.cpp
scummvm/trunk/engines/sci/sfx/seq/instrument-map.h
scummvm/trunk/engines/sci/sfx/seq/sequencers.cpp
scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp
scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp
scummvm/trunk/engines/sci/sfx/softseq.h
scummvm/trunk/engines/sci/sfx/songlib.cpp
Removed Paths:
-------------
scummvm/trunk/engines/sci/tools.cpp
scummvm/trunk/engines/sci/tools.h
Modified: scummvm/trunk/dists/msvc8/sci.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/sci.vcproj 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/dists/msvc8/sci.vcproj 2009-10-16 23:29:00 UTC (rev 45176)
@@ -161,8 +161,6 @@
<File RelativePath="..\..\engines\sci\seq_decoder.cpp" />
<File RelativePath="..\..\engines\sci\seq_decoder.h" />
<File RelativePath="..\..\engines\sci\engine\script.cpp" />
- <File RelativePath="..\..\engines\sci\tools.cpp" />
- <File RelativePath="..\..\engines\sci\tools.h" />
<File RelativePath="..\..\engines\sci\uinput.h" />
<File RelativePath="..\..\engines\sci\vocabulary.cpp" />
<File RelativePath="..\..\engines\sci\vocabulary.h" />
Modified: scummvm/trunk/dists/msvc9/sci.vcproj
===================================================================
--- scummvm/trunk/dists/msvc9/sci.vcproj 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/dists/msvc9/sci.vcproj 2009-10-16 23:29:00 UTC (rev 45176)
@@ -162,8 +162,6 @@
<File RelativePath="..\..\engines\sci\seq_decoder.cpp" />
<File RelativePath="..\..\engines\sci\seq_decoder.h" />
<File RelativePath="..\..\engines\sci\engine\script.cpp" />
- <File RelativePath="..\..\engines\sci\tools.cpp" />
- <File RelativePath="..\..\engines\sci\tools.h" />
<File RelativePath="..\..\engines\sci\uinput.h" />
<File RelativePath="..\..\engines\sci\vocabulary.cpp" />
<File RelativePath="..\..\engines\sci\vocabulary.h" />
Modified: scummvm/trunk/engines/sci/engine/grammar.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/grammar.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/engine/grammar.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -28,7 +28,6 @@
** that grammar, writing an appropriate node tree if successful.
*/
-#include "sci/tools.h"
#include "sci/vocabulary.h"
#include "sci/console.h"
Modified: scummvm/trunk/engines/sci/engine/message.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/message.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/engine/message.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -26,7 +26,6 @@
#include "sci/engine/message.h"
#include "sci/engine/kernel.h"
#include "sci/engine/seg_manager.h"
-#include "sci/tools.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/engine/segment.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/segment.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/engine/segment.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -29,7 +29,6 @@
#include "sci/engine/segment.h"
#include "sci/engine/seg_manager.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/gfx/gfx_system.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_system.h 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gfx/gfx_system.h 2009-10-16 23:29:00 UTC (rev 45176)
@@ -28,7 +28,6 @@
#include "common/scummsys.h"
#include "common/rect.h"
-#include "sci/tools.h"
#include "sci/gfx/palette.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/gfx/res_font.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/res_font.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gfx/res_font.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -23,6 +23,7 @@
*
*/
+#include "common/endian.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
Modified: scummvm/trunk/engines/sci/gfx/res_pic.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/res_pic.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gfx/res_pic.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -24,6 +24,9 @@
*/
#include <time.h> // for time() to seed rand() via srand()
+
+#include "common/endian.h"
+
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
#include "sci/sci.h" // for kDebugLevelSci0Pic
Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -29,7 +29,6 @@
#include "sci/sci.h"
#include "sci/debug.h" // for g_debug_sleeptime_factor
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui.h"
#include "sci/gui/gui_screen.h"
#include "sci/gui/gui_palette.h"
Modified: scummvm/trunk/engines/sci/gui/gui_animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_animate.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui_animate.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -29,7 +29,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui_gfx.h"
#include "sci/gui/gui_view.h"
#include "sci/gui/gui_screen.h"
Modified: scummvm/trunk/engines/sci/gui/gui_cursor.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_cursor.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui_cursor.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -29,7 +29,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui_palette.h"
#include "sci/gui/gui_view.h"
#include "sci/gui/gui_cursor.h"
Modified: scummvm/trunk/engines/sci/gui/gui_font.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_font.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui_font.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -25,7 +25,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui_screen.h"
#include "sci/gui/gui_font.h"
Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -29,7 +29,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui_gfx.h"
#include "sci/gui/gui_animate.h"
#include "sci/gui/gui_font.h"
Modified: scummvm/trunk/engines/sci/gui/gui_palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_palette.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui_palette.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -28,7 +28,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui_screen.h"
#include "sci/gui/gui_palette.h"
Modified: scummvm/trunk/engines/sci/gui/gui_picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui_picture.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -26,7 +26,6 @@
#include "common/stack.h"
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui_screen.h"
#include "sci/gui/gui_palette.h"
#include "sci/gui/gui_gfx.h"
Modified: scummvm/trunk/engines/sci/gui/gui_screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui_screen.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -29,7 +29,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui_screen.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/gui/gui_transitions.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_transitions.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -29,7 +29,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui.h"
#include "sci/gui/gui_screen.h"
#include "sci/gui/gui_palette.h"
Modified: scummvm/trunk/engines/sci/gui/gui_view.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui_view.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -25,7 +25,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui_gfx.h"
#include "sci/gui/gui_screen.h"
#include "sci/gui/gui_palette.h"
Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -27,7 +27,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/gui/gui_screen.h"
#include "sci/gui/gui_gfx.h"
#include "sci/gui/gui_animate.h"
Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -28,7 +28,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
-#include "sci/tools.h"
#include "sci/debug.h" // for g_debug_sleeptime_factor
#include "sci/resource.h"
#include "sci/engine/state.h"
Modified: scummvm/trunk/engines/sci/module.mk
===================================================================
--- scummvm/trunk/engines/sci/module.mk 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/module.mk 2009-10-16 23:29:00 UTC (rev 45176)
@@ -7,7 +7,6 @@
resource.o \
sci.o \
seq_decoder.o \
- tools.o \
vocabulary.o \
engine/game.o \
engine/gc.o \
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/resource.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -31,7 +31,6 @@
#include "sci/sci.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
-#include "sci/tools.h"
#include "sci/resource.h"
#include "sci/vocabulary.h"
#include "sci/decompressor.h"
Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/sci.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -132,8 +132,8 @@
return Common::kUnknownError;
// Gui change
- //_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor); // new
- _gamestate->_gui = new SciGui32(_gamestate, screen, palette, cursor); // old
+ _gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor); // new
+ //_gamestate->_gui = new SciGui32(_gamestate, screen, palette, cursor); // old
if (game_init(_gamestate)) { /* Initialize */
warning("Game initialization failed: Aborting...");
Modified: scummvm/trunk/engines/sci/sfx/core.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/core.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/sfx/core.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -25,7 +25,6 @@
/* Sound subsystem core: Event handler, sound player dispatching */
-#include "sci/tools.h"
#include "sci/sci.h"
#include "sci/sfx/core.h"
#include "sci/sfx/iterator.h"
Modified: scummvm/trunk/engines/sci/sfx/iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/sfx/iterator.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -31,7 +31,6 @@
#include "sci/sfx/iterator_internal.h"
#include "sci/engine/state.h" // for sfx_player_tell_synth :/
#include "sci/sfx/core.h" // for sfx_player_tell_synth
-#include "sci/tools.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
@@ -46,6 +45,21 @@
/*#define DEBUG_DECODING*/
/*#define DEBUG_VERBOSE*/
+/** Find first set bit in bits and return its index. Returns 0 if bits is 0. */
+static int sci_ffs(int bits) {
+ if (!bits)
+ return 0;
+
+ int retval = 1;
+
+ while (!(bits & 1)) {
+ retval++;
+ bits >>= 1;
+ }
+
+ return retval;
+}
+
static void print_tabs_id(int nr, songit_id_t id) {
while (nr-- > 0)
fprintf(stderr, "\t");
Modified: scummvm/trunk/engines/sci/sfx/seq/gm.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/seq/gm.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/sfx/seq/gm.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -25,7 +25,6 @@
#include "common/util.h"
-#include "sci/tools.h"
#include "sci/sfx/sequencer.h"
#include "sci/sfx/device.h"
#include "sci/sfx/seq/instrument-map.h"
Modified: scummvm/trunk/engines/sci/sfx/seq/instrument-map.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/seq/instrument-map.h 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/sfx/seq/instrument-map.h 2009-10-16 23:29:00 UTC (rev 45176)
@@ -28,7 +28,6 @@
#ifndef SCI_SFX_SEQ_INSTRUMENT_MAP_H
#define SCI_SFX_SEQ_INSTRUMENT_MAP_H
-#include "sci/tools.h"
#include "sci/sfx/device.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/sfx/seq/sequencers.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/seq/sequencers.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/sfx/seq/sequencers.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -24,7 +24,6 @@
*/
#include "../sequencer.h"
-#include "sci/tools.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/sfx/softseq/adlib.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -24,7 +24,6 @@
*/
#include "sci/sci.h"
-#include "sci/tools.h"
#include "sci/sfx/iterator.h"
#include "sound/fmopl.h"
Modified: scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -23,7 +23,6 @@
*
*/
-#include "sci/tools.h"
#include "sci/sfx/softseq.h"
#include "common/file.h"
Modified: scummvm/trunk/engines/sci/sfx/softseq.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq.h 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/sfx/softseq.h 2009-10-16 23:29:00 UTC (rev 45176)
@@ -29,7 +29,6 @@
#include "common/error.h"
#include "sci/sfx/sfx_pcm.h"
#include "sci/sfx/sequencer.h"
-#include "sci/tools.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/sfx/songlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/songlib.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/sfx/songlib.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -23,7 +23,6 @@
*
*/
-#include "sci/tools.h"
#include "sci/sfx/core.h"
#include "sci/sfx/iterator.h"
Deleted: scummvm/trunk/engines/sci/tools.cpp
===================================================================
--- scummvm/trunk/engines/sci/tools.cpp 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/tools.cpp 2009-10-16 23:29:00 UTC (rev 45176)
@@ -1,48 +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$
- *
- */
-
-#include "sci/tools.h"
-#include "sci/engine/state.h"
-
-#include "sci/sci.h" // For _console only
-#include "sci/console.h" // For _console only
-
-namespace Sci {
-
-int sci_ffs(int bits) {
- if (!bits)
- return 0;
-
- int retval = 1;
-
- while (!(bits & 1)) {
- retval++;
- bits >>= 1;
- }
-
- return retval;
-}
-
-} // End of namespace Sci
Deleted: scummvm/trunk/engines/sci/tools.h
===================================================================
--- scummvm/trunk/engines/sci/tools.h 2009-10-16 21:21:47 UTC (rev 45175)
+++ scummvm/trunk/engines/sci/tools.h 2009-10-16 23:29:00 UTC (rev 45176)
@@ -1,39 +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_TOOLS_H
-#define SCI_TOOLS_H
-
-#include "common/scummsys.h"
-#include "common/endian.h"
-
-namespace Sci {
-
-/** Find first set bit in bits and return its index. Returns 0 if bits is 0. */
-int sci_ffs(int bits);
-
-} // End of namespace Sci
-
-#endif // SCI_TOOLS_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