OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-12-11 14:45:42 +01:00
commit 71fd949f26
50 changed files with 327 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/r_data/voxels.cpp
View file

@ -456,7 +456,7 @@ static bool VOX_ReadSpriteNames(FScanner &sc, TArray<DWORD> &vsprites)
}
else if (sc.StringLen == 5 && (sc.String[4] = toupper(sc.String[4]), sc.String[4] < 'A' || sc.String[4] >= 'A' + MAX_SPRITE_FRAMES))
{
sc.ScriptMessage("Sprite frame %s is invalid.\n", sc.String[4]);
sc.ScriptMessage("Sprite frame %c is invalid.\n", sc.String[4]);
}
else
{