diff --git a/qbsp/map.cc b/qbsp/map.cc index efebe8fe..dd7d550c 100644 --- a/qbsp/map.cc +++ b/qbsp/map.cc @@ -1736,14 +1736,11 @@ void ConvertMapFile(void) std::string filename = stripExt(options.szBSPName); switch(options.convertMapTexFormat) { - case texcoord_style_t::TX_QUARK_TYPE1: - filename += "-etp.map"; - break; case texcoord_style_t::TX_QUAKED: filename += "-quake.map"; break; case texcoord_style_t::TX_VALVE_220: - filename += "-valve220.map"; + filename += "-valve.map"; break; case texcoord_style_t::TX_BRUSHPRIM: filename += "-bp.map"; diff --git a/qbsp/qbsp.cc b/qbsp/qbsp.cc index b68ef930..7aeabf39 100644 --- a/qbsp/qbsp.cc +++ b/qbsp/qbsp.cc @@ -820,9 +820,7 @@ ParseOptions(char *szOptions) if (!Q_strcasecmp(szTok2, "quake")) { options.convertMapTexFormat = texcoord_style_t::TX_QUAKED; - } else if (!Q_strcasecmp(szTok2, "etp")) { - options.convertMapTexFormat = texcoord_style_t::TX_QUARK_TYPE1; - } else if (!Q_strcasecmp(szTok2, "valve220")) { + } else if (!Q_strcasecmp(szTok2, "valve")) { options.convertMapTexFormat = texcoord_style_t::TX_VALVE_220; } else if (!Q_strcasecmp(szTok2, "bp")) { options.convertMapTexFormat = texcoord_style_t::TX_BRUSHPRIM;