From 651e2760a3b2de0c542ccbbf1bf3caa319cc0349 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 15 Jun 2010 12:33:20 +0000 Subject: Fix spelling, cleanup svn-id: r49843 --- engines/agi/keyboard.cpp | 2 +- engines/agos/icons.cpp | 2 +- engines/agos/vga_s2.cpp | 2 +- engines/saga/saga.cpp | 2 +- engines/sci/engine/kevent.cpp | 4 ++-- engines/sci/engine/seg_manager.h | 2 +- engines/sci/resource.cpp | 6 +++--- engines/sci/sci.h | 2 +- engines/scumm/verbs.h | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'engines') diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp index f99d5728be..62bcd5d8d8 100644 --- a/engines/agi/keyboard.cpp +++ b/engines/agi/keyboard.cpp @@ -121,7 +121,7 @@ int AgiEngine::handleController(int key) { if (_game.controllers[i].keycode == key) { debugC(3, kDebugLevelInput, "event %d: key press", _game.controllers[i].controller); _game.controllerOccured[_game.controllers[i].controller] = true; - report("event AC:%i occured\n", _game.controllers[i].controller); + report("event AC:%i occurred\n", _game.controllers[i].controller); return true; } } diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp index fdc5d1707e..08a3d4e2f0 100644 --- a/engines/agos/icons.cpp +++ b/engines/agos/icons.cpp @@ -448,7 +448,7 @@ void AGOSEngine_Feeble::drawIconArray(uint num, Item *itemRef, int line, int cla setupIconHitArea(window, k++, xp, yp, itemRef); } else { /* - * Just remember the overflow has occured + * Just remember the overflow has occurred */ window->iconPtr->iconArray[icount].item = NULL; /* END MARKINGS */ _iOverflow = 1; diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp index 4eb739e974..db3a7c18f3 100644 --- a/engines/agos/vga_s2.cpp +++ b/engines/agos/vga_s2.cpp @@ -138,7 +138,7 @@ void AGOSEngine::vc69_playSeq() { // This is a "play track". The original // design stored the track to play if one was // already in progress, so that the next time a - // "fill MIDI stream" event occured, the MIDI + // "fill MIDI stream" event occurred, the MIDI // player would find the change and switch // tracks. We use a different architecture that // allows for an immediate response here, but diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index 446ab86228..d1ab3bc9d7 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -419,7 +419,7 @@ void SagaEngine::loadStrings(StringsTable &stringsTable, const byte *stringsPoin offset = scriptS.readUint16(); // In some rooms in IHNM, string offsets can be greater than the maximum value than a 16-bit integer can hold // We detect this by checking the previous offset, and if it was bigger than the current one, an overflow - // occured (since the string offsets are sequential), so we're adding the missing part of the number + // occurred (since the string offsets are sequential), so we're adding the missing part of the number // Fixes bug #1895205 - "IHNM: end game text/caption error" if (prevOffset > offset) offset += 65536; diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp index d6cb4ebd8e..da014cd917 100644 --- a/engines/sci/engine/kevent.cpp +++ b/engines/sci/engine/kevent.cpp @@ -129,9 +129,9 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) { if ((s->r_acc.offset) && (g_debugState.stopOnEvent)) { g_debugState.stopOnEvent = false; - // A SCI event occured, and we have been asked to stop, so open the debug console + // A SCI event occurred, and we have been asked to stop, so open the debug console Console *con = g_sci->getSciDebugger(); - con->DebugPrintf("SCI event occured: "); + con->DebugPrintf("SCI event occurred: "); switch (curEvent.type) { case SCI_EVENT_QUIT: con->DebugPrintf("quit event\n"); diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h index ec89e42f9c..990836992c 100644 --- a/engines/sci/engine/seg_manager.h +++ b/engines/sci/engine/seg_manager.h @@ -407,7 +407,7 @@ public: * Determines the name of an object * @param[in] pos Location (segment, offset) of the object * @return A name for that object, or a string describing an error - * that occured while looking it up. The string is stored + * that occurred while looking it up. The string is stored * in a static buffer and need not be freed (neither may * it be modified). */ diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index e23d8fd080..cf253619e6 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -341,7 +341,7 @@ void MacResourceForkResourceSource::loadResource(Resource *res) { int error = res->decompress(stream); if (error) { - warning("Error %d occured while reading %s from Mac resource file: %s", + warning("Error %d occurred while reading %s from Mac resource file: %s", error, res->_id.toString().c_str(), sci_error_types[error]); res->unalloc(); } @@ -442,7 +442,7 @@ void ResourceSource::loadResource(Resource *res) { delete fileStream; if (error) { - warning("Error %d occured while reading %s from resource file: %s", + warning("Error %d occurred while reading %s from resource file: %s", error, res->_id.toString().c_str(), sci_error_types[error]); res->unalloc(); } @@ -817,7 +817,7 @@ Resource *ResourceManager::findResource(ResourceId id, bool lock) { loadResource(retval); else if (retval->_status == kResStatusEnqueued) removeFromLRU(retval); - // Unless an error occured, the resource is now either + // Unless an error occurred, the resource is now either // locked or allocated, but never queued or freed. freeOldResources(); diff --git a/engines/sci/sci.h b/engines/sci/sci.h index eb2b82fdce..c2f3f17732 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -222,7 +222,7 @@ private: * This function must be run before script_run() is executed. Graphics data * is initialized iff s->gfx_state != NULL. * @param[in] s The state to operate on - * @return true on success, false if an error occured. + * @return true on success, false if an error occurred. */ bool initGame(); diff --git a/engines/scumm/verbs.h b/engines/scumm/verbs.h index 96a49a7ced..83e924edac 100644 --- a/engines/scumm/verbs.h +++ b/engines/scumm/verbs.h @@ -31,7 +31,7 @@ namespace Scumm { /** - * The area in which some click (or key press) occured and which is passed + * The area in which some click (or key press) occurred and which is passed * to the input script. */ enum ClickArea { -- cgit v1.2.3