mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-03 15:41:41 +00:00
JANITORIAL: Clean up some English language
This commit is contained in:
parent
75bfee7d6b
commit
1d6f7b05ea
@ -216,7 +216,7 @@ static inline Bits MakeVolume( Bitu wave, Bitu volume ) {
|
|||||||
#if 0
|
#if 0
|
||||||
//Check if we overflow the 31 shift limit
|
//Check if we overflow the 31 shift limit
|
||||||
if ( exp >= 32 ) {
|
if ( exp >= 32 ) {
|
||||||
LOG_MSG( "WTF %d %d", total, exp );
|
LOG_MSG( "Overflow %d %d", total, exp );
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return (sig >> exp);
|
return (sig >> exp);
|
||||||
|
@ -37,7 +37,7 @@ const char *const kStandardActionOpenMainMenu = "MENU";
|
|||||||
const char *const kStandardActionLoad = "LOAD";
|
const char *const kStandardActionLoad = "LOAD";
|
||||||
const char *const kStandardActionSave = "SAVE";
|
const char *const kStandardActionSave = "SAVE";
|
||||||
const char *const kStandardActionOpenSettings = "OPTS";
|
const char *const kStandardActionOpenSettings = "OPTS";
|
||||||
const char *const kStandardActionEE = "WTF";
|
const char *const kStandardActionEE = "EEKY";
|
||||||
const char *const kStandardActionCut = "CUT";
|
const char *const kStandardActionCut = "CUT";
|
||||||
const char *const kStandardActionCopy = "COPY";
|
const char *const kStandardActionCopy = "COPY";
|
||||||
const char *const kStandardActionPaste = "PASTE";
|
const char *const kStandardActionPaste = "PASTE";
|
||||||
|
@ -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);
|
int out_b = (palette[fg].b>>1) * alpha + (palette[bg].b>>1) * (255 - alpha);
|
||||||
//unsigned char ralpha = alpha>>2;
|
//unsigned char ralpha = alpha>>2;
|
||||||
//unsigned char invralpha = 64-ralpha;
|
//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_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_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)];
|
//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 i=0;
|
||||||
int add_r,add_b,add_g = 0;
|
int add_r,add_b,add_g = 0;
|
||||||
char ralpha = alpha>>2;
|
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_r = (((palette[fg].r>>1) * (alpha))>>8);
|
||||||
//add_b = (((palette[fg].b>>1) * (alpha))>>8);
|
//add_b = (((palette[fg].b>>1) * (alpha))>>8);
|
||||||
//add_g = (((palette[fg].g) * (alpha))>>8);
|
//add_g = (((palette[fg].g) * (alpha))>>8);
|
||||||
|
@ -70,7 +70,7 @@ public:
|
|||||||
}
|
}
|
||||||
//char ralpha = MAX(0,MIN(63,alpha>>2));
|
//char ralpha = MAX(0,MIN(63,alpha>>2));
|
||||||
//unsigned char invralpha = 64-ralpha;
|
//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_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_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)];
|
//int out_b = alphamultiply[((palette[fg].b>>1)<<6) +ralpha] + alphamultiply[((palette[bg].b>>1)<<6) +(invralpha)];
|
||||||
|
@ -333,7 +333,6 @@ void maskBgOverlay(int targetBgIdx, const byte *spritePtr, const byte *maskPtr,
|
|||||||
void fadeFromBlack();
|
void fadeFromBlack();
|
||||||
void fadeToBlack();
|
void fadeToBlack();
|
||||||
|
|
||||||
// wtf?!
|
|
||||||
//void gfxDrawMaskedSprite(byte *param1, byte *param2, byte *param3, byte *param4, int16 param5);
|
//void gfxDrawMaskedSprite(byte *param1, byte *param2, byte *param3, byte *param4, int16 param5);
|
||||||
void gfxWaitVBL();
|
void gfxWaitVBL();
|
||||||
void gfxRedrawMouseCursor();
|
void gfxRedrawMouseCursor();
|
||||||
|
@ -121,13 +121,13 @@ cGuiGfxElement::~cGuiGfxElement() {
|
|||||||
// Delete all textures / Images
|
// Delete all textures / Images
|
||||||
if (mvImageBufferVec.size() > 0) {
|
if (mvImageBufferVec.size() > 0) {
|
||||||
for (int i = 0; i < (int)mvImageBufferVec.size(); ++i) {
|
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]);
|
// mpGui->GetResources()->GetImageManager()->Destroy(mvImageBufferVec[i]);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (int i = 0; i < mlTextureNum; ++i) {
|
for (int i = 0; i < mlTextureNum; ++i) {
|
||||||
if (mvImages[i]) {
|
if (mvImages[i]) {
|
||||||
// Skip for now, memory might be fucked..
|
// Skip for now, memory might go haywire..
|
||||||
// mpGui->GetResources()->GetImageManager()->Destroy(mvImages[i]);
|
// mpGui->GetResources()->GetImageManager()->Destroy(mvImages[i]);
|
||||||
} else if (mvTextures[i]) {
|
} else if (mvTextures[i]) {
|
||||||
mpGui->GetResources()->GetTextureManager()->Destroy(mvTextures[i]);
|
mpGui->GetResources()->GetTextureManager()->Destroy(mvTextures[i]);
|
||||||
|
@ -2648,7 +2648,7 @@ __mode_return _player::Player_running() {
|
|||||||
|
|
||||||
// set anim set
|
// set anim set
|
||||||
log->cur_anim_type = __RUN;
|
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
|
MS->Set_can_save(TRUE8); // can save
|
||||||
|
|
||||||
// arm?
|
// arm?
|
||||||
|
@ -1896,7 +1896,7 @@ void WSC::turnTo(const DirectionConstant direction) {
|
|||||||
}
|
}
|
||||||
// fall through
|
// fall through
|
||||||
// FIXME: fall through intentional?
|
// FIXME: fall through intentional?
|
||||||
// clone2727 says: This falls through?!??! WTF?
|
// clone2727 says: This falls through?!??!
|
||||||
case MakeRoomView(kWSC42, kEast):
|
case MakeRoomView(kWSC42, kEast):
|
||||||
_privateFlags.setFlag(kWSCPrivateSinclairOfficeOpenFlag, false);
|
_privateFlags.setFlag(kWSCPrivateSinclairOfficeOpenFlag, false);
|
||||||
setCurrentActivation(kActivationSinclairOfficeLocked);
|
setCurrentActivation(kActivationSinclairOfficeLocked);
|
||||||
|
@ -114,7 +114,7 @@ void VisualExplodingImage::ExplosionUnit::setExplosionSettings(const Common::Poi
|
|||||||
_speed.setX(cos(StarkRandomSource->getRandomNumber((float)M_PI * 100)) * (float)amplitude.x);
|
_speed.setX(cos(StarkRandomSource->getRandomNumber((float)M_PI * 100)) * (float)amplitude.x);
|
||||||
_speed.setY(sin(StarkRandomSource->getRandomNumber((float)M_PI * 100)) * (float)amplitude.y);
|
_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);
|
float magnitude = _position.getDistanceTo(_speed);
|
||||||
_speed -= _position;
|
_speed -= _position;
|
||||||
_speed = _speed / _speed.getMagnitude() * -magnitude;
|
_speed = _speed / _speed.getMagnitude() * -magnitude;
|
||||||
|
Loading…
Reference in New Issue
Block a user