diff options
Diffstat (limited to 'src/model/map.cc')
| -rw-r--r-- | src/model/map.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/model/map.cc b/src/model/map.cc index 377ed0d..62604ea 100644 --- a/src/model/map.cc +++ b/src/model/map.cc @@ -805,6 +805,8 @@ Model * Map::load(std::string const &name) if (mapfile.got_key_int("enginesound", u)) { model->model_enginesound = u; continue; + } else if (mapfile.got_key_color("enginecolor", model->model_enginecolor) ==0) { + continue; } } else if (mapfile.got_classname("light")) { @@ -896,18 +898,17 @@ Model * Map::load(std::string const &name) if (mapfile.got_key_vector3f("origin", engine->engine_location)) { engine->engine_location *= SCALE; continue; - - } else if (mapfile.got_key_color("_color", engine->engine_color)) { - continue; - + } else if (mapfile.got_key_float("radius", engine->engine_radius)) { engine->engine_radius /= 100.0f; continue; - } else if (mapfile.got_key_int("flare", engine->engine_flare)) { + } else if (mapfile.got_key_int("flare", engine->engine_flare)) { continue; - } else if (mapfile.got_key_color("_color", engine->engine_color)) { + } else if (mapfile.got_key_int("spawnflags", u)) { + engine->engine_noflare = spawnflag_isset(u, 1); + engine->engine_notrail = spawnflag_isset(u, 2); continue; } } @@ -915,15 +916,15 @@ Model * Map::load(std::string const &name) mapfile.close(); - con_debug << " " << mapfile.name() << " " << mapfile.map_materials.size() << " mat " << - mapfile.map_brushes << " brushes " << - mapfile.map_faces << "/" << mapfile.map_faces_detail << " faces/detail " << std::endl; + con_debug << " " << mapfile.name() << " " << mapfile.map_materials.size() << " mat " << + mapfile.map_brushes << " brushes " << + mapfile.map_faces << "/" << mapfile.map_faces_detail << " faces/detail " << std::endl; mapfile.load_fragments(model); con_debug << " " << mapfile.name() << " " << model->fragments().size() << " frags " << - model->model_tris_count << "/" << model->model_tris_detail_count << " tris/detail " << - model->model_quad_count << "/" << model->model_quad_detail_count << " quads/detail" << std::endl; + model->model_tris_count << "/" << model->model_tris_detail_count << " tris/detail " << + model->model_quad_count << "/" << model->model_quad_detail_count << " quads/detail" << std::endl; mapfile.clear_materials(); |