diff options
author | Strangerke | 2011-09-06 00:16:07 +0200 |
---|---|---|
committer | Strangerke | 2011-09-06 00:16:07 +0200 |
commit | d7695542cdd486dbb29e3cc7d0bc8c317760d185 (patch) | |
tree | 9764e3528c48f8a766b8f80f7421f0585dd0239c /engines/cge/general.h | |
parent | b75a308bccae32a4fbd28be7ce61410cff050271 (diff) | |
download | scummvm-rg350-d7695542cdd486dbb29e3cc7d0bc8c317760d185.tar.gz scummvm-rg350-d7695542cdd486dbb29e3cc7d0bc8c317760d185.tar.bz2 scummvm-rg350-d7695542cdd486dbb29e3cc7d0bc8c317760d185.zip |
CGE: Remove various defines and functions from "general"
Those were already present in ScummVM (thanks Fingolfin for point out)
Diffstat (limited to 'engines/cge/general.h')
-rw-r--r-- | engines/cge/general.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/engines/cge/general.h b/engines/cge/general.h index ad5abba6b1..33abd1e852 100644 --- a/engines/cge/general.h +++ b/engines/cge/general.h @@ -38,9 +38,6 @@ namespace CGE { #define kCryptSeed 0xA5 #define kMaxFile 128 -#define IsDigit(c) ((c) >= '0' && (c) <= '9') -#define IsHxDig(c) (IsDigit(c) || ((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f')) -#define ArrayCount(a) (sizeof(a) / sizeof((a)[0])) struct Dac { uint8 _r; @@ -50,27 +47,7 @@ struct Dac { typedef uint16 Crypt(void *buf, uint16 siz, uint16 seed); -template <class T> -void swap(T &A, T &B) { - T a = A; - A = B; - B = a; -} - -template <class T> -T max(T A, T B) { - return (A > B) ? A : B; -} - -template <class T> -T min(T A, T B) { - return (A < B) ? A : B; -} - -uint16 atow(const char *a); -uint16 xtow(const char *x); char *wtom(uint16 val, char *str, int radix, int len); -char *dwtom(uint32 val, char *str, int radix, int len); int takeEnum(const char **tab, const char *text); uint16 chkSum(void *m, uint16 n); char *mergeExt(char *buf, const char *name, const char *ext); |