olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix build

This commit is contained in:
Eric Wasylishen 2022-01-15 18:51:33 -07:00
parent f02bbca0c7
commit 07e7179c74
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bsputil/decompile.cpp
View File

@ -1032,7 +1032,8 @@ static void DecompileEntity(
} else if (areaportal_brush && keyValue.first == "style") { } else if (areaportal_brush && keyValue.first == "style") {
continue; continue;
} else if (modelNum > 0 && keyValue.first == "origin") { } else if (modelNum > 0 && keyValue.first == "origin") {
parser_t parser(keyValue.second.data()); auto &value = keyValue.second;
parser_t parser(value.data(), value.data() + value.size());
qvec3d vec; qvec3d vec;
parser.parse_token(); parser.parse_token();
vec[0] = stof(parser.token); vec[0] = stof(parser.token);

2
light/entities.cc
View File

@ -1404,7 +1404,7 @@ bool ParseLightsFile(const std::filesystem::path &fname)
while (!f.eof()) { while (!f.eof()) {
std::getline(f, buf); std::getline(f, buf);
parser_t parser(buf.c_str()); parser_t parser(buf.data(), buf.data() + buf.size());
if (!parser.parse_token()) if (!parser.parse_token())
continue; continue;

4
qbsp/test_qbsp.cc
View File

@ -3,6 +3,8 @@
#include <qbsp/qbsp.hh> #include <qbsp/qbsp.hh>
#include <qbsp/map.hh> #include <qbsp/map.hh>
#include <cstring>
// FIXME: Clear global data (planes, etc) between each test // FIXME: Clear global data (planes, etc) between each test
static face_t *Brush_FirstFaceWithTextureName(brush_t *brush, const char *texname) static face_t *Brush_FirstFaceWithTextureName(brush_t *brush, const char *texname)
@ -30,7 +32,7 @@ static mapentity_t LoadMap(const char *map)
options.target_version = &bspver_q1; options.target_version = &bspver_q1;
options.target_game = options.target_version->game; options.target_game = options.target_version->game;
parser_t parser(map); parser_t parser(map, map + strlen(map));
mapentity_t worldspawn; mapentity_t worldspawn;
// FIXME: adds the brush to the global map... // FIXME: adds the brush to the global map...