aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2016-03-08 20:15:22 +0100
committerJohannes Schickel2016-03-08 20:15:22 +0100
commit7be486ae271ff87e1f7b3d3a5b9b0596826c6cc1 (patch)
tree9d379f6fa5efc83e4935558f3d683c36d185a010
parent693f8dc295dc43e3bccd954a8a243f7aedd5da22 (diff)
downloadscummvm-rg350-7be486ae271ff87e1f7b3d3a5b9b0596826c6cc1.tar.gz
scummvm-rg350-7be486ae271ff87e1f7b3d3a5b9b0596826c6cc1.tar.bz2
scummvm-rg350-7be486ae271ff87e1f7b3d3a5b9b0596826c6cc1.zip
SCI: Slight template formatting fixes.
-rw-r--r--engines/sci/graphics/celobj32.cpp8
-rw-r--r--engines/sci/graphics/celobj32.h4
-rw-r--r--engines/sci/graphics/lists32.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index 35f934825d..389270ec42 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -107,7 +107,7 @@ void CelObj::deinit() {
#pragma mark -
#pragma mark CelObj - Scalers
-template <bool FLIP, typename READER>
+template<bool FLIP, typename READER>
struct SCALER_NoScale {
const byte *_row;
READER _reader;
@@ -562,7 +562,7 @@ void CelObj::putCopyInCache(const int cacheIndex) const {
#pragma mark -
#pragma mark CelObj - Drawing
-template <typename MAPPER, typename SCALER>
+template<typename MAPPER, typename SCALER>
struct RENDERER {
MAPPER &_mapper;
SCALER &_scaler;
@@ -594,7 +594,7 @@ struct RENDERER {
}
};
-template <typename MAPPER, typename SCALER>
+template<typename MAPPER, typename SCALER>
void CelObj::render(Buffer &target, const Common::Rect &targetRect, const Common::Point &scaledPosition) const {
MAPPER mapper;
@@ -603,7 +603,7 @@ void CelObj::render(Buffer &target, const Common::Rect &targetRect, const Common
renderer.draw(target, targetRect, scaledPosition);
}
-template <typename MAPPER, typename SCALER>
+template<typename MAPPER, typename SCALER>
void CelObj::render(Buffer &target, const Common::Rect &targetRect, const Common::Point &scaledPosition, const Ratio &scaleX, const Ratio &scaleY) const {
MAPPER mapper;
diff --git a/engines/sci/graphics/celobj32.h b/engines/sci/graphics/celobj32.h
index eca89352ae..8d030cfd4a 100644
--- a/engines/sci/graphics/celobj32.h
+++ b/engines/sci/graphics/celobj32.h
@@ -379,10 +379,10 @@ public:
#pragma mark -
#pragma mark CelObj - Drawing
private:
- template <typename MAPPER, typename SCALER>
+ template<typename MAPPER, typename SCALER>
void render(Buffer &target, const Common::Rect &targetRect, const Common::Point &scaledPosition) const;
- template <typename MAPPER, typename SCALER>
+ template<typename MAPPER, typename SCALER>
void render(Buffer &target, const Common::Rect &targetRect, const Common::Point &scaledPosition, const Ratio &scaleX, const Ratio &scaleY) const;
void drawHzFlip(Buffer &target, const Common::Rect &targetRect, const Common::Point &scaledPosition) const;
diff --git a/engines/sci/graphics/lists32.h b/engines/sci/graphics/lists32.h
index 7e94eb127f..4f74c77325 100644
--- a/engines/sci/graphics/lists32.h
+++ b/engines/sci/graphics/lists32.h
@@ -36,7 +36,7 @@ namespace Sci {
* calling `erase` or when destroying the
* StablePointerArray.
*/
-template <class T, uint N>
+template<class T, uint N>
class StablePointerArray {
uint _size;
T *_items[N];
@@ -178,7 +178,7 @@ public:
}
};
-template <typename T>
+template<typename T>
class FindByObject {
const reg_t &_object;
public: