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

map.cc: move rgfStartSpots to map struct

This commit is contained in:
Eric Wasylishen 2022-04-11 17:49:49 -06:00
parent 9b9239fc38
commit 5df0dde756
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/qbsp/map.hh
View File

@ -154,6 +154,9 @@ struct mapdata_t
// Q2 stuff
int32_t numareaportals;
// misc
int start_spots = 0;
// helpers
const std::string &miptexTextureName(int mt) const { return miptex.at(mt).name; }

16
qbsp/map.cc
View File

@ -46,8 +46,6 @@
#define info_player_deathmatch 2
#define info_player_coop 4
static int rgfStartSpots;
struct texdef_valve_t
{
qmat<vec_t, 2, 3> axis{};
@ -441,14 +439,14 @@ static void ParseEpair(parser_t &parser, mapentity_t *entity)
// Quake II uses multiple starts for level transitions/backtracking.
// TODO: instead, this should check targetnames. There should only be
// one info_player_start per targetname in Q2.
if (options.target_game->id != GAME_QUAKE_II && (rgfStartSpots & info_player_start)) {
if (options.target_game->id != GAME_QUAKE_II && (map.start_spots & info_player_start)) {
logging::print("WARNING: Multiple info_player_start entities\n");
}
rgfStartSpots |= info_player_start;
map.start_spots |= info_player_start;
} else if (string_iequals(parser.token, "info_player_deathmatch")) {
rgfStartSpots |= info_player_deathmatch;
map.start_spots |= info_player_deathmatch;
} else if (string_iequals(parser.token, "info_player_coop")) {
rgfStartSpots |= info_player_coop;
map.start_spots |= info_player_coop;
}
}
}
@ -1894,11 +1892,11 @@ void LoadMapFile(void)
}
// Print out warnings for entities
if (!(rgfStartSpots & info_player_start))
if (!(map.start_spots & info_player_start))
logging::print("WARNING: No info_player_start entity in level\n");
if (!(rgfStartSpots & info_player_deathmatch))
if (!(map.start_spots & info_player_deathmatch))
logging::print("WARNING: No info_player_deathmatch entities in level\n");
// if (!(rgfStartSpots & info_player_coop))
// if (!(map.start_spots & info_player_coop))
// logging::print("WARNING: No info_player_coop entities in level\n");
logging::print(logging::flag::STAT, " {:8} faces\n", map.numfaces());