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
#	src/p_setup.cpp
#	src/r_defs.h
#	src/version.h

This only updates to a compileable state. The new portals are not yet functional in the hardware renderer because they require some refactoring in the data management first.
This commit is contained in:
Christoph Oelckers 2016-02-05 12:31:41 +01:00
commit dda73b531c
260 changed files with 25391 additions and 8986 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/g_doomedmap.cpp
View file

@ -259,10 +259,10 @@ void InitActorNumsFromMapinfo()
while (it.NextPair(pair))
{
const PClass *cls = NULL;
PClassActor *cls = NULL;
if (pair->Value.classname != NAME_None)
{
cls = PClass::FindClass(pair->Value.classname);
cls = PClass::FindActor(pair->Value.classname);
if (cls == NULL)
{
Printf(TEXTCOLOR_RED "Script error, \"%s\" line %d:\nUnknown actor class %s\n",