From e6e5bad82441a10d85dd18f9ba25f1f393495e70 Mon Sep 17 00:00:00 2001
From: megazig <megazig@megazig-desktop.(none)>
Date: Mon, 4 May 2009 19:38:54 -0500
Subject: second mxml push

---
 brlan.c   | 4 ++--
 brlan.h   | 2 +-
 brlyt.c   | 8 ++++----
 brlyt.h   | 2 +-
 general.h | 2 +-
 main.c    | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/brlan.c b/brlan.c
index 2919994..ac17eb5 100644
--- a/brlan.c
+++ b/brlan.c
@@ -169,7 +169,7 @@ void BRLAN_CreateXMLTag(tag_header tagHeader, void* data, u32 offset, mxml_node_
     printf("\t\t</tag>\n");
 }
 
-void parse_brlan(char* filename)
+void parse_brlan(char* filename, char *filenameout)
 {
     FILE* fp = fopen(filename, "rb");
     if(fp == NULL) {
@@ -300,7 +300,7 @@ void parse_brlan(char* filename)
     }
 
     FILE *xmlFile;
-    xmlFile = fopen("testy.xmlan", "w");
+    xmlFile = fopen(filenameout, "w");
     mxml_node_t *xml;
     mxml_node_t *xmlan;
     xml = mxmlNewXML("1.0");
diff --git a/brlan.h b/brlan.h
index 93878ea..bc91159 100755
--- a/brlan.h
+++ b/brlan.h
@@ -105,7 +105,7 @@ typedef struct
 } tag_data2;
 
 
-void parse_brlan(char* filename);
+void parse_brlan(char* filename, char *filenameout);
 void make_brlan(char* infile, char* outfile);
 
 #endif //BRLAN_H_
diff --git a/brlyt.c b/brlyt.c
index 3aadff7..ffcda82 100644
--- a/brlyt.c
+++ b/brlyt.c
@@ -532,7 +532,7 @@ void PrintBRLYTEntry_txt1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag)
     BRLYT_ReadDataFromMemory(&data2, brlyt_file, sizeof(brlyt_text_chunk));
     unsigned char texty[short_swap_bytes(data2.len2)];
     memcpy(texty, &brlyt_file[BRLYT_fileoffset], short_swap_bytes(data2.len2));
-    length = mxmlNewElement(tag, "length"); mxmlNewTextf(length, 0, "%04x-%-04x", short_swap_bytes(data2.len2), short_swap_bytes(data2.len2));
+    length = mxmlNewElement(tag, "length"); mxmlNewTextf(length, 0, "%04x-%04x", short_swap_bytes(data2.len2), short_swap_bytes(data2.len2));
     font = mxmlNewElement(tag, "font"); mxmlElementSetAttrf(font, 0, "%d", short_swap_bytes(data2.font_idx));
     xsize = mxmlNewElement(font, "xsize"); mxmlNewTextf(xsize, 0, "%f", float_swap_bytes(data2.font_size_x));
     ysize = mxmlNewElement(font, "ysize"); mxmlNewTextf(ysize, 0, "%f", float_swap_bytes(data2.font_size_y));
@@ -560,7 +560,7 @@ void PrintBRLYTEntry_mat1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag)
         BRLYT_ReadDataFromMemory(&data3, brlyt_file, sizeof(brlyt_material_chunk));
 
         unsigned int flaggs = be32(data3.flags);
-        entries = mxmlNewElement(tag, "entries"); mxmlElementSetAttrf(entries, "%s", data3.name);
+        entries = mxmlNewElement(tag, "entries"); mxmlElementSetAttrf(entries, 0,  "%s", data3.name);
         colors = mxmlNewElement(entries, "colors");
         int i; for (i=0;i<4;i++)
         {
@@ -811,7 +811,7 @@ void PrintBRLYTEntries(brlyt_entry *entries, int entrycnt, u8* brlyt_file, mxml_
     }
 }
 
-void parse_brlyt(char *filename)
+void parse_brlyt(char *filename, char *filenameout)
 {
     materials = (char*)malloc(12);
     numberOfMaterials = 0;
@@ -885,7 +885,7 @@ void parse_brlyt(char *filename)
     }
 
     FILE *xmlFile;
-    xmlFile = fopen("testy.xmlyt", "w");
+    xmlFile = fopen(filenameout, "w");
     mxml_node_t *xml;
     mxml_node_t *xmlyt;
     xml = mxmlNewXML("1.0");
diff --git a/brlyt.h b/brlyt.h
index 472b125..49e2194 100644
--- a/brlyt.h
+++ b/brlyt.h
@@ -207,7 +207,7 @@ typedef struct
 void swapBytes(unsigned char* char1, unsigned char* char2);
 int bitExtraction(unsigned int num, unsigned int start, unsigned int end);
 
-void parse_brlyt(char *filename);
+void parse_brlyt(char *filename, char *filenameout);
 void make_brlyt(char* infile, char* outfile);
 
 #endif //BRLYT_H_
diff --git a/general.h b/general.h
index 3889c6b..bddf7fc 100644
--- a/general.h
+++ b/general.h
@@ -9,7 +9,7 @@
 
 #define BENZIN_VERSION_MAJOR        1
 #define BENZIN_VERSION_MINOR        0
-#define BENZIN_VERSION_BUILD        107
+#define BENZIN_VERSION_BUILD        213
 #define BENZIN_VERSION_OTHER        "BETA"
 
 #define INFORMATION_TEXT        \
diff --git a/main.c b/main.c
index 285412c..b1d0322 100644
--- a/main.c
+++ b/main.c
@@ -116,11 +116,11 @@ if(type == 1)
     if((argv[1][0] == 'r') || (argv[1][0] == 'p')) {
 if(type == 2)
 {
-        parse_brlan(argv[brlanargread]);
+        parse_brlan(argv[brlanargread], argv[3]);
 }
 if(type == 1)
 {
-        parse_brlyt(argv[brlytargread]);
+        parse_brlyt(argv[brlytargread], argv[3]);
 }
     }else if((argv[1][0] == 'm') || (argv[1][0] == 'w')) {
 if(type == 2)
-- 
cgit v1.3.1