aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorThierry Crozat2018-12-28 22:21:01 +0100
committerThierry Crozat2018-12-28 22:21:01 +0100
commit3fa3967cff99457bbb9f18c36284af78f3ef5678 (patch)
treec7a3bf1f7fe9e5cd09c89378af36305f4b51b11d /engines
parent080ab79d7a71e45cece234c13957803e81828dee (diff)
downloadscummvm-rg350-3fa3967cff99457bbb9f18c36284af78f3ef5678.tar.gz
scummvm-rg350-3fa3967cff99457bbb9f18c36284af78f3ef5678.tar.bz2
scummvm-rg350-3fa3967cff99457bbb9f18c36284af78f3ef5678.zip
GLK: Attemp to fix multiple definitions link errors
Diffstat (limited to 'engines')
-rw-r--r--engines/glk/alan2/util.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/glk/alan2/util.h b/engines/glk/alan2/util.h
index a9cd26f8b7..702cdf1f71 100644
--- a/engines/glk/alan2/util.h
+++ b/engines/glk/alan2/util.h
@@ -37,47 +37,47 @@ extern ActElem *acts; // Actor table pointer
extern ObjElem *objs; // Object table pointer
// Type checks
-bool isObj(Aword x) {
+inline bool isObj(Aword x) {
return x >= OBJMIN && x <= OBJMAX;
}
-bool isAct(Aword x) {
+inline bool isAct(Aword x) {
return x >= ACTMIN && x <= ACTMAX;
}
-bool isCnt(Aword x) {
+inline bool isCnt(Aword x) {
return (x >= CNTMIN && x <= CNTMAX) ||
(isObj(x) && objs[x - OBJMIN].cont != 0) ||
(isAct(x) && acts[x - ACTMIN].cont != 0);
}
-bool isLoc(Aword x) {
+inline bool isLoc(Aword x) {
return x >= LOCMIN && x <= LOCMAX;
}
-bool isNum(Aword x) {
+inline bool isNum(Aword x) {
return x >= LITMIN && x <= LITMAX && litValues[x - LITMIN].type == TYPNUM;
}
-bool isStr(Aword x) {
+inline bool isStr(Aword x) {
return x >= LITMIN && x <= LITMAX && litValues[x - LITMIN].type == TYPSTR;
}
-bool isLit(Aword x) {
+inline bool isLit(Aword x) {
return x >= LITMIN && x <= LITMAX;
}
-bool endOfTable(LimElem *addr) {
+inline bool endOfTable(LimElem *addr) {
Aword *x = (Aword *)addr;
return *x == EOF;
}
-bool endOfTable(ScrElem *addr) {
+inline bool endOfTable(ScrElem *addr) {
Aword *x = (Aword *)addr;
return *x == EOF;
}
-bool endOfTable(ExtElem *addr) {
+inline bool endOfTable(ExtElem *addr) {
Aword *x = (Aword *)addr;
return *x == EOF;
}