Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

at_npcfaction is deprecated stuff.

This commit is contained in:
Enno Rehling 2019-08-26 19:09:40 +02:00
parent fc29b492a2
commit 331546eec4
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/attributes/attributes.c
View File

@ -196,7 +196,6 @@ void register_attributes(void)
at_register(&at_group); at_register(&at_group);
at_register(&at_building_generic_type); at_register(&at_building_generic_type);
at_register(&at_npcfaction);
/* connection-typen */ /* connection-typen */
register_bordertype(&bt_noway); register_bordertype(&bt_noway);
@ -205,6 +204,7 @@ void register_attributes(void)
register_bordertype(&bt_illusionwall); register_bordertype(&bt_illusionwall);
register_bordertype(&bt_road); register_bordertype(&bt_road);
at_deprecate("npcfaction", a_readint);
at_deprecate("siege", a_readint); at_deprecate("siege", a_readint);
at_deprecate("maxmagicians", a_readint); /* factions with differnt magician limits, probably unused */ at_deprecate("maxmagicians", a_readint); /* factions with differnt magician limits, probably unused */
at_deprecate("hurting", a_readint); /* an old arena attribute */ at_deprecate("hurting", a_readint); /* an old arena attribute */

17
src/kernel/ally.c
View File

@ -220,17 +220,6 @@ static void init_npcfaction(variant *var)
var->i = 1; var->i = 1;
} }
attrib_type at_npcfaction = {
"npcfaction",
init_npcfaction,
NULL,
NULL,
a_writeint,
a_readint,
NULL,
ATF_UNIQUE
};
/** Limits the available help modes /** Limits the available help modes
* The bitfield returned by this function specifies the available help modes * The bitfield returned by this function specifies the available help modes
* in this game (so you can, for example, disable HELP GIVE globally). * in this game (so you can, for example, disable HELP GIVE globally).
@ -284,12 +273,6 @@ int alliance_status(const faction *f, const faction *f2, int status) {
if (status > 0) { if (status > 0) {
int mask = AllianceRestricted(); int mask = AllianceRestricted();
if (mask) { if (mask) {
if (a_find(f->attribs, &at_npcfaction)) {
return status;
}
if (a_find(f2->attribs, &at_npcfaction)) {
return status;
}
if (f->alliance != f2->alliance) { if (f->alliance != f2->alliance) {
status &= ~mask; status &= ~mask;
} }