mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-18 07:53:12 +00:00
ALL: Fix typo (existant->existent)
This commit is contained in:
parent
21ed47ce13
commit
2d1fd3b554
@ -51,7 +51,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
// MSVC's vsnprintf is either non-existant (2003) or bugged since it
|
||||
// MSVC's vsnprintf is either non-existent (2003) or bugged since it
|
||||
// does not always include a terminating NULL (2005+). To work around
|
||||
// that we fix up the _vsnprintf included. Note that the return value
|
||||
// will still not match C99's specs!
|
||||
|
@ -447,7 +447,7 @@ int16 readVolCnf() {
|
||||
|
||||
///////////////////////////::
|
||||
|
||||
// This code used to rely on "strupr", which is non existant on my system,
|
||||
// This code used to rely on "strupr", which is non existent on my system,
|
||||
// thus I just implemented this function instead. - LordHoto
|
||||
//
|
||||
// TODO: This might be code duplication, please check this out.
|
||||
|
@ -506,7 +506,7 @@ void DrasculaEngine::animation_2_1() {
|
||||
trackProtagonist = 3;
|
||||
// The room number was originally changed here to "no_bj.alg",
|
||||
// which doesn't exist. In reality, this was just a hack to
|
||||
// set the room number to a non-existant one, so that BJ does
|
||||
// set the room number to a non-existent one, so that BJ does
|
||||
// not appear again when the room is refreshed after the
|
||||
// animation where Count Drascula abducts her. We set the
|
||||
// room number to -1 for the same purpose
|
||||
@ -1655,8 +1655,8 @@ void DrasculaEngine::animation_9_6() {
|
||||
objExit = 108;
|
||||
enterRoom(59);
|
||||
// The room number was originally changed here to "nada.alg",
|
||||
// which is a non-existant file. In reality, this was just a
|
||||
// hack to set the room number to a non-existant one, so that
|
||||
// which is a non-existent file. In reality, this was just a
|
||||
// hack to set the room number to a non-existent one, so that
|
||||
// room sprites do not appear again when the room is refreshed.
|
||||
// We set the room number to -1 for the same purpose.
|
||||
// Also check animation_2_1(), where the same hack was used
|
||||
|
@ -185,7 +185,7 @@ bool Resource::loadFileList(const Common::String &filedata) {
|
||||
// the demo version supplied with Kyra3 does not
|
||||
// contain all pak files listed in filedata.fdt
|
||||
// so we don't do anything here if they are non
|
||||
// existant.
|
||||
// existent.
|
||||
} else if (!loadPakFile(filename)) {
|
||||
delete f;
|
||||
error("couldn't load file '%s'", filename.c_str());
|
||||
|
@ -213,7 +213,7 @@ void Hotspot::setAnimation(uint16 newAnimId) {
|
||||
else {
|
||||
tempAnim = r.getAnimation(newAnimId);
|
||||
if (tempAnim == NULL)
|
||||
error("Hotspot %xh tried to set non-existant Animation Id: %xh", _hotspotId, newAnimId);
|
||||
error("Hotspot %xh tried to set non-existent Animation Id: %xh", _hotspotId, newAnimId);
|
||||
}
|
||||
|
||||
setAnimation(tempAnim);
|
||||
|
@ -549,7 +549,7 @@ void Room::setRoomNumber(uint16 newRoomNumber, bool showOverlay) {
|
||||
|
||||
_roomData = res.getRoom(newRoomNumber);
|
||||
if (!_roomData)
|
||||
error("Tried to change to non-existant room: %d", newRoomNumber);
|
||||
error("Tried to change to non-existent room: %d", newRoomNumber);
|
||||
|
||||
bool fadeFlag = (newRoomNumber != _roomNumber) && (_roomNumber != 0);
|
||||
bool leaveFlag = _roomNumber != 999;
|
||||
|
@ -616,7 +616,7 @@ void PegasusEngine::loadFromContinuePoint() {
|
||||
// Failure to load a continue point is fatal
|
||||
|
||||
if (!_continuePoint)
|
||||
error("Attempting to load from non-existant continue point");
|
||||
error("Attempting to load from non-existent continue point");
|
||||
|
||||
_continuePoint->seek(0);
|
||||
|
||||
|
@ -79,7 +79,7 @@ reg_t disassemble(EngineState *s, reg32_t pos, bool printBWTag, bool printByteco
|
||||
Kernel *kernel = g_sci->getKernel();
|
||||
|
||||
if (!mobj) {
|
||||
warning("Disassembly failed: Segment %04x non-existant or not a script", pos.getSegment());
|
||||
warning("Disassembly failed: Segment %04x non-existent or not a script", pos.getSegment());
|
||||
return retval;
|
||||
} else
|
||||
script_entity = (Script *)mobj;
|
||||
|
@ -314,7 +314,7 @@ void GfxMenu::kernelSetAttribute(uint16 menuId, uint16 itemId, uint16 attributeI
|
||||
reg_t GfxMenu::kernelGetAttribute(uint16 menuId, uint16 itemId, uint16 attributeId) {
|
||||
GuiMenuItemEntry *itemEntry = findItem(menuId, itemId);
|
||||
if (!itemEntry)
|
||||
error("Tried to getAttribute() on non-existant menu-item %d:%d", menuId, itemId);
|
||||
error("Tried to getAttribute() on non-existent menu-item %d:%d", menuId, itemId);
|
||||
switch (attributeId) {
|
||||
case SCI_MENU_ATTRIBUTE_ENABLED:
|
||||
if (itemEntry->enabled)
|
||||
|
@ -193,7 +193,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
|
||||
drawBitmap(syncCue);
|
||||
bitsShow();
|
||||
} else {
|
||||
warning("kPortrait: sync information tried to draw non-existant %d", syncCue);
|
||||
warning("kPortrait: sync information tried to draw non-existent %d", syncCue);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1741,10 +1741,10 @@ void IMuseInternal::copyGlobalInstrument(byte slot, Instrument *dest) {
|
||||
// In case we have an valid instrument set up, copy it to the part.
|
||||
_global_instruments[slot].copy_to(dest);
|
||||
} else if (_pcSpeaker) {
|
||||
debug(0, "Trying to use non-existant global PC Speaker instrument %d", slot);
|
||||
debug(0, "Trying to use non-existent global PC Speaker instrument %d", slot);
|
||||
dest->pcspk(defaultInstr);
|
||||
} else {
|
||||
debug(0, "Trying to use non-existant global AdLib instrument %d", slot);
|
||||
debug(0, "Trying to use non-existent global AdLib instrument %d", slot);
|
||||
dest->adlib(defaultInstr);
|
||||
}
|
||||
}
|
||||
|
@ -91,7 +91,7 @@ typedef int HPOLYGON;
|
||||
#define MAX_SAVED_ALIVES 512 // Saves actors'lives
|
||||
#define MAX_SAVED_ACTOR_Z 512 // Saves actors' Z-ness
|
||||
|
||||
// Legal non-existant entrance number for LoadScene()
|
||||
// Legal non-existent entrance number for LoadScene()
|
||||
#define NO_ENTRY_NUM (-3458) // Magic unlikely number
|
||||
|
||||
|
||||
|
@ -286,7 +286,7 @@ static void LoadScene(SCNHANDLE scene, int entry) {
|
||||
}
|
||||
|
||||
if (i == ss->numEntrance)
|
||||
error("Non-existant scene entry number");
|
||||
error("Non-existent scene entry number");
|
||||
|
||||
if (ss->hSceneScript) {
|
||||
init.event = STARTUP;
|
||||
|
@ -289,7 +289,7 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p
|
||||
uint32 dwSampleIndex = _sampleIndex[id];
|
||||
|
||||
if (dwSampleIndex == 0) {
|
||||
warning("Tinsel2 playSample, non-existant sample %d", id);
|
||||
warning("Tinsel2 playSample, non-existent sample %d", id);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -106,7 +106,7 @@ static TIMER *findTimer(int num) {
|
||||
*/
|
||||
static TIMER *allocateTimer(int num) {
|
||||
assert(num); // zero is not allowed as a timer number
|
||||
assert(!findTimer(num)); // Allocating already existant timer
|
||||
assert(!findTimer(num)); // Allocating already existent timer
|
||||
|
||||
for (int i = 0; i < MAX_TIMERS; i++) {
|
||||
if (!g_timers[i].tno) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user