[Scummvm-cvs-logs] SF.net SVN: scummvm: [30667] scummvm/trunk
jvprat at users.sourceforge.net
jvprat at users.sourceforge.net
Mon Jan 28 01:14:17 CET 2008
Revision: 30667
http://scummvm.svn.sourceforge.net/scummvm/?rev=30667&view=rev
Author: jvprat
Date: 2008-01-27 16:14:17 -0800 (Sun, 27 Jan 2008)
Log Message:
-----------
Fixed the spaces before tabs.
Modified Paths:
--------------
scummvm/trunk/backends/events/default/default-events.cpp
scummvm/trunk/backends/fs/abstract-fs.h
scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
scummvm/trunk/backends/fs/dc/dc-fs.cpp
scummvm/trunk/backends/fs/ds/ds-fs.cpp
scummvm/trunk/backends/fs/ds/ds-fs.h
scummvm/trunk/backends/fs/gp32/gp32-fs.cpp
scummvm/trunk/backends/fs/morphos/abox-fs.cpp
scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
scummvm/trunk/backends/fs/posix/posix-fs.cpp
scummvm/trunk/backends/fs/psp/psp-fs.cpp
scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
scummvm/trunk/backends/fs/windows/windows-fs.cpp
scummvm/trunk/backends/midi/zodiac.cpp
scummvm/trunk/backends/platform/PalmOS/Rsc/StarterRsc.h
scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.h
scummvm/trunk/backends/platform/PalmOS/Src/cd_default.h
scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.h
scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.h
scummvm/trunk/backends/platform/PalmOS/Src/globals.h
scummvm/trunk/backends/platform/PalmOS/Src/init_palmos.h
scummvm/trunk/backends/platform/PalmOS/Src/init_sony.cpp
scummvm/trunk/backends/platform/PalmOS/Src/init_stuffs.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/app.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formtabs.h
scummvm/trunk/backends/platform/PalmOS/Src/launcher/games.cpp
scummvm/trunk/backends/platform/PalmOS/Src/launcher/games.h
scummvm/trunk/backends/platform/PalmOS/Src/launcher/skin.cpp
scummvm/trunk/backends/platform/PalmOS/Src/native/pace.h
scummvm/trunk/backends/platform/PalmOS/Src/os5_renderer.cpp
scummvm/trunk/backends/platform/ds/arm7/Makefile
scummvm/trunk/backends/platform/ds/arm7/source/main.cpp
scummvm/trunk/backends/platform/ds/arm9/makefile
scummvm/trunk/backends/platform/ds/arm9/source/adpcm_arm.s
scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s
scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp
scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h
scummvm/trunk/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_dldi.s
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_njsd.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_nmmc.c
scummvm/trunk/backends/platform/ds/arm9/source/fat/io_sd_common.c
scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp
scummvm/trunk/backends/platform/ds/arm9/source/zipreader.cpp
scummvm/trunk/backends/platform/gp2x/events.cpp
scummvm/trunk/backends/platform/gp2x/gp2x-common.h
scummvm/trunk/backends/platform/gp2x/graphics.cpp
scummvm/trunk/backends/platform/gp32/Makefile
scummvm/trunk/backends/platform/gp32/debug-gdbstub-usb.cpp
scummvm/trunk/backends/platform/gp32/gp32std_memory.h
scummvm/trunk/backends/platform/iphone/iphone_keyboard.m
scummvm/trunk/backends/platform/iphone/iphone_video.m
scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
scummvm/trunk/backends/platform/ps2/systemps2.cpp
scummvm/trunk/backends/platform/psp/Makefile
scummvm/trunk/backends/platform/psp/README.PSP
scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp
scummvm/trunk/backends/platform/sdl/graphics.cpp
scummvm/trunk/backends/platform/sdl/sdl.h
scummvm/trunk/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in
scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in
scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in
scummvm/trunk/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
scummvm/trunk/backends/platform/symbian/src/ScummApp.cpp
scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
scummvm/trunk/backends/platform/symbian/src/portdefs.h
scummvm/trunk/backends/platform/wince/missing/dirent.h
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/backends/platform/x11/x11.cpp
scummvm/trunk/base/version.h
scummvm/trunk/common/events.h
scummvm/trunk/common/file.cpp
scummvm/trunk/common/iff_container.h
scummvm/trunk/common/rect.h
scummvm/trunk/common/str.h
scummvm/trunk/common/util.cpp
scummvm/trunk/common/util.h
scummvm/trunk/engines/agi/agi.h
scummvm/trunk/engines/agi/preagi_troll.cpp
scummvm/trunk/engines/agi/view.h
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/charset-fontdata.cpp
scummvm/trunk/engines/agos/cursor.cpp
scummvm/trunk/engines/agos/detection_tables.h
scummvm/trunk/engines/agos/draw.cpp
scummvm/trunk/engines/agos/oracle.cpp
scummvm/trunk/engines/agos/res_ami.cpp
scummvm/trunk/engines/agos/saveload.cpp
scummvm/trunk/engines/agos/string.cpp
scummvm/trunk/engines/cine/detection.cpp
scummvm/trunk/engines/cine/main_loop.cpp
scummvm/trunk/engines/cine/various.cpp
scummvm/trunk/engines/cruise/font.cpp
scummvm/trunk/engines/cruise/perso.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/gob/goblin.cpp
scummvm/trunk/engines/gob/inter_v2.cpp
scummvm/trunk/engines/igor/igor.cpp
scummvm/trunk/engines/igor/parts/part_23.cpp
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/kyra_v2.cpp
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/kyra/sequences_v1.cpp
scummvm/trunk/engines/kyra/sequences_v2.cpp
scummvm/trunk/engines/kyra/staticres.cpp
scummvm/trunk/engines/lure/events.cpp
scummvm/trunk/engines/lure/hotspots.cpp
scummvm/trunk/engines/parallaction/defs.h
scummvm/trunk/engines/parallaction/detection.cpp
scummvm/trunk/engines/parallaction/dialogue.cpp
scummvm/trunk/engines/parallaction/disk.h
scummvm/trunk/engines/parallaction/exec_ns.cpp
scummvm/trunk/engines/parallaction/font.cpp
scummvm/trunk/engines/parallaction/graphics.cpp
scummvm/trunk/engines/parallaction/graphics.h
scummvm/trunk/engines/parallaction/gui_ns.cpp
scummvm/trunk/engines/parallaction/inventory.cpp
scummvm/trunk/engines/parallaction/inventory.h
scummvm/trunk/engines/parallaction/objects.h
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/parallaction/parser_br.cpp
scummvm/trunk/engines/parallaction/parser_ns.cpp
scummvm/trunk/engines/parallaction/sound.h
scummvm/trunk/engines/parallaction/walk.cpp
scummvm/trunk/engines/parallaction/walk.h
scummvm/trunk/engines/queen/command.h
scummvm/trunk/engines/queen/resource.cpp
scummvm/trunk/engines/queen/sound.h
scummvm/trunk/engines/queen/walk.cpp
scummvm/trunk/engines/queen/xref.txt
scummvm/trunk/engines/saga/gfx.cpp
scummvm/trunk/engines/saga/itedata.cpp
scummvm/trunk/engines/saga/scene.h
scummvm/trunk/engines/scumm/actor.cpp
scummvm/trunk/engines/scumm/bomp.cpp
scummvm/trunk/engines/scumm/charset.cpp
scummvm/trunk/engines/scumm/cursor.cpp
scummvm/trunk/engines/scumm/gfx.cpp
scummvm/trunk/engines/scumm/he/floodfill_he.cpp
scummvm/trunk/engines/scumm/he/resource_he.cpp
scummvm/trunk/engines/scumm/he/resource_he.h
scummvm/trunk/engines/scumm/he/script_v60he.cpp
scummvm/trunk/engines/scumm/he/script_v72he.cpp
scummvm/trunk/engines/scumm/he/wiz_he.cpp
scummvm/trunk/engines/scumm/help.cpp
scummvm/trunk/engines/scumm/insane/insane.h
scummvm/trunk/engines/scumm/insane/insane_enemy.cpp
scummvm/trunk/engines/scumm/insane/insane_iact.cpp
scummvm/trunk/engines/scumm/insane/insane_scenes.cpp
scummvm/trunk/engines/scumm/saveload.cpp
scummvm/trunk/engines/scumm/script_v2.cpp
scummvm/trunk/engines/scumm/script_v5.cpp
scummvm/trunk/engines/scumm/script_v6.cpp
scummvm/trunk/engines/scumm/script_v8.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/scumm/smush/codec37.cpp
scummvm/trunk/engines/scumm/smush/codec47ARM.s
scummvm/trunk/engines/scumm/vars.cpp
scummvm/trunk/engines/scumm/verbs.cpp
scummvm/trunk/engines/sky/compact.cpp
scummvm/trunk/engines/sky/control.cpp
scummvm/trunk/engines/sky/logic.cpp
scummvm/trunk/engines/sky/sound.cpp
scummvm/trunk/engines/sword1/control.cpp
scummvm/trunk/engines/sword1/object.h
scummvm/trunk/engines/sword1/objectman.h
scummvm/trunk/engines/sword1/router.cpp
scummvm/trunk/engines/sword1/router.h
scummvm/trunk/engines/sword1/screen.cpp
scummvm/trunk/engines/sword1/staticres.cpp
scummvm/trunk/engines/sword1/swordres.h
scummvm/trunk/engines/sword2/debug.cpp
scummvm/trunk/engines/sword2/function.cpp
scummvm/trunk/engines/sword2/layers.cpp
scummvm/trunk/engines/sword2/mouse.cpp
scummvm/trunk/engines/sword2/object.h
scummvm/trunk/engines/sword2/palette.cpp
scummvm/trunk/engines/sword2/resman.cpp
scummvm/trunk/engines/sword2/router.cpp
scummvm/trunk/engines/sword2/router.h
scummvm/trunk/engines/sword2/saveload.cpp
scummvm/trunk/engines/sword2/screen.cpp
scummvm/trunk/engines/sword2/speech.cpp
scummvm/trunk/engines/sword2/sprite.cpp
scummvm/trunk/engines/touche/touche.cpp
scummvm/trunk/graphics/font.h
scummvm/trunk/graphics/iff.h
scummvm/trunk/graphics/surface.cpp
scummvm/trunk/gui/TabWidget.cpp
scummvm/trunk/gui/console.h
scummvm/trunk/gui/dialog.h
scummvm/trunk/gui/object.h
scummvm/trunk/sound/iff.h
scummvm/trunk/tools/create_lure/create_lure_dat.cpp
scummvm/trunk/tools/credits.pl
scummvm/trunk/tools/md5table.c
scummvm/trunk/tools/scumm-md5.txt
scummvm/trunk/tools/skycpt/cptcompiler.cpp
Modified: scummvm/trunk/backends/events/default/default-events.cpp
===================================================================
--- scummvm/trunk/backends/events/default/default-events.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/events/default/default-events.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -96,7 +96,7 @@
_modifierState(0),
_shouldQuit(false) {
- assert(_boss);
+ assert(_boss);
_recordFile = NULL;
_recordTimeFile = NULL;
Modified: scummvm/trunk/backends/fs/abstract-fs.h
===================================================================
--- scummvm/trunk/backends/fs/abstract-fs.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/abstract-fs.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -53,8 +53,8 @@
* handle this gracefully by returning 0.
*
* Example:
- * Calling getChild() for a node with path "/foo/bar" using name="file.txt",
- * would produce a new node with "/foo/bar/file.txt" as path.
+ * Calling getChild() for a node with path "/foo/bar" using name="file.txt",
+ * would produce a new node with "/foo/bar/file.txt" as path.
*
* @note This function will append a separator char (\ or /) to the end of the
* path if needed.
@@ -106,8 +106,8 @@
* Returns the last component of the path pointed by this FilesystemNode.
*
* Examples (POSIX):
- * /foo/bar.txt would return /bar.txt
- * /foo/bar/ would return /bar/
+ * /foo/bar.txt would return /bar.txt
+ * /foo/bar/ would return /bar/
*
* @note This method is very architecture dependent, please check the concrete implementation for more information.
*/
Modified: scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/amigaos4/amigaos4-fs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -380,7 +380,7 @@
if (entry) {
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
// specification, the following call had to be changed:
- // if (entry->isValid())
+ // if (entry->isValid())
// Please verify that the logic of the code remains coherent. Also, remember
// that the isReadable() and isWritable() methods are available.
if (entry->exists())
@@ -542,7 +542,7 @@
if (entry) {
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
// specification, the following call had to be changed:
- // if (entry->isValid())
+ // if (entry->isValid())
// Please verify that the logic of the code remains coherent. Also, remember
// that the isReadable() and isWritable() methods are available.
if(entry->exists())
Modified: scummvm/trunk/backends/fs/dc/dc-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/dc/dc-fs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/dc/dc-fs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -73,8 +73,8 @@
* Returns the last component of a given path.
*
* Examples:
- * /foo/bar.txt would return /bar.txt
- * /foo/bar/ would return /bar/
+ * /foo/bar.txt would return /bar.txt
+ * /foo/bar/ would return /bar/
*
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
Modified: scummvm/trunk/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/ds/ds-fs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -35,7 +35,7 @@
// DSFileSystemNode - Flash ROM file system using Zip files //
//////////////////////////////////////////////////////////////
-ZipFile* DSFileSystemNode::_zipFile = NULL;
+ZipFile* DSFileSystemNode::_zipFile = NULL;
char currentDir[128];
DSFileSystemNode::DSFileSystemNode() {
@@ -803,8 +803,8 @@
* Returns the last component of a given path.
*
* Examples:
- * /foo/bar.txt would return /bar.txt
- * /foo/bar/ would return /bar/
+ * /foo/bar.txt would return /bar.txt
+ * /foo/bar/ would return /bar/
*
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
Modified: scummvm/trunk/backends/fs/ds/ds-fs.h
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/ds/ds-fs.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -179,17 +179,17 @@
#define FILE DS::fileHandle
// Please do not remove any of these prototypes that appear not to be required.
-FILE* std_fopen(const char* name, const char* mode);
-void std_fclose(FILE* handle);
-int std_getc(FILE* handle);
-size_t std_fread(const void* ptr, size_t size, size_t numItems, FILE* handle);
-size_t std_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle);
-bool std_feof(FILE* handle);
+FILE* std_fopen(const char* name, const char* mode);
+void std_fclose(FILE* handle);
+int std_getc(FILE* handle);
+size_t std_fread(const void* ptr, size_t size, size_t numItems, FILE* handle);
+size_t std_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle);
+bool std_feof(FILE* handle);
long int std_ftell(FILE* handle);
-int std_fseek(FILE* handle, long int offset, int whence);
-void std_clearerr(FILE* handle);
-void std_cwd(char* dir);
-void std_fflush(FILE* handle);
+int std_fseek(FILE* handle, long int offset, int whence);
+void std_clearerr(FILE* handle);
+void std_cwd(char* dir);
+void std_fflush(FILE* handle);
} //namespace DS
Modified: scummvm/trunk/backends/fs/gp32/gp32-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/gp32/gp32-fs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/gp32/gp32-fs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -74,8 +74,8 @@
* Returns the last component of a given path.
*
* Examples:
- * gp:\foo\bar.txt would return "\bar.txt"
- * gp:\foo\bar\ would return "\bar\"
+ * gp:\foo\bar.txt would return "\bar.txt"
+ * gp:\foo\bar\ would return "\bar\"
*
* @param str Path to obtain the last component from.
* @return Pointer to the first char of the last component inside str.
Modified: scummvm/trunk/backends/fs/morphos/abox-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/morphos/abox-fs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/morphos/abox-fs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -312,7 +312,7 @@
{
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
// specification, the following call had to be changed:
- // if (entry->isValid())
+ // if (entry->isValid())
// Please verify that the logic of the code remains coherent. Also, remember
// that the isReadable() and isWritable() methods are available.
if (entry->exists())
@@ -396,7 +396,7 @@
{
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
// specification, the following call had to be changed:
- // if (entry->isValid())
+ // if (entry->isValid())
// Please verify that the logic of the code remains coherent. Also, remember
// that the isReadable() and isWritable() methods are available.
if (entry->exists())
Modified: scummvm/trunk/backends/fs/palmos/palmos-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/palmos/palmos-fs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/palmos/palmos-fs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -76,7 +76,7 @@
* @param mode Mode to use while adding the file entry to the list.
* @param base String with the directory being listed.
* @param find_data Describes a file that the FindFirstFile, FindFirstFileEx, or FindNextFile functions find.
- */
+ */
static void addFile(AbstractFSList &list, ListMode mode, const Char *base, FileInfoType* find_data);
};
@@ -84,8 +84,8 @@
* Returns the last component of a given path.
*
* Examples:
- * /foo/bar.txt would return /bar.txt
- * /foo/bar/ would return /bar/
+ * /foo/bar.txt would return /bar.txt
+ * /foo/bar/ would return /bar/
*
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
Modified: scummvm/trunk/backends/fs/posix/posix-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/posix/posix-fs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/posix/posix-fs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -84,8 +84,8 @@
* Returns the last component of a given path.
*
* Examples:
- * /foo/bar.txt would return /bar.txt
- * /foo/bar/ would return /bar/
+ * /foo/bar.txt would return /bar.txt
+ * /foo/bar/ would return /bar/
*
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
Modified: scummvm/trunk/backends/fs/psp/psp-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/psp/psp-fs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/psp/psp-fs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -75,8 +75,8 @@
* Returns the last component of a given path.
*
* Examples:
- * /foo/bar.txt would return /bar.txt
- * /foo/bar/ would return /bar/
+ * /foo/bar.txt would return /bar.txt
+ * /foo/bar/ would return /bar/
*
* @param str String containing the path.
* @return Pointer to the first char of the last component inside str.
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -81,8 +81,8 @@
* Returns the last component of a given path.
*
* Examples:
- * c:\foo\bar.txt would return "\bar.txt"
- * c:\foo\bar\ would return "\bar\"
+ * c:\foo\bar.txt would return "\bar.txt"
+ * c:\foo\bar\ would return "\bar\"
*
* @param str Path to obtain the last component from.
* @return Pointer to the first char of the last component inside str.
Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -79,8 +79,8 @@
*
* Examples:
* path=c:\foo\bar.txt, currentDir=false -> c:\foo\bar.txt
- * path=c:\foo\bar.txt, currentDir=true -> current directory
- * path=NULL, currentDir=true -> current directory
+ * path=c:\foo\bar.txt, currentDir=true -> current directory
+ * path=NULL, currentDir=true -> current directory
*
* @param path String with the path the new node should point to.
* @param currentDir if true, the path parameter will be ignored and the resulting node will point to the current directory.
@@ -108,7 +108,7 @@
* @param mode Mode to use while adding the file entry to the list.
* @param base String with the directory being listed.
* @param find_data Describes a file that the FindFirstFile, FindFirstFileEx, or FindNextFile functions find.
- */
+ */
static void addFile(AbstractFSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data);
/**
@@ -116,7 +116,7 @@
*
* @param str String to convert from Unicode to Ascii.
* @return str in Ascii format.
- */
+ */
static char *toAscii(TCHAR *str);
/**
@@ -124,7 +124,7 @@
*
* @param str String to convert from Ascii to Unicode.
* @return str in Unicode format.
- */
+ */
static const TCHAR* toUnicode(const char *str);
};
@@ -132,8 +132,8 @@
* Returns the last component of a given path.
*
* Examples:
- * c:\foo\bar.txt would return "\bar.txt"
- * c:\foo\bar\ would return "\bar\"
+ * c:\foo\bar.txt would return "\bar.txt"
+ * c:\foo\bar\ would return "\bar\"
*
* @param str Path to obtain the last component from.
* @return Pointer to the first char of the last component inside str.
Modified: scummvm/trunk/backends/midi/zodiac.cpp
===================================================================
--- scummvm/trunk/backends/midi/zodiac.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/midi/zodiac.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -53,7 +53,7 @@
Err e;
if (e = TwMidiOpen(&_midiHandle))
- return MERR_DEVICE_NOT_AVAILABLE;
+ return MERR_DEVICE_NOT_AVAILABLE;
TwMidiGetMasterVolume(&_oldVol);
TwMidiSetMasterVolume(twMidiMaxVolume); // TODO : set volume based on gVars
Modified: scummvm/trunk/backends/platform/PalmOS/Rsc/StarterRsc.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Rsc/StarterRsc.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Rsc/StarterRsc.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -10,7 +10,7 @@
// THIS IS AN AUTOMATICALLY GENERATED HEADER FILE
// DO NOT EDIT - CHANGES MADE TO THIS FILE WILL BE LOST
//
-// Palm App Name: "ScummVM"
+// Palm App Name: "ScummVM"
//
// Palm App Version: "1.0"
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_aeroplayer.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -41,7 +41,7 @@
void play(int track, int num_loops, int start_frame, int duration);
void stop();
- void setVolume(int volume);
+ void setVolume(int volume);
private:
OSystem *_sys;
@@ -53,9 +53,9 @@
UInt32 getPosition();
void forceStop();
- UInt16 _volumeLimit;
+ UInt16 _volumeLimit;
- Boolean _isPlaying;
+ Boolean _isPlaying;
// cdrom
UInt16 _pckLoops, _pckTrack;
UInt32 _pckTrackStartFrame, _pckTrackEndFrame;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_default.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_default.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_default.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -30,20 +30,20 @@
class DefaultCDPlayer : public CDAudio {
public:
- DefaultCDPlayer(OSystem *sys);
+ DefaultCDPlayer(OSystem *sys);
- bool init();
- void release();
+ bool init();
+ void release();
- bool poll();
- void update();
- void play(int track, int num_loops, int start_frame, int duration);
- void stop();
+ bool poll();
+ void update();
+ void play(int track, int num_loops, int start_frame, int duration);
+ void stop();
private:
- OSystem *_sys;
+ OSystem *_sys;
- // cdrom
+ // cdrom
UInt16 _defLoops;
UInt32 _defStopTime, _defTrackEndFrame, _defTrackLength;
};
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_msa.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -30,28 +30,28 @@
class MsaCDPlayer : public CDAudio {
public:
- MsaCDPlayer(OSystem *sys);
+ MsaCDPlayer(OSystem *sys);
- bool init();
- void release();
+ bool init();
+ void release();
- bool poll();
- void update();
- void play(int track, int num_loops, int start_frame, int duration);
- void stop();
+ bool poll();
+ void update();
+ void play(int track, int num_loops, int start_frame, int duration);
+ void stop();
- void setVolume(int volume);
+ void setVolume(int volume);
private:
- void initInternal();
+ void initInternal();
- OSystem *_sys;
- UInt16 _msaRefNum;
+ OSystem *_sys;
+ UInt16 _msaRefNum;
UInt32 _volumeLLimit;
UInt32 _volumeRLimit;
- // cdrom
+ // cdrom
AlbumInfoType _msaAlbum;
UInt16 _msaLoops;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/cd_pockettunes.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -31,35 +31,35 @@
class PckTunesCDPlayer : public CDAudio {
public:
- PckTunesCDPlayer(OSystem *sys);
+ PckTunesCDPlayer(OSystem *sys);
- bool init();
- void release();
+ bool init();
+ void release();
- bool poll();
- void update();
- void play(int track, int num_loops, int start_frame, int duration);
- void stop();
+ bool poll();
+ void update();
+ void play(int track, int num_loops, int start_frame, int duration);
+ void stop();
- void setVolume(int volume);
+ void setVolume(int volume);
private:
- OSystem *_sys;
- Char gameP[15];
+ OSystem *_sys;
+ Char gameP[15];
- PocketTunesAction *_pAction; // prevent memory fragmentation
- EventType _eAction;
+ PocketTunesAction *_pAction; // prevent memory fragmentation
+ EventType _eAction;
- UInt32 getStatus();
- void setPosition(UInt32 value);
- UInt32 getDuration();
- UInt32 getPosition(UInt32 deft);
+ UInt32 getStatus();
+ void setPosition(UInt32 value);
+ UInt32 getDuration();
+ UInt32 getPosition(UInt32 deft);
- UInt32 _volumeLimit;
- UInt32 getVolumeLimit();
+ UInt32 _volumeLimit;
+ UInt32 getVolumeLimit();
- Boolean _isPlaying;
- // cdrom
+ Boolean _isPlaying;
+ // cdrom
UInt16 _pckLoops, _pckTrack;
UInt32 _pckTrackStartFrame, _pckTrackEndFrame;
UInt32 _pckStopTime, _pckTrackDuration;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/globals.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/globals.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/globals.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -94,7 +94,7 @@
#define DO_VARS(z, t, o) \
{ Int8 *tmp = (Int8 *)gVars + o + 8; \
for (Int8 cnt = 0; cnt < gVars->z; cnt++) \
- { UInt##t val = *((UInt##t *)tmp); \
+ { UInt##t val = *((UInt##t *)tmp); \
val = ByteSwap##t(val); \
*((UInt##t *)tmp) = val; \
tmp += (t / 8); \
Modified: scummvm/trunk/backends/platform/PalmOS/Src/init_palmos.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/init_palmos.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/init_palmos.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -26,7 +26,7 @@
#ifndef INIT_PALMOS_H
#define INIT_PALMOS_H
-#define PALM_PORTRAIT 1
+#define PALM_PORTRAIT 1
#define PALM_LANDSCAPE 2
void PalmInit(UInt8 init);
@@ -39,4 +39,4 @@
UInt8 PalmScreenSize(Coord *stdw, Coord *stdh, Coord *fullw, Coord *fullh);
void PalmGetMemory(UInt32* storageMemoryP, UInt32* dynamicMemoryP, UInt32 *storageFreeP, UInt32 *dynamicFreeP);
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/backends/platform/PalmOS/Src/init_sony.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/init_sony.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/init_sony.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -45,13 +45,13 @@
e = FtrGet(sonySysFtrCreator, sonySysFtrNumVskVersion, &version);
if (e) {
// v1 = NR
- e = SilkLibOpen(slkRefNum);
+ e = SilkLibOpen(slkRefNum);
if (!e) version = vskVersionNum1;
} else {
// v2 = NX/NZ
// v3 = UX...
- e = VskOpen(slkRefNum);
+ e = VskOpen(slkRefNum);
}
}
} else
Modified: scummvm/trunk/backends/platform/PalmOS/Src/init_stuffs.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/init_stuffs.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/init_stuffs.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -80,11 +80,11 @@
OPTIONS_SET(kOptDeviceOS5);
// ARM ?
- if (!FtrGet(sysFileCSystem, sysFtrNumProcessorID, &ulProcessorType))
- if (sysFtrNumProcessorIsARM(ulProcessorType))
- OPTIONS_SET(kOptDeviceARM);
- else if (ulProcessorType == sysFtrNumProcessorx86)
- OPTIONS_SET(kOptDeviceProcX86);
+ if (!FtrGet(sysFileCSystem, sysFtrNumProcessorID, &ulProcessorType))
+ if (sysFtrNumProcessorIsARM(ulProcessorType))
+ OPTIONS_SET(kOptDeviceARM);
+ else if (ulProcessorType == sysFtrNumProcessorx86)
+ OPTIONS_SET(kOptDeviceProcX86);
// 5Way Navigator
if (!FtrGet(hsFtrCreator, hsFtrIDNavigationSupported, &version)) {
Modified: scummvm/trunk/backends/platform/PalmOS/Src/launcher/app.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/launcher/app.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/launcher/app.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -202,7 +202,7 @@
#define max(id,value) gVars->memory[id] = (gVars->memory[id] < value ? value : gVars->memory[id])
#define min(id,value) gVars->memory[id] = (gVars->memory[id] > value ? value : gVars->memory[id])
-#define threshold 700
+#define threshold 700
static void AppStartSetMemory() {
UInt32 mem, def;
@@ -221,7 +221,7 @@
#ifndef _DEBUG_ENGINE
// delete old databases
- ModDelete();
+ ModDelete();
#endif
// allocate global variables space
@@ -295,7 +295,7 @@
GamImportDatabase();
AppStartCheckScreenSize();
- AppStartCheckNotify(); // not fatal error if not avalaible
+ AppStartCheckNotify(); // not fatal error if not avalaible
return error;
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -121,8 +121,8 @@
break;
case MainOptionsAbout:
- FrmPopupForm(InfoForm);
- handled = true;
+ FrmPopupForm(InfoForm);
+ handled = true;
break;
case MainGamesMusicSound:
@@ -252,7 +252,7 @@
break;
case MainAboutButton:
- FrmPopupForm(InfoForm);
+ FrmPopupForm(InfoForm);
break;
// case MainListTypeSelTrigger:
Modified: scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formtabs.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formtabs.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/launcher/forms/formtabs.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -17,8 +17,8 @@
} TabType, *TabPtr;
TabType *TabNewTabs (UInt16 cnt);
-void TabDeleteTabs (TabType *tabP);
-Err TabAddContent (FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc = 0);
-void TabSetActive (FormType *frmP, TabType *tabP, UInt16 num);
+void TabDeleteTabs (TabType *tabP);
+Err TabAddContent (FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc = 0);
+void TabSetActive (FormType *frmP, TabType *tabP, UInt16 num);
void TabMoveUpObject (FormType *frmP, UInt16 objID, Coord amount);
#endif
Modified: scummvm/trunk/backends/platform/PalmOS/Src/launcher/games.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/launcher/games.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/launcher/games.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -414,8 +414,8 @@
return;
}
- // get current db info and rename it
- DmOpenDatabaseInfo(gameDB, &oDbID, 0, 0, &oCardNo, 0);
+ // get current db info and rename it
+ DmOpenDatabaseInfo(gameDB, &oDbID, 0, 0, &oCardNo, 0);
GamCloseDatabase(true);
e = DmDeleteDatabase(oCardNo, oDbID);
Modified: scummvm/trunk/backends/platform/PalmOS/Src/launcher/games.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/launcher/games.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/launcher/games.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -53,9 +53,9 @@
UInt16 icnID; // icon to display on the list
Boolean selected;
- Char nameP[50]; // game name to display in list
- Char pathP[150]; // path to the game files
- Char gameP[10]; // scumm name of the game
+ Char nameP[50]; // game name to display in list
+ Char pathP[150]; // path to the game files
+ Char gameP[10]; // scumm name of the game
UInt16 gfxMode;
Boolean autoLoad;
@@ -75,9 +75,9 @@
UInt16 icnID; // icon to display on the list
Boolean selected;
- Char nameP[50]; // game name to display in list
- Char pathP[150]; // path to the game files
- Char gameP[10]; // scumm name of the game
+ Char nameP[50]; // game name to display in list
+ Char pathP[150]; // path to the game files
+ Char gameP[10]; // scumm name of the game
UInt16 gfxMode;
Boolean autoLoad;
@@ -127,9 +127,9 @@
UInt16 icnID; // icon to display on the list
Boolean selected;
- Char nameP[50]; // game name to display in list
- Char pathP[150]; // path to the game files
- Char gameP[15]; // scumm name of the game
+ Char nameP[50]; // game name to display in list
+ Char pathP[150]; // path to the game files
+ Char gameP[15]; // scumm name of the game
UInt16 gfxMode;
Boolean autoLoad;
@@ -142,13 +142,13 @@
UInt16 bootValue;
UInt16 talkValue;
UInt8 platform;
- UInt8 language; // |- v2.5
+ UInt8 language; // |- v2.5
- Boolean filter; // v2.6
+ Boolean filter; // v2.6
Boolean fullscreen; // |
Boolean aspectRatio; // |- v2.7
- MusicInfoType musicInfo;// v3.0
+ MusicInfoType musicInfo;// v3.0
UInt8 engine; // |- v3.1
UInt8 renderMode; // |- v3.2
Modified: scummvm/trunk/backends/platform/PalmOS/Src/launcher/skin.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/launcher/skin.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/launcher/skin.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -134,7 +134,7 @@
WinDrawBitmap(bmpTemp, 0, 0);
WinSetDrawWindow(old);
- bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL);
+ bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL);
copy.topLeft.x = destX / 2;
copy.topLeft.y = destY / 2;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/native/pace.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/native/pace.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/native/pace.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -89,14 +89,14 @@
PACE_EMULSTATE->regData[2] = pinTrap; \
return ((returnType)((PACE_CALLBACK_PTR)( \
static_cast<void *>(PACE_EMULSTATE), \
- PceNativeTrapNo(sysTrapPinsDispatch), \
+ PceNativeTrapNo(sysTrapPinsDispatch), \
NULL, 0)));
#define PACE_PIN_EXEC(pinTrap, returnType) \
PACE_EMULSTATE->regData[2] = pinTrap; \
return ((returnType)((PACE_CALLBACK_PTR)( \
static_cast<void *>(PACE_EMULSTATE), \
- PceNativeTrapNo(sysTrapPinsDispatch), \
+ PceNativeTrapNo(sysTrapPinsDispatch), \
¶ms, \
sizeof(params))));
Modified: scummvm/trunk/backends/platform/PalmOS/Src/os5_renderer.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/os5_renderer.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/PalmOS/Src/os5_renderer.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -79,10 +79,10 @@
void OSystem_PalmOS5::render_landscape15x(RectangleType &r, PointType &p) {
Coord x, y, o = 0;
- int16 *dst = _workScreenP;
+ int16 *dst = _workScreenP;
if (_overlayVisible) {
- int16 *src = _overlayP;
+ int16 *src = _overlayP;
for (y = 0; y < 100; y++) {
// draw 2 lines
Modified: scummvm/trunk/backends/platform/ds/arm7/Makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm7/Makefile 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm7/Makefile 2008-01-28 00:14:17 UTC (rev 30667)
@@ -25,7 +25,7 @@
# note: arm9tdmi isn't the correct CPU arch, but anything newer and LD
# *insists* it has a FPU or VFP, and it won't take no for an answer!
CFLAGS := -g -Wall -O2\
- -mcpu=arm7tdmi -mtune=arm7tdmi -fomit-frame-pointer\
+ -mcpu=arm7tdmi -mtune=arm7tdmi -fomit-frame-pointer\
-ffast-math \
$(ARCH)
Modified: scummvm/trunk/backends/platform/ds/arm7/source/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm7/source/main.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm7/source/main.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -547,17 +547,17 @@
while (REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank();
fifo_temp=REG_IPC_FIFO_RX;
if (fifo_temp==0x12345678) break;
- }
+ }
- while (REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank();
- fifo_temp=REG_IPC_FIFO_RX; // give next value to wifi_init
- Wifi_Init(fifo_temp);
+ while (REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank();
+ fifo_temp=REG_IPC_FIFO_RX; // give next value to wifi_init
+ Wifi_Init(fifo_temp);
- irqSet(IRQ_FIFO_NOT_EMPTY,arm7_fifo); // set up fifo irq
- irqEnable(IRQ_FIFO_NOT_EMPTY);
- REG_IPC_FIFO_CR = IPC_FIFO_ENABLE | IPC_FIFO_RECV_IRQ;
+ irqSet(IRQ_FIFO_NOT_EMPTY,arm7_fifo); // set up fifo irq
+ irqEnable(IRQ_FIFO_NOT_EMPTY);
+ REG_IPC_FIFO_CR = IPC_FIFO_ENABLE | IPC_FIFO_RECV_IRQ;
- Wifi_SetSyncHandler(arm7_synctoarm9); // allow wifi lib to notify arm9
+ Wifi_SetSyncHandler(arm7_synctoarm9); // allow wifi lib to notify arm9
// arm7 wifi init complete
}
Modified: scummvm/trunk/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile 2008-01-28 00:14:17 UTC (rev 30667)
@@ -268,14 +268,14 @@
ARM7BIN := -7 $(CURDIR)/../../arm7/arm7.bin
-ICON := -b ../../../logo.bmp "ScummVM;By Neil Millstone;"
+ICON := -b ../../../logo.bmp "ScummVM;By Neil Millstone;"
CC = arm-eabi-gcc
CXX = arm-eabi-g++
CFLAGS = -Wno-multichar -Wall\
-Wno-multichar -mcpu=arm9tdmi -mtune=arm9tdmi \
- -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\
+ -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\
-ffast-math -mthumb-interwork
ifdef USE_DEBUGGER
Modified: scummvm/trunk/backends/platform/ds/arm9/source/adpcm_arm.s
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/adpcm_arm.s 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/adpcm_arm.s 2008-01-28 00:14:17 UTC (rev 30667)
@@ -55,14 +55,14 @@
loop:
LDRH r10,[r11,r2] @ r10 = stepTab[stepTableIndex]
TST r12,#4 @ if ((offset & 4) == 0)
- MOVEQ r9, #0 @ r9 = diff = 0
+ MOVEQ r9, #0 @ r9 = diff = 0
MOVNE r9, r10 @ else r9 = diff = stepTab[stepTableIndex]
TST r12,#2 @ if (offset & 2)
- ADDNE r9, r9, r10,ASR #1 @ diff += r10>>1
+ ADDNE r9, r9, r10,ASR #1 @ diff += r10>>1
TST r12,#1 @ if (offset & 1)
- ADDNE r9, r9, r10,ASR #2 @ diff += r10>>2
+ ADDNE r9, r9, r10,ASR #2 @ diff += r10>>2
ADD r9, r9, r10,ASR #3 @ diff += r10>>3
Modified: scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s 2008-01-28 00:14:17 UTC (rev 30667)
@@ -292,7 +292,7 @@
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src0]
AND r9, r14,r10,LSR #16 @ r9 = src2
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src2]
- MOV r10,r10,LSR #24 @ r10= src3
+ MOV r10,r10,LSR #24 @ r10= src3
LDR r10,[r13,r10,LSL #2] @ r10= pal[src3]
ADD r6, r6, r7 @ r6 = dst0<<2
AND r6, r8, r6, LSR #2 @ r6 = dst0 (split)
@@ -322,7 +322,7 @@
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src5]
MOV r9, r11,LSR #24 @ r9 = src7
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src7]
- AND r10,r14,r12 @ r10= src8
+ AND r10,r14,r12 @ r10= src8
LDR r10,[r13,r10,LSL #2] @ r10= pal[src8]
ADD r6, r6, r7 @ r6 = dst4<<2
AND r6, r8, r6, LSR #2 @ r6 = dst4 (split)
@@ -354,7 +354,7 @@
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src10]
AND r9, r14,r10 @ r9 = src12
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src12]
- AND r12,r14,r10,LSR #8 @ r11= src13
+ AND r12,r14,r10,LSR #8 @ r11= src13
LDR r12,[r13,r12,LSL #2] @ r11= pal[src13]
ADD r6, r6, r7 @ r6 = dst8<<2
AND r6, r8, r6, LSR #2 @ r6 = dst8 (split)
@@ -384,7 +384,7 @@
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src15]
AND r9, r14,r11,LSR #8 @ r9 = src17
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src17]
- AND r12,r14,r11,LSR #16 @ r11= src18
+ AND r12,r14,r11,LSR #16 @ r11= src18
LDR r12,[r13,r12,LSL #2] @ r11= pal[src18]
ADD r6, r6, r7 @ r6 = dst12<<2
AND r6, r8, r6, LSR #2 @ r6 = dst12 (split)
Modified: scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -55,12 +55,12 @@
} __attribute__ ((packed));
struct chunkHeader {
- char name[4];
+ char name[4];
u32 size;
} __attribute__ ((packed));
struct Header {
- s16 firstSample;
+ s16 firstSample;
char stepTableIndex;
char reserved;
} __attribute__ ((packed));
Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -220,7 +220,7 @@
gameListType gameList[NUM_SUPPORTED_GAMES] = {
// Unknown game - use normal SCUMM controls
- {"unknown", CONT_SCUMM_ORIGINAL},
+ {"unknown", CONT_SCUMM_ORIGINAL},
// SCUMM games
{"maniac", CONT_SCUMM_ORIGINAL},
@@ -1810,7 +1810,7 @@
if (zooming) {
subScX = subScTargetX;
subScY = subScTargetY;
- triggerIcon(5);
+ triggerIcon(5);
}
} else if ( ((subScreenWidth) > 128 - 8) && ((subScreenWidth) < 128 + 8) ) {
subScreenWidth = 128;
Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -42,98 +42,98 @@
};
struct gameListType {
- char gameId[16];
- controlType control;
+ char gameId[16];
+ controlType control;
};
// Pen reading functions
-void penInit();
-void penUpdate();
-bool getPenDown();
-bool getPenHeld();
-bool getPenReleased();
-int getPenX();
-int getPenY();
+void penInit();
+void penUpdate();
+bool getPenDown();
+bool getPenHeld();
+bool getPenReleased();
+int getPenX();
+int getPenY();
GLvector getPenPos();
-void consumePenEvents();
+void consumePenEvents();
// Pad reading
-int getKeysHeld();
-void keysUpdate();
-int getKeysDown();
-int getKeysReleased();
-void consumeKeys();
-int leftHandedSwap(int keys);
+int getKeysHeld();
+void keysUpdate();
+int getKeysDown();
+int getKeysReleased();
+void consumeKeys();
+int leftHandedSwap(int keys);
// Video
-void displayMode8Bit(); // Switch to 8-bit mode5
-void displayMode16Bit(); // Switch to 16-bit mode5
+void displayMode8Bit(); // Switch to 8-bit mode5
+void displayMode16Bit(); // Switch to 16-bit mode5
// Flip double buffer
-void displayMode16BitFlipBuffer();
+void displayMode16BitFlipBuffer();
// Get address of current back buffer
-u16* get16BitBackBuffer();
-u16* get8BitBackBuffer();
+u16* get16BitBackBuffer();
+u16* get8BitBackBuffer();
-void setTalkPos(int x, int y);
-void setTopScreenTarget(int x, int y);
+void setTalkPos(int x, int y);
+void setTopScreenTarget(int x, int y);
void set200PercentFixedScale(bool on);
// Timers
-void setTimerCallback(OSystem_DS::TimerProc proc, int interval); // Setup a callback function at a regular interval
-int getMillis(); // Return the current runtime in milliseconds
-void doTimerCallback(); // Call callback function if required
+void setTimerCallback(OSystem_DS::TimerProc proc, int interval); // Setup a callback function at a regular interval
+int getMillis(); // Return the current runtime in milliseconds
+void doTimerCallback(); // Call callback function if required
// Sound
-void setSoundProc(OSystem_DS::SoundProc proc, void* param); // Setup a callback function for sound
-void doSoundCallback(); // Call function if sound buffers need more data
-void playSound(const void* data, u32 length, bool loop, bool adpcm = false, int rate = 22050); // Start a sound
-void stopSound(int channel);
+void setSoundProc(OSystem_DS::SoundProc proc, void* param); // Setup a callback function for sound
+void doSoundCallback(); // Call function if sound buffers need more data
+void playSound(const void* data, u32 length, bool loop, bool adpcm = false, int rate = 22050); // Start a sound
+void stopSound(int channel);
int getSoundFrequency();
// Event queue
-void addEventsToQueue();
-void VBlankHandler();
+void addEventsToQueue();
+void VBlankHandler();
// Sam and Max Stuff
-void setGameID(int id);
-void setCursorIcon(const u8* icon, uint w, uint h, byte keycolor, int hotspotX, int hotspotY);
+void setGameID(int id);
+void setCursorIcon(const u8* icon, uint w, uint h, byte keycolor, int hotspotX, int hotspotY);
void setShowCursor(bool enable);
void setMouseCursorVisible(bool visible);
// Shake
-void setShakePos(int shakePos);
+void setShakePos(int shakePos);
// Reports
-void memoryReport();
+void memoryReport();
// GBAMP
-bool isGBAMPAvailable();
+bool isGBAMPAvailable();
// Sleep (I'd like some of that right now)
-void checkSleepMode();
+void checkSleepMode();
// Virtual keyboard
-void setKeyboardIcon(bool enable);
-bool getKeyboardIcon();
-void setKeyboardEnable(bool en);
-bool getKeyboardEnable();
+void setKeyboardIcon(bool enable);
+bool getKeyboardIcon();
+void setKeyboardEnable(bool en);
+bool getKeyboardEnable();
// Options
-void setLeftHanded(bool enable);
-void setTouchXOffset(int x);
-void setTouchYOffset(int y);
-void setUnscaledMode(bool enable);
+void setLeftHanded(bool enable);
+void setTouchXOffset(int x);
+void setTouchYOffset(int y);
+void setUnscaledMode(bool enable);
void setSnapToBorder(bool enable);
-void setIndyFightState(bool st);
-bool getIndyFightState();
+void setIndyFightState(bool st);
+bool getIndyFightState();
bool isCpuScalerEnabled();
void setCpuScalerEnable(bool enable);
// Display
-bool getIsDisplayMode8Bit();
-void setGameSize(int width, int height);
+bool getIsDisplayMode8Bit();
+void setGameSize(int width, int height);
int getGameWidth();
int getGameHeight();
Modified: scummvm/trunk/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/fat/gba_nds_fat.c 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/fat/gba_nds_fat.c 2008-01-28 00:14:17 UTC (rev 30667)
@@ -362,7 +362,7 @@
if (cluster & 0x01) {
nextCluster = nextCluster >> 4;
- } else {
+ } else {
nextCluster &= 0x0FFF;
}
@@ -1231,7 +1231,7 @@
// Read in the last accessed directory entry
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
- return FAT_GetFilename (((DIR_ENT*)globalBuffer)[wrkDirOffset], alias);
+ return FAT_GetFilename (((DIR_ENT*)globalBuffer)[wrkDirOffset], alias);
}
/*-----------------------------------------------------------------
@@ -1245,7 +1245,7 @@
// Read in the last accessed directory entry
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
- return ((DIR_ENT*)globalBuffer)[wrkDirOffset].fileSize;
+ return ((DIR_ENT*)globalBuffer)[wrkDirOffset].fileSize;
}
/*-----------------------------------------------------------------
@@ -1258,7 +1258,7 @@
// Read in the last accessed directory entry
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
- return (((DIR_ENT*)globalBuffer)[wrkDirOffset].startCluster) | (((DIR_ENT*)globalBuffer)[wrkDirOffset].startClusterHigh << 16);
+ return (((DIR_ENT*)globalBuffer)[wrkDirOffset].startCluster) | (((DIR_ENT*)globalBuffer)[wrkDirOffset].startClusterHigh << 16);
}
/*-----------------------------------------------------------------
@@ -1271,7 +1271,7 @@
// Read in the last accessed directory entry
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
- return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib;
+ return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib;
}
#ifdef CAN_WRITE_TO_DISC
@@ -1297,7 +1297,7 @@
disc_WriteSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
- return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib;
+ return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib;
}
#endif
@@ -1327,7 +1327,7 @@
// Read in the last accessed directory entry
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
- return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].cTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].cDate);
+ return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].cTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].cDate);
}
/*-----------------------------------------------------------------
@@ -1340,7 +1340,7 @@
// Read in the last accessed directory entry
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
- return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].mTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].mDate);
+ return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].mTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].mDate);
}
#endif
Modified: scummvm/trunk/backends/platform/ds/arm9/source/fat/io_dldi.s
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/fat/io_dldi.s 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/fat/io_dldi.s 2008-01-28 00:14:17 UTC (rev 30667)
@@ -17,7 +17,7 @@
.byte 0x01 @ Version number
.byte 0x0F @32KiB @ Log [base-2] of the size of this driver in bytes.
.byte 0x00 @ Sections to fix
- .byte 0x0F @32KiB @ Log [base-2] of the allocated space in bytes.
+ .byte 0x0F @32KiB @ Log [base-2] of the allocated space in bytes.
@---------------------------------------------------------------------------------
@ Text identifier - can be anything up to 47 chars + terminating null -- 16 bytes
Modified: scummvm/trunk/backends/platform/ds/arm9/source/fat/io_njsd.c
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/fat/io_njsd.c 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/fat/io_njsd.c 2008-01-28 00:14:17 UTC (rev 30667)
@@ -445,7 +445,7 @@
_NJSD_sendCLK (SD_CLK_200KHz, 8);
_NJSD_sendCLK (SD_CLK_200KHz, 256);
- _NJSD_sendCMDN (SD_CLK_200KHz, GO_IDLE_STATE, 0);
+ _NJSD_sendCMDN (SD_CLK_200KHz, GO_IDLE_STATE, 0);
_NJSD_sendCLK (SD_CLK_200KHz, 8);
for (i = 0; i < MAX_STARTUP_TRIES ; i++) {
@@ -473,7 +473,7 @@
break;
}
}
- if (i >= MAX_STARTUP_TRIES) {
+ if (i >= MAX_STARTUP_TRIES) {
return false;
}
@@ -525,7 +525,7 @@
bool _NJSD_writeSectors (u32 sector, u32 numSectors, const void* buffer) {
- u8 crc[8];
+ u8 crc[8];
u32 offset = sector * BYTES_PER_READ;
u8* data = (u8*) buffer;
Modified: scummvm/trunk/backends/platform/ds/arm9/source/fat/io_nmmc.c
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/fat/io_nmmc.c 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/fat/io_nmmc.c 2008-01-28 00:14:17 UTC (rev 30667)
@@ -73,7 +73,7 @@
static inline void Neo_EnableEEPROM( bool enable ) {
Neo_OpenSPI(spi_freq);
if(enable) Neo_SPI(0x06);
- else Neo_SPI(0x0E);
+ else Neo_SPI(0x0E);
Neo_CloseSPI();
}
@@ -294,7 +294,7 @@
Neo_SPI( 0xFF ); // Send fake CRC16
Neo_SPI( 0xFF ); // Send fake CRC16
- Neo_SPI (0xFF); // Send 8 clocks
+ Neo_SPI (0xFF); // Send 8 clocks
while( Neo_SPI( 0xFF ) == 0x00 ); // Wait for the busy signal to clear
Modified: scummvm/trunk/backends/platform/ds/arm9/source/fat/io_sd_common.c
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/fat/io_sd_common.c 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/fat/io_sd_common.c 2008-01-28 00:14:17 UTC (rev 30667)
@@ -169,7 +169,7 @@
break;
}
}
- if (i >= MAX_STARTUP_TRIES) {
+ if (i >= MAX_STARTUP_TRIES) {
return false;
}
Modified: scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -194,7 +194,7 @@
for (int y = 0 ; y < 8; y++) {
for (int x = 0; x < 2; x++) {
*(tileAddr + (y * 2) + x) =(*(src + (y * 752) + (x * 4) + 0) & 0x0F)
- | ((*(src + (y * 752) + (x * 4) + 1) & 0x0F) << 4)
+ | ((*(src + (y * 752) + (x * 4) + 1) & 0x0F) << 4)
| ((*(src + (y * 752) + (x * 4) + 2) & 0x0F) << 8)
| ((*(src + (y * 752) + (x * 4) + 3) & 0x0F) << 12);
@@ -317,7 +317,7 @@
void typeCompletion(int current) {
Common::Event event;
- OSystem_DS* system = OSystem_DS::instance();
+ OSystem_DS* system = OSystem_DS::instance();
strcat(autoCompleteBuffer, &autoCompleteWord[current][charactersEntered]);
strcat(autoCompleteBuffer, " ");
@@ -350,7 +350,7 @@
if (autoCompleteBuffer[0] != '\0')
{
Common::Event event;
- OSystem_DS* system = OSystem_DS::instance();
+ OSystem_DS* system = OSystem_DS::instance();
event.kbd.keycode = (Common::KeyCode) autoCompleteBuffer[0];
event.kbd.ascii = autoCompleteBuffer[0];
@@ -433,7 +433,7 @@
for (int r = 0; r < DS_NUM_KEYS; r++) {
if (( (tx >= keys[r].x) && (tx <= keys[r].x + 1)) &&
(ty >= keys[r].y) && (ty <= keys[r].y + 1)) {
- OSystem_DS* system = OSystem_DS::instance();
+ OSystem_DS* system = OSystem_DS::instance();
Common::Event event;
// consolePrintf("Key: %d\n", r);
@@ -491,7 +491,7 @@
if (keys[r].pressed) {
DS::setKeyHighlight(r, false);
- OSystem_DS* system = OSystem_DS::instance();
+ OSystem_DS* system = OSystem_DS::instance();
Common::Event event;
createKeyEvent(r, event);
Modified: scummvm/trunk/backends/platform/ds/arm9/source/zipreader.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/zipreader.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ds/arm9/source/zipreader.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -98,7 +98,7 @@
if (_directory[0] == 0) { // Root directory
name[strlen(name) - 1] = 0;
- return !strchr(name, '\\'); // Not in root if contains a / character before the last character
+ return !strchr(name, '\\'); // Not in root if contains a / character before the last character
} else {
/* if (name starts with directory && it's not the directory
&& (no slashes after the directory || it's the last character)
@@ -170,7 +170,7 @@
}
bool ZipFile::isDirectory() {
- return _currentFile->fileSize == 0; // This is a bit wrong, but seems to work.
+ return _currentFile->fileSize == 0; // This is a bit wrong, but seems to work.
}
char* ZipFile::getFile() {
Modified: scummvm/trunk/backends/platform/gp2x/events.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/events.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/gp2x/events.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -214,7 +214,7 @@
} else if ((stickBtn[3])||(stickBtn[4])||(stickBtn[5])){
if (_km.y_down_count!=2){
_km.y_vel = 1;
- _km.y_down_count = 1;
+ _km.y_down_count = 1;
}else
_km.y_vel = 4;
}
@@ -297,7 +297,7 @@
Combos:
GP2X_BUTTON_VOLUP & GP2X_BUTTON_VOLDOWN 0 (For Monkey 2 CP)
- GP2X_BUTTON_L & GP2X_BUTTON_SELECT Common::EVENT_QUIT (Calls Sync() to make sure SD is flushed)
+ GP2X_BUTTON_L & GP2X_BUTTON_SELECT Common::EVENT_QUIT (Calls Sync() to make sure SD is flushed)
GP2X_BUTTON_L & GP2X_BUTTON_Y Toggles setZoomOnMouse() for larger then 320*240 games to scale to the point + raduis.
GP2X_BUTTON_L & GP2X_BUTTON_A Common::EVENT_PREDICTIVE_DIALOG for predictive text entry box (AGI games)
*/
Modified: scummvm/trunk/backends/platform/gp2x/gp2x-common.h
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -309,7 +309,7 @@
int16 x, y;
// The size and hotspot of the original cursor image.
- int16 w, h;
+ int16 w, h;
int16 hotX, hotY;
// The size and hotspot of the pre-scaled cursor image, in real
Modified: scummvm/trunk/backends/platform/gp2x/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/graphics.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/gp2x/graphics.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -1222,29 +1222,29 @@
_mouseKeyColor = keycolor;
- _cursorTargetScale = cursorTargetScale;
+ _cursorTargetScale = cursorTargetScale;
- if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) {
- _mouseCurState.w = w;
- _mouseCurState.h = h;
+ if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) {
+ _mouseCurState.w = w;
+ _mouseCurState.h = h;
- if (_mouseOrigSurface)
- SDL_FreeSurface(_mouseOrigSurface);
+ if (_mouseOrigSurface)
+ SDL_FreeSurface(_mouseOrigSurface);
// Allocate bigger surface because AdvMame2x adds black pixel at [0,0]
- _mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
- _mouseCurState.w + 2,
- _mouseCurState.h + 2,
- 16,
- _hwscreen->format->Rmask,
- _hwscreen->format->Gmask,
- _hwscreen->format->Bmask,
- _hwscreen->format->Amask);
+ _mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
+ _mouseCurState.w + 2,
+ _mouseCurState.h + 2,
+ 16,
+ _hwscreen->format->Rmask,
+ _hwscreen->format->Gmask,
+ _hwscreen->format->Bmask,
+ _hwscreen->format->Amask);
- if (_mouseOrigSurface == NULL)
- error("allocating _mouseOrigSurface failed");
- SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
- }
+ if (_mouseOrigSurface == NULL)
+ error("allocating _mouseOrigSurface failed");
+ SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
+ }
free(_mouseData);
@@ -1260,7 +1260,7 @@
int w, h, i, j;
if (!_mouseOrigSurface || !_mouseData)
- return;
+ return;
w = _mouseCurState.w;
h = _mouseCurState.h;
@@ -1297,7 +1297,7 @@
srcPtr++;
}
dstPtr += _mouseOrigSurface->pitch - w * 2;
- }
+ }
int rW, rH;
@@ -1338,7 +1338,7 @@
_mouseCurState.vH = h;
_mouseCurState.vHotX = _mouseCurState.hotX;
_mouseCurState.vHotY = _mouseCurState.hotY;
- }
+ }
int rH1 = rH; // store original to pass to aspect-correction function later
if (_adjustAspectRatio && _cursorTargetScale == 1) {
@@ -1366,7 +1366,7 @@
error("allocating _mouseSurface failed");
SDL_SetColorKey(_mouseSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
- }
+ }
SDL_LockSurface(_mouseSurface);
@@ -1429,7 +1429,7 @@
void OSystem_GP2X::drawMouse() {
if (!_mouseVisible || !_mouseSurface) {
_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
- return;
+ return;
}
SDL_Rect zoomdst;
Modified: scummvm/trunk/backends/platform/gp32/Makefile
===================================================================
--- scummvm/trunk/backends/platform/gp32/Makefile 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/gp32/Makefile 2008-01-28 00:14:17 UTC (rev 30667)
@@ -56,7 +56,7 @@
LDSPECS = -specs=gp32_gpsdk.specs
-LDFLAGS = $(STRIP_DEBUG) -Wl,-Map,$(MAPFILE) $(LDSPECS) -Wl,--no-warn-mismatch
+LDFLAGS = $(STRIP_DEBUG) -Wl,-Map,$(MAPFILE) $(LDSPECS) -Wl,--no-warn-mismatch
LIBS += -L$(GPSDK)/lib \
-lgpmem -lgpos -lgpstdio -lgpstdlib -lgpsound -lgpgraphic -lgpfont \
@@ -75,7 +75,7 @@
# Plugins hack
srcdir = ./
-DEFINES = -D__GP32__
+DEFINES = -D__GP32__
DEFINES += -DNONSTANDARD_PORT
# Disable new themes. GP32 has LOW memory!
@@ -132,7 +132,7 @@
#backends/platform/gp32/dmaaudio.o \
#Main ScummVM for the GP32 Backend
-OBJS += backends/platform/gp32/gp32_main.o \
+OBJS += backends/platform/gp32/gp32_main.o \
backends/platform/gp32/gp32_launcher.o \
backends/platform/gp32/gp32_osys.o \
backends/fs/gp32/gp32-fs.o
Modified: scummvm/trunk/backends/platform/gp32/debug-gdbstub-usb.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/debug-gdbstub-usb.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/gp32/debug-gdbstub-usb.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -141,7 +141,7 @@
// Some USB stuff
GPN_DESC g_CommDesc;
GPN_COMM g_Comm;
-const char HexDigits[17] = "0123456789abcdef";
+const char HexDigits[17] = "0123456789abcdef";
char g_SendBuffer[256];
char g_TempBuffer[256];
char g_ReadBuffer[0x100];
@@ -592,7 +592,7 @@
void SendMemory(void *pAddr, int iBytes)
{
unsigned char *pData;
- unsigned char iData;
+ unsigned char iData;
int iBufferPos = 0;
int iBytesToSend;
char Byte;
@@ -1016,7 +1016,7 @@
int iResult;
int iMessageLength;
int iOffsetAdd;
- int iNullVal = 0;
+ int iNullVal = 0;
void *pAddr;
int iOffset;
int iBytes;
@@ -1871,7 +1871,7 @@
unsigned int DecodeLSM(lsm Instr, unsigned int uiPC)
{
unsigned int uiRnValue = g_Registers[Instr.Rn];
- unsigned int uiOffsetToPC = 0;
+ unsigned int uiOffsetToPC = 0;
unsigned int uiMemValue;
// Make sure PC is destination and it's Load instruction
Modified: scummvm/trunk/backends/platform/gp32/gp32std_memory.h
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_memory.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/gp32/gp32std_memory.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -30,6 +30,6 @@
extern void * gp_memset(void *dst, int val, size_t count);
extern void * gp_malloc(size_t size);
extern void * gp_calloc(size_t nitems, size_t size);
-extern void gp_free(void *block);
+extern void gp_free(void *block);
#endif
Modified: scummvm/trunk/backends/platform/iphone/iphone_keyboard.m
===================================================================
--- scummvm/trunk/backends/platform/iphone/iphone_keyboard.m 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/iphone/iphone_keyboard.m 2008-01-28 00:14:17 UTC (rev 30667)
@@ -42,7 +42,7 @@
- (id)initWithKeyboard:(SoftKeyboard*)keyboard; {
self = [super initWithFrame:CGRectMake(0.0f, 0.0f, 0.0f, 0.0f)];
- softKeyboard = keyboard;
+ softKeyboard = keyboard;
return self;
}
@@ -85,4 +85,4 @@
[inputDelegate handleKeyPress:c];
}
- at end
\ No newline at end of file
+ at end
Modified: scummvm/trunk/backends/platform/iphone/iphone_video.m
===================================================================
--- scummvm/trunk/backends/platform/iphone/iphone_video.m 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/iphone/iphone_video.m 2008-01-28 00:14:17 UTC (rev 30667)
@@ -70,7 +70,7 @@
_height = height;
_landscape = landscape;
- [sharedInstance performSelectorOnMainThread:@selector(initSurface) withObject:nil waitUntilDone: YES];
+ [sharedInstance performSelectorOnMainThread:@selector(initSurface) withObject:nil waitUntilDone: YES];
}
bool iPhone_fetchEvent(int *outEvent, float *outX, float *outY) {
@@ -134,14 +134,14 @@
- (void)drawRect:(CGRect)frame {
// if (lastTick == 0) {
- // lastTick = time(0);
+ // lastTick = time(0);
// }
//
// frames++;
// if (time(0) > lastTick) {
- // lastTick = time(0);
- // printf("FPS: %i\n", frames);
- // frames = 0;
+ // lastTick = time(0);
+ // printf("FPS: %i\n", frames);
+ // frames = 0;
// }
}
@@ -336,25 +336,25 @@
// struct CGPoint point = GSEventGetLocationInWindow(event);
//
// if (!getLocalMouseCoords(&point))
- // return;
+ // return;
//
// [self addEvent:
- // [[NSDictionary alloc] initWithObjectsAndKeys:
- // [NSNumber numberWithInt:kInputMouseSecondToggled], @"type",
- // [NSNumber numberWithFloat:point.x], @"x",
- // [NSNumber numberWithFloat:point.y], @"y",
- // nil
- // ]
+ // [[NSDictionary alloc] initWithObjectsAndKeys:
+ // [NSNumber numberWithInt:kInputMouseSecondToggled], @"type",
+ // [NSNumber numberWithFloat:point.x], @"x",
+ // [NSNumber numberWithFloat:point.y], @"y",
+ // nil
+ // ]
// ];
}
- (void)mouseExited:(GSEvent*)event {
//printf("mouseExited().\n");
// [self addEvent:
- // [[NSDictionary alloc] initWithObjectsAndKeys:
- // @"mouseExited", @"type",
- // nil
- // ]
+ // [[NSDictionary alloc] initWithObjectsAndKeys:
+ // @"mouseExited", @"type",
+ // nil
+ // ]
// ];
}
Modified: scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_iphone.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/iphone/osys_iphone.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -728,7 +728,7 @@
//printf("Mouse dragged at (%u, %u)\n", x, y);
if (_secondaryTapped) {
if (_gestureStartX == -1 || _gestureStartY == -1) {
- return false;
+ return false;
}
int vecX = (x - _gestureStartX);
Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -465,7 +465,7 @@
" addiu $t8, 32\n\t"
" bnez $t9, loop\n\t" // loop
: // outputs
- : "r"(soundBufL), "r"(soundBufR) // inputs
+ : "r"(soundBufL), "r"(soundBufR) // inputs
// : "$t2", "$t3", "$t4", "$t5", "$t6", "$t7", "$t8", "$t9" // destroyed
: "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25" // destroyed
);
Modified: scummvm/trunk/backends/platform/psp/Makefile
===================================================================
--- scummvm/trunk/backends/platform/psp/Makefile 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/psp/Makefile 2008-01-28 00:14:17 UTC (rev 30667)
@@ -20,8 +20,8 @@
AR = psp-ar cru
RANLIB = psp-ranlib
STRIP = psp-strip
-MKDIR = mkdir -p
-RM = rm -f
+MKDIR = mkdir -p
+RM = rm -f
MKSFO = mksfo
PACK_PBP = pack-pbp
FIXUP = psp-fixup-imports
Modified: scummvm/trunk/backends/platform/psp/README.PSP
===================================================================
--- scummvm/trunk/backends/platform/psp/README.PSP 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/psp/README.PSP 2008-01-28 00:14:17 UTC (rev 30667)
@@ -12,12 +12,12 @@
Controls
========
-Left trigger - ESC
-Right trigger - Enter
-Analog - Mouse movement
+Left trigger - ESC
+Right trigger - Enter
+Analog - Mouse movement
Directionals - Mouse movement
Analog + triangle - Fine control mouse
-Cross - Mouse button 1
+Cross - Mouse button 1
Circle - Mouse button 2
Square - '.' (skip dialogue in some games)
Select - Show/Hide Virtual Keyboard
@@ -76,9 +76,9 @@
- PSP toolchain (svn co svn://svn.pspdev.org/psp/trunk/psptoolchain)
-- PSPSDK (svn co svn://svn.pspdev.org/psp/trunk/pspsdk)
- Note: This usually gets installed by the PSP toolchain,
- so you don't have to do it manually.
+- PSPSDK (svn co svn://svn.pspdev.org/psp/trunk/pspsdk)
+ Note: This usually gets installed by the PSP toolchain,
+ so you don't have to do it manually.
- SDL (svn co svn://svn.pspdev.org/psp/trunk/SDL)
Modified: scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -65,7 +65,7 @@
Common::KeyCode kbd_code_cl[] = {Common::KEYCODE_EXCLAIM, Common::KEYCODE_AT, Common::KEYCODE_HASH, Common::KEYCODE_DOLLAR, (Common::KeyCode)37, Common::KEYCODE_CARET, Common::KEYCODE_AMPERSAND, Common::KEYCODE_ASTERISK, Common::KEYCODE_LEFTPAREN, Common::KEYCODE_RIGHTPAREN, Common::KEYCODE_UNDERSCORE,
Common::KEYCODE_PLUS, (Common::KeyCode)123, (Common::KeyCode)125, (Common::KeyCode)124, Common::KEYCODE_COLON, Common::KEYCODE_QUOTEDBL, Common::KEYCODE_LESS, Common::KEYCODE_GREATER, Common::KEYCODE_QUESTION, (Common::KeyCode)126};
#define CAPS_LOCK (1 << 0)
-#define SYMBOLS (1 << 1)
+#define SYMBOLS (1 << 1)
OSystem_PSP_GU::OSystem_PSP_GU() {
@@ -278,9 +278,9 @@
sceGuClutLoad(32, clut256); // upload 32*8 entries (256)
sceGuTexMode(GU_PSM_T8, 0, 0, 0); // 8-bit image
if (_screenWidth == 320)
- sceGuTexImage(0, 512, 256, _screenWidth, _offscreen);
+ sceGuTexImage(0, 512, 256, _screenWidth, _offscreen);
else
- sceGuTexImage(0, 512, 512, _screenWidth, _offscreen);
+ sceGuTexImage(0, 512, 512, _screenWidth, _offscreen);
sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGB);
sceGuTexFilter(GU_LINEAR, GU_LINEAR);
sceGuTexOffset(0,0);
@@ -349,7 +349,7 @@
}
// draw mouse
- if (_mouseVisible) {
+ if (_mouseVisible) {
sceGuTexMode(GU_PSM_T8, 0, 0, 0); // 8-bit image
sceGuClutMode(GU_PSM_5551, 0, 0xff, 0);
sceGuClutLoad(32, mouseClut); // upload 32*8 entries (256)
Modified: scummvm/trunk/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/graphics.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/sdl/graphics.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -1289,29 +1289,29 @@
_mouseKeyColor = keycolor;
- _cursorTargetScale = cursorTargetScale;
+ _cursorTargetScale = cursorTargetScale;
- if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) {
- _mouseCurState.w = w;
- _mouseCurState.h = h;
+ if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) {
+ _mouseCurState.w = w;
+ _mouseCurState.h = h;
- if (_mouseOrigSurface)
- SDL_FreeSurface(_mouseOrigSurface);
+ if (_mouseOrigSurface)
+ SDL_FreeSurface(_mouseOrigSurface);
// Allocate bigger surface because AdvMame2x adds black pixel at [0,0]
- _mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
- _mouseCurState.w + 2,
- _mouseCurState.h + 2,
- 16,
- _hwscreen->format->Rmask,
- _hwscreen->format->Gmask,
- _hwscreen->format->Bmask,
- _hwscreen->format->Amask);
+ _mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
+ _mouseCurState.w + 2,
+ _mouseCurState.h + 2,
+ 16,
+ _hwscreen->format->Rmask,
+ _hwscreen->format->Gmask,
+ _hwscreen->format->Bmask,
+ _hwscreen->format->Amask);
- if (_mouseOrigSurface == NULL)
- error("allocating _mouseOrigSurface failed");
- SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
- }
+ if (_mouseOrigSurface == NULL)
+ error("allocating _mouseOrigSurface failed");
+ SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
+ }
free(_mouseData);
@@ -1327,7 +1327,7 @@
int w, h, i, j;
if (!_mouseOrigSurface || !_mouseData)
- return;
+ return;
w = _mouseCurState.w;
h = _mouseCurState.h;
@@ -1364,7 +1364,7 @@
srcPtr++;
}
dstPtr += _mouseOrigSurface->pitch - w * 2;
- }
+ }
int rW, rH;
@@ -1405,7 +1405,7 @@
_mouseCurState.vH = h;
_mouseCurState.vHotX = _mouseCurState.hotX;
_mouseCurState.vHotY = _mouseCurState.hotY;
- }
+ }
#ifndef DISABLE_SCALERS
int rH1 = rH; // store original to pass to aspect-correction function later
@@ -1436,7 +1436,7 @@
error("allocating _mouseSurface failed");
SDL_SetColorKey(_mouseSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
- }
+ }
SDL_LockSurface(_mouseSurface);
@@ -1510,7 +1510,7 @@
void OSystem_SDL::drawMouse() {
if (!_mouseVisible || !_mouseSurface) {
_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
- return;
+ return;
}
SDL_Rect dst;
Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/sdl/sdl.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -312,7 +312,7 @@
int16 x, y;
// The size and hotspot of the original cursor image.
- int16 w, h;
+ int16 w, h;
int16 hotX, hotY;
// The size and hotspot of the pre-scaled cursor image, in real
Modified: scummvm/trunk/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
===================================================================
--- scummvm/trunk/backends/platform/symbian/BuildPackageUpload_AllVersions.pl 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/BuildPackageUpload_AllVersions.pl 2008-01-28 00:14:17 UTC (rev 30667)
@@ -320,7 +320,7 @@
{
PrintErrorMessage("'abld build $TargetName urel' apparently failed.");
if ($HaltOnError)
- {
+ {
PrintErrorMessage("Halting on error as requested!");
exit 1;
}
Modified: scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in 2008-01-28 00:14:17 UTC (rev 30667)
@@ -63,8 +63,8 @@
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\ESDL
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
Modified: scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2008-01-28 00:14:17 UTC (rev 30667)
@@ -41,7 +41,7 @@
LANG SC
END
-SOURCEPATH ..\res
+SOURCEPATH ..\res
START RESOURCE ScummVM.rss
HEADER
TARGETPATH \Resource\Apps
@@ -89,8 +89,8 @@
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\ESDL
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
Modified: scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in 2008-01-28 00:14:17 UTC (rev 30667)
@@ -61,8 +61,8 @@
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\ESDL
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
Modified: scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in 2008-01-28 00:14:17 UTC (rev 30667)
@@ -61,8 +61,8 @@
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\ESDL
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
Modified: scummvm/trunk/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in 2008-01-28 00:14:17 UTC (rev 30667)
@@ -59,8 +59,8 @@
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\ESDL
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
Modified: scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2008-01-28 00:14:17 UTC (rev 30667)
@@ -41,7 +41,7 @@
LANG SC
END
-SOURCEPATH .
+SOURCEPATH .
START RESOURCE ScummVM.rss
HEADER
TARGETPATH \Resource\Apps
@@ -89,8 +89,8 @@
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\ESDL
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in 2008-01-28 00:14:17 UTC (rev 30667)
@@ -67,8 +67,8 @@
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\ESDL
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include\tremor
SYSTEMINCLUDE \epoc32\include
@@ -119,6 +119,6 @@
source backends\saves\savefile.cpp
source backends\saves\default\default-saves.cpp
source backends\saves\compressed\compressed-saves.cpp
-source engines\engine.cpp
+source engines\engine.cpp
// backend specific includes
// backend specific includes
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in 2008-01-28 00:14:17 UTC (rev 30667)
@@ -65,7 +65,7 @@
USERINCLUDE ..\..\..\..\engines ..\..\..\..\engines\scumm\smush ..\..\..\..\engines\scumm\insane
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
Modified: scummvm/trunk/backends/platform/symbian/src/ScummApp.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/ScummApp.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/src/ScummApp.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -77,7 +77,7 @@
#include <eikstart.h>
// E32Main() contains the program's start up code, the entry point for an EXE.
GLDEF_C TInt E32Main() {
- return EikStart::RunApplication(NewApplication);
+ return EikStart::RunApplication(NewApplication);
}
#endif
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -243,7 +243,7 @@
void OSystem_SDL_Symbian::symbianMix(byte *samples, int len) {
// If not stereo then we need to downmix
if (_channels != 2) {
- _sound_proc(_sound_proc_param, _stereo_mix_buffer, len * 2);
+ _sound_proc(_sound_proc_param, _stereo_mix_buffer, len * 2);
int16 *bitmixDst = (int16 *)samples;
int16 *bitmixSrc = (int16 *)_stereo_mix_buffer;
@@ -440,7 +440,7 @@
#define FILE void
-FILE* symbian_fopen(const char* name, const char* mode) {
+FILE* symbian_fopen(const char* name, const char* mode) {
TSymbianFileEntry* fileEntry = new TSymbianFileEntry;
if (fileEntry != NULL) {
Modified: scummvm/trunk/backends/platform/symbian/src/portdefs.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/portdefs.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/symbian/src/portdefs.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -98,7 +98,7 @@
return (SIGND (dl1) ? -l : l);
}
- /* okay, okay: I admit it: I absolutely have _NO_ idea why __fixdfdi does not get linked in by gcc from libgcc.a
+ /* okay, okay: I admit it: I absolutely have _NO_ idea why __fixdfdi does not get linked in by gcc from libgcc.a
because I know it's in there: I checked with `ar x _fixdfdi.o libgcc.a` and the symbol is in there, so I'm lost
and had to fix it this way. I tried all gcc and ld options I could find: no hope :( If someone can enlighten me:
feel free to let me know at sumthinwicked at users.sf.net! Much obliged.
Modified: scummvm/trunk/backends/platform/wince/missing/dirent.h
===================================================================
--- scummvm/trunk/backends/platform/wince/missing/dirent.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/wince/missing/dirent.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -7,7 +7,7 @@
long d_ino; /* Always zero. */
unsigned short d_reclen; /* Always zero. */
unsigned short d_namlen; /* Length of name in d_name. */
- char* d_name; /* File name. */
+ char* d_name; /* File name. */
/* NOTE: The name in the dirent structure points to the name in the
* finddata_t structure in the DIR. */
};
@@ -44,7 +44,7 @@
DIR* opendir (const char*);
struct dirent* readdir (DIR*);
-int closedir (DIR*);
+int closedir (DIR*);
/*
void rewinddir (DIR*);
long telldir (DIR*);
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -1122,7 +1122,7 @@
_adjustAspectRatio = false;
if (CEDevice::hasPocketPCResolution()) {
- if ( (!_orientationLandscape && (_screenWidth == 320 || !_screenWidth))
+ if ( (!_orientationLandscape && (_screenWidth == 320 || !_screenWidth))
|| CEDevice::hasSquareQVGAResolution() ) {
if (getScreenWidth() != 320) {
_scaleFactorXm = 3;
@@ -1157,14 +1157,14 @@
_scalerProc = Normal1x;
_modeFlags = 0;
}
- } else if (_screenWidth == 640 && !(isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) {
+ } else if (_screenWidth == 640 && !(isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) {
_scaleFactorXm = 1;
_scaleFactorXd = 2;
_scaleFactorYm = 1;
_scaleFactorYd = 2;
_scalerProc = PocketPCHalf;
_modeFlags = 0;
- } else if (_screenWidth == 640 && (isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) {
+ } else if (_screenWidth == 640 && (isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) {
_scaleFactorXm = 1;
_scaleFactorXd = 1;
_scaleFactorYm = 1;
@@ -2433,7 +2433,7 @@
SYSTEMTIME systime;
GetLocalTime(&systime);
- t.tm_year = systime.wYear - 1900;
+ t.tm_year = systime.wYear - 1900;
t.tm_mon = systime.wMonth - 1;
t.tm_wday = systime.wDayOfWeek;
t.tm_mday = systime.wDay;
Modified: scummvm/trunk/backends/platform/x11/x11.cpp
===================================================================
--- scummvm/trunk/backends/platform/x11/x11.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/backends/platform/x11/x11.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -439,7 +439,7 @@
_palette_changed = true;
}
-#define AddDirtyRec(xi,yi,wi,hi) \
+#define AddDirtyRec(xi,yi,wi,hi) \
if (_num_of_dirty_rects < MAX_NUMBER_OF_DIRTY_RECTS) { \
_ds[_num_of_dirty_rects].x = xi; \
_ds[_num_of_dirty_rects].y = yi; \
Modified: scummvm/trunk/base/version.h
===================================================================
--- scummvm/trunk/base/version.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/base/version.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -29,6 +29,6 @@
extern const char *gScummVMBuildDate; // e.g. "2003-06-24"
extern const char *gScummVMVersionDate; // e.g. "0.4.1 (2003-06-24)"
extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)"
-extern const char *gScummVMFeatures; // e.g. "ALSA MPEG2 zLib"
+extern const char *gScummVMFeatures; // e.g. "ALSA MPEG2 zLib"
#endif
Modified: scummvm/trunk/common/events.h
===================================================================
--- scummvm/trunk/common/events.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/common/events.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -78,24 +78,24 @@
* Implementation wise, we might want to use the classic
* union-of-structs trick. It goes roughly like this:
* struct BasicEvent {
- * EventType type;
+ * EventType type;
* };
* struct MouseMovedEvent : BasicEvent {
- * Common::Point pos;
+ * Common::Point pos;
* };
* struct MouseButtonEvent : MouseMovedEvent {
- * int button;
+ * int button;
* };
* struct KeyEvent : BasicEvent {
- * ...
+ * ...
* };
* ...
* union Event {
* EventType type;
- * MouseMovedEvent mouse;
- * MouseButtonEvent button;
- * KeyEvent key;
- * ...
+ * MouseMovedEvent mouse;
+ * MouseButtonEvent button;
+ * KeyEvent key;
+ * ...
* };
*/
struct Event {
Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/common/file.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -77,18 +77,18 @@
#include "backends/fs/ds/ds-fs.h"
- //void std_fprintf(FILE* handle, const char* fmt, ...); // used in common/util.cpp
- //void std_fflush(FILE* handle); // used in common/util.cpp
+ //void std_fprintf(FILE* handle, const char* fmt, ...); // used in common/util.cpp
+ //void std_fflush(FILE* handle); // used in common/util.cpp
- //char* std_fgets(char* str, int size, FILE* file); // not used
- //int std_getc(FILE* handle); // not used
- //char* std_getcwd(char* dir, int dunno); // not used
- //void std_cwd(char* dir); // not used
- //int std_ferror(FILE* handle); // not used
+ //char* std_fgets(char* str, int size, FILE* file); // not used
+ //int std_getc(FILE* handle); // not used
+ //char* std_getcwd(char* dir, int dunno); // not used
+ //void std_cwd(char* dir); // not used
+ //int std_ferror(FILE* handle); // not used
// Only functions used in the ScummVM source have been defined here!
- #define fopen(name, mode) DS::std_fopen(name, mode)
- #define fclose(handle) DS::std_fclose(handle)
+ #define fopen(name, mode) DS::std_fopen(name, mode)
+ #define fclose(handle) DS::std_fclose(handle)
#define fread(ptr, size, items, file) DS::std_fread(ptr, size, items, file)
#define fwrite(ptr, size, items, file) DS::std_fwrite(ptr, size, items, file)
#define feof(handle) DS::std_feof(handle)
@@ -114,18 +114,18 @@
#define FILE void
- FILE* symbian_fopen(const char* name, const char* mode);
- void symbian_fclose(FILE* handle);
- size_t symbian_fread(const void* ptr, size_t size, size_t numItems, FILE* handle);
- size_t symbian_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle);
- bool symbian_feof(FILE* handle);
+ FILE* symbian_fopen(const char* name, const char* mode);
+ void symbian_fclose(FILE* handle);
+ size_t symbian_fread(const void* ptr, size_t size, size_t numItems, FILE* handle);
+ size_t symbian_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle);
+ bool symbian_feof(FILE* handle);
long int symbian_ftell(FILE* handle);
- int symbian_fseek(FILE* handle, long int offset, int whence);
- void symbian_clearerr(FILE* handle);
+ int symbian_fseek(FILE* handle, long int offset, int whence);
+ void symbian_clearerr(FILE* handle);
// Only functions used in the ScummVM source have been defined here!
- #define fopen(name, mode) symbian_fopen(name, mode)
- #define fclose(handle) symbian_fclose(handle)
+ #define fopen(name, mode) symbian_fopen(name, mode)
+ #define fclose(handle) symbian_fclose(handle)
#define fread(ptr, size, items, file) symbian_fread(ptr, size, items, file)
#define fwrite(ptr, size, items, file) symbian_fwrite(ptr, size, items, file)
#define feof(handle) symbian_feof(handle)
Modified: scummvm/trunk/common/iff_container.h
===================================================================
--- scummvm/trunk/common/iff_container.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/common/iff_container.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -218,11 +218,11 @@
return &_chunk;
}
- IFF_ID _typeId;
+ IFF_ID _typeId;
protected:
- IFFChunk _formChunk;
- IFFChunk _chunk;
+ IFFChunk _formChunk;
+ IFFChunk _chunk;
};
} // namespace Common
Modified: scummvm/trunk/common/rect.h
===================================================================
--- scummvm/trunk/common/rect.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/common/rect.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -31,7 +31,7 @@
namespace Common {
-/*! @brief simple class for handling both 2D position and size
+/*! @brief simple class for handling both 2D position and size
This small class is an helper for position and size values.
*/
@@ -65,7 +65,7 @@
}
};
-/*! @brief simple class for handling a rectangular zone.
+/*! @brief simple class for handling a rectangular zone.
This small class is an helper for rectangles.
Note: This implementation is built around the assumption that (top,left) is
Modified: scummvm/trunk/common/str.h
===================================================================
--- scummvm/trunk/common/str.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/common/str.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -61,7 +61,7 @@
* a lot. Yes, we limit ourselves to strings shorter than 4GB --
* on purpose :-).
*/
- uint32 _len;
+ uint32 _len;
/**
* Pointer to the actual string storage. Either points to _storage,
@@ -81,7 +81,7 @@
*/
struct {
mutable int *_refCount;
- uint32 _capacity;
+ uint32 _capacity;
} _extern;
};
Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/common/util.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -53,8 +53,8 @@
#define stderr ((DS::fileHandle*) -2)
#define stdin ((DS::fileHandle*) -3)
- void std_fprintf(FILE* handle, const char* fmt, ...);
- void std_fflush(FILE* handle);
+ void std_fprintf(FILE* handle, const char* fmt, ...);
+ void std_fflush(FILE* handle);
#define fprintf(file, fmt, ...) { char str[128]; sprintf(str, fmt, ##__VA_ARGS__); DS::std_fwrite(str, strlen(str), 1, file); }
#define fflush(file) DS::std_fflush(file)
Modified: scummvm/trunk/common/util.h
===================================================================
--- scummvm/trunk/common/util.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/common/util.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -57,15 +57,15 @@
* Taken from exult/files/listfiles.cc
*
* Token meaning:
- * "*": any character, any amount of times.
- * "?": any character, only once.
+ * "*": any character, any amount of times.
+ * "?": any character, only once.
*
* Example strings/patterns:
- * String: monkey.s?? Pattern: monkey.s01 => true
- * String: monkey.s?? Pattern: monkey.s101 => false
- * String: monkey.s?1 Pattern: monkey.s99 => false
- * String: monkey.s* Pattern: monkey.s101 => true
- * String: monkey.s*1 Pattern: monkey.s99 => false
+ * String: monkey.s?? Pattern: monkey.s01 => true
+ * String: monkey.s?? Pattern: monkey.s101 => false
+ * String: monkey.s?1 Pattern: monkey.s99 => false
+ * String: monkey.s* Pattern: monkey.s101 => true
+ * String: monkey.s*1 Pattern: monkey.s99 => false
*
* @param str Text to be matched against the given pattern.
* @param pat Glob pattern.
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agi/agi.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -517,7 +517,7 @@
int lineMinPrint; /**< num lines to print on */
int cursorPos; /**< column where the input cursor is */
uint8 inputBuffer[40]; /**< buffer for user input */
- uint8 echoBuffer[40]; /**< buffer for echo.line */
+ uint8 echoBuffer[40]; /**< buffer for echo.line */
int keypress;
#define INPUT_NORMAL 0x01
#define INPUT_GETSTRING 0x02
@@ -577,7 +577,7 @@
AgiDir dirSound[MAX_DIRS];
/* resources */
- AgiPicture pictures[MAX_DIRS]; /**< AGI picture resources */
+ AgiPicture pictures[MAX_DIRS]; /**< AGI picture resources */
AgiLogic logics[MAX_DIRS]; /**< AGI logic resources */
AgiView views[MAX_DIRS]; /**< AGI view resources */
AgiSound *sounds[MAX_DIRS]; /**< Pointers to AGI sound resources */
Modified: scummvm/trunk/engines/agi/preagi_troll.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_troll.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agi/preagi_troll.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -723,7 +723,7 @@
// Init
void Troll::init() {
- _vm->_picture->setPictureVersion(AGIPIC_V15);
+ _vm->_picture->setPictureVersion(AGIPIC_V15);
//SetScreenPar(320, 200, (char*)ibm_fontdata);
const int gaps[] = { 0x3A40, 0x4600, 0x4800, 0x5800, 0x5a00, 0x6a00,
Modified: scummvm/trunk/engines/agi/view.h
===================================================================
--- scummvm/trunk/engines/agi/view.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agi/view.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -92,7 +92,7 @@
#define CYCLE_NORMAL 0
#define CYCLE_END_OF_LOOP 1
-#define CYCLE_REV_LOOP 2
+#define CYCLE_REV_LOOP 2
#define CYCLE_REVERSE 3
uint8 cycle;
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agos/agos.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -338,8 +338,8 @@
_syncCount = 0;
- _iconToggleCount = 0;
- _voiceCount = 0;
+ _iconToggleCount = 0;
+ _voiceCount = 0;
_lastTickCount = 0;
_thisTickCount = 0;
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agos/agos.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -324,8 +324,8 @@
uint8 _wallOn;
uint16 _hyperLink, _newLines;
- uint16 _oracleMaxScrollY, _noOracleScroll;
- uint16 _interactY;
+ uint16 _oracleMaxScrollY, _noOracleScroll;
+ uint16 _interactY;
int16 _scriptVerb, _scriptNoun1, _scriptNoun2;
int16 _scriptAdj1, _scriptAdj2;
@@ -1634,8 +1634,8 @@
void sendInteractText(uint16 num, const char *fmt, ...);
void checkLinkBox();
- void hyperLinkOn(uint16 x);
- void hyperLinkOff();
+ void hyperLinkOn(uint16 x);
+ void hyperLinkOff();
void linksUp();
void linksDown();
Modified: scummvm/trunk/engines/agos/charset-fontdata.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset-fontdata.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agos/charset-fontdata.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -1403,7 +1403,7 @@
0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00,
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00,
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00,
- 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00,
+ 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00,
0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00,
0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00,
0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00,
@@ -1504,7 +1504,7 @@
0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00,
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00,
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00,
- 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00,
+ 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00,
0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00,
0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00,
0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00,
Modified: scummvm/trunk/engines/agos/cursor.cpp
===================================================================
--- scummvm/trunk/engines/agos/cursor.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agos/cursor.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -37,7 +37,7 @@
static const uint16 _common_mouseInfo[32] = {
0xC000, 0x8000, 0xE000, 0xC000, 0xF000, 0xE000, 0xF800, 0xF000,
0xFC00, 0xF800, 0xFE00, 0xFC00, 0xFC00, 0xF000, 0x9800, 0x9000,
- 0x0C00, 0x0800, 0x0C00, 0x0800, 0x0600, 0x0400, 0x0000, 0x0000,
+ 0x0C00, 0x0800, 0x0C00, 0x0800, 0x0600, 0x0400, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
};
Modified: scummvm/trunk/engines/agos/detection_tables.h
===================================================================
--- scummvm/trunk/engines/agos/detection_tables.h 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agos/detection_tables.h 2008-01-28 00:14:17 UTC (rev 30667)
@@ -750,10 +750,10 @@
"Floppy",
{
- { "gamebase.dat", GAME_BASEFILE, "c392e494dcabed797b98cbcfc687b33a", -1},
- { "icondata.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
- { "stripped.dat", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1},
- { "tbllist.dat", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
+ { "gamebase.dat", GAME_BASEFILE, "c392e494dcabed797b98cbcfc687b33a", -1},
+ { "icondata.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
+ { "stripped.dat", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1},
+ { "tbllist.dat", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
{ NULL, 0, NULL, 0}
},
Common::EN_ANY,
@@ -773,11 +773,11 @@
"CD Demo",
{
- { "data", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1},
- { "gamebase", GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1},
- { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
- { "stripped", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1},
- { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
+ { "data", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1},
+ { "gamebase", GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1},
+ { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
+ { "stripped", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1},
+ { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
{ NULL, 0, NULL, 0}
},
Common::EN_ANY,
@@ -797,11 +797,11 @@
"CD",
{
- { "data", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", -1},
- { "gamebase", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", -1},
- { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
- { "stripped", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", -1},
- { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
+ { "data", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", -1},
+ { "gamebase", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", -1},
+ { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
+ { "stripped", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", -1},
+ { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
{ NULL, 0, NULL, 0}
},
Common::EN_ANY,
@@ -1189,11 +1189,11 @@
"CD Demo",
{
- { "simon.gme", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1},
- { "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1},
- { "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
- { "stripped.txt", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1},
- { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
+ { "simon.gme", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1},
+ { "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1},
+ { "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
+ { "stripped.txt", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1},
+ { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
{ NULL, 0, NULL, 0}
},
Common::EN_ANY,
Modified: scummvm/trunk/engines/agos/draw.cpp
===================================================================
--- scummvm/trunk/engines/agos/draw.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agos/draw.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -848,8 +848,8 @@
memcpy(_videoBuf1 + 1024, _displayPalette, 1024);
for (c = 255; c >= 0; c -= 4) {
- src = _videoBuf1 + 1024;
- dst = _videoBuf1;
+ src = _videoBuf1 + 1024;
+ dst = _videoBuf1;
for (p = _fastFadeInFlag; p !=0 ; p -= 3) {
if (src[0] >= c)
@@ -860,10 +860,10 @@
dst[2] += 4;
src += 4;
dst += 4;
- }
- _system->setPalette(_videoBuf1, 0, _fastFadeCount);
- delay(5);
- }
+ }
+ _system->setPalette(_videoBuf1, 0, _fastFadeCount);
+ delay(5);
+ }
_fastFadeInFlag = 0;
}
Modified: scummvm/trunk/engines/agos/oracle.cpp
===================================================================
--- scummvm/trunk/engines/agos/oracle.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agos/oracle.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -184,7 +184,7 @@
changeWindow(3);
_noOracleScroll = 0;
- if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up
+ if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up
_oracleMaxScrollY = _textWindow->scrollY;
while (1) {
if (_textWindow->scrollY == _oracleMaxScrollY)
@@ -218,7 +218,7 @@
changeWindow(3);
_noOracleScroll = 0;
- if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up
+ if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up
_oracleMaxScrollY = _textWindow->scrollY;
while (1) {
if (_textWindow->scrollY == 0)
@@ -411,7 +411,7 @@
showMessageFormat("\n");
hyperLinkOn(j + 400);
setTextColor(116);
- showMessageFormat(" %d. ",1);
+ showMessageFormat(" %d. ",1);
hyperLinkOff();
setTextColor(113);
k++;
Modified: scummvm/trunk/engines/agos/res_ami.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_ami.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agos/res_ami.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -129,7 +129,7 @@
free(uncbfrout);
for (i = 0; i < colorDepth; ++i) {
free(uncptr[i]);
- }
+ }
}
byte *AGOSEngine::convertImage(VC10_state *state, bool compressed) {
Modified: scummvm/trunk/engines/agos/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agos/saveload.cpp 2008-01-27 20:26:53 UTC (rev 30666)
+++ scummvm/trunk/engines/agos/saveload.cpp 2008-01-28 00:14:17 UTC (rev 30667)
@@ -1235,7 +1235,7 @@
SubSuperRoom *sr = (SubSuperRoom *)findChildOfType(item, kSuperRoomType);
if (sr) {
uint16 n = sr->roomX * sr->roomY * sr->roomZ;
- for (i = j = 0; i != n; i++)
+ for (i = j = 0; i != n; i++)
sr->roomExitStates[j++] = f->readUint16BE();
}
@@ -1384,7 +1384,7 @@
@@ Diff output truncated at 100000 characters. @@
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