olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://tuon.disenchant.net/~/scm/tyrutils

This commit is contained in:
Kevin Shanahan 2013-05-08 11:34:58 +09:30
parent 31cdb99ac6 8939d1f6db
commit e4367bc970
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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))

4
changelog.txt
View File

@ -1,3 +1,7 @@
Unreleased
* qbsp: Fix animating texture bug when brushes are textured with alt-animations
2013-04-25 TyrUtils v0.10
* Documentation added for bspinfo and bsputil

2
qbsp/map.c
View File

@ -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)

2
qbsp/wad.c
View File

@ -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);
}