OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source 
# Conflicts:
#	src/CMakeLists.txt
This commit is contained in:
Christoph Oelckers 2016-04-11 10:49:11 +02:00
commit 7ce670951b
72 changed files with 627 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/r_data/sprites.cpp
View file

@ -499,7 +499,7 @@ static const char *skinsoundnames[NUMSKINSOUNDS][2] =
};
/*
static int STACK_ARGS skinsorter (const void *a, const void *b)
static int skinsorter (const void *a, const void *b)
{
return stricmp (((FPlayerSkin *)a)->name, ((FPlayerSkin *)b)->name);
}