From d04e1b48bd934f8d9d91aab13e9e51393fd7b6ba Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Wed, 25 Apr 2018 18:51:04 +0200 Subject: Rename repl/replicator to teleporter. --- src/game/game.cpp | 58 +++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'src/game/game.cpp') diff --git a/src/game/game.cpp b/src/game/game.cpp index 2ad7f05..2e15024 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -80,16 +80,16 @@ void entity_t::sleep(void) void state_t::start(void) { - unit_repl_t *repl; + unit_teleporter_t *teleporter; world.generator = worldgen; world.generator_data = (void*)this; - repl = new unit_repl_t(this); - repl->place(&world, v2f_t(5.3, 4.2)); - repl->constructed = true; - repl->health = repl->max_health; - select_unit(repl, SELECT_NEW); + teleporter = new unit_teleporter_t(this); + teleporter->place(&world, v2f_t(5.3, 4.2)); + teleporter->constructed = true; + teleporter->health = teleporter->max_health; + select_unit(teleporter, SELECT_NEW); resume(); } @@ -183,19 +183,19 @@ enum { COMMAND_THROW_GRENADE, COMMAND_STOP, - COMMAND_REPL_SOLDIER, - COMMAND_REPL_SCIENTIST, - COMMAND_REPL_BUILDER, + COMMAND_HIRE_SOLDIER, + COMMAND_HIRE_SCIENTIST, + COMMAND_HIRE_BUILDER, COMMAND_GATHER, COMMAND_REPAIR, - COMMAND_BUILD_REPL + COMMAND_BUILD_TELEPORTER }; bool state_t::populate_pie_menu(std::vector &items) { - bool soldiers = false, repls = false, grenades = false, + bool soldiers = false, teleporters = false, grenades = false, scientists = false, builders = false; items.clear(); @@ -222,8 +222,8 @@ bool state_t::populate_pie_menu(std::vector &items) builders = true; break; - case unit_t::UNIT_REPL: - repls = true; + case unit_t::UNIT_TELEPORTER: + teleporters = true; break; default:; @@ -246,13 +246,13 @@ bool state_t::populate_pie_menu(std::vector &items) if (builders) { items.push_back((interface::pie_item_t){"Repair", COMMAND_REPAIR}); - items.push_back((interface::pie_item_t){"Build a replicator", COMMAND_BUILD_REPL}); + items.push_back((interface::pie_item_t){"Build a teleporter", COMMAND_BUILD_TELEPORTER}); } - if (repls) { - items.push_back((interface::pie_item_t){"Spawn a soldier", COMMAND_REPL_SOLDIER}); - items.push_back((interface::pie_item_t){"Spawn a scientist", COMMAND_REPL_SCIENTIST}); - items.push_back((interface::pie_item_t){"Spawn a builder", COMMAND_REPL_BUILDER}); + if (teleporters) { + items.push_back((interface::pie_item_t){"Hire a soldier", COMMAND_HIRE_SOLDIER}); + items.push_back((interface::pie_item_t){"Hire a scientist", COMMAND_HIRE_SCIENTIST}); + items.push_back((interface::pie_item_t){"Hire a builder", COMMAND_HIRE_BUILDER}); } return true; @@ -336,25 +336,25 @@ static void command_builder(unit_builder_t *builder, v2f_t x, int number) builder->command_repair(x); break; - case COMMAND_BUILD_REPL: - builder->command_build(x, unit_t::UNIT_REPL); + case COMMAND_BUILD_TELEPORTER: + builder->command_build(x, unit_t::UNIT_TELEPORTER); break; } } -static void command_repl(unit_repl_t *repl, v2f_t x, int number) +static void command_teleporter(unit_teleporter_t *teleporter, v2f_t x, int number) { switch (number) { - case COMMAND_REPL_SOLDIER: - repl->activate(unit_t::UNIT_SOLDIER); + case COMMAND_HIRE_SOLDIER: + teleporter->activate(unit_t::UNIT_SOLDIER); break; - case COMMAND_REPL_SCIENTIST: - repl->activate(unit_t::UNIT_SCIENTIST); + case COMMAND_HIRE_SCIENTIST: + teleporter->activate(unit_t::UNIT_SCIENTIST); break; - case COMMAND_REPL_BUILDER: - repl->activate(unit_t::UNIT_BUILDER); + case COMMAND_HIRE_BUILDER: + teleporter->activate(unit_t::UNIT_BUILDER); break; } } @@ -392,8 +392,8 @@ void state_t::command(v2f_t x, int number) x, number); break; - case unit_t::UNIT_REPL: - command_repl(dynamic_cast(unit), + case unit_t::UNIT_TELEPORTER: + command_teleporter(dynamic_cast(unit), x, number); break; -- cgit