aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base/gameDetector.cpp2
-rw-r--r--base/plugins.cpp2
-rw-r--r--base/plugins.h2
-rw-r--r--gui/PopUpWidget.cpp2
-rw-r--r--gui/ScrollBarWidget.cpp2
-rw-r--r--gui/dialog.cpp4
-rw-r--r--sky/logic.cpp2
-rw-r--r--sky/music/adlibchannel.cpp2
-rw-r--r--sky/music/gmchannel.cpp2
-rw-r--r--sky/text.h2
10 files changed, 11 insertions, 11 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index cc7f4a4b13..e13d20c868 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -36,7 +36,7 @@
#include "config.h"
#endif
-// DONT FIXME: DO NOT ORDER ALPHABETICALY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :)
+// DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :)
#ifdef __PALM_OS__
static const char USAGE_STRING[] = "NoUsageString"; // save more data segment space
#else
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 7a4d3ffba7..faee80456a 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -268,7 +268,7 @@ bool PluginManager::tryLoadPlugin(Plugin *plugin) {
assert(plugin);
// Try to load the plugin
if (plugin->loadPlugin()) {
- // If succesful, add it to the list of known plugins and return.
+ // If successful, add it to the list of known plugins and return.
_plugins.push_back(plugin);
return true;
} else {
diff --git a/base/plugins.h b/base/plugins.h
index 038c8a774c..e0b886cb49 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -118,7 +118,7 @@ public:
// Factory functions => no need to include the specific classes
// in this header. This serves two purposes:
-// 1) Clean seperation from the game modules (scumm, simon) and the generic code
+// 1) Clean separation from the game modules (scumm, simon) and the generic code
// 2) Faster (compiler doesn't have to parse lengthy header files)
#ifndef DISABLE_SCUMM
DECLARE_PLUGIN(SCUMM)
diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp
index acdc0feae6..127a3ec9c5 100644
--- a/gui/PopUpWidget.cpp
+++ b/gui/PopUpWidget.cpp
@@ -251,7 +251,7 @@ void PopUpDialog::drawMenuEntry(int entry, bool hilite) {
g_gui.fillRect(x, y, w, kLineHeight, hilite ? g_gui._textcolorhi : g_gui._bgcolor);
if (name.size() == 0) {
- // Draw a seperator
+ // Draw a separator
g_gui.hLine(x - 1, y + kLineHeight / 2, x + w, g_gui._shadowcolor);
g_gui.hLine(x, y + 1 + kLineHeight / 2, x + w, g_gui._color);
} else {
diff --git a/gui/ScrollBarWidget.cpp b/gui/ScrollBarWidget.cpp
index 16ef59f115..287f058303 100644
--- a/gui/ScrollBarWidget.cpp
+++ b/gui/ScrollBarWidget.cpp
@@ -166,7 +166,7 @@ void ScrollBarWidget::handleTickle() {
/*
// FIXME/TODO - this code is supposed to allow for "click-repeat" (like key repeat),
// i.e. if you click on one of the arrows and keep clicked, it will scroll
- // continously. However, just like key repeat, this requires two delays:
+ // continuously. However, just like key repeat, this requires two delays:
// First an "initial" delay that has to pass before repeating starts (otherwise
// it is near to impossible to achieve single clicks). Secondly, a repeat delay
// that determines how often per second a click is simulated.
diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index 58d308795b..2cd6848d0b 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -205,7 +205,7 @@ void Dialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
}
void Dialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) {
- // Focused widget recieves keyup events
+ // Focused widget receives keyup events
if (_focusedWidget)
_focusedWidget->handleKeyUp(ascii, keycode, modifiers);
}
@@ -250,7 +250,7 @@ void Dialog::handleMouseMoved(int x, int y, int button) {
}
void Dialog::handleTickle() {
- // Focused widget recieves tickle notifications
+ // Focused widget receives tickle notifications
if (_focusedWidget && _focusedWidget->getFlags() & WIDGET_WANT_TICKLE) {
_focusedWidget->handleTickle();
}
diff --git a/sky/logic.cpp b/sky/logic.cpp
index d83157204f..4157cbb39b 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -687,7 +687,7 @@ bool SkyLogic::collide(Compact *cpt) {
uint16 x = cpt->xcood & 0xfff8;
uint16 y = cpt->ycood & 0xfff8;
- // The collision is direction dependant
+ // The collision is direction dependent
switch (_compact->extCompact->dir) {
case 0: // looking up
x -= m1->colOffset; // compensate for inner x offsets
diff --git a/sky/music/adlibchannel.cpp b/sky/music/adlibchannel.cpp
index df789991bd..a206d5f1f9 100644
--- a/sky/music/adlibchannel.cpp
+++ b/sky/music/adlibchannel.cpp
@@ -161,7 +161,7 @@ uint8 SkyAdlibChannel::process(uint16 aktTime) {
break;
default:
// these opcodes aren't implemented in original music driver
- error("SkyChannel: Not existant routine 0x%02X was called",opcode);
+ error("SkyChannel: Not existent routine 0x%02X was called",opcode);
_channelData.channelActive = 0;
break;
}
diff --git a/sky/music/gmchannel.cpp b/sky/music/gmchannel.cpp
index 5635f9a20d..950e4404c1 100644
--- a/sky/music/gmchannel.cpp
+++ b/sky/music/gmchannel.cpp
@@ -115,7 +115,7 @@ uint8 SkyGmChannel::process(uint16 aktTime) {
break;
default:
// these opcodes aren't implemented in original music driver
- error("SkyChannel: Not existant routine 0x%02X was called",opcode);
+ error("SkyChannel: Not existent routine 0x%02X was called",opcode);
_channelData.channelActive = 0;
break;
}
diff --git a/sky/text.h b/sky/text.h
index d659711a18..ed5bfa6630 100644
--- a/sky/text.h
+++ b/sky/text.h
@@ -93,7 +93,7 @@ protected:
uint32 _dtLineSize; //size of one line in bytes
uint8 *_dtData; //address of textdata
char *_dtText; //pointer to text
- uint32 _dtCharSpacing; //character seperation adjustment
+ uint32 _dtCharSpacing; //character separation adjustment
uint32 _dtWidth; //width of chars in last line (for editing (?))
uint32 _dtLastWidth;
bool _dtCentre; //set for centre text