[Scummvm-cvs-logs] scummvm master -> 3584680587cc0ad5c8f6c234edced42c34ec5ca4
Strangerke
Strangerke at scummvm.org
Wed Feb 19 21:47:45 CET 2014
This automated email contains information about 10 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a2a222e647 AVALANCHE: Some British to American english
2c7f6a9d1d CGE: Some British to American english
137f625548 DREAMWEB: Some British to American english
a675ac09c2 SCUMM: Some British to American english
9a22da6573 SWORD1: Some British to American English
9c82cf4844 TEENAGENT: Some British to American English
93c06d52a5 TSAGE: Some British to American English
8d25112e14 VOYEUR: Some British to American English
719f8f23ec WINTERMUTE: Some British to American English
3584680587 TSAGE: Remove leftover debug display
Commit: a2a222e647c2227c9bf01c0023cae1aa72aadcad
https://github.com/scummvm/scummvm/commit/a2a222e647c2227c9bf01c0023cae1aa72aadcad
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T12:45:19-08:00
Commit Message:
AVALANCHE: Some British to American english
Changed paths:
engines/avalanche/avalanche.cpp
engines/avalanche/dialogs.cpp
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 8158536..27c3669 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -279,9 +279,9 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) {
if (!_favoriteSong.empty())
_favoriteSong.clear();
- uint16 favourite_songSize = 0;
- sz.syncAsUint16LE(favourite_songSize);
- for (uint16 i = 0; i < favourite_songSize; i++) {
+ uint16 favoriteSongSize = 0;
+ sz.syncAsUint16LE(favoriteSongSize);
+ for (uint16 i = 0; i < favoriteSongSize; i++) {
sz.syncAsByte(actChr);
_favoriteSong += actChr;
}
diff --git a/engines/avalanche/dialogs.cpp b/engines/avalanche/dialogs.cpp
index b175464..36f6f44 100644
--- a/engines/avalanche/dialogs.cpp
+++ b/engines/avalanche/dialogs.cpp
@@ -455,7 +455,7 @@ void Dialogs::drawScroll(DialogFunctionType modeFunc) {
mx -= lx;
my -= ly + 2;
- bool centre = false;
+ bool center = false;
byte iconIndent = 0;
switch (_useIcon) {
@@ -481,11 +481,11 @@ void Dialogs::drawScroll(DialogFunctionType modeFunc) {
if (!_scroll[i].empty())
switch (_scroll[i][_scroll[i].size() - 1]) {
case kControlCenter:
- centre = true;
+ center = true;
_scroll[i].deleteLastChar();
break;
case kControlLeftJustified:
- centre = false;
+ center = false;
_scroll[i].deleteLastChar();
break;
case kControlQuestion:
@@ -497,7 +497,7 @@ void Dialogs::drawScroll(DialogFunctionType modeFunc) {
break;
}
- if (centre)
+ if (center)
say(320 - _scroll[i].size() * 4 + iconIndent, my, _scroll[i]);
else
say(mx + iconIndent, my, _scroll[i]);
Commit: 2c7f6a9d1dd5e2a9a145304fc7ca2fe2acfd7200
https://github.com/scummvm/scummvm/commit/2c7f6a9d1dd5e2a9a145304fc7ca2fe2acfd7200
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T12:45:20-08:00
Commit Message:
CGE: Some British to American english
Changed paths:
engines/cge/cge.cpp
engines/cge/vga13h.cpp
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 8d8c4e4..e8ab3c2 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -73,7 +73,7 @@ void CGEEngine::initSceneValues() {
void CGEEngine::init() {
debugC(1, kCGEDebugEngine, "CGEEngine::setup()");
- // Initialise fields
+ // Initialize fields
_lastFrame = 0;
_lastTick = 0;
_hero = NULL;
@@ -87,7 +87,7 @@ void CGEEngine::init() {
// Create debugger console
_console = new CGEConsole(this);
- // Initialise engine objects
+ // Initialize engine objects
_font = new Font(this, "CGE");
_text = new Text(this, "CGE");
_talk = NULL;
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index 27b5d9a..d5e1be5 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -761,7 +761,7 @@ void Vga::setColors(Dac *tab, int lum) {
if (_mono) {
destP = _newColors;
for (int idx = 0; idx < kPalCount; idx++, destP++) {
- // Form a greyscalce colour from 30% R, 59% G, 11% B
+ // Form a greyscalce color from 30% R, 59% G, 11% B
uint8 intensity = (((int)destP->_r * 77) + ((int)destP->_g * 151) + ((int)destP->_b * 28)) >> 8;
destP->_r = intensity;
destP->_g = intensity;
Commit: 137f62554854905a7a3a72289235bbec71a922bd
https://github.com/scummvm/scummvm/commit/137f62554854905a7a3a72289235bbec71a922bd
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T12:45:22-08:00
Commit Message:
DREAMWEB: Some British to American english
Changed paths:
engines/dreamweb/dreamweb.cpp
engines/dreamweb/dreamweb.h
engines/dreamweb/newplace.cpp
engines/dreamweb/stubs.cpp
engines/dreamweb/use.cpp
engines/dreamweb/vgafades.cpp
engines/dreamweb/vgagrafx.cpp
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 3fe20bd..94a2e60 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -199,7 +199,7 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
_saveLoadPage = 0;
_currentSlot = 0;
_cursorPos = 0;
- _colourPos = 0;
+ _colorPos = 0;
_fadeDirection = 0;
_numToFade = 0;
_fadeCount = 0;
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index d572e2b..e39f8c0 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -415,7 +415,7 @@ public:
uint8 _saveLoadPage;
uint8 _currentSlot;
uint8 _cursorPos;
- uint8 _colourPos;
+ uint8 _colorPos;
uint8 _fadeDirection;
uint8 _numToFade;
uint8 _fadeCount;
@@ -515,8 +515,8 @@ public:
int findCommand(const char *const cmdList[]);
// from newplace.cpp
- void getUnderCentre();
- void putUnderCentre();
+ void getUnderCenter();
+ void putUnderCenter();
void showArrows();
uint8 getLocation(uint8 index);
void setLocation(uint8 index);
@@ -996,7 +996,7 @@ public:
void useDryer();
void callEdensDLift();
void callEdensLift();
- void openYourNeighbour();
+ void openYourNeighbor();
void openRyan();
void openPoolBoss();
void openEden();
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index b2975d2..3834a11 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -113,7 +113,7 @@ void DreamWebEngine::lookAtPlace() {
delPointer();
delTextLine();
- getUnderCentre();
+ getUnderCenter();
showFrame(_newplaceGraphics3, 60, 72, 0, 0);
showFrame(_newplaceGraphics3, 60, 72 + 55, 4, 0);
if (_foreignRelease)
@@ -127,15 +127,15 @@ void DreamWebEngine::lookAtPlace() {
hangOnP(500);
_pointerMode = 0;
_pointerFrame = 0;
- putUnderCentre();
+ putUnderCenter();
workToScreenM();
}
-void DreamWebEngine::getUnderCentre() {
+void DreamWebEngine::getUnderCenter() {
multiGet(_mapStore, 58, 72, 254, 110);
}
-void DreamWebEngine::putUnderCentre() {
+void DreamWebEngine::putUnderCenter() {
multiPut(_mapStore, 58, 72, 254, 110);
}
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a4fd6df..68b2233 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2566,14 +2566,14 @@ void DreamWebEngine::showGun() {
greyscaleSum();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(130);
endPalToStart();
clearEndPal();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(200);
_roomsSample = 34;
@@ -2749,7 +2749,7 @@ void DreamWebEngine::entryAnims() {
// Make doors open
removeSetObject(4);
placeSetObject(5);
- } else if (_vars._location == 47) { // Dream centre
+ } else if (_vars._location == 47) { // Dream center
placeSetObject(4);
placeSetObject(5);
} else if (_vars._location == 38) { // Car park
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index b8b99c6..01aefd9 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -73,7 +73,7 @@ void DreamWebEngine::useRoutine() {
{ &DreamWebEngine::openLouis, "ENTA" },
{ &DreamWebEngine::openRyan, "ENTB" },
{ &DreamWebEngine::openPoolBoss, "ENTE" },
- { &DreamWebEngine::openYourNeighbour, "ENTC" },
+ { &DreamWebEngine::openYourNeighbor, "ENTC" },
{ &DreamWebEngine::openEden, "ENTD" },
{ &DreamWebEngine::openSarters, "ENTH" },
{ &DreamWebEngine::wearWatch, "WWAT" },
@@ -458,7 +458,7 @@ void DreamWebEngine::callEdensDLift() {
}
}
-void DreamWebEngine::openYourNeighbour() {
+void DreamWebEngine::openYourNeighbor() {
enterCode(255, 255, 255, 255);
_getBack = 1;
}
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index a0f14e1..65930ae 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -72,11 +72,11 @@ void DreamWebEngine::doFade() {
return;
processEvents();
- uint8 *src = _startPal + 3 * _colourPos;
- setPalette(src, _colourPos, _numToFade);
+ uint8 *src = _startPal + 3 * _colorPos;
+ setPalette(src, _colorPos, _numToFade);
- _colourPos += _numToFade;
- if (_colourPos == 0)
+ _colorPos += _numToFade;
+ if (_colorPos == 0)
fadeCalculation();
}
@@ -109,7 +109,7 @@ void DreamWebEngine::fadeUpYellows() {
memset(_endPal + 246 * 3, 0, 1 * 3);
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(128);
}
@@ -121,7 +121,7 @@ void DreamWebEngine::fadeUpMonFirst() {
memset(_startPal + 246 * 3, 0, 1 * 3);
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(64);
_sound->playChannel1(26);
@@ -136,7 +136,7 @@ void DreamWebEngine::fadeDownMon() {
memset(_endPal + 246 * 3, 0, 1 * 3);
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(64);
}
@@ -148,7 +148,7 @@ void DreamWebEngine::fadeUpMon() {
memset(_startPal + 246 * 3, 0, 1 * 3);
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(128);
}
@@ -166,7 +166,7 @@ void DreamWebEngine::fadeScreenUp() {
palToEndPal();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
}
@@ -175,7 +175,7 @@ void DreamWebEngine::fadeScreenUps() {
palToEndPal();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 64;
}
@@ -184,7 +184,7 @@ void DreamWebEngine::fadeScreenUpHalf() {
palToEndPal();
_fadeDirection = 1;
_fadeCount = 31;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 32;
}
@@ -193,7 +193,7 @@ void DreamWebEngine::fadeScreenDown() {
clearEndPal();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
}
@@ -202,7 +202,7 @@ void DreamWebEngine::fadeScreenDowns() {
clearEndPal();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 64;
}
@@ -222,7 +222,7 @@ void DreamWebEngine::fadeScreenDownHalf() {
_fadeDirection = 1;
_fadeCount = 31;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 32;
}
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index ef8b483..e853134 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -235,7 +235,7 @@ void DreamWebEngine::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y
void DreamWebEngine::showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height) {
if (effectsFlag) {
- if (effectsFlag & 128) { //centred
+ if (effectsFlag & 128) { //centered
x -= width / 2;
y -= height / 2;
}
Commit: a675ac09c20caf96ccfec0d314c5032a0cf63d60
https://github.com/scummvm/scummvm/commit/a675ac09c20caf96ccfec0d314c5032a0cf63d60
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T12:45:23-08:00
Commit Message:
SCUMM: Some British to American english
Changed paths:
engines/scumm/he/logic/soccer.cpp
diff --git a/engines/scumm/he/logic/soccer.cpp b/engines/scumm/he/logic/soccer.cpp
index a0eaf2e..0efe482 100644
--- a/engines/scumm/he/logic/soccer.cpp
+++ b/engines/scumm/he/logic/soccer.cpp
@@ -566,7 +566,7 @@ int LogicHEsoccer::addCollisionTreeChild(int depth, int index, int parent) {
}
int LogicHEsoccer::op_1013(int32 a1, int32 a2, int32 a3) {
- // Initialises _collisionTree, a tree used for collision detection.
+ // Initializes _collisionTree, a tree used for collision detection.
// It is used by op_1014 to work out which objects to check.
_collisionTree = new uint32[585 * 11];
Commit: 9a22da65730f8be718c7bf6eac29e2a9a5c6630f
https://github.com/scummvm/scummvm/commit/9a22da65730f8be718c7bf6eac29e2a9a5c6630f
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T12:45:24-08:00
Commit Message:
SWORD1: Some British to American English
Changed paths:
engines/sword1/staticres.cpp
diff --git a/engines/sword1/staticres.cpp b/engines/sword1/staticres.cpp
index 47a097e..37ab3c2 100644
--- a/engines/sword1/staticres.cpp
+++ b/engines/sword1/staticres.cpp
@@ -2682,7 +2682,7 @@ const char Music::_tuneList[TOTAL_TUNES][8] = {
"3m10", // DONE 82 After, "A description, perhaps."
"2m13", // DONE 83 Red nose icon at costumier's. Copy 2M13.
"3m12", // DONE 84 Tissue icon. Also, after Nico's "No, I write it (the magazine) 5M19.
- "3m13", // DONE 85 Photo icon over, "Do you recognise this man?"
+ "3m13", // DONE 85 Photo icon over, "Do you recognize this man?"
"3m14", // DONE 86 Exit icon, over, "Thanks for your help, buddy."
"2m9", // DONE 87 Clicking on police station on the map.
"3m17", // DONE 88 Police station on, "I've tracked down the clown's movements."
@@ -2702,7 +2702,7 @@ const char Music::_tuneList[TOTAL_TUNES][8] = {
"3m32", // DONE 100 Source music for Lady Piermont.
"3m33", // DONE 101 More music for Lady P.
"2m13", // DONE 102 Red Nose music Copy 2M13
- "4m3", // DONE 103 On photo, "Do you recognise the man in this photograph"
+ "4m3", // DONE 103 On photo, "Do you recognize the man in this photograph"
"4m4", // DONE 104 With Lady P. After, "Hi there, ma'am."
"4m5", // DONE 105 After, "I think the word you're looking for is...dick"
"4m6", // DONE 106 After, "English arrogance might do the trick." Also for "More English arrogance" (4M27)
@@ -2881,7 +2881,7 @@ const char Music::_tuneList[TOTAL_TUNES][8] = {
"scm1b", // DONE 260 When George passes the trigger point toward the back of the train and he sees Guido.
"spm6b", // DONE 261 The climax of "spm6", which should coincide with the Countess holding up the chalice.
"marquet", // DONE 262 Starts at the fade down when George is asked to leave Jacques' room
- "rm4", // DONE 263 "On crystal stand icon. As George walks to the centre of the cavern." I'd do this on the first LMB on the stump.
+ "rm4", // DONE 263 "On crystal stand icon. As George walks to the center of the cavern." I'd do this on the first LMB on the stump.
"rm5", // DONE 264 "On icon. As George places the crystal on top of the stand." When the player places the gem luggage on the emplaced tripod.
"rm6", // DONE 265 "Chalice reflection. On icon as George places Chalice on floor of Church" i.e. the mosaic in the Baphomet dig. It's over thirty seconds long so it had best start running when the chalice luggage is placed on the mosaic so it runs through the big screen of the reflection.
"rm7", // DONE 266 "Burning candle. On icon as George sets about lighting candle." One minute forty-eight, this one. I've no idea how long the burning candle Smacker is but the cue description seems to indicate it should run from the moment the burning tissue successfully lights the candle, i.e. the window is shut.
Commit: 9c82cf4844130c32e5d25d958e47d829149c1a84
https://github.com/scummvm/scummvm/commit/9c82cf4844130c32e5d25d958e47d829149c1a84
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T12:45:26-08:00
Commit Message:
TEENAGENT: Some British to American English
Changed paths:
engines/teenagent/callbacks.cpp
engines/teenagent/resources.h
diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp
index 3f77673..74d3d7d 100644
--- a/engines/teenagent/callbacks.cpp
+++ b/engines/teenagent/callbacks.cpp
@@ -4624,7 +4624,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
SET_FLAG(dsAddr_mansionVCRPlayedTapeBeforeFlag, 1);
}
} else
- displayMessage(dsAddr_tvOffMsg); // "I just realised that the TV is off"
+ displayMessage(dsAddr_tvOffMsg); // "I just realized that the TV is off"
} else {
SET_FLAG(dsAddr_mansionVCRPlayingTapeFlag, 0);
if (CHECK_FLAG(dsAddr_mansionTVOnFlag, 1)) {
diff --git a/engines/teenagent/resources.h b/engines/teenagent/resources.h
index d2b4874..2cdc070 100644
--- a/engines/teenagent/resources.h
+++ b/engines/teenagent/resources.h
@@ -495,7 +495,7 @@ const uint16 dsAddr_noDepraveMsg = 0x4d02; // "Nah, I don't want to deprave the
// No Read Again Message : 0x4d2a to 0x4d5a
const uint16 dsAddr_noReadAgainMsg = 0x4d2a; // "I don't want to read it again. I might like it."
// TV Off Message : 0x4d5b to 0x4d7f
-const uint16 dsAddr_tvOffMsg = 0x4d5b; // "I just realised that the TV is off"
+const uint16 dsAddr_tvOffMsg = 0x4d5b; // "I just realized that the TV is off"
// Not Happen Message : 0x4d80 to 0x4d92
const uint16 dsAddr_NotHappenMsg = 0x4d80; // "Nothing happened"
// Tape Started Message : 0x4d93 to 0x4da5
Commit: 93c06d52a532a53e37cc15aacaaa1aa4eaf27c6f
https://github.com/scummvm/scummvm/commit/93c06d52a532a53e37cc15aacaaa1aa4eaf27c6f
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T12:45:27-08:00
Commit Message:
TSAGE: Some British to American English
Changed paths:
engines/tsage/debugger.cpp
engines/tsage/events.h
engines/tsage/ringworld2/ringworld2_logic.cpp
engines/tsage/ringworld2/ringworld2_logic.h
engines/tsage/ringworld2/ringworld2_scenes0.cpp
engines/tsage/ringworld2/ringworld2_scenes0.h
engines/tsage/scenes.cpp
diff --git a/engines/tsage/debugger.cpp b/engines/tsage/debugger.cpp
index d87afc7..140e1af 100644
--- a/engines/tsage/debugger.cpp
+++ b/engines/tsage/debugger.cpp
@@ -653,7 +653,7 @@ bool Ringworld2Debugger::Cmd_ListObjects(int argc, const char **argv) {
DebugPrintf("11 - R2_CHARGED_POWER_CAPSULE\n");
DebugPrintf("12 - R2_AEROSOL\n");
DebugPrintf("13 - R2_REMOTE_CONTROL\n");
- DebugPrintf("14 - R2_OPTICAL_FIBRE\n");
+ DebugPrintf("14 - R2_OPTICAL_FIBER\n");
DebugPrintf("15 - R2_CLAMP\n");
DebugPrintf("16 - R2_ATTRACTOR_CABLE_HARNESS\n");
DebugPrintf("17 - R2_FUEL_CELL\n");
diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index 0a99290..a3d96ab 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -90,7 +90,7 @@ enum CursorType {
R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, R2_SONIC_STUNNER = 7,
R2_CABLE_HARNESS = 8, R2_COM_SCANNER = 9, R2_SPENT_POWER_CAPSULE = 10,
R2_CHARGED_POWER_CAPSULE = 11, R2_AEROSOL = 12, R2_REMOTE_CONTROL = 13,
- R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_ATTRACTOR_CABLE_HARNESS = 16,
+ R2_OPTICAL_FIBER = 14, R2_CLAMP = 15, R2_ATTRACTOR_CABLE_HARNESS = 16,
R2_FUEL_CELL = 17, R2_GYROSCOPE = 18, R2_AIRBAG = 19, R2_REBREATHER_TANK = 20,
R2_RESERVE_REBREATHER_TANK = 21, R2_GUIDANCE_MODULE = 22, R2_THRUSTER_VALVE = 23,
R2_BALLOON_BACKPACK = 24, R2_RADAR_MECHANISM = 25, R2_JOYSTICK = 26,
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 555e395..773425f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -814,7 +814,7 @@ Ringworld2InvObjectList::Ringworld2InvObjectList():
_chargedPowerCapsule(1, 12),
_aerosol(1, 13),
_remoteControl(1, 14),
- _opticalFibre(1, 15),
+ _opticalFiber(1, 15),
_clamp(1, 16),
_attractorHarness(1, 17),
_fuelCell(2, 2),
@@ -869,7 +869,7 @@ Ringworld2InvObjectList::Ringworld2InvObjectList():
_itemList.push_back(&_chargedPowerCapsule);
_itemList.push_back(&_aerosol);
_itemList.push_back(&_remoteControl);
- _itemList.push_back(&_opticalFibre);
+ _itemList.push_back(&_opticalFiber);
_itemList.push_back(&_clamp);
_itemList.push_back(&_attractorHarness);
_itemList.push_back(&_fuelCell);
@@ -933,7 +933,7 @@ void Ringworld2InvObjectList::reset() {
setObjectScene(R2_CHARGED_POWER_CAPSULE, 400);
setObjectScene(R2_AEROSOL, 500);
setObjectScene(R2_REMOTE_CONTROL, 1550);
- setObjectScene(R2_OPTICAL_FIBRE, 850);
+ setObjectScene(R2_OPTICAL_FIBER, 850);
setObjectScene(R2_CLAMP, 850);
setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 0);
setObjectScene(R2_FUEL_CELL, 1550);
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 94dd294..31d801f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -178,7 +178,7 @@ public:
InvObject _chargedPowerCapsule;
InvObject _aerosol;
InvObject _remoteControl;
- InvObject _opticalFibre;
+ InvObject _opticalFiber;
InvObject _clamp;
InvObject _attractorHarness;
InvObject _fuelCell;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 5f532e3..c6dd248 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -6721,19 +6721,19 @@ bool Scene800::Button::startAction(CursorType action, Event &event) {
}
bool Scene800::CableJunction::startAction(CursorType action, Event &event) {
- if (action != R2_OPTICAL_FIBRE) {
+ if (action != R2_OPTICAL_FIBER) {
return NamedHotspot::startAction(action, event);
} else {
Scene800 *scene = (Scene800 *)R2_GLOBALS._sceneManager._scene;
R2_GLOBALS._player.disableControl();
- scene->_opticalFibre.postInit();
+ scene->_opticalFiber.postInit();
scene->_sceneMode = 803;
if (R2_INVENTORY.getObjectScene(R2_READER) == 800)
- scene->setAction(&scene->_sequenceManager1, scene, 813, &R2_GLOBALS._player, &scene->_opticalFibre, &scene->_reader, NULL);
+ scene->setAction(&scene->_sequenceManager1, scene, 813, &R2_GLOBALS._player, &scene->_opticalFiber, &scene->_reader, NULL);
else
- scene->setAction(&scene->_sequenceManager1, scene, 803, &R2_GLOBALS._player, &scene->_opticalFibre, NULL);
+ scene->setAction(&scene->_sequenceManager1, scene, 803, &R2_GLOBALS._player, &scene->_opticalFiber, NULL);
return true;
}
@@ -6751,8 +6751,8 @@ bool Scene800::DeviceSlot::startAction(CursorType action, Event &event) {
_lookLineNum = 27;
scene->_sceneMode = 809;
- if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800)
- scene->setAction(&scene->_sequenceManager1, scene, 815, &R2_GLOBALS._player, &scene->_reader, &scene->_opticalFibre, NULL);
+ if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) == 800)
+ scene->setAction(&scene->_sequenceManager1, scene, 815, &R2_GLOBALS._player, &scene->_reader, &scene->_opticalFiber, NULL);
else
scene->setAction(&scene->_sequenceManager1, scene, 809, &R2_GLOBALS._player, &scene->_reader, NULL);
return true;
@@ -6761,9 +6761,9 @@ bool Scene800::DeviceSlot::startAction(CursorType action, Event &event) {
scene->_reader.postInit();
scene->_sceneMode = 804;
- if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
+ if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) == 800) {
scene->setAction(&scene->_sequenceManager1, scene, 814, &R2_GLOBALS._player,
- &scene->_reader, &scene->_opticalFibre, NULL);
+ &scene->_reader, &scene->_opticalFiber, NULL);
} else {
scene->setAction(&scene->_sequenceManager1, scene, 804, &R2_GLOBALS._player,
&scene->_reader, NULL);
@@ -6879,22 +6879,22 @@ void Scene800::postInit(SceneObjectList *OwnerList) {
_autodocCover.setPosition(Common::Point(119, 161));
_autodocCover.setDetails(800, 6, 7, -1, 1, (SceneItem *)NULL);
- if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
- _opticalFibre.postInit();
+ if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) == 800) {
+ _opticalFiber.postInit();
if (R2_INVENTORY.getObjectScene(R2_READER) == 800)
- _opticalFibre.setup(800, 4, 1);
+ _opticalFiber.setup(800, 4, 1);
else
- _opticalFibre.setup(800, 7, 2);
+ _opticalFiber.setup(800, 7, 2);
- _opticalFibre.setPosition(Common::Point(220, 124));
- _opticalFibre.fixPriority(140);
+ _opticalFiber.setPosition(Common::Point(220, 124));
+ _opticalFiber.fixPriority(140);
}
if (R2_INVENTORY.getObjectScene(R2_READER) == 800) {
_reader.postInit();
- if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
- _opticalFibre.setup(800, 4, 1);
+ if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) == 800) {
+ _opticalFiber.setup(800, 4, 1);
_reader.hide();
} else {
_reader.setup(800, 7, 1);
@@ -6969,7 +6969,7 @@ void Scene800::signal() {
break;
case 803:
R2_GLOBALS._player.enableControl();
- R2_INVENTORY.setObjectScene(R2_OPTICAL_FIBRE, 800);
+ R2_INVENTORY.setObjectScene(R2_OPTICAL_FIBER, 800);
break;
case 804:
R2_GLOBALS._player.enableControl();
@@ -7265,7 +7265,7 @@ void Scene825::doButtonPress(int buttonId) {
if (R2_GLOBALS.getFlag(4)) {
if ((R2_INVENTORY.getObjectScene(R2_READER) != 800) ||
- (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) != 800)) {
+ (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) != 800)) {
_sceneText.setPosition(Common::Point(116, 75));
_sceneText.setup(ACCESS_CODE_REQUIRED);
} else if (R2_INVENTORY.getObjectScene(R2_OPTO_DISK) != 800) {
@@ -7282,7 +7282,7 @@ void Scene825::doButtonPress(int buttonId) {
R2_GLOBALS.setFlag(2);
if ((R2_INVENTORY.getObjectScene(R2_READER) != 800) ||
- (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) != 800)) {
+ (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) != 800)) {
_sceneText.setPosition(Common::Point(116, 75));
_sceneText.setup(ACCESS_CODE_REQUIRED);
} else {
@@ -7382,14 +7382,14 @@ void Scene825::doButtonPress(int buttonId) {
*--------------------------------------------------------------------------*/
bool Scene850::Indicator::startAction(CursorType action, Event &event) {
- if ((action != CURSOR_USE) || (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) != 850))
+ if ((action != CURSOR_USE) || (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) != 850))
return NamedHotspot::startAction(action, event);
else {
Scene850 *scene = (Scene850 *)R2_GLOBALS._sceneManager._scene;
R2_GLOBALS._player.disableControl();
scene->_sceneMode = 851;
- scene->setAction(&scene->_sequenceManager1, scene, 851, &R2_GLOBALS._player, &scene->_fibre, NULL);
+ scene->setAction(&scene->_sequenceManager1, scene, 851, &R2_GLOBALS._player, &scene->_fiber, NULL);
return true;
}
}
@@ -7488,10 +7488,10 @@ void Scene850::postInit(SceneObjectList *OwnerList) {
_panel.fixPriority(82);
_panel.setDetails(850, 24, -1, -1, 1, (SceneItem *)NULL);
- if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 850) {
- _fibre.postInit();
- _fibre.setup(850, 6, 1);
- _fibre.setPosition(Common::Point(280, 87));
+ if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) == 850) {
+ _fiber.postInit();
+ _fiber.setup(850, 6, 1);
+ _fiber.setPosition(Common::Point(280, 87));
}
R2_GLOBALS._player.postInit();
@@ -7538,8 +7538,8 @@ void Scene850::signal() {
R2_GLOBALS._player.enableControl();
break;
case 851:
- R2_INVENTORY.setObjectScene(R2_OPTICAL_FIBRE, 1);
- _fibre.remove();
+ R2_INVENTORY.setObjectScene(R2_OPTICAL_FIBER, 1);
+ _fiber.remove();
R2_GLOBALS._player.enableControl();
break;
case 852:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 1c8f955..f50c9a9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -809,7 +809,7 @@ public:
Button _button;
CableJunction _cableJunction;
DeviceSlot _deviceSlot;
- SceneActor _autodocCover, _opticalFibre, _reader;
+ SceneActor _autodocCover, _opticalFiber, _reader;
Door _door;
Tray _tray;
ComScanner _comScanner;
@@ -885,7 +885,7 @@ public:
NamedHotspot _background, _eastDoor, _compartment, _sickBayIndicator;
NamedHotspot _liftControls;
Indicator _indicator;
- SceneActor _spark, _fibre;
+ SceneActor _spark, _fiber;
LiftDoor _liftDoor;
SickBayDoor _sickBayDoor;
Clamp _clamp;
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 5347c58..04dcd29 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -150,6 +150,7 @@ void SceneManager::fadeInIfNecessary() {
void SceneManager::changeScene(int newSceneNumber) {
debug(1, "changeScene(%d)", newSceneNumber);
+ warning("Scene %d", newSceneNumber);
// Fade out the scene
ScenePalette scenePalette;
uint32 adjustData = 0;
Commit: 8d25112e14453b1670a2bfb051288374afe6f35f
https://github.com/scummvm/scummvm/commit/8d25112e14453b1670a2bfb051288374afe6f35f
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T12:45:29-08:00
Commit Message:
VOYEUR: Some British to American English
Changed paths:
engines/voyeur/files.h
engines/voyeur/voyeur.cpp
engines/voyeur/voyeur_game.cpp
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index f2fd918..8c5f5d9 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -332,7 +332,7 @@ public:
byte *_field30;
// Rect lists and counts. Note that _rectListCount values of '-1' seem to have
- // special significance, which is why I'm not making them redundant in favour
+ // special significance, which is why I'm not making them redundant in favor
// of the arrays' .size() method
Common::Array<Common::Rect> *_rectListPtr[3];
int _rectListCount[3];
@@ -390,7 +390,7 @@ public:
virtual ~FontResource();
};
-enum FontJustify { ALIGN_LEFT = 0, ALIGN_CENTRE = 1, ALIGN_RIGHT = 2 };
+enum FontJustify { ALIGN_LEFT = 0, ALIGN_CENTER = 1, ALIGN_RIGHT = 2 };
class FontInfoResource {
public:
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index beaec8a..09da8f1 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -279,7 +279,7 @@ bool VoyeurEngine::doLock() {
// Display the last play time
_graphicsManager._fontPtr->_pos = Common::Point(0, 97);
- _graphicsManager._fontPtr->_justify = ALIGN_CENTRE;
+ _graphicsManager._fontPtr->_justify = ALIGN_CENTER;
_graphicsManager._fontPtr->_justifyWidth = 384;
_graphicsManager._fontPtr->_justifyHeight = 97;
@@ -646,7 +646,7 @@ void VoyeurEngine::doTransitionCard(const Common::String &time, const Common::St
fi._foreColor = 224;
fi._fontSaveBack = 0;
fi._pos = Common::Point(0, 116);
- fi._justify = ALIGN_CENTRE;
+ fi._justify = ALIGN_CENTER;
fi._justifyWidth = 384;
fi._justifyHeight = 120;
@@ -654,7 +654,7 @@ void VoyeurEngine::doTransitionCard(const Common::String &time, const Common::St
if (!location.empty()) {
fi._pos = Common::Point(0, 138);
- fi._justify = ALIGN_CENTRE;
+ fi._justify = ALIGN_CENTER;
fi._justifyWidth = 384;
fi._justifyHeight = 140;
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index e7abdfc..2c0df87 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -307,7 +307,7 @@ void VoyeurEngine::doClosingCredits() {
if (flags & 1) {
fi._foreColor = 1;
fi._curFont = _bVoy->boltEntry(0x402)._fontResource;
- fi._justify = ALIGN_CENTRE;
+ fi._justify = ALIGN_CENTER;
fi._justifyWidth = 384;
fi._justifyHeight = 240;
fi._pos = Common::Point(0, READ_LE_UINT16(entry));
@@ -319,7 +319,7 @@ void VoyeurEngine::doClosingCredits() {
if (flags & 0x40) {
fi._foreColor = 2;
fi._curFont = _bVoy->boltEntry(0x400)._fontResource;
- fi._justify = ALIGN_CENTRE;
+ fi._justify = ALIGN_CENTER;
fi._justifyWidth = 384;
fi._justifyHeight = 240;
fi._pos = Common::Point(0, READ_LE_UINT16(entry));
@@ -352,7 +352,7 @@ void VoyeurEngine::doClosingCredits() {
if (flags & 4) {
fi._foreColor = 1;
fi._curFont = _bVoy->boltEntry(0x402)._fontResource;
- fi._justify = ALIGN_CENTRE;
+ fi._justify = ALIGN_CENTER;
fi._justifyWidth = 384;
fi._justifyHeight = 240;
fi._pos = Common::Point(0, READ_LE_UINT16(entry));
@@ -362,7 +362,7 @@ void VoyeurEngine::doClosingCredits() {
fi._foreColor = 2;
fi._curFont = _bVoy->boltEntry(0x400)._fontResource;
- fi._justify = ALIGN_CENTRE;
+ fi._justify = ALIGN_CENTER;
fi._justifyWidth = 384;
fi._justifyHeight = 240;
fi._pos = Common::Point(0, READ_LE_UINT16(entry) + 13);
@@ -399,7 +399,7 @@ void VoyeurEngine::doPiracy() {
fi._backColor = 2;
fi._fontSaveBack = false;
fi._fontFlags = 0;
- fi._justify = ALIGN_CENTRE;
+ fi._justify = ALIGN_CENTER;
fi._justifyWidth = 384;
fi._justifyHeight = 230;
Commit: 719f8f23ec1d3834f6bde3e1ff7300f52000c8d3
https://github.com/scummvm/scummvm/commit/719f8f23ec1d3834f6bde3e1ff7300f52000c8d3
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T12:45:30-08:00
Commit Message:
WINTERMUTE: Some British to American English
Changed paths:
engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 6f149f9..601fcc0 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -376,7 +376,7 @@ void BaseRenderOSystem::addDirtyRect(const Common::Rect &rect) {
void BaseRenderOSystem::drawTickets() {
RenderQueueIterator it = _renderQueue.begin();
// Clean out the old tickets
- // Note: We draw invalid tickets too, otherwise we wouldn't be honouring
+ // Note: We draw invalid tickets too, otherwise we wouldn't be honoring
// the draw request they obviously made BEFORE becoming invalid, either way
// we have a copy of their data, so their invalidness won't affect us.
while (it != _renderQueue.end()) {
@@ -402,7 +402,7 @@ void BaseRenderOSystem::drawTickets() {
it = _renderQueue.begin();
_lastFrameIter = _renderQueue.end();
// A special case: If the screen has one giant OPAQUE rect to be drawn, then we skip filling
- // the background colour. Typical use-case: Fullscreen FMVs.
+ // the background color. Typical use-case: Fullscreen FMVs.
// Caveat: The FPS-counter will invalidate this.
if (it != _lastFrameIter && _renderQueue.front() == _renderQueue.back() && (*it)->_transform._alphaDisable == true) {
// If our single opaque rect fills the dirty rect, we can skip filling.
Commit: 3584680587cc0ad5c8f6c234edced42c34ec5ca4
https://github.com/scummvm/scummvm/commit/3584680587cc0ad5c8f6c234edced42c34ec5ca4
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T12:45:31-08:00
Commit Message:
TSAGE: Remove leftover debug display
Changed paths:
engines/tsage/scenes.cpp
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 04dcd29..80ce1e3 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -150,7 +150,7 @@ void SceneManager::fadeInIfNecessary() {
void SceneManager::changeScene(int newSceneNumber) {
debug(1, "changeScene(%d)", newSceneNumber);
- warning("Scene %d", newSceneNumber);
+
// Fade out the scene
ScenePalette scenePalette;
uint32 adjustData = 0;
More information about the Scummvm-git-logs
mailing list