[Scummvm-git-logs] scummvm master -> 1d6f7b05eacb00fe99ddd8ebe6aa9a9d9705a34e
sev-
noreply at scummvm.org
Sat Jan 20 23:28:55 UTC 2024
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:
1d6f7b05ea JANITORIAL: Clean up some English language
Commit: 1d6f7b05eacb00fe99ddd8ebe6aa9a9d9705a34e
https://github.com/scummvm/scummvm/commit/1d6f7b05eacb00fe99ddd8ebe6aa9a9d9705a34e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-01-21T00:28:44+01:00
Commit Message:
JANITORIAL: Clean up some English language
Changed paths:
audio/softsynth/opl/dbopl.cpp
backends/keymapper/standard-actions.cpp
engines/ags/plugins/ags_pal_render/ags_pal_render.cpp
engines/ags/plugins/ags_pal_render/pal_render.h
engines/cine/gfx.h
engines/hpl1/engine/gui/GuiGfxElement.cpp
engines/icb/player.cpp
engines/pegasus/neighborhood/wsc/wsc.cpp
engines/stark/visual/explodingimage.cpp
diff --git a/audio/softsynth/opl/dbopl.cpp b/audio/softsynth/opl/dbopl.cpp
index 5604365d94a..5dafd1b3535 100644
--- a/audio/softsynth/opl/dbopl.cpp
+++ b/audio/softsynth/opl/dbopl.cpp
@@ -216,7 +216,7 @@ static inline Bits MakeVolume( Bitu wave, Bitu volume ) {
#if 0
//Check if we overflow the 31 shift limit
if ( exp >= 32 ) {
- LOG_MSG( "WTF %d %d", total, exp );
+ LOG_MSG( "Overflow %d %d", total, exp );
}
#endif
return (sig >> exp);
diff --git a/backends/keymapper/standard-actions.cpp b/backends/keymapper/standard-actions.cpp
index 720f0d26ab3..138a7794288 100644
--- a/backends/keymapper/standard-actions.cpp
+++ b/backends/keymapper/standard-actions.cpp
@@ -37,7 +37,7 @@ const char *const kStandardActionOpenMainMenu = "MENU";
const char *const kStandardActionLoad = "LOAD";
const char *const kStandardActionSave = "SAVE";
const char *const kStandardActionOpenSettings = "OPTS";
-const char *const kStandardActionEE = "WTF";
+const char *const kStandardActionEE = "EEKY";
const char *const kStandardActionCut = "CUT";
const char *const kStandardActionCopy = "COPY";
const char *const kStandardActionPaste = "PASTE";
diff --git a/engines/ags/plugins/ags_pal_render/ags_pal_render.cpp b/engines/ags/plugins/ags_pal_render/ags_pal_render.cpp
index 1fe2ecd2e46..0e3caa050e9 100644
--- a/engines/ags/plugins/ags_pal_render/ags_pal_render.cpp
+++ b/engines/ags/plugins/ags_pal_render/ags_pal_render.cpp
@@ -603,7 +603,7 @@ unsigned char MixColorAlpha (unsigned char fg,unsigned char bg,unsigned char alp
int out_b = (palette[fg].b>>1) * alpha + (palette[bg].b>>1) * (255 - alpha);
//unsigned char ralpha = alpha>>2;
//unsigned char invralpha = 64-ralpha;
- //if (ralpha > alpha) engine->AbortGame ("wtf");
+ //if (ralpha > alpha) engine->AbortGame ("oops");
//int out_r = alphamultiply[(palette[fg].r>>1)][ralpha] + alphamultiply[(palette[bg].r>>1)][(invralpha)];
//int out_g = alphamultiply[(palette[fg].g)][ralpha] + alphamultiply[(palette[bg].g)][(invralpha)];
//int out_b = alphamultiply[(palette[fg].b>>1)][ralpha] + alphamultiply[(palette[bg].b>>1)][(invralpha)];
@@ -629,7 +629,7 @@ unsigned char MixColorAdditive (unsigned char fg,unsigned char bg,unsigned char
int i=0;
int add_r,add_b,add_g = 0;
char ralpha = alpha>>2;
- //if (ralpha > alpha) engine->AbortGame ("wtf");
+ //if (ralpha > alpha) engine->AbortGame ("oops");
//add_r = (((palette[fg].r>>1) * (alpha))>>8);
//add_b = (((palette[fg].b>>1) * (alpha))>>8);
//add_g = (((palette[fg].g) * (alpha))>>8);
diff --git a/engines/ags/plugins/ags_pal_render/pal_render.h b/engines/ags/plugins/ags_pal_render/pal_render.h
index 2e632547f85..1fce4bbd3a4 100644
--- a/engines/ags/plugins/ags_pal_render/pal_render.h
+++ b/engines/ags/plugins/ags_pal_render/pal_render.h
@@ -70,7 +70,7 @@ public:
}
//char ralpha = MAX(0,MIN(63,alpha>>2));
//unsigned char invralpha = 64-ralpha;
- //if (ralpha > alpha) engine->AbortGame ("wtf");
+ //if (ralpha > alpha) engine->AbortGame ("oops");
//int out_r = alphamultiply[((palette[fg].r>>1)<<6) +ralpha] + alphamultiply[((palette[bg].r>>1)<<6) +(invralpha)];
//int out_g = alphamultiply[((palette[fg].g) <<6) +ralpha] + alphamultiply[((palette[bg].g) <<6) +(invralpha)];
//int out_b = alphamultiply[((palette[fg].b>>1)<<6) +ralpha] + alphamultiply[((palette[bg].b>>1)<<6) +(invralpha)];
diff --git a/engines/cine/gfx.h b/engines/cine/gfx.h
index 5ef6574002a..1eefe15b3cd 100644
--- a/engines/cine/gfx.h
+++ b/engines/cine/gfx.h
@@ -333,7 +333,6 @@ void maskBgOverlay(int targetBgIdx, const byte *spritePtr, const byte *maskPtr,
void fadeFromBlack();
void fadeToBlack();
-// wtf?!
//void gfxDrawMaskedSprite(byte *param1, byte *param2, byte *param3, byte *param4, int16 param5);
void gfxWaitVBL();
void gfxRedrawMouseCursor();
diff --git a/engines/hpl1/engine/gui/GuiGfxElement.cpp b/engines/hpl1/engine/gui/GuiGfxElement.cpp
index 6efd3e8e7f6..b1c150f5832 100644
--- a/engines/hpl1/engine/gui/GuiGfxElement.cpp
+++ b/engines/hpl1/engine/gui/GuiGfxElement.cpp
@@ -121,13 +121,13 @@ cGuiGfxElement::~cGuiGfxElement() {
// Delete all textures / Images
if (mvImageBufferVec.size() > 0) {
for (int i = 0; i < (int)mvImageBufferVec.size(); ++i) {
- // Skip for now, memory might be fucked..
+ // Skip for now, memory might be go haywire..
// mpGui->GetResources()->GetImageManager()->Destroy(mvImageBufferVec[i]);
}
} else {
for (int i = 0; i < mlTextureNum; ++i) {
if (mvImages[i]) {
- // Skip for now, memory might be fucked..
+ // Skip for now, memory might go haywire..
// mpGui->GetResources()->GetImageManager()->Destroy(mvImages[i]);
} else if (mvTextures[i]) {
mpGui->GetResources()->GetTextureManager()->Destroy(mvTextures[i]);
diff --git a/engines/icb/player.cpp b/engines/icb/player.cpp
index 82ab57d98e4..30de3ad695e 100644
--- a/engines/icb/player.cpp
+++ b/engines/icb/player.cpp
@@ -2648,7 +2648,7 @@ __mode_return _player::Player_running() {
// set anim set
log->cur_anim_type = __RUN;
- MS->Set_motion(__MOTION_RUN); // wtf is this for?
+ MS->Set_motion(__MOTION_RUN); // what is this for?
MS->Set_can_save(TRUE8); // can save
// arm?
diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index a5366d02bd4..785061ed5ef 100644
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -1896,7 +1896,7 @@ void WSC::turnTo(const DirectionConstant direction) {
}
// fall through
// FIXME: fall through intentional?
- // clone2727 says: This falls through?!??! WTF?
+ // clone2727 says: This falls through?!??!
case MakeRoomView(kWSC42, kEast):
_privateFlags.setFlag(kWSCPrivateSinclairOfficeOpenFlag, false);
setCurrentActivation(kActivationSinclairOfficeLocked);
diff --git a/engines/stark/visual/explodingimage.cpp b/engines/stark/visual/explodingimage.cpp
index cbd746dc6a8..0539f1a92c6 100644
--- a/engines/stark/visual/explodingimage.cpp
+++ b/engines/stark/visual/explodingimage.cpp
@@ -114,7 +114,7 @@ void VisualExplodingImage::ExplosionUnit::setExplosionSettings(const Common::Poi
_speed.setX(cos(StarkRandomSource->getRandomNumber((float)M_PI * 100)) * (float)amplitude.x);
_speed.setY(sin(StarkRandomSource->getRandomNumber((float)M_PI * 100)) * (float)amplitude.y);
- // WTF, ensuring all fragments go in the same direction?
+ // Really? ensuring all fragments go in the same direction?
float magnitude = _position.getDistanceTo(_speed);
_speed -= _position;
_speed = _speed / _speed.getMagnitude() * -magnitude;
More information about the Scummvm-git-logs
mailing list