[Scummvm-cvs-logs] SF.net SVN: scummvm:[44683] scummvm/trunk/backends/platform/ps2

[sunmax at users.sourceforge.net]

Revision: 44683
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44683&view=rev
Author:   sunmax
Date:     2009-10-05 23:46:39 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
Here we have:

 - dropped gBitFormat 

 - added extra param "const Graphics::PixelFormat *" to 

    OSystem_PS2::initSize

    OSystem_PS2::setMouseCursor

Note! To compile on SVN you will have (for now ;-) to create
few few empty folders by hand, note very elegant but will
keep you going until when we (ehm...) refine the PS2 Makefile.

Here comes the brute force script I use inside backends/platform/ps2

mkdir -p backends/platform/ps2
mkdir -p base
mkdir -p engines/scumm
mkdir -p engines/scumm/he
mkdir -p engines/scumm/imuse
mkdir -p engines/scumm/imuse_digi
mkdir -p engines/scumm/insane
mkdir -p engines/scumm/smush
mkdir -p engines/agi
mkdir -p engines/agos
mkdir -p engines/cine
mkdir -p engines/cruise
mkdir -p engines/drascula
mkdir -p engines/gob
mkdir -p engines/gob/demos
mkdir -p engines/gob/save
mkdir -p engines/gob/sound
mkdir -p engines/igor
mkdir -p engines/igor/parts
mkdir -p engines/kyra
mkdir -p engines/lure
mkdir -p engines/made
mkdir -p engines/parallaction
mkdir -p engines/queen
mkdir -p engines/saga
mkdir -p engines/sky
mkdir -p engines/sky/music
mkdir -p engines/sword1
mkdir -p engines/sword2
mkdir -p engines/touche
mkdir -p gui
mkdir -p graphics
mkdir -p graphics/fonts
mkdir -p graphics/scaler
mkdir -p graphics/video
mkdir -p graphics/video/coktelvideo
mkdir -p sound
mkdir -p sound/mods
mkdir -p sound/softsynth
mkdir -p sound/softsynth/opl
mkdir -p backends/events/default
mkdir -p backends/fs
mkdir -p backends/fs/amigaos4
mkdir -p backends/fs/ds
mkdir -p backends/fs/palmos
mkdir -p backends/fs/posix
mkdir -p backends/fs/ps2
mkdir -p backends/fs/psp
mkdir -p backends/fs/symbian
mkdir -p backends/fs/windows
mkdir -p backends/fs/wii
mkdir -p backends/keymapper
mkdir -p backends/midi
mkdir -p backends/plugins/dc
mkdir -p backends/plugins/posix
mkdir -p backends/plugins/sdl
mkdir -p backends/plugins/win32
mkdir -p backends/saves
mkdir -p backends/saves/default
mkdir -p backends/saves/posix
mkdir -p backends/saves/psp
mkdir -p backends/timer/default
mkdir -p backends/vkeybd
mkdir -p common

I know, you don't need all those "-p" but it looks more consistent ;-)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ps2/Makefile.ps2
    scummvm/trunk/backends/platform/ps2/systemps2.cpp
    scummvm/trunk/backends/platform/ps2/systemps2.h

Modified: scummvm/trunk/backends/platform/ps2/Makefile.ps2
===================================================================
--- scummvm/trunk/backends/platform/ps2/Makefile.ps2	2009-10-05 23:00:48 UTC (rev 44682)
+++ scummvm/trunk/backends/platform/ps2/Makefile.ps2	2009-10-05 23:46:39 UTC (rev 44683)
@@ -1,7 +1,7 @@
 # $Header: Exp $
  include $(PS2SDK)/Defs.make
 
-PS2_EXTRA = /media/disk/nw8240/extras/scummvm/ports
+PS2_EXTRA = /works/devel/ps2/sdk-extra
 PS2_EXTRA_INCS = /zlib/include /libmad/ee/include /SjPcm/ee/src /tremor
 PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /tremor/tremor
 

Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp	2009-10-05 23:00:48 UTC (rev 44682)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp	2009-10-05 23:46:39 UTC (rev 44683)
@@ -52,7 +52,6 @@
 #include "backends/platform/ps2/asyncfio.h"
 #include "eecodyvdfs.h"
 #include "graphics/surface.h"
-#include "graphics/scaler.h"
 #include "graphics/font.h"
 #include "backends/timer/default/default-timer.h"
 #include "sound/mixer_intern.h"
@@ -87,8 +86,6 @@
 
 OSystem_PS2 *g_systemPs2;
 
-int gBitFormat = 1555;
-
 #define FOREVER 2147483647
 
 namespace Graphics {
@@ -525,7 +522,7 @@
 	return _useNet;
 }
 
-void OSystem_PS2::initSize(uint width, uint height) {
+void OSystem_PS2::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
 	printf("initializing new size: (%d/%d)...", width, height);
 	_screen->newScreenSize(width, height);
 	_screen->setMouseXy(width / 2, height / 2);
@@ -624,7 +621,7 @@
 	_screen->setMouseXy(x, y);
 }
 
-void OSystem_PS2::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor, int cursorTargetScale) {
+void OSystem_PS2::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
 	_screen->setMouseOverlay(buf, w, h, hotspot_x, hotspot_y, keycolor);
 }
 

Modified: scummvm/trunk/backends/platform/ps2/systemps2.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.h	2009-10-05 23:00:48 UTC (rev 44682)
+++ scummvm/trunk/backends/platform/ps2/systemps2.h	2009-10-05 23:46:39 UTC (rev 44683)
@@ -58,7 +58,7 @@
 public:
 	OSystem_PS2(const char *elfPath);
 	virtual ~OSystem_PS2(void);
-	virtual void initSize(uint width, uint height);
+	virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format);
 
 	void init(void);
 
@@ -88,7 +88,7 @@
 	virtual bool showMouse(bool visible);
 
 	virtual void warpMouse(int x, int y);
-	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor, int cursorTargetScale = 1);
+	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale = 1, const Graphics::PixelFormat *format = 0);
 
 	virtual uint32 getMillis();
 	virtual void delayMillis(uint msecs);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.