aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise/menu.cpp
diff options
context:
space:
mode:
authorDavid Corrales2007-05-31 23:44:43 +0000
committerDavid Corrales2007-05-31 23:44:43 +0000
commit0cab5b7791e56b32455748bf20c21f0d6b42f654 (patch)
tree9e6580328542f1db230e019ba77e3db1be8fa50b /engines/cruise/menu.cpp
parent6c69d531d262e14fa02b6e1adb42baaa5c74dbe6 (diff)
parent22c0403e0dfec16badf156afa842c6c37e850263 (diff)
downloadscummvm-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/menu.cpp')
-rw-r--r--engines/cruise/menu.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/cruise/menu.cpp b/engines/cruise/menu.cpp
index d76934439b..e30542cc1b 100644
--- a/engines/cruise/menu.cpp
+++ b/engines/cruise/menu.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/menu.cpp $
+ * $Id:menu.cpp 26949 2007-05-26 20:23:24Z david_corrales $
*
*/
@@ -39,7 +40,7 @@ menuStruct *createMenu(int X, int Y, const char *menuName) {
entry->stringPtr = menuName;
entry->numElements = 0;
entry->ptrNextElement = NULL;
- entry->gfx = renderText(160, (uint8 *) menuName);
+ entry->gfx = renderText(160, (const uint8 *)menuName);
return entry;
}
@@ -117,7 +118,7 @@ void addSelectableMenuEntry(int param0, int param1, menuStruct *pMenu,
pNewElement->next = NULL;
pNewElement->varC = 0;
pNewElement->color = color;
- pNewElement->gfx = renderText(160, (uint8 *) menuText);
+ pNewElement->gfx = renderText(160, (const uint8 *)menuText);
if (var_6 == NULL) {
pMenu->ptrNextElement = pNewElement;