aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--brlyt.c47
-rw-r--r--main.c10
-rwxr-xr-xtypes.h16
-rw-r--r--xml.c2
4 files changed, 61 insertions, 14 deletions
diff --git a/brlyt.c b/brlyt.c
index 2f0b483..7b9f32e 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" );
@@ -589,7 +599,8 @@ 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 );
+ 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" );
@@ -2820,7 +2831,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 +3003,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 +3175,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 +3497,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 +3582,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 +3800,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" );
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");
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;
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 "";
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-29 08:57:52 +0000