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

CID 22452 'Constant' variable guards dead code

Browse source 
github issue #353 there is no a_fshidden attribute.
This commit is contained in:
Enno Rehling 2015-11-04 19:08:45 +01:00
parent a6039c7611
commit c9f886078b
3 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/tests/e2/e2features.lua
View file

@ -335,3 +335,14 @@ function test_stonegolems()
assert_equal(1 ,u2.number, "There shoud be one Stone Golems") assert_equal(1 ,u2.number, "There shoud be one Stone Golems")
-- end test Stone Golems four stones -- end test Stone Golems four stones
end end
function test_birthdaycake()
r = region.create(0,0, "plain")
f = faction.create("cake@eressea.de", "human", "de")
u = unit.create(f, r, 1)
u:add_item("birthdaycake", 1)
u:clear_orders()
u:add_order("ZEIGE Geburtstagstorte")
process_orders()
end

10
src/creport.c
View file

@ -746,7 +746,6 @@ void cr_output_unit(stream *out, const region * r, const faction * f,
building *b; building *b;
const char *pzTmp; const char *pzTmp;
skill *sv; skill *sv;
const attrib *a_fshidden = NULL;
bool itemcloak = false; bool itemcloak = false;
static const curse_type *itemcloak_ct = 0; static const curse_type *itemcloak_ct = 0;
static bool init = false; static bool init = false;
@ -834,13 +833,7 @@ void cr_output_unit(stream *out, const region * r, const faction * f,
stream_printf(out, "\"%s\";typprefix\n", translate(prefix, LOC(f->locale, stream_printf(out, "\"%s\";typprefix\n", translate(prefix, LOC(f->locale,
prefix))); prefix)));
} }
if (u->faction != f && a_fshidden
&& a_fshidden->data.ca[0] == 1 && effskill(u, SK_STEALTH, 0) >= 6) {
stream_printf(out, "-1;Anzahl\n");
}
else {
stream_printf(out, "%d;Anzahl\n", u->number); stream_printf(out, "%d;Anzahl\n", u->number);
}
pzTmp = get_racename(u->attribs); pzTmp = get_racename(u->attribs);
if (pzTmp) { if (pzTmp) {
@ -981,8 +974,7 @@ void cr_output_unit(stream *out, const region * r, const faction * f,
if (f == u->faction || omniscient(f)) { if (f == u->faction || omniscient(f)) {
show = u->items; show = u->items;
} }
else if (!itemcloak && mode >= see_unit && !(a_fshidden else if (!itemcloak && mode >= see_unit) {
&& a_fshidden->data.ca[1] == 1 && effskill(u, SK_STEALTH, 0) >= 3)) {
int n = report_items(u->items, result, MAX_INVENTORY, u, f); int n = report_items(u->items, result, MAX_INVENTORY, u, f);
assert(n >= 0); assert(n >= 0);
if (n > 0) if (n > 0)

10
src/reports.c
View file

@ -456,7 +456,6 @@ size_t size)
building *b; building *b;
bool isbattle = (bool)(mode == see_battle); bool isbattle = (bool)(mode == see_battle);
int telepath_see = 0; int telepath_see = 0;
attrib *a_fshidden = NULL;
item *itm; item *itm;
item *show; item *show;
faction *fv = visible_faction(f, u); faction *fv = visible_faction(f, u);
@ -520,14 +519,8 @@ size_t size)
bufp = STRLCPY(bufp, ", ", size); bufp = STRLCPY(bufp, ", ", size);
if (u->faction != f && a_fshidden && a_fshidden->data.ca[0] == 1
&& effskill(u, SK_STEALTH, 0) >= 6) {
bufp = STRLCPY(bufp, "? ", size);
}
else {
if (wrptr(&bufp, &size, _snprintf(bufp, size, "%d ", u->number))) if (wrptr(&bufp, &size, _snprintf(bufp, size, "%d ", u->number)))
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();
}
pzTmp = get_racename(u->attribs); pzTmp = get_racename(u->attribs);
if (pzTmp) { if (pzTmp) {
@ -607,8 +600,7 @@ size_t size)
if (f == u->faction || telepath_see || omniscient(f)) { if (f == u->faction || telepath_see || omniscient(f)) {
show = u->items; show = u->items;
} }
else if (!itemcloak && mode >= see_unit && !(a_fshidden else if (!itemcloak && mode >= see_unit) {
&& a_fshidden->data.ca[1] == 1 && effskill(u, SK_STEALTH, 0) >= 3)) {
int n = report_items(u->items, results, MAX_INVENTORY, u, f); int n = report_items(u->items, results, MAX_INVENTORY, u, f);
assert(n >= 0); assert(n >= 0);
if (n > 0) if (n > 0)