OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom into lightmaps2

Browse source 
# Conflicts:
#	src/common/engine/namedef.h
This commit is contained in:
nashmuhandes 2022-01-21 01:39:37 +08:00
commit 8ea47fdcc3
4 changed files with 916 additions and 969 deletions
Download patch file Download diff file Expand all files Collapse all files

1022
src/common/engine/namedef.h
View file

File diff suppressed because it is too large Load diff

3
src/common/utility/name.cpp
View file

@ -75,6 +75,9 @@ static const char *PredefinedNames[] =
#define xx(n) #n,
#define xy(n, s) s,
#include "namedef.h"
#if __has_include("namedef_custom.h")
#include "namedef_custom.h"
#endif
#undef xx
#undef xy
};

3
src/common/utility/name.h
View file

@ -42,6 +42,9 @@ enum ENamedName
#define xx(n) NAME_##n,
#define xy(n, s) NAME_##n,
#include "namedef.h"
#if __has_include("namedef_custom.h")
#include "namedef_custom.h"
#endif
#undef xx
#undef xy
};