mirror of
https://github.com/libretro/scummvm.git
synced 2024-11-27 11:20:40 +00:00
parent
bf5ae45490
commit
c975ed11a1
@ -310,7 +310,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
|
||||
Common::StringMap settings;
|
||||
command = Base::parseCommandLine(settings, argc, argv);
|
||||
|
||||
// Load the config file (possibly overriden via command line):
|
||||
// Load the config file (possibly overridden via command line):
|
||||
if (settings.contains("config")) {
|
||||
ConfMan.loadConfigFile(settings["config"]);
|
||||
settings.erase("config");
|
||||
|
@ -401,7 +401,7 @@ typedef struct {
|
||||
/* ===========================================================================
|
||||
Read a byte from a gz_stream; update next_in and avail_in. Return EOF
|
||||
for end of file.
|
||||
IN assertion: the stream s has been sucessfully opened for reading.
|
||||
IN assertion: the stream s has been successfully opened for reading.
|
||||
*/
|
||||
|
||||
|
||||
|
@ -622,7 +622,7 @@ static ADGameDescList detectGameFilebased(const FileMap &allFiles, const ADParam
|
||||
matchedDesc = agdesc;
|
||||
maxNumMatchedFiles = numMatchedFiles;
|
||||
|
||||
debug(4, "and overriden");
|
||||
debug(4, "and overridden");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -55,7 +55,7 @@ void decodeGfxUnified(dataFileEntry *pCurrentFileEntry, int16 format) {
|
||||
break;
|
||||
|
||||
default:
|
||||
error("Unkown gfx format %d", format);
|
||||
error("Unknown gfx format %d", format);
|
||||
}
|
||||
|
||||
uint8 *buffer = (uint8 *)MemAlloc(spriteSize);
|
||||
|
@ -323,7 +323,7 @@ bool Debugger::cmd_hotspot(int argc, const char **argv) {
|
||||
|
||||
if (h != NULL) {
|
||||
DebugPrintf("Frame Number = %d of %d\n", h->frameNumber(), h->numFrames());
|
||||
DebugPrintf("Persistant = %s\n", h->persistant() ? "true" : "false");
|
||||
DebugPrintf("Persistent = %s\n", h->persistant() ? "true" : "false");
|
||||
}
|
||||
|
||||
} else if (strcmp(argv[2], "actions") == 0) {
|
||||
|
@ -485,7 +485,7 @@ int Scene::ITEIntroCave1Proc(int param) {
|
||||
break;
|
||||
|
||||
default:
|
||||
warning("Illegal scene procedure paramater");
|
||||
warning("Illegal scene procedure parameter");
|
||||
break;
|
||||
}
|
||||
|
||||
@ -589,7 +589,7 @@ int Scene::ITEIntroCave2Proc(int param) {
|
||||
case SCENE_END:
|
||||
break;
|
||||
default:
|
||||
warning("Illegal scene procedure paramater");
|
||||
warning("Illegal scene procedure parameter");
|
||||
break;
|
||||
}
|
||||
|
||||
@ -694,7 +694,7 @@ int Scene::ITEIntroCave3Proc(int param) {
|
||||
case SCENE_END:
|
||||
break;
|
||||
default:
|
||||
warning("Illegal scene procedure paramater");
|
||||
warning("Illegal scene procedure parameter");
|
||||
break;
|
||||
}
|
||||
|
||||
@ -812,7 +812,7 @@ int Scene::ITEIntroCave4Proc(int param) {
|
||||
case SCENE_END:
|
||||
break;
|
||||
default:
|
||||
warning("Illegal scene procedure paramater");
|
||||
warning("Illegal scene procedure parameter");
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -529,7 +529,7 @@ bool ScummDebugger::Cmd_Debug(int argc, const char **argv) {
|
||||
} else {
|
||||
DebugPrintf("Usage: debug [+CHANNEL|-CHANNEL]\n");
|
||||
DebugPrintf("Enables or disables the given debug channel.\n");
|
||||
DebugPrintf("When used without parameters, lists all avaiable debug channels and their status.\n");
|
||||
DebugPrintf("When used without parameters, lists all available debug channels and their status.\n");
|
||||
}
|
||||
|
||||
return true;
|
||||
|
@ -1163,7 +1163,7 @@ void Insane::actor02Reaction(int32 buttons) {
|
||||
setBenState();
|
||||
_actor[0].act[2].tilt = 0;
|
||||
// for some reason there is no break at this
|
||||
// place, so tilt gets overriden on next line
|
||||
// place, so tilt gets overridden on next line
|
||||
}
|
||||
_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
|
||||
break;
|
||||
|
@ -2072,7 +2072,7 @@ void Insane::actor12Reaction(int32 buttons) {
|
||||
setEnemyState();
|
||||
_actor[1].act[2].tilt = 0;
|
||||
// for some reason there is no break at this
|
||||
// place, so tilt gets overriden on next line
|
||||
// place, so tilt gets overridden on next line
|
||||
}
|
||||
_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
|
||||
break;
|
||||
|
@ -70,7 +70,7 @@ bool FlicDecoder::load(Common::SeekableReadStream *stream) {
|
||||
}
|
||||
|
||||
_fileStream->readUint16LE(); // flags
|
||||
// Note: The normal delay is a 32-bit integer (dword), whereas the overriden delay is a 16-bit integer (word)
|
||||
// Note: The normal delay is a 32-bit integer (dword), whereas the overridden delay is a 16-bit integer (word)
|
||||
// the frame delay is the FLIC "speed", in milliseconds.
|
||||
_frameRate = Common::Rational(1000, _fileStream->readUint32LE());
|
||||
|
||||
@ -207,7 +207,7 @@ Surface *FlicDecoder::decodeNextFrame() {
|
||||
// this properly.
|
||||
|
||||
chunkCount = _fileStream->readUint16LE();
|
||||
// Note: The overriden delay is a 16-bit integer (word), whereas the normal delay is a 32-bit integer (dword)
|
||||
// Note: The overridden delay is a 16-bit integer (word), whereas the normal delay is a 32-bit integer (dword)
|
||||
// the frame delay is the FLIC "speed", in milliseconds.
|
||||
uint16 newFrameDelay = _fileStream->readUint16LE(); // "speed", in milliseconds
|
||||
if (newFrameDelay > 0)
|
||||
|
@ -303,7 +303,7 @@ int FLACStream::readBuffer(int16 *buffer, const int numSamples) {
|
||||
const uint numChannels = getChannels();
|
||||
|
||||
if (numChannels == 0) {
|
||||
warning("FLACStream: Stream not sucessfully initialised, cant playback");
|
||||
warning("FLACStream: Stream not successfully initialised, cant playback");
|
||||
return -1; // streaminfo wasnt read!
|
||||
}
|
||||
|
||||
|
@ -281,7 +281,7 @@ void Tfmx::macroRun(ChannelContext &channel) {
|
||||
continue;
|
||||
|
||||
case 0x04: // Wait. Parameters: Ticks to wait(W).
|
||||
// TODO: some unkown Parameter? (macroPtr[1] & 1)
|
||||
// TODO: some unknown Parameter? (macroPtr[1] & 1)
|
||||
channel.macroWait = READ_BE_UINT16(¯oPtr[2]);
|
||||
break;
|
||||
|
||||
@ -1154,7 +1154,7 @@ void displayMacroStep(const void * const vptr) {
|
||||
if (macroData[0] < ARRAYSIZE(tableMacros))
|
||||
debug("%s %02X%02X%02X", tableMacros[macroData[0]], macroData[1], macroData[2], macroData[3]);
|
||||
else
|
||||
debug("Unkown Macro #%02X %02X%02X%02X", macroData[0], macroData[1], macroData[2], macroData[3]);
|
||||
debug("Unknown Macro #%02X %02X%02X%02X", macroData[0], macroData[1], macroData[2], macroData[3]);
|
||||
}
|
||||
|
||||
void displayPatternstep(const void * const vptr) {
|
||||
|
@ -342,7 +342,7 @@ void CMSEmulator::portWriteIntern(int chip, int offset, int data) {
|
||||
default:
|
||||
// The CMS allows all registers to be written, so we just output some debug
|
||||
// message here
|
||||
debug(5, "CMS Unkown write to reg %x with %x",reg, data);
|
||||
debug(5, "CMS Unknown write to reg %x with %x",reg, data);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user