[Scummvm-cvs-logs] scummvm master -> 6a9ab747f9ec97d644787bf8a3415b55ca44c2d1

wjp wjp at usecode.org
Sun Nov 27 13:13:56 CET 2011


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a78b2d777d JANITORIAL: Remove extra semicolons.
89ccde3948 DS: Remove the unused method OSystem_DS::grabRawScreen().
6a9ab747f9 PS2: Remove the unused method OSystem_PS2::grabRawScreen().


Commit: a78b2d777d98e494b988843bfd9694c58c6c6018
    https://github.com/scummvm/scummvm/commit/a78b2d777d98e494b988843bfd9694c58c6c6018
Author: Christoph Mallon (christoph.mallon at gmx.de)
Date: 2011-11-27T03:54:22-08:00

Commit Message:
JANITORIAL: Remove extra semicolons.

Changed paths:
    backends/fs/amigaos4/amigaos4-fs.h
    backends/fs/ps2/ps2-fs.h
    backends/fs/psp/psp-fs-factory.h
    backends/platform/dc/dc-fs.cpp
    devtools/create_project/create_project.h
    devtools/sci/musicplayer.cpp
    engines/agi/sound_2gs.h
    engines/sword25/gfx/renderobject.h
    engines/toon/character.h
    engines/tsage/core.h
    engines/tsage/sound.h



diff --git a/backends/fs/amigaos4/amigaos4-fs.h b/backends/fs/amigaos4/amigaos4-fs.h
index 4e23133..c5ca614 100644
--- a/backends/fs/amigaos4/amigaos4-fs.h
+++ b/backends/fs/amigaos4/amigaos4-fs.h
@@ -91,10 +91,10 @@ public:
 	virtual ~AmigaOSFilesystemNode();
 
 	virtual bool exists() const;
-	virtual Common::String getDisplayName() const { return _sDisplayName; };
-	virtual Common::String getName() const { return _sDisplayName; };
-	virtual Common::String getPath() const { return _sPath; };
-	virtual bool isDirectory() const { return _bIsDirectory; };
+	virtual Common::String getDisplayName() const { return _sDisplayName; }
+	virtual Common::String getName() const { return _sDisplayName; }
+	virtual Common::String getPath() const { return _sPath; }
+	virtual bool isDirectory() const { return _bIsDirectory; }
 	virtual bool isReadable() const;
 	virtual bool isWritable() const;
 
diff --git a/backends/fs/ps2/ps2-fs.h b/backends/fs/ps2/ps2-fs.h
index 9323715..df78f9f 100644
--- a/backends/fs/ps2/ps2-fs.h
+++ b/backends/fs/ps2/ps2-fs.h
@@ -96,7 +96,7 @@ public:
 	virtual Common::SeekableReadStream *createReadStream();
 	virtual Common::WriteStream *createWriteStream();
 
-	int getDev() { return 0; };
+	int getDev() { return 0; }
 };
 
 #endif
diff --git a/backends/fs/psp/psp-fs-factory.h b/backends/fs/psp/psp-fs-factory.h
index aeaa9d6..d57c8fb 100644
--- a/backends/fs/psp/psp-fs-factory.h
+++ b/backends/fs/psp/psp-fs-factory.h
@@ -37,7 +37,7 @@ public:
 	virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const;
 
 protected:
-	PSPFilesystemFactory() {};
+	PSPFilesystemFactory() {}
 
 private:
 	friend class Common::Singleton<SingletonBaseType>;
diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp
index f30c9c5..36f5a14 100644
--- a/backends/platform/dc/dc-fs.cpp
+++ b/backends/platform/dc/dc-fs.cpp
@@ -39,7 +39,7 @@ protected:
 	Common::String _path;
 
 public:
-	RoninCDFileNode(const Common::String &path) : _path(path) {};
+	RoninCDFileNode(const Common::String &path) : _path(path) {}
 
 	virtual bool exists() const { return true; }
 	virtual Common::String getName() const { return lastPathComponent(_path, '/'); }
@@ -61,7 +61,7 @@ public:
 /* A directory */
 class RoninCDDirectoryNode : public RoninCDFileNode {
 public:
-	RoninCDDirectoryNode(const Common::String &path) : RoninCDFileNode(path) {};
+	RoninCDDirectoryNode(const Common::String &path) : RoninCDFileNode(path) {}
 
 	virtual bool isDirectory() const { return true; }
 	virtual AbstractFSNode *getChild(const Common::String &n) const;
@@ -72,7 +72,7 @@ public:
 /* A file/directory which does not exist */
 class RoninCDNonexistingNode : public RoninCDFileNode {
 public:
-	RoninCDNonexistingNode(const Common::String &path) : RoninCDFileNode(path) {};
+	RoninCDNonexistingNode(const Common::String &path) : RoninCDFileNode(path) {}
 
 	virtual bool exists() const { return false; }
 	virtual bool isReadable() const { return false; }
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index 55e04be..8719143 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -371,7 +371,7 @@ protected:
 	 *
 	 * @param output File stream to write to.
 	 */
-	virtual void writeReferences(const BuildSetup &, std::ofstream &) {};
+	virtual void writeReferences(const BuildSetup &, std::ofstream &) {}
 
 	/**
 	 * Get the file extension for project files
diff --git a/devtools/sci/musicplayer.cpp b/devtools/sci/musicplayer.cpp
index d225195..25f2d68 100644
--- a/devtools/sci/musicplayer.cpp
+++ b/devtools/sci/musicplayer.cpp
@@ -90,7 +90,7 @@ int main(int argc, char** argv) {
 			return 2;
 		}
 		sfx_song_set_status(&sound, DUMMY_SOUND_HANDLE, SOUND_STATUS_PLAYING);
-		while (sfx_poll(&sound, &dummy1, &dummy2) != SI_FINISHED) {};
+		while (sfx_poll(&sound, &dummy1, &dummy2) != SI_FINISHED) {}
 	}
 	sfx_exit(&sound);
 	scir_free_resource_manager(resmgr);
diff --git a/engines/agi/sound_2gs.h b/engines/agi/sound_2gs.h
index 89ffc3f..404f4a4 100644
--- a/engines/agi/sound_2gs.h
+++ b/engines/agi/sound_2gs.h
@@ -247,7 +247,7 @@ private:
 	void midiNoteOff(int channel, int note, int velocity);
 	void midiNoteOn(int channel, int note, int velocity);
 	double midiKeyToFreq(int key, double finetune);
-	IIgsInstrumentHeader* getInstrument(uint8 program) { return &_instruments[_progToInst->map(program)]; };
+	IIgsInstrumentHeader* getInstrument(uint8 program) { return &_instruments[_progToInst->map(program)]; }
 	IIgsGenerator* allocateGenerator() { IIgsGenerator* g = &_generators[_nextGen++]; _nextGen %= 16; return g; }
 
 	bool _disableMidi;	///< Disable MIDI if loading instruments fail
diff --git a/engines/sword25/gfx/renderobject.h b/engines/sword25/gfx/renderobject.h
index 0b54ccc..f963cca 100644
--- a/engines/sword25/gfx/renderobject.h
+++ b/engines/sword25/gfx/renderobject.h
@@ -402,7 +402,7 @@ protected:
 	    @return Gibt false zurück, falls das Rendern fehlgeschlagen ist.
 	    @remark
 	 */
-	virtual bool doRender() = 0; // { return true; };
+	virtual bool doRender() = 0; // { return true; }
 
 	// RenderObject-Baum Variablen
 	// ---------------------------
diff --git a/engines/toon/character.h b/engines/toon/character.h
index de58a41..d06a6c0 100644
--- a/engines/toon/character.h
+++ b/engines/toon/character.h
@@ -96,7 +96,7 @@ public:
 	virtual void updateTimers(int32 relativeAdd);
 	virtual void setTalking(bool talking) { _isTalking = talking; }
 	virtual bool isTalking() { return _isTalking; }
-	virtual void resetScale() { };
+	virtual void resetScale() {}
 	virtual void plotPath(Graphics::Surface& surface);
 
 	int32 getFacingFromDirection(int32 dx, int32 dy);
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 8a2e733..d553523 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -129,7 +129,7 @@ public:
 	virtual void dispatch();
 	virtual void setAction(Action *action) { setAction(action, NULL); }
 	virtual void setAction(Action *action, EventHandler *endHandler, ...);
-	virtual void destroy() {};
+	virtual void destroy() {}
 };
 
 class Action : public EventHandler {
diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h
index c7b07e2..77d1f3d 100644
--- a/engines/tsage/sound.h
+++ b/engines/tsage/sound.h
@@ -87,7 +87,7 @@ public:
 	int _driverResID;
 public:
 	SoundDriver();
-	virtual ~SoundDriver() {};
+	virtual ~SoundDriver() {}
 
 	const Common::String &getShortDriverDescription() { return _shortDescription; }
 	const Common::String &getLongDriverDescription() { return _longDescription; }


Commit: 89ccde39485196c5131e88e30ab34d268a0f32cc
    https://github.com/scummvm/scummvm/commit/89ccde39485196c5131e88e30ab34d268a0f32cc
Author: Christoph Mallon (christoph.mallon at gmx.de)
Date: 2011-11-27T04:09:47-08:00

Commit Message:
DS: Remove the unused method OSystem_DS::grabRawScreen().

This was removed from OSystem in b51f2f3212ae8a5abbdce4d947ec2d1cad1a0b6f.

Changed paths:
    backends/platform/ds/arm9/source/osystem_ds.cpp
    backends/platform/ds/arm9/source/osystem_ds.h



diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index fdd310e..73340ed 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -267,23 +267,6 @@ void OSystem_DS::setCursorPalette(const byte *colors, uint start, uint num) {
 	refreshCursor();
 }
 
-bool OSystem_DS::grabRawScreen(Graphics::Surface *surf) {
-	surf->create(DS::getGameWidth(), DS::getGameHeight(), Graphics::PixelFormat::createFormatCLUT8());
-
-	// Ensure we copy using 16 bit quantities due to limitation of VRAM addressing
-
-
-	const u16 *image = (const u16 *) DS::get8BitBackBuffer();
-	for (int y = 0; y <  DS::getGameHeight(); y++) {
-		DC_FlushRange(image + (y << 8), DS::getGameWidth());
-		for (int x = 0; x < DS::getGameWidth() >> 1; x++) {
-			*(((u16 *) (surf->pixels)) + y * (DS::getGameWidth() >> 1) + x) = image[(y << 8) + x];
-		}
-	}
-
-	return true;
-}
-
 void OSystem_DS::grabPalette(unsigned char *colors, uint start, uint num) {
 //	consolePrintf("Grabpalette");
 
diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index b1222a1..6aa3731 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -141,8 +141,6 @@ public:
 	void addEvent(const Common::Event& e);
 	bool isEventQueueEmpty() const { return queuePos == 0; }
 
-	virtual bool grabRawScreen(Graphics::Surface *surf);
-
 	virtual void setFocusRectangle(const Common::Rect& rect);
 
 	virtual void clearFocusRectangle();


Commit: 6a9ab747f9ec97d644787bf8a3415b55ca44c2d1
    https://github.com/scummvm/scummvm/commit/6a9ab747f9ec97d644787bf8a3415b55ca44c2d1
Author: Christoph Mallon (christoph.mallon at gmx.de)
Date: 2011-11-27T04:11:58-08:00

Commit Message:
PS2: Remove the unused method OSystem_PS2::grabRawScreen().

This was removed from OSystem in b51f2f3212ae8a5abbdce4d947ec2d1cad1a0b6f.

Changed paths:
    backends/platform/ps2/Gs2dScreen.cpp
    backends/platform/ps2/Gs2dScreen.h
    backends/platform/ps2/systemps2.cpp
    backends/platform/ps2/systemps2.h



diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp
index ddc1bdf..b70e8b1 100644
--- a/backends/platform/ps2/Gs2dScreen.cpp
+++ b/backends/platform/ps2/Gs2dScreen.cpp
@@ -437,14 +437,6 @@ void Gs2dScreen::grabPalette(uint8 *pal, uint8 start, uint16 num) {
 	}
 }
 
-void Gs2dScreen::grabScreen(Graphics::Surface *surf) {
-	assert(surf);
-	WaitSema(g_DmacSema);
-	surf->create(_width, _height, Graphics::PixelFormat::createFormatCLUT8());
-	memcpy(surf->pixels, _screenBuf, _width * _height);
-	SignalSema(g_DmacSema);
-}
-
 void Gs2dScreen::uploadToVram(void) {
 	if (_clutChanged) {
 		_clutChanged = false;
diff --git a/backends/platform/ps2/Gs2dScreen.h b/backends/platform/ps2/Gs2dScreen.h
index 3701afd..4fbb3fd 100644
--- a/backends/platform/ps2/Gs2dScreen.h
+++ b/backends/platform/ps2/Gs2dScreen.h
@@ -61,7 +61,6 @@ public:
 	void setPalette(const uint8 *pal, uint8 start, uint16 num);
 	void updateScreen(void);
 	void grabPalette(uint8 *pal, uint8 start, uint16 num);
-	void grabScreen(Graphics::Surface *surf);
 	//- overlay routines
 	void copyOverlayRect(const uint16 *buf, uint16 pitch, uint16 x, uint16 y, uint16 w, uint16 h);
 	void grabOverlay(uint16 *buf, uint16 pitch);
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index c75d749..481227d 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -558,11 +558,6 @@ void OSystem_PS2::copyRectToScreen(const byte *buf, int pitch, int x, int y, int
 	_screen->copyScreenRect((const uint8*)buf, pitch, x, y, w, h);
 }
 
-bool OSystem_PS2::grabRawScreen(Graphics::Surface *surf) {
-	_screen->grabScreen(surf);
-	return true;
-}
-
 void OSystem_PS2::updateScreen(void) {
 	if (_msgClearTime && (_msgClearTime < getMillis())) {
 		_screen->clearPrintfOverlay();
diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h
index 35ceaf8..3a0e247 100644
--- a/backends/platform/ps2/systemps2.h
+++ b/backends/platform/ps2/systemps2.h
@@ -64,7 +64,6 @@ public:
 
 	virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
 	virtual void setShakePos(int shakeOffset);
-	virtual bool grabRawScreen(Graphics::Surface *surf);
 	virtual Graphics::Surface *lockScreen();
 	virtual void unlockScreen();
 	virtual void updateScreen();






More information about the Scummvm-git-logs mailing list