aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx/image
diff options
context:
space:
mode:
authorEugene Sandulenko2010-09-25 19:48:56 +0000
committerEugene Sandulenko2010-10-13 00:05:09 +0000
commit56e05f93a38576b32d77f81cb7b43b5970f87d92 (patch)
tree91559576163599fc7d235d02e8a08eb50076171b /engines/sword25/gfx/image
parent0603a5884577c13f40c91de1ef67dbf245f48df5 (diff)
downloadscummvm-rg350-56e05f93a38576b32d77f81cb7b43b5970f87d92.tar.gz
scummvm-rg350-56e05f93a38576b32d77f81cb7b43b5970f87d92.tar.bz2
scummvm-rg350-56e05f93a38576b32d77f81cb7b43b5970f87d92.zip
SWORD25: Stop polluting global namespace
svn-id: r53385
Diffstat (limited to 'engines/sword25/gfx/image')
-rw-r--r--engines/sword25/gfx/image/art.cpp4
-rw-r--r--engines/sword25/gfx/image/art.h9
2 files changed, 10 insertions, 3 deletions
diff --git a/engines/sword25/gfx/image/art.cpp b/engines/sword25/gfx/image/art.cpp
index b158e437aa..400b7893ed 100644
--- a/engines/sword25/gfx/image/art.cpp
+++ b/engines/sword25/gfx/image/art.cpp
@@ -36,6 +36,8 @@
#include "art.h"
+namespace Sword25 {
+
/**
* art_die: Print the error message to stderr and exit with a return code of 1.
* @fmt: The printf-style format for the error message.
@@ -2645,3 +2647,5 @@ void art_svp_render_aa(const ArtSVP *svp,
art_svp_render_aa_iter_done(iter);
}
+
+} // End of namespace Sword25
diff --git a/engines/sword25/gfx/image/art.h b/engines/sword25/gfx/image/art.h
index f0d0d7cacc..90baa770cf 100644
--- a/engines/sword25/gfx/image/art.h
+++ b/engines/sword25/gfx/image/art.h
@@ -35,11 +35,13 @@
/* Simple macros to set up storage allocation and basic types for libart
functions. */
-#ifndef __ART_MISC_H__
-#define __ART_MISC_H__
+#ifndef __ART_H__
+#define __ART_H__
#include "common/scummsys.h"
+namespace Sword25 {
+
typedef byte art_u8;
typedef uint16 art_u16;
typedef uint32 art_u32;
@@ -272,5 +274,6 @@ art_svp_render_aa(const ArtSVP *svp,
ArtSVPRenderAAStep *steps, int n_steps),
void *callback_data);
+} // End of namespace Sword25
-#endif /* __ART_MISC_H__ */
+#endif /* __ART_H__ */