aboutsummaryrefslogtreecommitdiff
path: root/sword2
diff options
context:
space:
mode:
authorJonathan Gray2003-11-07 01:36:53 +0000
committerJonathan Gray2003-11-07 01:36:53 +0000
commit9a1cfe838f6ad609b135170f95109d7b07adc5fa (patch)
treea25fdcd609763723911b3096a1f68264a93b8429 /sword2
parentb8379d646a9689de98bb27f70529e7b7a54c9699 (diff)
downloadscummvm-rg350-9a1cfe838f6ad609b135170f95109d7b07adc5fa.tar.gz
scummvm-rg350-9a1cfe838f6ad609b135170f95109d7b07adc5fa.tar.bz2
scummvm-rg350-9a1cfe838f6ad609b135170f95109d7b07adc5fa.zip
spelling fixes
svn-id: r11175
Diffstat (limited to 'sword2')
-rw-r--r--sword2/events.cpp2
-rw-r--r--sword2/logic.h2
-rw-r--r--sword2/resman.cpp2
-rw-r--r--sword2/router.cpp8
-rw-r--r--sword2/speech.cpp4
-rw-r--r--sword2/sync.cpp2
-rw-r--r--sword2/walker.cpp10
7 files changed, 15 insertions, 15 deletions
diff --git a/sword2/events.cpp b/sword2/events.cpp
index c5924f445a..e721e4655f 100644
--- a/sword2/events.cpp
+++ b/sword2/events.cpp
@@ -148,7 +148,7 @@ int32 Logic::fnSendEvent(int32 *params) {
// we want to intercept the player character and have him interact
// with an object - from script
- // params: 0 id to recieve event
+ // params: 0 id to receive event
// 1 script to run
g_sword2->sendEvent(params[0], params[1]);
diff --git a/sword2/logic.h b/sword2/logic.h
index 6820d1a6a3..8892329c9d 100644
--- a/sword2/logic.h
+++ b/sword2/logic.h
@@ -153,7 +153,7 @@ private:
//tell the manager which startup you want (if there are more
// than 1) (i.e more than 1 entrance to a screen and/or
- // seperate game boots)
+ // separate game boots)
uint32 key;
};
diff --git a/sword2/resman.cpp b/sword2/resman.cpp
index 4da9dc4ee6..cec6bf1df7 100644
--- a/sword2/resman.cpp
+++ b/sword2/resman.cpp
@@ -1204,7 +1204,7 @@ void ResourceManager::cacheNewCluster(uint32 newCluster) {
}
void ResourceManager::getCd(int cd) {
- // TODO support a seperate path for cd data?
+ // TODO support a separate path for cd data?
bool done = false;
char sCDName[_MAX_PATH];
diff --git a/sword2/router.cpp b/sword2/router.cpp
index 9373a655fd..d15b590587 100644
--- a/sword2/router.cpp
+++ b/sword2/router.cpp
@@ -2054,8 +2054,8 @@ int32 Router::lineCheck(int32 x1, int32 y1, int32 x2, int32 y2) {
if (xmax >= _bars[i].xmin && xmin <= _bars[i].xmax) {
// skip if not on module
if (ymax >= _bars[i].ymin && ymin <= _bars[i].ymax) {
- // okay its a valid line calculate an intersept
- // wow but all this arithmatic we must have
+ // okay its a valid line calculate an intercept
+ // wow but all this arithmetic we must have
// loads of time
// slope it he slope between the two lines
@@ -2117,7 +2117,7 @@ int32 Router::horizCheck(int32 x1, int32 y, int32 x2) {
// skip if not on module
if (y >= _bars[i].ymin && y <= _bars[i].ymax) {
// okay its a valid line calculate an intercept
- // wow but all this arithmatic we must have
+ // wow but all this arithmetic we must have
// loads of time
if (_bars[i].dy == 0)
@@ -2164,7 +2164,7 @@ int32 Router::vertCheck(int32 x, int32 y1, int32 y2) {
// skip if not on module
if (ymax >= _bars[i].ymin && ymin <= _bars[i].ymax) {
// okay its a valid line calculate an intercept
- // wow but all this arithmatic we must have
+ // wow but all this arithmetic we must have
// loads of time
// both lines vertical and overlap in x and y
diff --git a/sword2/speech.cpp b/sword2/speech.cpp
index 130dc67462..eddb0f3a44 100644
--- a/sword2/speech.cpp
+++ b/sword2/speech.cpp
@@ -562,7 +562,7 @@ int32 Logic::fnTimedWait(int32 *params) {
}
int32 Logic::fnSpeechProcess(int32 *params) {
- // Recieve and sequence the commands sent from the conversation
+ // Receive and sequence the commands sent from the conversation
// script.
// We have to do this in a slightly tweeky manner as we can no longer
@@ -821,7 +821,7 @@ int32 Logic::fnSpeechProcess(int32 *params) {
ob_speech->ins4 = INS4;
ob_speech->ins5 = INS5;
- // the current send has been recieved - i.e. seperate
+ // the current send has been received - i.e. seperate
// multiple they-do's
INS_COMMAND = 0;
diff --git a/sword2/sync.cpp b/sword2/sync.cpp
index 1f22c33c72..659cf4a6ff 100644
--- a/sword2/sync.cpp
+++ b/sword2/sync.cpp
@@ -113,7 +113,7 @@ int32 Logic::fnGetSync(int32 *params) {
}
int32 Logic::fnWaitSync(int32 *params) {
- // keep calling until a sync recieved
+ // keep calling until a sync received
// params: none
diff --git a/sword2/walker.cpp b/sword2/walker.cpp
index 91e2d1e758..21718b5088 100644
--- a/sword2/walker.cpp
+++ b/sword2/walker.cpp
@@ -651,7 +651,7 @@ int32 Logic::fnWalkToTalkToMega(int32 *params) {
char *raw_script_ad;
int32 pars[7];
int scale;
- int mega_seperation = params[5];
+ int mega_separation = params[5];
_standardHeader *head;
ob_logic = (Object_logic*) params[0];
@@ -690,9 +690,9 @@ int32 Logic::fnWalkToTalkToMega(int32 *params) {
scale = (ob_mega->scale_a * ob_mega->feet_y + ob_mega->scale_b) / 256;
- mega_seperation= (mega_seperation * scale) / 256;
+ mega_separation= (mega_separation * scale) / 256;
- debug(5, "seperation %d", mega_seperation);
+ debug(5, "separation %d", mega_separation);
debug(5, " target x %d, y %d", g_sword2->_engineMega.feet_x, g_sword2->_engineMega.feet_y);
if (g_sword2->_engineMega.feet_x < ob_mega->feet_x)
@@ -700,13 +700,13 @@ int32 Logic::fnWalkToTalkToMega(int32 *params) {
// Target is left of us, so aim to stand to their
// right. Face down_left
- pars[4] = g_sword2->_engineMega.feet_x + mega_seperation;
+ pars[4] = g_sword2->_engineMega.feet_x + mega_separation;
pars[6] = 5;
} else {
// Ok, must be right of us so aim to stand to their
// left. Face down_right.
- pars[4] = g_sword2->_engineMega.feet_x - mega_seperation;
+ pars[4] = g_sword2->_engineMega.feet_x - mega_separation;
pars[6] = 3;
}
}