[Scummvm-cvs-logs] CVS: scummvm/backends/epoc README,1.1,1.2 SymbianOS.cpp,1.3,1.4
Lars Persson
anotherguest at users.sourceforge.net
Sun Oct 2 14:28:38 CEST 2005
Update of /cvsroot/scummvm/scummvm/backends/epoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19164/backends/epoc
Modified Files:
README SymbianOS.cpp
Log Message:
Update Symbian README, default Joystick config is on, Updated pkg files for S80 & S90, updated symbian-fs (cleaner code)
Index: README
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README 21 Jun 2005 20:19:39 -0000 1.1
+++ README 1 Oct 2005 18:02:37 -0000 1.2
@@ -18,15 +18,21 @@
Nescessary components
---------------------
- Building EScummVM yourself using the UIQ 2.1 framework is not an easy task!
+ Building EScummVM yourself using the UIQ 2.1/Nokia S60 SDK/Nokia S80 SDK/Nokia S90 SDK framework is not an easy task!
Lets just say the framework needs quite some time to set up and takes a while
to get used to. If you choose to continue you will need the following items:
- - Symbian UIQ 2.1 Framework
+ - UIQ 2.1 SDK (To build for UIQ devices);
http://www.symbian.com/developer/sdks_uiq.asp
+ - Nokia S60 1st, 2nd edition (3rd edition has not been tested) SDK (To build for S60 devices)
+
+ - Nokia S80 SDK (To build for S80 devices)
+
+ - Nokia 7710 SDK (To build for the 7710/S90 device)
+
- ECompXL, an EPOC application compression library
- http://www.yipton.demon.co.uk/ecompxl/latest/readme.html
+ http://www.yipton.demon.co.uk/ecompxl/latest/readme.html (To build for UIQ devices)
- libsdl, Simple Directmedia Layer, a cross-platform multimedia library
http://www.libsdl.org/ (see note about ESDL below)
Index: SymbianOS.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/SymbianOS.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SymbianOS.cpp 30 Jul 2005 21:10:50 -0000 1.3
+++ SymbianOS.cpp 1 Oct 2005 18:02:37 -0000 1.4
@@ -49,11 +49,11 @@
{
ConfMan.set("FM_high_quality", false);
ConfMan.set("FM_medium_quality", true);
-// ConfMan.set("joystick_num",0); // S60 should have joystick_num set to 0 in the ini file
+ ConfMan.set("joystick_num",0); // Symbian OS should have joystick_num set to 0 in the ini file , but uiq devices might refuse opening the joystick
ConfMan.flushToDisk();
// Initialize global key mapping for Smartphones
GUI::Actions* actions = GUI::Actions::Instance();
- actions->initInstanceMain(this);
+ actions->initInstanceMain(this);
actions->loadMapping();
initZones();
}
@@ -77,14 +77,14 @@
}
/*
- * SumthinWicked says: the stuff below is copied from common/scaler.cpp,
+ * SumthinWicked says: the stuff below is copied from common/scaler.cpp,
* so we can skip compiling the scalers. ESDL still needs 1x and the scaler
* architecture because we inherit from OSystem_SDL.
*/
int gBitFormat = 565;
void InitScalers(uint32 BitFormat) {} // called by OSystem_SDL functions, not relevant for ESDL
-
-/**
+
+/**
* Trivial 'scaler' - in fact it doesn't do any scaling but just copies the
* source to the destination.
*/
@@ -100,7 +100,7 @@
bool OSystem_SDL_Symbian::setSoundCallback(SoundProc proc, void *param) {
// First save the proc and param
- _sound_proc_param = param;
+ _sound_proc_param = param;
_sound_proc = proc;
SDL_AudioSpec desired;
SDL_AudioSpec obtained;
@@ -200,12 +200,12 @@
{
if(!GUI::Actions::Instance()->mappingActive() && ev.key.keysym.sym>SDLK_UNKNOWN)
for(TInt loop=0;loop<GUI::ACTION_LAST;loop++){
- if(GUI::Actions::Instance()->getMapping(loop) ==ev.key.keysym.sym &&
+ if(GUI::Actions::Instance()->getMapping(loop) ==ev.key.keysym.sym &&
GUI::Actions::Instance()->isEnabled(loop)){
// Create proper event instead
switch(loop)
{
- case GUI::ACTION_UP:
+ case GUI::ACTION_UP:
if(ev.type == SDL_KEYDOWN)
{
_km.y_vel = -1;
@@ -218,7 +218,7 @@
}
event.type = EVENT_MOUSEMOVE;
fillMouseEvent(event, _km.x, _km.y);
- return true;
+ return true;
case GUI::ACTION_DOWN:
if(ev.type == SDL_KEYDOWN)
{
@@ -232,7 +232,7 @@
}
event.type = EVENT_MOUSEMOVE;
fillMouseEvent(event, _km.x, _km.y);
- return true;
+ return true;
case GUI::ACTION_LEFT:
if(ev.type == SDL_KEYDOWN)
{
@@ -272,8 +272,8 @@
case GUI::ACTION_ZONE:
if(ev.type == SDL_KEYDOWN)
{
- int i;
-
+ int i;
+
for (i=0; i<TOTAL_ZONES; i++)
if (_km.x >= _zones[i].x && _km.y >= _zones[i].y &&
_km.x <= _zones[i].x + _zones[i].width && _km.y <= _zones[i].y + _zones[i].height
@@ -287,7 +287,7 @@
_currentZone = 0;
event.type = EVENT_MOUSEMOVE;
fillMouseEvent(event, _mouseXZone[_currentZone],_mouseYZone[_currentZone]);
- SDL_WarpMouse(event.mouse.x,event.mouse.y);
+ SDL_WarpMouse(event.mouse.x,event.mouse.y);
}
return true;
case GUI::ACTION_SAVE:
@@ -301,7 +301,7 @@
ev.key.keysym.scancode= key.keycode();
ev.key.keysym.mod =(SDLMod) key.flags();
return false;
- }
+ }
case GUI::ACTION_QUIT:{
GUI::MessageDialog alert("Do you want to quit ?", "Yes", "No");
if (alert.runModal() == GUI::kMessageOK)
More information about the Scummvm-git-logs
mailing list