summaryrefslogtreecommitdiff
path: root/src/m_misc.c
diff options
context:
space:
mode:
authorJames Haley2010-01-26 00:59:02 +0000
committerJames Haley2010-01-26 00:59:02 +0000
commitb80409202d07732ec201c9816887262b505b81d4 (patch)
tree364dcb86f2c22411a720447bfa21c4de9191ff6f /src/m_misc.c
parent66e8dc63bd0b384c99f0d0ff60b3d75c42d441b1 (diff)
parent8f6edc1f7402215c5e38d1f03939ce6b5ff5e3ae (diff)
downloadchocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.gz
chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.bz2
chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.zip
Merge from raven-branch
Subversion-branch: /branches/strife-branch Subversion-revision: 1825
Diffstat (limited to 'src/m_misc.c')
-rw-r--r--src/m_misc.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/m_misc.c b/src/m_misc.c
index 4f3becfb..5847f1a2 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -199,6 +199,14 @@ char *M_TempFile(char *s)
return result;
}
+boolean M_StrToInt(const char *str, int *result)
+{
+ return sscanf(str, " 0x%x", result) == 1
+ || sscanf(str, " 0X%x", result) == 1
+ || sscanf(str, " 0%o", result) == 1
+ || sscanf(str, " %d", result) == 1;
+}
+
void M_ExtractFileBase(char *path, char *dest)
{
char* src;