MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rename squad: use entity data to skip squads from abandoned forts.

develop
Alexander Gavrilov 2012-02-22 17:44:36 +04:00
parent 34c9c2d663
commit e88d5cb035
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/rename.cpp
Unescape Escape View File

@ -11,6 +11,7 @@
#include "df/squad.h" #include "df/squad.h"
#include "df/unit.h" #include "df/unit.h"
#include "df/unit_soul.h" #include "df/unit_soul.h"
#include "df/historical_entity.h"
#include "df/historical_figure.h" #include "df/historical_figure.h"
#include "df/historical_figure_info.h" #include "df/historical_figure_info.h"
#include "df/assumed_identity.h" #include "df/assumed_identity.h"
@ -66,6 +67,18 @@ static void set_nickname(df::language_name *name, std::string nick)
name->nickname = nick; name->nickname = nick;
} }
static df::squad *getSquadByIndex(unsigned idx)
{
auto entity = df::historical_entity::find(ui->group_id);
if (!entity)
return NULL;
if (idx >= entity->squads.size())
return NULL;
return df::squad::find(entity->squads[idx]);
}
static command_result rename(Core * c, vector <string> &parameters) static command_result rename(Core * c, vector <string> &parameters)
{ {
CoreSuspender suspend(c); CoreSuspender suspend(c);
@ -79,15 +92,15 @@ static command_result rename(Core * c, vector <string> &parameters)
if (parameters.size() != 3) if (parameters.size() != 3)
return CR_WRONG_USAGE; return CR_WRONG_USAGE;
std::vector<df::squad*> &squads = world->squads.all;
int id = atoi(parameters[1].c_str()); int id = atoi(parameters[1].c_str());
if (id < 1 || id > squads.size()) { df::squad *squad = getSquadByIndex(id-1);
c->con.printerr("Invalid squad index\n");
if (!squad) {
c->con.printerr("Couldn't find squad with index %d.\n", id);
return CR_WRONG_USAGE; return CR_WRONG_USAGE;
} }
squads[id-1]->alias = parameters[2]; squad->alias = parameters[2];
} }
else if (cmd == "hotkey") else if (cmd == "hotkey")
{ {