--- a/tools/packed.c	Thu Apr 18 00:01:50 2013 +0300
+++ b/tools/packed.c	Sun Apr 21 16:40:45 2013 +0300
@@ -250,30 +250,6 @@
 }
 
 
-int dmAddFileToPack(DMPackFile *pack, const char *filename, int compression, int resFlags)
-{
-    DMPackEntry *node;
-    int res = dm_pack_add_file(pack, filename, compression, resFlags, &node);
-
-    if (res != DMERR_OK)
-    {
-        dmPrint(1, "%-32s [ERROR:%d]\n",
-            filename, res);
-    }
-    else
-    {
-        char tmp[16];
-        dmres_flags_to_symbolic(tmp, sizeof(tmp), node->resFlags);
-        dmPrint(1, "%-32s ['%s', s=%d, c=%d, o=%ld, f=%s]\n",
-            filename, node->filename,
-            node->size, node->length, node->offset,
-            tmp);
-    }
-
-    return res;
-}
-
-
 int main(int argc, char *argv[])
 {
     int i, res = 0;
@@ -314,12 +290,12 @@
         {
         case CMD_CREATE:
             dmMsg(1, "Creating new PACK\n");
-            res = dm_pack_create(optPackFilename, &pack);
+            res = dmPackCreate(optPackFilename, &pack);
             break;
 
         case CMD_ADD:
             dmMsg(1, "Opening existing PACK\n");
-            res = dm_pack_open(optPackFilename, &pack, FALSE);
+            res = dmPackOpen(optPackFilename, &pack, FALSE);
             break;
         }
 
@@ -330,18 +306,24 @@
 
             for (i = 0; i < nsrcFilenames; i++)
             {
-                // Handle resource definition files
-                if (srcFilenames[i][0] == '@')
+                DMPackEntry *node = NULL;
+                int res = dmPackAddFile(pack, srcFilenames[i], optCompress, optDefResFlags, &node);
+
+                if (res != DMERR_OK)
                 {
+                    dmPrint(1, "%-32s [ERROR:%d]\n",
+                        srcFilenames[i], res);
                 }
                 else
                 {
-                    dmAddFileToPack(pack, srcFilenames[i], optCompress, optDefResFlags);
+                    dmPrint(1, "%-32s ['%s', s=%d, c=%d, o=%ld, f=0x%04x]\n",
+                        srcFilenames[i], node->filename,
+                        node->size, node->length, node->offset, node->flags);
                 }
             }
 
-            dmMsg(1, "w=%d\n", dm_pack_write(pack));
-            dmMsg(1, "c=%d\n", dm_pack_close(pack));
+            dmMsg(1, "w=%d\n", dmPackWrite(pack));
+            dmMsg(1, "c=%d\n", dmPackClose(pack));
         }
         else
         {
@@ -352,7 +334,7 @@
 
     case CMD_LIST:
         // List files in PACK
-        res = dm_pack_open(optPackFilename, &pack, TRUE);
+        res = dmPackOpen(optPackFilename, &pack, TRUE);
         if (res == DMERR_OK)
         {
             DMPackEntry *node;
@@ -381,16 +363,13 @@
 
                 if (match)
                 {
-                    char flags[16];
-                    dmres_flags_to_symbolic(flags, sizeof(flags), node->resFlags);
-
-                    dmPrint(0, "%-32s | %8d | %8d | %08x | %s\n",
+                    dmPrint(0, "%-32s | %8d | %8d | %08x | %04x\n",
                         node->filename, node->size, node->length,
-                        node->offset, flags);
+                        node->offset, node->flags);
                 }
             }
 
-            dmMsg(1, "c=%d\n", dm_pack_close(pack));
+            dmMsg(1, "c=%d\n", dmPackClose(pack));
         }
         else
             dmError("Could not open packfile, error #%d: %s\n", res,
@@ -399,7 +378,7 @@
 
     case CMD_EXTRACT:
         // Extract files from PACK
-        res = dm_pack_open(optPackFilename, &pack, TRUE);
+        res = dmPackOpen(optPackFilename, &pack, TRUE);
         if (res == DMERR_OK)
         {
             DMPackEntry *node;
@@ -428,28 +407,19 @@
 
                 if (match && (node->privFlags & PACK_EXTRACTED) == 0)
                 {
-                    char tmp[16];
-
                     // Mark as done
                     node->privFlags |= PACK_EXTRACTED;
 
                     // Print one entry
-                    dmres_flags_to_symbolic(tmp, sizeof(tmp), node->resFlags);
-                    dmPrint(0, "Extracting: %-32s [siz=%d, cmp=%d, offs=0x%08x, flags=%s]\n",
+                    dmPrint(0, "Extracting: %-32s [siz=%d, cmp=%d, offs=0x%08x, flags=0x%04x]\n",
                             node->filename, node->size, node->length,
-                            node->offset, tmp);
+                            node->offset, node->flags);
 
-                    dm_pack_extract_file(pack, node);
-                    
-                    if (resFile != NULL)
-                    {
-                        fprintf(resFile,
-                        "%s|%s\n", node->filename, tmp);
-                    }
+                    dmPackExtractFile(pack, node);
                 }
             }
 
-            dmMsg(1, "c=%d\n", dm_pack_close(pack));
+            dmMsg(1, "c=%d\n", dmPackClose(pack));
             
             if (resFile != NULL)
                 fclose(resFile);