From bb13c489120aa1c4c9f56b554ddca5c828a729bf Mon Sep 17 00:00:00 2001
From: cagelight <kallikrates.koios@gmail.com>
Date: Sun, 29 Apr 2018 19:25:58 -0400
Subject: [PATCH 1/2] use shader name instead of editor image in *BITMAP field
on ASE export
---
tools/quake3/q3map2/convert_ase.c | 2 +-
tools/urt/tools/quake3/q3map2/convert_ase.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/quake3/q3map2/convert_ase.c b/tools/quake3/q3map2/convert_ase.c
index 628bec2f3..9d93e5ecb 100644
--- a/tools/quake3/q3map2/convert_ase.c
+++ b/tools/quake3/q3map2/convert_ase.c
@@ -272,7 +272,7 @@ static void ConvertShader( FILE *f, bspShader_t *shader, int shaderNum ){
fprintf( f, "\t\t\t*MAP_SUBNO\t1\r\n" );
fprintf( f, "\t\t\t*MAP_AMOUNT\t1.0\r\n" );
fprintf( f, "\t\t\t*MAP_TYPE\tScreen\r\n" );
- fprintf( f, "\t\t\t*BITMAP\t\"..\\%s\"\r\n", filename );
+ fprintf( f, "\t\t\t*BITMAP\t\"..\\%s\"\r\n", shader->shader );
fprintf( f, "\t\t\t*BITMAP_FILTER\tPyramidal\r\n" );
fprintf( f, "\t\t}\r\n" );
diff --git a/tools/urt/tools/quake3/q3map2/convert_ase.c b/tools/urt/tools/quake3/q3map2/convert_ase.c
index 628bec2f3..9d93e5ecb 100644
--- a/tools/urt/tools/quake3/q3map2/convert_ase.c
+++ b/tools/urt/tools/quake3/q3map2/convert_ase.c
@@ -272,7 +272,7 @@ static void ConvertShader( FILE *f, bspShader_t *shader, int shaderNum ){
fprintf( f, "\t\t\t*MAP_SUBNO\t1\r\n" );
fprintf( f, "\t\t\t*MAP_AMOUNT\t1.0\r\n" );
fprintf( f, "\t\t\t*MAP_TYPE\tScreen\r\n" );
- fprintf( f, "\t\t\t*BITMAP\t\"..\\%s\"\r\n", filename );
+ fprintf( f, "\t\t\t*BITMAP\t\"..\\%s\"\r\n", shader->shader );
fprintf( f, "\t\t\t*BITMAP_FILTER\tPyramidal\r\n" );
fprintf( f, "\t\t}\r\n" );
From 55bb8e39bb9024b55959f695400c0c358264d427 Mon Sep 17 00:00:00 2001
From: cagelight <kallikrates.koios@gmail.com>
Date: Wed, 22 Aug 2018 15:52:59 -0400
Subject: [PATCH 2/2] remove ../ from *BITMAP field export
Doesn't seem to actually affect anything as far as q3map2 is concerned, but it's a bit cleaner this way.
---
tools/quake3/q3map2/convert_ase.c | 2 +-
tools/urt/tools/quake3/q3map2/convert_ase.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/quake3/q3map2/convert_ase.c b/tools/quake3/q3map2/convert_ase.c
index 9d93e5ecb..28c408534 100644
--- a/tools/quake3/q3map2/convert_ase.c
+++ b/tools/quake3/q3map2/convert_ase.c
@@ -272,7 +272,7 @@ static void ConvertShader( FILE *f, bspShader_t *shader, int shaderNum ){
fprintf( f, "\t\t\t*MAP_SUBNO\t1\r\n" );
fprintf( f, "\t\t\t*MAP_AMOUNT\t1.0\r\n" );
fprintf( f, "\t\t\t*MAP_TYPE\tScreen\r\n" );
- fprintf( f, "\t\t\t*BITMAP\t\"..\\%s\"\r\n", shader->shader );
+ fprintf( f, "\t\t\t*BITMAP\t\"%s\"\r\n", shader->shader );
fprintf( f, "\t\t\t*BITMAP_FILTER\tPyramidal\r\n" );
fprintf( f, "\t\t}\r\n" );
diff --git a/tools/urt/tools/quake3/q3map2/convert_ase.c b/tools/urt/tools/quake3/q3map2/convert_ase.c
index 9d93e5ecb..28c408534 100644
--- a/tools/urt/tools/quake3/q3map2/convert_ase.c
+++ b/tools/urt/tools/quake3/q3map2/convert_ase.c
@@ -272,7 +272,7 @@ static void ConvertShader( FILE *f, bspShader_t *shader, int shaderNum ){
fprintf( f, "\t\t\t*MAP_SUBNO\t1\r\n" );
fprintf( f, "\t\t\t*MAP_AMOUNT\t1.0\r\n" );
fprintf( f, "\t\t\t*MAP_TYPE\tScreen\r\n" );
- fprintf( f, "\t\t\t*BITMAP\t\"..\\%s\"\r\n", shader->shader );
+ fprintf( f, "\t\t\t*BITMAP\t\"%s\"\r\n", shader->shader );
fprintf( f, "\t\t\t*BITMAP_FILTER\tPyramidal\r\n" );
fprintf( f, "\t\t}\r\n" );