diff options
| author | David Corrales | 2007-05-31 23:44:43 +0000 |
|---|---|---|
| committer | David Corrales | 2007-05-31 23:44:43 +0000 |
| commit | 0cab5b7791e56b32455748bf20c21f0d6b42f654 (patch) | |
| tree | 9e6580328542f1db230e019ba77e3db1be8fa50b /engines/cruise/overlay.cpp | |
| parent | 6c69d531d262e14fa02b6e1adb42baaa5c74dbe6 (diff) | |
| parent | 22c0403e0dfec16badf156afa842c6c37e850263 (diff) | |
| download | scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.gz scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.bz2 scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.zip | |
Merged the fs branch with trunk. r26949:27031
svn-id: r27032
Diffstat (limited to 'engines/cruise/overlay.cpp')
| -rw-r--r-- | engines/cruise/overlay.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp index 10e807380a..c1b35f61f6 100644 --- a/engines/cruise/overlay.cpp +++ b/engines/cruise/overlay.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * cinE Engine is (C) 2004-2005 by CinE Team + * 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 @@ -17,8 +18,8 @@ * 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$ + * $URL:https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-fsnode/engines/cruise/overlay.cpp $ + * $Id:overlay.cpp 26949 2007-05-26 20:23:24Z david_corrales $ * */ @@ -42,7 +43,7 @@ void initOverlayTable(void) { numOfLoadedOverlay = 1; } -int loadOverlay(uint8 *scriptName) { +int loadOverlay(const uint8 *scriptName) { int newNumberOfScript; bool scriptNotLoadedBefore; int scriptIdx; @@ -59,7 +60,7 @@ int loadOverlay(uint8 *scriptName) { scriptNotLoadedBefore = false; - scriptIdx = findOverlayByName((char *)scriptName); + scriptIdx = findOverlayByName((const char *)scriptName); if (scriptIdx == -4) { scriptIdx = numOfLoadedOverlay; @@ -723,7 +724,7 @@ int releaseOverlay(const char *name) { return 0; } -int32 findOverlayByName2(uint8 *name) { +int32 findOverlayByName2(const uint8 *name) { int i; for (i = 1; i < numOfLoadedOverlay; i++) { |