diff options
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r-- | scumm/scumm.cpp | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 18f746f73c..d3a5ad94d7 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -2545,91 +2545,6 @@ void ScummEngine::errorString(const char *buf1, char *buf2) { } } -#pragma mark - -#pragma mark --- Utilities --- -#pragma mark - - -void checkRange(int max, int min, int no, const char *str) { - if (no < min || no > max) { - char buf[256]; - snprintf(buf, sizeof(buf), str, no); - error("Value %d is out of bounds (%d,%d) (%s)", no, min, max, buf); - } -} - -/** - * Convert an old style direction to a new style one (angle), - */ -int newDirToOldDir(int dir) { - if (dir >= 71 && dir <= 109) - return 1; - if (dir >= 109 && dir <= 251) - return 2; - if (dir >= 251 && dir <= 289) - return 0; - return 3; -} - -/** - * Convert an new style (angle) direction to an old style one. - */ -int oldDirToNewDir(int dir) { - assert(0 <= dir && dir <= 3); - const int new_dir_table[4] = { 270, 90, 180, 0 }; - return new_dir_table[dir]; -} - -/** - * Convert an angle to a simple direction. - */ -int toSimpleDir(int dirType, int dir) { - if (dirType) { - const int16 directions[] = { 22, 72, 107, 157, 202, 252, 287, 337 }; - for (int i = 0; i < 7; i++) - if (dir >= directions[i] && dir <= directions[i+1]) - return i+1; - } else { - const int16 directions[] = { 71, 109, 251, 289 }; - for (int i = 0; i < 3; i++) - if (dir >= directions[i] && dir <= directions[i+1]) - return i+1; - } - - return 0; -} - -/** - * Convert a simple direction to an angle. - */ -int fromSimpleDir(int dirType, int dir) { - if (dirType) - return dir * 45; - else - return dir * 90; -} - -/** - * Normalize the given angle - that means, ensure it is positive, and - * change it to the closest multiple of 45 degree by abusing toSimpleDir. - */ -int normalizeAngle(int angle) { - int temp; - - temp = (angle + 360) % 360; - - return toSimpleDir(1, temp) * 45; -} - -const char *tag2str(uint32 tag) { - static char str[5]; - str[0] = (char)(tag >> 24); - str[1] = (char)(tag >> 16); - str[2] = (char)(tag >> 8); - str[3] = (char)tag; - str[4] = '\0'; - return str; -} - } // End of namespace Scumm using namespace Scumm; |