[Scummvm-cvs-logs] SF.net SVN: scummvm:[48675] scummvm/branches/branch-1-1-0/backends/platform /ds/arm9
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Apr 16 22:44:23 CEST 2010
Revision: 48675
http://scummvm.svn.sourceforge.net/scummvm/?rev=48675&view=rev
Author: fingolfin
Date: 2010-04-16 20:44:22 +0000 (Fri, 16 Apr 2010)
Log Message:
-----------
DS: Formatting / whitespace cleanup
Modified Paths:
--------------
scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/dist/readme_ds.txt
scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp
Modified: scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/dist/readme_ds.txt
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/dist/readme_ds.txt 2010-04-16 18:23:50 UTC (rev 48674)
+++ scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/dist/readme_ds.txt 2010-04-16 20:44:22 UTC (rev 48675)
@@ -43,7 +43,7 @@
ScummVM DS 1.1.0
- * New games are supported in this stable build: Return to Zork, Rodney's
+ * New games are supported in this stable build: Return to Zork, Rodney's
Funscreen, Manhole, Leather Goddess of Phobos 2, Cruise for a Corpse.
ScummVM DS 1.0.0
@@ -235,25 +235,25 @@
If your copy of ScummVM DS has been successfully patched, you will get a
message on the top screen that looks like this:
- DLDI Device:
- GBA Movie Player (Compact Flash)
+ DLDI Device:
+ GBA Movie Player (Compact Flash)
The message should show the name of your card reader. If it is wrong,
you have used the wrong DLDI file.
If you haven't patched your .nds file, you will get the following message
- DLDI Driver not patched!
- DLDI Initialise failed.
+ DLDI Driver not patched!
+ DLDI Initialise failed.
In this case, you've made a mistake following the above instructions, or
have patched the wrong file.
You may also see the following message:
- DLDI Device:
- GBA Movie Player (Compact Flash)
- DLDI Initialise failed.
+ DLDI Device:
+ GBA Movie Player (Compact Flash)
+ DLDI Initialise failed.
In this case, the driver did not start up correctly. The driver is
probably broken, or you've used the wrong one for your card reader.
@@ -351,9 +351,9 @@
Indiana Jones and the Fate of Atlantis A
-Day of the Tentacle A
+Day of the Tentacle A
-Sam & Max Hit the Road A Some slowdown in a few scenes
+Sam & Max Hit the Road A Some slowdown in a few scenes
when MP3 audio is enabled
Bear Stormin' (DOS) A
@@ -409,15 +409,15 @@
Nippon Safes G
-Return to Zork I
+Return to Zork I
-Leather Goddess of Phobos 2 I
+Leather Goddess of Phobos 2 I
-Manhole I
+Manhole I
-Rodney's Funscreen I
+Rodney's Funscreen I
-Cruise for a Corpse K
+Cruise for a Corpse K
Full Throttle and The Dig can run on the DS using an external RAM pack
@@ -475,7 +475,8 @@
left on the D-pad to enable the left mouse button. Press right on the
D-pad to enable the right mouse button. Press up on the D-pad to enable
hover mode. In this mode, you won't click on anything, just hover the
-mouse cursor over it. This lets you pick out active objects in the scene.
+mouse cursor over it. This lets you pick out active objects in the
+scene.
An icon on the top screen will show you which mode you're in.
@@ -486,46 +487,48 @@
There is an alternative method of control which doesn't require you to
change modes with the D-pad. Press 'Select' to bring up the DS options,
and choose 'Tap for left click, double tap for right click'. In this
-mode, you can quickly tap the screen to left click the mouse, and tap twice
-to right click the mouse.
+mode, you can quickly tap the screen to left click the mouse, and tap
+twice to right click the mouse.
Here is a complete list of controls in right-handed mode (the default
setting):
-Key Usage
-Pad Left Left mouse button
-Pad Right Right mouse button
-Pad Up Hover mouse (no mouse button)
-Pad Down Skip dialogue line (for some Lucasarts games), Show inventory
- (for Beneath a Steel Sky), Show active objects (for Simon the Sorceror)
-Start Pause/game menu (works in some games)
-Select DS Options
-B Skip cutscenes
-A Swap main screen and zoomed screen
-Y Show/Hide debug console
-X Show/Hide on-screen keyboard
-L + D-pad or L + Pen Scroll touch screen view
-L + B Zoom in
-L + A Zoom out
+Key Usage
+Pad Left Left mouse button
+Pad Right Right mouse button
+Pad Up Hover mouse (no mouse button)
+Pad Down Skip dialogue line (for some Lucasarts games),
+ Show inventory (for Beneath a Steel Sky), Show
+ active objects (for Simon the Sorceror)
+Start Pause/game menu (works in some games)
+Select DS Options
+B Skip cutscenes
+A Swap main screen and zoomed screen
+Y Show/Hide debug console
+X Show/Hide on-screen keyboard
+L + D-pad or L + Pen Scroll touch screen view
+L + B Zoom in
+L + A Zoom out
And here's left-handed mode:
-Key Usage
-Y Left mouse button
-A Right mouse button
-X Hover mouse (no mouse button)
-B Skip dialogue line (for some Lucasarts games), Show inventory (for
- Beneath a Steel Sky), Show active objects (for Simon the Sorceror)
-Start Pause/game menu (works in some games)
-Select DS Options
-D-pad down Skip cutscenes
-D-pad up Swap main screen and zoomed screen
-D-pad left Show/Hide debug console
-D-pad right Show/Hide on-screen keyboard
-R + D-pad or R + Pen Scroll touch screen view
-R + D-pad down Zoom in
-R + d-pad right Zoom out
+Key Usage
+Y Left mouse button
+A Right mouse button
+X Hover mouse (no mouse button)
+B Skip dialogue line (for some Lucasarts games),
+ Show inventory (for Beneath a Steel Sky), Show
+ active objects (for Simon the Sorceror)
+Start Pause/game menu (works in some games)
+Select DS Options
+D-pad down Skip cutscenes
+D-pad up Swap main screen and zoomed screen
+D-pad left Show/Hide debug console
+D-pad right Show/Hide on-screen keyboard
+R + D-pad or R + Pen Scroll touch screen view
+R + D-pad down Zoom in
+R + d-pad right Zoom out
@@ -798,11 +801,11 @@
------------------------------------------------------------------------
If you have problems getting ScummVM to work on your hardware, please
-read the FAQ first. /Please/ don't ask me questions which are
-answered in the FAQ, I get many emails about this program each day, and
-I can't help the people who really need help if I'm answering the same
-question all the time which is already answered on this page. Other than
-that, feel free to post on the ScummVM DS forum <http://forums.scummvm.org>
+read the FAQ first. /Please/ don't ask me questions which are answered
+in the FAQ, I get many emails about this program each day, and I can't
+help the people who really need help if I'm answering the same question
+all the time which is already answered on this page. Other than that,
+feel free to post on the ScummVM DS forum <http://forums.scummvm.org>
for help. Please do your research first though. There is no way of
running this on an out-of-the box DS without extra hardware. Most of
these things are fairly inexpensive though.
@@ -838,16 +841,18 @@
commenting out the line which says USE_MAD = 1.
Then, enter the 'backends/platform/ds' folder and type:
-make SCUMM_BUILD=a
+ make SCUMM_BUILD=a
+
The executable nds file will build inside 'backends/platform/ds/arm9/SCUMMVM-A'.
For other builds, substitute the letters b - g in the above line.
To build everything, type:
-make allbuildssafe
+ make allbuildssafe
+
Modified: scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp 2010-04-16 18:23:50 UTC (rev 48674)
+++ scummvm/branches/branch-1-1-0/backends/platform/ds/arm9/source/dsmain.cpp 2010-04-16 20:44:22 UTC (rev 48675)
@@ -580,12 +580,12 @@
//strcpy(gameName, ConfMan.getActiveDomain().c_str());
if (currentGame == NULL) {
-
+
strcpy(gameName, ConfMan.get("gameid").c_str());
// consolePrintf("\n\n\n\nCurrent game: '%s' %d\n", gameName, gameName[0]);
-
+
currentGame = &gameList[0]; // Default game
-
+
for (int r = 0; r < NUM_SUPPORTED_GAMES; r++) {
if (!stricmp(gameName, gameList[r].gameId)) {
currentGame = &gameList[r];
@@ -1353,33 +1353,33 @@
}
if (!(getKeysHeld() & (KEY_L | KEY_R))) {
-
+
if (getKeysDown() & KEY_LEFT) {
event.type = Common::EVENT_LBUTTONDOWN;
event.mouse = Common::Point(getPenX(), getPenY());
system->addEvent(event);
}
-
+
if (getKeysReleased() & KEY_LEFT) {
event.type = Common::EVENT_LBUTTONUP;
event.mouse = Common::Point(getPenX(), getPenY());
system->addEvent(event);
}
-
-
+
+
if (getKeysDown() & KEY_RIGHT) {
event.type = Common::EVENT_RBUTTONDOWN;
event.mouse = Common::Point(getPenX(), getPenY());
system->addEvent(event);
}
-
+
if (getKeysReleased() & KEY_RIGHT) {
event.type = Common::EVENT_RBUTTONUP;
event.mouse = Common::Point(getPenX(), getPenY());
system->addEvent(event);
}
}
-
+
event.type = Common::EVENT_MOUSEMOVE;
event.mouse = Common::Point(getPenX(), getPenY());
system->addEvent(event);
@@ -1658,7 +1658,7 @@
g_engine->openMainMenuDialog();
}
}
-
+
if (getKeysReleased() & KEY_SELECT) {
if (getMillis() - selectTimeDown < SELECT_HOLD_TIME) {
// Just pressed select - show DS options screen
@@ -2592,16 +2592,16 @@
if ((!keyboardEnable) || (!isInsideKeyboard(IPC->touchXpx, IPC->touchYpx))) {
int diffX = IPC->touchXpx - penDownX;
int diffY = IPC->touchYpx - penDownY;
-
+
int speed = ABS(diffX) + ABS(diffY);
-
+
if ((ABS(diffX) < 35) && (ABS(diffY) < 35)) {
-
+
if (speed >= 8) {
diffX *= ((speed >> 3) * touchPadSensitivity) >> 3;
diffY *= ((speed >> 3) * touchPadSensitivity) >> 3;
}
-
+
penX += diffX;
penY += diffY;
@@ -2614,7 +2614,7 @@
scX -= -penX;
penX = 0;
}
-
+
if (penY > 191) {
scY += penY - 191;
penY = 191;
@@ -2625,7 +2625,7 @@
penY = 0;
}
}
-
+
// consolePrintf("x: %d y: %d\n", IPC->touchYpx - penDownY, IPC->touchYpx - penDownY);
}
penDownX = IPC->touchXpx;
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