mirror of
https://github.com/libretro/scummvm.git
synced 2025-03-04 17:29:11 +00:00
spelling fixes
svn-id: r11175
This commit is contained in:
parent
b8379d646a
commit
9a1cfe838f
@ -148,7 +148,7 @@ int32 Logic::fnSendEvent(int32 *params) {
|
|||||||
// we want to intercept the player character and have him interact
|
// we want to intercept the player character and have him interact
|
||||||
// with an object - from script
|
// with an object - from script
|
||||||
|
|
||||||
// params: 0 id to recieve event
|
// params: 0 id to receive event
|
||||||
// 1 script to run
|
// 1 script to run
|
||||||
|
|
||||||
g_sword2->sendEvent(params[0], params[1]);
|
g_sword2->sendEvent(params[0], params[1]);
|
||||||
|
@ -153,7 +153,7 @@ private:
|
|||||||
|
|
||||||
//tell the manager which startup you want (if there are more
|
//tell the manager which startup you want (if there are more
|
||||||
// than 1) (i.e more than 1 entrance to a screen and/or
|
// than 1) (i.e more than 1 entrance to a screen and/or
|
||||||
// seperate game boots)
|
// separate game boots)
|
||||||
uint32 key;
|
uint32 key;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1204,7 +1204,7 @@ void ResourceManager::cacheNewCluster(uint32 newCluster) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ResourceManager::getCd(int cd) {
|
void ResourceManager::getCd(int cd) {
|
||||||
// TODO support a seperate path for cd data?
|
// TODO support a separate path for cd data?
|
||||||
|
|
||||||
bool done = false;
|
bool done = false;
|
||||||
char sCDName[_MAX_PATH];
|
char sCDName[_MAX_PATH];
|
||||||
|
@ -2054,8 +2054,8 @@ int32 Router::lineCheck(int32 x1, int32 y1, int32 x2, int32 y2) {
|
|||||||
if (xmax >= _bars[i].xmin && xmin <= _bars[i].xmax) {
|
if (xmax >= _bars[i].xmin && xmin <= _bars[i].xmax) {
|
||||||
// skip if not on module
|
// skip if not on module
|
||||||
if (ymax >= _bars[i].ymin && ymin <= _bars[i].ymax) {
|
if (ymax >= _bars[i].ymin && ymin <= _bars[i].ymax) {
|
||||||
// okay its a valid line calculate an intersept
|
// 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
|
// loads of time
|
||||||
|
|
||||||
// slope it he slope between the two lines
|
// 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
|
// skip if not on module
|
||||||
if (y >= _bars[i].ymin && y <= _bars[i].ymax) {
|
if (y >= _bars[i].ymin && y <= _bars[i].ymax) {
|
||||||
// okay its a valid line calculate an intercept
|
// 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
|
// loads of time
|
||||||
|
|
||||||
if (_bars[i].dy == 0)
|
if (_bars[i].dy == 0)
|
||||||
@ -2164,7 +2164,7 @@ int32 Router::vertCheck(int32 x, int32 y1, int32 y2) {
|
|||||||
// skip if not on module
|
// skip if not on module
|
||||||
if (ymax >= _bars[i].ymin && ymin <= _bars[i].ymax) {
|
if (ymax >= _bars[i].ymin && ymin <= _bars[i].ymax) {
|
||||||
// okay its a valid line calculate an intercept
|
// 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
|
// loads of time
|
||||||
|
|
||||||
// both lines vertical and overlap in x and y
|
// both lines vertical and overlap in x and y
|
||||||
|
@ -562,7 +562,7 @@ int32 Logic::fnTimedWait(int32 *params) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int32 Logic::fnSpeechProcess(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.
|
// script.
|
||||||
|
|
||||||
// We have to do this in a slightly tweeky manner as we can no longer
|
// 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->ins4 = INS4;
|
||||||
ob_speech->ins5 = INS5;
|
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
|
// multiple they-do's
|
||||||
|
|
||||||
INS_COMMAND = 0;
|
INS_COMMAND = 0;
|
||||||
|
@ -113,7 +113,7 @@ int32 Logic::fnGetSync(int32 *params) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int32 Logic::fnWaitSync(int32 *params) {
|
int32 Logic::fnWaitSync(int32 *params) {
|
||||||
// keep calling until a sync recieved
|
// keep calling until a sync received
|
||||||
|
|
||||||
// params: none
|
// params: none
|
||||||
|
|
||||||
|
@ -651,7 +651,7 @@ int32 Logic::fnWalkToTalkToMega(int32 *params) {
|
|||||||
char *raw_script_ad;
|
char *raw_script_ad;
|
||||||
int32 pars[7];
|
int32 pars[7];
|
||||||
int scale;
|
int scale;
|
||||||
int mega_seperation = params[5];
|
int mega_separation = params[5];
|
||||||
_standardHeader *head;
|
_standardHeader *head;
|
||||||
|
|
||||||
ob_logic = (Object_logic*) params[0];
|
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;
|
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);
|
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)
|
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
|
// Target is left of us, so aim to stand to their
|
||||||
// right. Face down_left
|
// 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;
|
pars[6] = 5;
|
||||||
} else {
|
} else {
|
||||||
// Ok, must be right of us so aim to stand to their
|
// Ok, must be right of us so aim to stand to their
|
||||||
// left. Face down_right.
|
// 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;
|
pars[6] = 3;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user