[Scummvm-cvs-logs] scummvm master -> e578cb8976f10cd9217cddef48c6693cf5d03c7b
fuzzie
fuzzie at fuzzie.org
Mon Nov 21 16:08:10 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:
d485b36b45 GROOVIE: Use SWAP().
d9bcf1a3bf SAGA: Simply use a Graphics::Surface instead of a Saga::Surface.
e578cb8976 ALL: Remove unnecessary forward declarations.
Commit: d485b36b4591ed58c77bccbabaa84c2ea3b78526
https://github.com/scummvm/scummvm/commit/d485b36b4591ed58c77bccbabaa84c2ea3b78526
Author: Christoph Mallon (christoph.mallon at gmx.de)
Date: 2011-11-21T06:58:31-08:00
Commit Message:
GROOVIE: Use SWAP().
Changed paths:
engines/groovie/roq.cpp
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index ca896a8..53f335c 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -138,9 +138,7 @@ void ROQPlayer::buildShowBuf() {
}
// Swap buffers
- Graphics::Surface *tmp = _prevBuf;
- _prevBuf = _currBuf;
- _currBuf = tmp;
+ SWAP(_prevBuf, _currBuf);
}
bool ROQPlayer::playFrameInternal() {
Commit: d9bcf1a3bfa697c09252f14a397cd0fc610b7cfb
https://github.com/scummvm/scummvm/commit/d9bcf1a3bfa697c09252f14a397cd0fc610b7cfb
Author: Christoph Mallon (christoph.mallon at gmx.de)
Date: 2011-11-21T06:59:00-08:00
Commit Message:
SAGA: Simply use a Graphics::Surface instead of a Saga::Surface.
Changed paths:
engines/saga/scene.cpp
diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp
index 61e62d5..35d923f 100644
--- a/engines/saga/scene.cpp
+++ b/engines/saga/scene.cpp
@@ -454,7 +454,6 @@ void Scene::changeScene(int16 sceneNumber, int actorsEntrance, SceneTransitionTy
if (_vm->_hasITESceneSubstitutes) {
for (int i = 0; i < ARRAYSIZE(sceneSubstitutes); i++) {
if (sceneSubstitutes[i].sceneId == sceneNumber) {
- Surface bbmBuffer;
byte *pal, colors[768];
Common::File file;
Rect rect;
@@ -463,6 +462,7 @@ void Scene::changeScene(int16 sceneNumber, int actorsEntrance, SceneTransitionTy
_vm->_interface->setMode(kPanelSceneSubstitute);
if (file.open(sceneSubstitutes[i].image)) {
+ Graphics::Surface bbmBuffer;
Graphics::decodePBM(file, bbmBuffer, colors);
pal = colors;
rect.setWidth(bbmBuffer.w);
Commit: e578cb8976f10cd9217cddef48c6693cf5d03c7b
https://github.com/scummvm/scummvm/commit/e578cb8976f10cd9217cddef48c6693cf5d03c7b
Author: Christoph Mallon (christoph.mallon at gmx.de)
Date: 2011-11-21T06:59:19-08:00
Commit Message:
ALL: Remove unnecessary forward declarations.
Changed paths:
backends/platform/ps2/Gs2dScreen.h
engines/kyra/kyra_lok.h
engines/lastexpress/data/scene.h
engines/teenagent/surface.h
graphics/yuv_to_rgb.h
video/avi_decoder.h
video/codecs/cinepak.h
video/codecs/mjpeg.h
video/dxa_decoder.h
diff --git a/backends/platform/ps2/Gs2dScreen.h b/backends/platform/ps2/Gs2dScreen.h
index dffdce5..3701afd 100644
--- a/backends/platform/ps2/Gs2dScreen.h
+++ b/backends/platform/ps2/Gs2dScreen.h
@@ -42,10 +42,6 @@ enum GsInterlace {
};
-namespace Graphics {
-struct Surface;
-}
-
class Gs2dScreen {
public:
Gs2dScreen(uint16 width, uint16 height, TVMode tvMode);
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index db70d19..e5fb3cd 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -29,10 +29,6 @@
#include "kyra/gui_lok.h"
#include "kyra/item.h"
-namespace Graphics {
-struct Surface;
-}
-
namespace Kyra {
class Movie;
diff --git a/engines/lastexpress/data/scene.h b/engines/lastexpress/data/scene.h
index 0c0d12b..69a1417 100644
--- a/engines/lastexpress/data/scene.h
+++ b/engines/lastexpress/data/scene.h
@@ -76,10 +76,6 @@ class SeekableReadStream;
class String;
}
-namespace Graphics {
-struct Surface;
-}
-
namespace LastExpress {
class Scene;
diff --git a/engines/teenagent/surface.h b/engines/teenagent/surface.h
index 1771b2d..51368c6 100644
--- a/engines/teenagent/surface.h
+++ b/engines/teenagent/surface.h
@@ -31,7 +31,6 @@ class SeekableReadStream;
namespace TeenAgent {
-class Pack;
class Surface : public Graphics::Surface {
public:
enum Type {kTypeOns, kTypeLan};
diff --git a/graphics/yuv_to_rgb.h b/graphics/yuv_to_rgb.h
index 2d3b9e6..259ba09 100644
--- a/graphics/yuv_to_rgb.h
+++ b/graphics/yuv_to_rgb.h
@@ -35,8 +35,6 @@
namespace Graphics {
-struct Surface;
-
/**
* Convert a YUV420 image to an RGB surface
*
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 540a768..508760e 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -43,10 +43,6 @@ namespace Graphics {
struct PixelFormat;
}
-namespace Graphics {
-struct Surface;
-}
-
namespace Video {
class Codec;
diff --git a/video/codecs/cinepak.h b/video/codecs/cinepak.h
index 67000bf..ca4552f 100644
--- a/video/codecs/cinepak.h
+++ b/video/codecs/cinepak.h
@@ -33,10 +33,6 @@ namespace Common {
class SeekableReadStream;
}
-namespace Graphics {
-struct Surface;
-}
-
namespace Video {
struct CinepakCodebook {
diff --git a/video/codecs/mjpeg.h b/video/codecs/mjpeg.h
index 8a446ee..45cb57d 100644
--- a/video/codecs/mjpeg.h
+++ b/video/codecs/mjpeg.h
@@ -32,7 +32,6 @@ class SeekableReadStream;
namespace Graphics {
class JPEG;
-struct Surface;
}
namespace Video {
diff --git a/video/dxa_decoder.h b/video/dxa_decoder.h
index 4eb4a89..d13cd30 100644
--- a/video/dxa_decoder.h
+++ b/video/dxa_decoder.h
@@ -31,10 +31,6 @@ namespace Common {
class SeekableReadStream;
}
-namespace Graphics {
-struct Surface;
-}
-
namespace Video {
/**
More information about the Scummvm-git-logs
mailing list