[Scummvm-cvs-logs] SF.net SVN: scummvm: [28275] scummvm/branches/branch-0-10-0/backends
agent-q at users.sourceforge.net
agent-q at users.sourceforge.net
Sat Jul 28 22:24:23 CEST 2007
Revision: 28275
http://scummvm.svn.sourceforge.net/scummvm/?rev=28275&view=rev
Author: agent-q
Date: 2007-07-28 13:24:22 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
Final changes for 0.10.0a. Removed some printfs, fixed shift key problem, added a few key bindings for AGI, new icons.
Modified Paths:
--------------
scummvm/branches/branch-0-10-0/backends/fs/ds/ds-fs.cpp
scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/makefile
scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/gbampsave.cpp
scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/touchkeyboard.cpp
scummvm/branches/branch-0-10-0/backends/platform/ds/logoa.bmp
scummvm/branches/branch-0-10-0/backends/platform/ds/logob.bmp
scummvm/branches/branch-0-10-0/backends/platform/ds/logoc.bmp
scummvm/branches/branch-0-10-0/backends/platform/ds/logod.bmp
scummvm/branches/branch-0-10-0/backends/platform/ds/logoe.bmp
scummvm/branches/branch-0-10-0/backends/platform/ds/logof.bmp
Modified: scummvm/branches/branch-0-10-0/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/backends/fs/ds/ds-fs.cpp 2007-07-28 19:43:26 UTC (rev 28274)
+++ scummvm/branches/branch-0-10-0/backends/fs/ds/ds-fs.cpp 2007-07-28 20:24:22 UTC (rev 28275)
@@ -358,7 +358,7 @@
int entryType = FAT_FindFirstFileLFN(fname);
- consolePrintf("First: %s\n", fname);
+// consolePrintf("First: %s\n", fname);
char pathTemp2[256];
while (entryType != TYPE_NO_MORE) {
@@ -367,7 +367,6 @@
|| ((entryType == TYPE_FILE) && ((mode == FilesystemNode::kListFilesOnly) || (mode == FilesystemNode::kListAll))) ) {
GBAMPFileSystemNode* dsfsn;
- consolePrintf("file %s\n", fname);
if (strcmp(fname, ".") && strcmp(fname, "..")) {
@@ -857,7 +856,7 @@
if (*(currentDir + strlen(currentDir) - 1) == '/') {
*(currentDir + strlen(currentDir) - 1) = '\0';
}
- consolePrintf("CWD: %s\n", currentDir);
+// consolePrintf("CWD: %s\n", currentDir);
}
}
Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/makefile 2007-07-28 19:43:26 UTC (rev 28274)
+++ scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/makefile 2007-07-28 20:24:22 UTC (rev 28275)
@@ -19,8 +19,15 @@
# TODO: Fix this. When libmad is compiled in, the Kyrandia resource loading
# searches through it's entire index to find an mp3 each time a voice sample is requested
# this causes a nasty pause.
-else
- USE_MAD = 1
+else
+ ifdef DS_BUILD_E
+ # TODO: Inherit the earth uses so much RAM that I have removed libmad in order to
+ # claw some back.
+
+
+ else
+ USE_MAD = 1
+ endif
endif
# Uncomment the following line to enable support for the
@@ -204,7 +211,7 @@
-fno-exceptions -fno-rtti
ASFLAGS = -mcpu=arm9tdmi -mthumb-interwork
-DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DARM
+DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DARM -DDISABLE_IHNM
ifdef USE_MAD
DEFINES += -DUSE_MAD
endif
@@ -422,8 +429,8 @@
#---------------------------------------------------------------------------------
%.nds: %.bin
- @echo ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.10.0;DS Port"
- ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.10.0;DS Port"
+ @echo ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "ScummVM DS;Version 0.10.0a;http://www.scummvm.org"
+ ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "ScummVM DS;Version 0.10.0a;http://www.scummvm.org"
dsbuild $@ -l ../ndsloader.bin
padbin 16 $(basename $@).ds.gba
Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/dsmain.cpp 2007-07-28 19:43:26 UTC (rev 28274)
+++ scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/dsmain.cpp 2007-07-28 20:24:22 UTC (rev 28275)
@@ -1173,9 +1173,15 @@
if (!indyFightState) {
if ((!(getKeysHeld() & KEY_L)) && (!(getKeysHeld() & KEY_R)) && (getKeysDown() & KEY_B)) {
- event.kbd.keycode = 27;
- event.kbd.ascii = 27;
- event.kbd.flags = 0;
+ if (currentGame->control == CONT_AGI) {
+ event.kbd.keycode = 13;
+ event.kbd.ascii = 13;
+ event.kbd.flags = 0;
+ } else {
+ event.kbd.keycode = 27;
+ event.kbd.ascii = 27;
+ event.kbd.flags = 0;
+ }
event.type = Common::EVENT_KEYDOWN;
system->addEvent(event);
@@ -1392,7 +1398,9 @@
system->addEvent(event);
}
}
+
+
if (currentGame->control == CONT_SCUMM_ORIGINAL) {
// Extra controls for Scumm v1-5 games
if ((getKeysDown() & KEY_DOWN)) {
@@ -1459,6 +1467,9 @@
event.kbd.keycode = 282;
event.kbd.ascii = 315;
// consolePrintf("!!!!!F1!!!!!");
+ } else if (currentGame->control == CONT_AGI) {
+ event.kbd.keycode = 27;
+ event.kbd.ascii = 27;
} else {
event.kbd.keycode = 319; // F5
event.kbd.ascii = 319;
@@ -2586,7 +2597,7 @@
consolePrintf("-------------------------------\n");
consolePrintf("ScummVM DS\n");
consolePrintf("Ported by Neil Millstone\n");
- consolePrintf("Version 0.10.0 beta2 ");
+ consolePrintf("Version 0.10.0a ");
#if defined(DS_BUILD_A)
consolePrintf("build A\n");
consolePrintf("Lucasarts SCUMM games (SCUMM)\n");
@@ -2709,7 +2720,7 @@
if (!initGBAMP(mode)) {
consolePrintf("\nNo file system was found.\n");
- consolePrintf("View the README_DLDI.TXT file\n");
+ consolePrintf("View the readme file\n");
consolePrintf("for more information.\n");
while (1);
Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/gbampsave.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/gbampsave.cpp 2007-07-28 19:43:26 UTC (rev 28274)
+++ scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/gbampsave.cpp 2007-07-28 20:24:22 UTC (rev 28275)
@@ -29,7 +29,7 @@
GBAMPSaveFile::GBAMPSaveFile(char* name, bool saveOrLoad) {
handle = DS::std_fopen(name, saveOrLoad? "w": "r");
- consolePrintf("%s handle is %d\n", name, handle);
+// consolePrintf("%s handle is %d\n", name, handle);
// consolePrintf("Created %s\n", name);
bufferPos = 0;
saveSize = 0;
@@ -39,7 +39,7 @@
GBAMPSaveFile::~GBAMPSaveFile() {
flushSaveBuffer();
if (handle) DS::std_fclose(handle);
- consolePrintf("Closed file\n");
+// consolePrintf("Closed file\n");
}
uint32 GBAMPSaveFile::read(void *buf, uint32 size) {
@@ -176,7 +176,7 @@
DS::std_cwd((char *) getSavePath());
- consolePrintf("Save path: %s\n", getSavePath());
+// consolePrintf("Save path: %s\n", getSavePath());
int fileType = FAT_FindFirstFileLFN(name);
@@ -195,10 +195,10 @@
sprintf(str, "%s%02d", prefix, r);
- consolePrintf("%s != %s", str, name);
+// consolePrintf("%s != %s", str, name);
if (!stricmp(str, name)) {
marks[r] = true;
- consolePrintf("Matched %d", r);
+// consolePrintf("Matched %d", r);
}
}
Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/touchkeyboard.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/touchkeyboard.cpp 2007-07-28 19:43:26 UTC (rev 28274)
+++ scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/touchkeyboard.cpp 2007-07-28 20:24:22 UTC (rev 28275)
@@ -37,7 +37,7 @@
};
#define DS_NUM_KEYS 60
-#define DS_SHIFT 0
+#define DS_SHIFT 2
#define DS_BACKSPACE 8
#define DS_RETURN 13
#define DS_CAPSLOCK 1
Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/logoa.bmp
===================================================================
(Binary files differ)
Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/logob.bmp
===================================================================
(Binary files differ)
Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/logoc.bmp
===================================================================
(Binary files differ)
Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/logod.bmp
===================================================================
(Binary files differ)
Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/logoe.bmp
===================================================================
(Binary files differ)
Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/logof.bmp
===================================================================
(Binary files differ)
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