From 1ace43b584c941e69114bcf14ff2156c8ba1926e Mon Sep 17 00:00:00 2001 From: megazig Date: Sun, 20 Sep 2009 18:21:08 -0500 Subject: changed memset for brlyt --- brlyt.c | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/brlyt.c b/brlyt.c index 2f0b483..85ab071 100644 --- a/brlyt.c +++ b/brlyt.c @@ -305,7 +305,9 @@ void PrintBRLYTEntry_fnl1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) void PrintBRLYTEntry_pan1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) { char origins[9][15]; - memset( origins , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( origins[o] , 0 , 20 ); strcpy( origins[0] , "TOP LEFT" ); strcpy( origins[1] , "TOP CENTER" ); strcpy( origins[2] , "TOP RIGHT" ); @@ -351,7 +353,9 @@ void PrintBRLYTEntry_pan1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) void PrintBRLYTEntry_wnd1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) { char origins[9][15]; - memset( origins , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( origins[o] , 0 , 20 ); strcpy( origins[0] , "TOP LEFT" ); strcpy( origins[1] , "TOP CENTER" ); strcpy( origins[2] , "TOP RIGHT" ); @@ -454,7 +458,9 @@ void PrintBRLYTEntry_wnd1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) void PrintBRLYTEntry_bnd1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) { char origins[9][15]; - memset( origins , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( origins[o] , 0 , 20 ); strcpy( origins[0] , "TOP LEFT" ); strcpy( origins[1] , "TOP CENTER" ); strcpy( origins[2] , "TOP RIGHT" ); @@ -500,7 +506,9 @@ void PrintBRLYTEntry_bnd1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) void PrintBRLYTEntry_pic1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) { char origins[9][15]; - memset( origins , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( origins[o] , 0 , 20 ); strcpy( origins[0] , "TOP LEFT" ); strcpy( origins[1] , "TOP CENTER" ); strcpy( origins[2] , "TOP RIGHT" ); @@ -577,7 +585,9 @@ void PrintBRLYTEntry_pic1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) void PrintBRLYTEntry_txt1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) { char origins[9][15]; - memset( origins , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( origins[o] , 0 , 20 ); strcpy( origins[0] , "TOP LEFT" ); strcpy( origins[1] , "TOP CENTER" ); strcpy( origins[2] , "TOP RIGHT" ); @@ -2820,7 +2830,9 @@ void WriteBRLYTEntry(mxml_node_t *tree, mxml_node_t *node, u8** tagblob, u32* bl if (subnode != NULL) { char origins[9][15]; - memset( origins , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( origins[o] , 0 , 20 ); strcpy( origins[0] , "TOP LEFT" ); strcpy( origins[1] , "TOP CENTER" ); strcpy( origins[2] , "TOP RIGHT" ); @@ -2990,7 +3002,9 @@ void WriteBRLYTEntry(mxml_node_t *tree, mxml_node_t *node, u8** tagblob, u32* bl if (subnode != NULL) { char origins[9][15]; - memset( origins , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( origins[o] , 0 , 20 ); strcpy( origins[0] , "TOP LEFT" ); strcpy( origins[1] , "TOP CENTER" ); strcpy( origins[2] , "TOP RIGHT" ); @@ -3160,7 +3174,9 @@ void WriteBRLYTEntry(mxml_node_t *tree, mxml_node_t *node, u8** tagblob, u32* bl if (subnode != NULL) { char origins[9][15]; - memset( origins , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( origins[o] , 0 , 20 ); strcpy( origins[0] , "TOP LEFT" ); strcpy( origins[1] , "TOP CENTER" ); strcpy( origins[2] , "TOP RIGHT" ); @@ -3480,7 +3496,9 @@ void WriteBRLYTEntry(mxml_node_t *tree, mxml_node_t *node, u8** tagblob, u32* bl if (subnode != NULL) { char origins[9][15]; - memset( origins , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( origins[o] , 0 , 20 ); strcpy( origins[0] , "TOP LEFT" ); strcpy( origins[1] , "TOP CENTER" ); strcpy( origins[2] , "TOP RIGHT" ); @@ -3563,7 +3581,9 @@ void WriteBRLYTEntry(mxml_node_t *tree, mxml_node_t *node, u8** tagblob, u32* bl if (valnode != NULL) { char alignments[9][15]; - memset( alignments , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( alignments[o] , 0 , 20 ); strcpy( alignments[0] , "TOP LEFT" ); strcpy( alignments[1] , "TOP CENTER" ); strcpy( alignments[2] , "TOP RIGHT" ); @@ -3779,7 +3799,9 @@ void WriteBRLYTEntry(mxml_node_t *tree, mxml_node_t *node, u8** tagblob, u32* bl if (subnode != NULL) { char origins[9][15]; - memset( origins , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( origins[o] , 0 , 20 ); strcpy( origins[0] , "TOP LEFT" ); strcpy( origins[1] , "TOP CENTER" ); strcpy( origins[2] , "TOP RIGHT" ); -- cgit v1.3.1 From 140650ef063001fd44154692b68fecb983deac21 Mon Sep 17 00:00:00 2001 From: megazig Date: Sun, 20 Sep 2009 18:28:47 -0500 Subject: added definition check for types --- types.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/types.h b/types.h index 956584b..607c30e 100755 --- a/types.h +++ b/types.h @@ -17,14 +17,30 @@ typedef signed short s16; typedef signed int s32; typedef signed long long s64; +#ifndef uint9_t typedef unsigned char uint8_t; +#endif +#ifndef uint16_t typedef unsigned short uint16_t; +#endif +#ifndef uint32_t typedef unsigned int uint32_t; +#endif +#ifndef uint64_t typedef unsigned long long uint64_t; +#endif +#ifndef int9_t typedef signed char int8_t; +#endif +#ifndef int16_t typedef signed short int16_t; +#endif +#ifndef int32_t typedef signed int int32_t; +#endif +#ifndef int64_t typedef signed long long int64_t; +#endif typedef float f32; typedef double f64; -- cgit v1.3.1 From ba2604687d1e7ec3f5dea9477fcbcc97e228174f Mon Sep 17 00:00:00 2001 From: megazig Date: Sun, 20 Sep 2009 18:29:57 -0500 Subject: fixed last memset --- brlyt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/brlyt.c b/brlyt.c index 85ab071..1dbe259 100644 --- a/brlyt.c +++ b/brlyt.c @@ -599,7 +599,9 @@ void PrintBRLYTEntry_txt1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) strcpy( origins[8] , "BOTTOM RIGHT" ); char alignments[9][15]; - memset( alignments , 0 , 8 * 20 ); + int o; + for ( o = 0 ; o < 8 ; o++ ) + memset( alignments[o] , 0 , 20 ); strcpy( alignments[0] , "TOP LEFT" ); strcpy( alignments[1] , "TOP CENTER" ); strcpy( alignments[2] , "TOP RIGHT" ); -- cgit v1.3.1 From a3fc079c5cc9ad993fc6386a11b3ac80b8456f05 Mon Sep 17 00:00:00 2001 From: megazig Date: Sun, 20 Sep 2009 18:38:04 -0500 Subject: added xmlyt/xmlan check --- brlyt.c | 1 - main.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/brlyt.c b/brlyt.c index 1dbe259..7b9f32e 100644 --- a/brlyt.c +++ b/brlyt.c @@ -599,7 +599,6 @@ void PrintBRLYTEntry_txt1(brlyt_entry entry, u8* brlyt_file, mxml_node_t *tag) strcpy( origins[8] , "BOTTOM RIGHT" ); char alignments[9][15]; - int o; for ( o = 0 ; o < 8 ; o++ ) memset( alignments[o] , 0 , 20 ); strcpy( alignments[0] , "TOP LEFT" ); diff --git a/main.c b/main.c index 59bfab9..244fc69 100644 --- a/main.c +++ b/main.c @@ -60,6 +60,16 @@ int main(int argc, char* argv[]) { type = 2; } + ext = temp; + if(strcmp(++ext, "xmlyt") == 0) + { + type = 1; + } + ext = temp; + if(strcmp(++ext, "xmlan") == 0) + { + type = 2; + } if(type > 2) { printf("Unknown file extension\n"); -- cgit v1.3.1 From b90c5b2caa56f34afb63f6376204bd5d95a84b89 Mon Sep 17 00:00:00 2001 From: megazig Date: Sun, 20 Sep 2009 18:42:14 -0500 Subject: removed unneeded lines --- xml.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/xml.c b/xml.c index bb0e067..062d5c1 100644 --- a/xml.c +++ b/xml.c @@ -92,8 +92,6 @@ const char *whitespace_cb(mxml_node_t *node, int where) if (where == 3 || where == 1){ return ""; }else if(((node->prev && where == 0) || node->parent) && !(where == 2 && strncmp(name, "ua", 2) && strcmp(name, "rotate") && strcmp(name, "scale") && strcmp(name, "translate") && strcmp(name, "entries") && strcmp(name, "xmlyt") && strcmp(name, "xmlan") && strcmp(name, "entries") && strcmp(name, "triplet") && strcmp(name, "pair") && strcmp(name, "entry") && strcmp(name, "pane") && (strcmp(name, "tag") && strcmp(name, "size") && strcmp(name, "material") && strcmp(name, "vtx") && strcmp(name, "colors") && strcmp(name, "subs") && strcmp(name, "font") && strcmp(name, "wnd4") && strcmp(name, "wnd4mat") && strcmp(name, "set") && strcmp(name, "coordinates") && strcmp(name, "TevStage") && strcmp(name, "texture") && strcmp(name, "TextureSRT") && strcmp(name, "CoordGen") && strcmp(name, "ChanControl") && strcmp(name, "MaterialColor") && strcmp(name, "TevSwapModeTable") && strcmp(name, "IndTextureSRT") && strcmp(name, "IndTextureOrder") && strcmp(name, "AlphaCompare") && strcmp(name, "BlendMode") )) ){ - //sprintf(xmlbuff, "\n%*s", (depth-1)*4 , ""); - //sprintf(xmlbuff, "\n%*s", (depth)*4 , "\t"); sprintf( xmlbuff , "\n%s" , tab_buffer ); }else{ return ""; -- cgit v1.3.1