changeset 212:8c2cb920a383

Changed the magic number macro to be more uniform with other decoders.
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 13 Jan 2002 19:46:04 +0000
parents b35c04e4691e
children 948b62500a54
files decoders/shn.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/decoders/shn.c	Fri Jan 11 11:10:22 2002 +0000
+++ b/decoders/shn.c	Sun Jan 13 19:46:04 2002 +0000
@@ -215,7 +215,7 @@
 #define SHN_LPCQOFFSET_VER2 (1 << SHN_LPCQUANT)
 
 
-#define MAGIC_NUM 0x676B6A61   /* looks like "ajkg" as chars. */
+#define SHN_MAGIC  0x676B6A61   /* looks like "ajkg" as chars. */
 
 #ifndef M_LN2
 #define M_LN2   0.69314718055994530942
@@ -357,7 +357,7 @@
     {
         BAIL_IF_MACRO(SDL_RWread(rw, &ch, sizeof (ch), 1) != 1, NULL, -1);
         word = ((word << 8) & 0xFFFFFF00) | ch;
-        if (SDL_SwapBE32(word) == MAGIC_NUM)
+        if (SDL_SwapBE32(word) == SHN_MAGIC)
         {
             BAIL_IF_MACRO(SDL_RWread(rw, &ch, sizeof (ch), 1) != 1, NULL, -1);
             return((int) ch);
@@ -387,7 +387,7 @@
         return(extended_shn_magic_search(sample));
 
     BAIL_IF_MACRO(SDL_RWread(rw, &magic, sizeof (magic), 1) != 1, NULL, -1);
-    BAIL_IF_MACRO(SDL_SwapLE32(magic) != MAGIC_NUM, "SHN: Not a SHN file", -1);
+    BAIL_IF_MACRO(SDL_SwapLE32(magic) != SHN_MAGIC, "SHN: Not a SHN file", -1);
     BAIL_IF_MACRO(SDL_RWread(rw, &ch, sizeof (ch), 1) != 1, NULL, -1);
     BAIL_IF_MACRO(ch > 3, "SHN: Unsupported file version", -1);