Skip to content

Commit 7fe626f

Browse files
committed
common: ReadQ2BSP: roll back some debug test code
which was breaking Q2 bsp loading
1 parent 2bff32d commit 7fe626f

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

common/bspfile.cc

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2079,28 +2079,20 @@ inline void ReadQ1BSP(lump_reader &reader, T &bsp)
20792079
template<typename T>
20802080
inline void ReadQ2BSP(lump_reader &reader, T &bsp)
20812081
{
2082-
//reader.read(Q2_LUMP_ENTITIES, bsp.dentdata);
2083-
bsp.dentdata = "{ \"classname\" \"worldspawn\" \"model\" \"*0\" } ";
2082+
reader.read(Q2_LUMP_ENTITIES, bsp.dentdata);
20842083
reader.read(Q2_LUMP_PLANES, bsp.dplanes);
20852084
reader.read(Q2_LUMP_VERTEXES, bsp.dvertexes);
2086-
//reader.read(Q2_LUMP_VISIBILITY, bsp.dvis);
2085+
reader.read(Q2_LUMP_VISIBILITY, bsp.dvis);
20872086
reader.read(Q2_LUMP_NODES, bsp.dnodes);
20882087
reader.read(Q2_LUMP_TEXINFO, bsp.texinfo);
20892088
reader.read(Q2_LUMP_FACES, bsp.dfaces);
2090-
//reader.read(Q2_LUMP_LIGHTING, bsp.dlightdata);
2089+
reader.read(Q2_LUMP_LIGHTING, bsp.dlightdata);
20912090
reader.read(Q2_LUMP_LEAFS, bsp.dleafs);
20922091
reader.read(Q2_LUMP_LEAFFACES, bsp.dleaffaces);
20932092
reader.read(Q2_LUMP_LEAFBRUSHES, bsp.dleafbrushes);
20942093
reader.read(Q2_LUMP_EDGES, bsp.dedges);
20952094
reader.read(Q2_LUMP_SURFEDGES, bsp.dsurfedges);
20962095
reader.read(Q2_LUMP_MODELS, bsp.dmodels);
2097-
2098-
for (size_t i = 1; i < bsp.dmodels.size(); i++)
2099-
{
2100-
q2_dmodel_t &model = bsp.dmodels[i];
2101-
bsp.dentdata += fmt::format("{{ \"classname\" \"bmodel\" \"model\" \"*{}\" }} ", i);
2102-
}
2103-
21042096
reader.read(Q2_LUMP_BRUSHES, bsp.dbrushes);
21052097
reader.read(Q2_LUMP_BRUSHSIDES, bsp.dbrushsides);
21062098
reader.read(Q2_LUMP_AREAS, bsp.dareas);

0 commit comments

Comments
 (0)