Code: Select all
#ifdef _3DFLOORSUnable to build 1189-gd58d38a
Moderator: Graf Zahl
-
jpalomo
- Posts: 4
- Joined: Thu Apr 19, 2012 23:48
Unable to build 1189-gd58d38a
This seems to be the culprit (p_3dfloors.cpp line 47):
Removing the offending line seems to fix it.
-
Graf Zahl
- GZDoom Developer
- Posts: 7148
- Joined: Wed Jul 20, 2005 9:48
- Location: Germany
- Contact:
Re: Unable to build 1189-gd58d38a
Yes, that's a remnant of some badly resolved merge conflict.