From 59f53cf2fa165d65d34d7b2a6adde8cc95582d4c Mon Sep 17 00:00:00 2001 From: Kevin Shanahan Date: Thu, 25 Apr 2013 21:43:32 +0930 Subject: [PATCH 1/2] bump version post-release Signed-off-by: Kevin Shanahan --- Makefile | 2 +- changelog.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3af6e1ab..1cd278fb 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ TARGET_UNIX ?= $(if $(filter UNIX,$(TARGET_OS)),$(HOST_UNIX),) # ============================================================================ -TYR_RELEASE := v0.10-pre +TYR_RELEASE := v0.11-pre TYR_GIT := $(shell git describe --dirty 2> /dev/null) TYR_VERSION := $(if $(TYR_GIT),$(TYR_GIT),$(TYR_RELEASE)) TYR_VERSION_NUM ?= $(patsubst v%,%,$(TYR_VERSION)) diff --git a/changelog.txt b/changelog.txt index 8e8326ad..32051ced 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +Unreleased + +* + 2013-04-25 TyrUtils v0.10 * Documentation added for bspinfo and bsputil From 8939d1f6dbb950726df8c274b8c5093612bf8c29 Mon Sep 17 00:00:00 2001 From: Kevin Shanahan Date: Thu, 25 Apr 2013 21:43:59 +0930 Subject: [PATCH 2/2] qbsp: fix adding animated textures for alt-anim textured brushes If brushes in the map are textured with alt-animations, and the second character (i.e. the 'a' in +abutton) is lower case then we have the lowercase texture name in the miptex list, but when we add alt textures we use the uppercase, so it gets duplicated. Duplicated animating textures cause most engines to exit with an error. Since the map file could use uppercase texture names as well, really we should either be normalizing texture names to upper or lower case, or we need to do case-insensitive matching - so I just changed to case-insensitive matching. Signed-off-by: Kevin Shanahan --- changelog.txt | 2 +- qbsp/map.c | 2 +- qbsp/wad.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.txt b/changelog.txt index 32051ced..2f475812 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,6 @@ Unreleased -* +* qbsp: Fix animating texture bug when brushes are textured with alt-animations 2013-04-25 TyrUtils v0.10 diff --git a/qbsp/map.c b/qbsp/map.c index 8a81b700..c3aa3d4c 100644 --- a/qbsp/map.c +++ b/qbsp/map.c @@ -37,7 +37,7 @@ FindMiptex(const char *name) int i; for (i = 0; i < map.nummiptex; i++) { - if (!strcmp(name, map.miptex[i])) + if (!strcasecmp(name, map.miptex[i])) return i; } if (map.nummiptex == map.maxmiptex) diff --git a/qbsp/wad.c b/qbsp/wad.c index b61f6dda..335b76b0 100644 --- a/qbsp/wad.c +++ b/qbsp/wad.c @@ -254,7 +254,7 @@ WADList_AddAnimatingTextures(const wad_t *wadlist) /* Search for all animations (0-9) and alt-animations (A-J) */ for (j = 0; j < 20; j++) { - name[1] = (j < 10) ? '0' + j : 'A' + j - 10; + name[1] = (j < 10) ? '0' + j : 'a' + j - 10; if (WADList_FindTexture(wadlist, name)) FindMiptex(name); }