aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2008-01-21 12:44:39 +0000
committerEugene Sandulenko2008-01-21 12:44:39 +0000
commit86456702f91e6a82dbc8f363e0bc4631212c01b6 (patch)
tree24ca30bb6767135c6aa6c99405a37de2875ab7fe
parent50845303485d74d4ced816177e4a97548f0e06ac (diff)
downloadscummvm-rg350-86456702f91e6a82dbc8f363e0bc4631212c01b6.tar.gz
scummvm-rg350-86456702f91e6a82dbc8f363e0bc4631212c01b6.tar.bz2
scummvm-rg350-86456702f91e6a82dbc8f363e0bc4631212c01b6.zip
Move tag2str() to common/
svn-id: r30598
-rw-r--r--common/util.cpp10
-rw-r--r--common/util.h3
-rw-r--r--engines/scumm/util.cpp10
-rw-r--r--engines/scumm/util.h2
4 files changed, 13 insertions, 12 deletions
diff --git a/common/util.cpp b/common/util.cpp
index 5ee3f38c2f..8068378d5b 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -639,3 +639,13 @@ char *scumm_strrev(char *str) {
}
return str;
}
+
+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;
+}
diff --git a/common/util.h b/common/util.h
index 99b003f380..f4f40223b1 100644
--- a/common/util.h
+++ b/common/util.h
@@ -319,4 +319,7 @@ extern int gDebugLevel;
char *scumm_strrev(char *str);
+const char *tag2str(uint32 tag);
+
+
#endif
diff --git a/engines/scumm/util.cpp b/engines/scumm/util.cpp
index c78b72d7f6..ccd0230efa 100644
--- a/engines/scumm/util.cpp
+++ b/engines/scumm/util.cpp
@@ -101,14 +101,4 @@ int normalizeAngle(int angle) {
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
diff --git a/engines/scumm/util.h b/engines/scumm/util.h
index c05a90cfe6..0d33987c31 100644
--- a/engines/scumm/util.h
+++ b/engines/scumm/util.h
@@ -43,8 +43,6 @@ int toSimpleDir(int dirtype, int dir);
void assertRange(int min, int value, int max, const char *desc);
-const char *tag2str(uint32 tag);
-
} // End of namespace Scumm
#endif