[Scummvm-cvs-logs] scummvm master -> c1dacbe65d4fa72128f7f521326beb0838784ac2
bluegr
bluegr at gmail.com
Fri Feb 19 01:50:57 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c1dacbe65d SCI: Use American English, like we do in other parts of ScummVM
Commit: c1dacbe65d4fa72128f7f521326beb0838784ac2
https://github.com/scummvm/scummvm/commit/c1dacbe65d4fa72128f7f521326beb0838784ac2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-02-19T02:50:16+02:00
Commit Message:
SCI: Use American English, like we do in other parts of ScummVM
This replaces "colour" to "color"
Changed paths:
engines/sci/graphics/celobj32.cpp
engines/sci/graphics/celobj32.h
engines/sci/graphics/frameout.h
engines/sci/graphics/palette32.cpp
engines/sci/graphics/palette32.h
engines/sci/graphics/plane32.h
engines/sci/graphics/text32.h
diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index 07bac74..d96bf37 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -236,7 +236,7 @@ public:
// Fill with skip color
if (controlByte & 0x40) {
memset(_buffer + i, _transparentColor, length);
- // Next value is fill colour
+ // Next value is fill color
} else {
memset(_buffer + i, *literal, length);
++literal;
@@ -1020,7 +1020,7 @@ CelObjColor::CelObjColor(const uint8 color, const int16 width, const int16 heigh
void CelObjColor::draw(Buffer &target, const ScreenItem &screenItem, const Common::Rect &targetRect, const bool mirrorX) {
// TODO: The original engine sets this flag but why? One cannot
- // draw a solid colour mirrored.
+ // draw a solid color mirrored.
_drawMirrored = mirrorX;
draw(target, targetRect);
}
diff --git a/engines/sci/graphics/celobj32.h b/engines/sci/graphics/celobj32.h
index 1877099..897615d 100644
--- a/engines/sci/graphics/celobj32.h
+++ b/engines/sci/graphics/celobj32.h
@@ -79,7 +79,7 @@ struct CelInfo32 {
reg_t bitmap;
/**
- * For CelObjColor, the fill colour.
+ * For CelObjColor, the fill color.
*/
uint8 color;
@@ -264,8 +264,8 @@ public:
uint16 _scaledWidth, _scaledHeight;
/**
- * The skip (transparent) colour for the cel. When
- * compositing, any pixels matching this colour will not
+ * The skip (transparent) color for the cel. When
+ * compositing, any pixels matching this color will not
* be copied to the buffer.
*/
uint8 _transparentColor;
@@ -559,7 +559,7 @@ public:
/**
* A CelObjColor is the drawing primitive for fast,
- * low-memory, flat colour fills.
+ * low-memory, flat color fills.
*/
class CelObjColor : public CelObj {
public:
@@ -568,7 +568,7 @@ public:
using CelObj::draw;
/**
- * Block fills the target buffer with the cel colour.
+ * Block fills the target buffer with the cel color.
*/
void draw(Buffer &target, const Common::Rect &targetRect) const;
virtual void draw(Buffer &target, const ScreenItem &screenItem, const Common::Rect &targetRect, const bool mirrorX) override;
diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h
index 5323a2a..27fce71 100644
--- a/engines/sci/graphics/frameout.h
+++ b/engines/sci/graphics/frameout.h
@@ -89,7 +89,7 @@ struct ShowStyleEntry {
int unknownC;
/**
- * The colour used by transitions that draw CelObjColor
+ * The color used by transitions that draw CelObjColor
* screen items. -1 for transitions that do not draw
* screen items.
*/
@@ -410,7 +410,7 @@ private:
* Erases the areas in the given erase list from the
* visible screen buffer by filling them with the color
* from the corresponding plane. This is an optimisation
- * for coloured-type planes only; other plane types have
+ * for colored-type planes only; other plane types have
* to be redrawn from pixel data.
*/
void drawEraseList(const RectList &eraseList, const Plane &plane);
diff --git a/engines/sci/graphics/palette32.cpp b/engines/sci/graphics/palette32.cpp
index a164dde..b681709 100644
--- a/engines/sci/graphics/palette32.cpp
+++ b/engines/sci/graphics/palette32.cpp
@@ -789,7 +789,7 @@ void GfxPalette32::applyCycles() {
// processShowStyleNone use 255 instead of 256. It is not clear if this is because
// the last palette entry is intentionally left unmodified, or if this is a bug
// in the engine. It certainly seems confused because all other places that accept
-// colour ranges typically receive values in the range of 0–255.
+// color ranges typically receive values in the range of 0–255.
void GfxPalette32::setFade(uint8 percent, uint8 fromColor, uint16 numColorsToFade) {
if (fromColor > numColorsToFade) {
return;
diff --git a/engines/sci/graphics/palette32.h b/engines/sci/graphics/palette32.h
index 9110a8a..9da217b 100644
--- a/engines/sci/graphics/palette32.h
+++ b/engines/sci/graphics/palette32.h
@@ -133,7 +133,7 @@ public:
void applyAll();
#pragma mark -
-#pragma mark Colour look-up
+#pragma mark color look-up
private:
/**
* An optional lookup table used to remap RGB565 colors to a palette
diff --git a/engines/sci/graphics/plane32.h b/engines/sci/graphics/plane32.h
index 8eec417..be6f714 100644
--- a/engines/sci/graphics/plane32.h
+++ b/engines/sci/graphics/plane32.h
@@ -155,7 +155,7 @@ private:
public:
/**
- * The colour to use when erasing the plane. Only
+ * The color to use when erasing the plane. Only
* applies to planes of type kPlaneTypeColored.
*/
byte _back;
diff --git a/engines/sci/graphics/text32.h b/engines/sci/graphics/text32.h
index 42804f5..08568e4 100644
--- a/engines/sci/graphics/text32.h
+++ b/engines/sci/graphics/text32.h
@@ -58,17 +58,17 @@ private:
int16 _width, _height;
/**
- * The colour used to draw text.
+ * The color used to draw text.
*/
uint8 _foreColor;
/**
- * The background colour of the text box.
+ * The background color of the text box.
*/
uint8 _backColor;
/**
- * The transparent colour of the text box. Used when
+ * The transparent color of the text box. Used when
* compositing the bitmap onto the screen.
*/
uint8 _skipColor;
@@ -91,7 +91,7 @@ private:
GuiResourceId _fontId;
/**
- * The colour of the text box border.
+ * The color of the text box border.
*/
int16 _borderColor;
More information about the Scummvm-git-logs
mailing list