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

making the mapper compile

This commit is contained in:
Enno Rehling 2002-05-01 20:06:32 +00:00
parent 08821f8cc8
commit cefa3e61bb
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mapper/map_region.c
View File

@ -149,17 +149,17 @@ SpecialFunction(region *r)
wrefresh(win); wrefresh(win);
switch(getch()) { switch(getch()) {
case '1': case '1':
if(!is_cursed_internal(r->attribs, C_CURSED_BY_THE_GODS, 0)) { if (get_curse(r->attribs, ct_find("godcursezone"))==NULL) {
create_curse(NULL, &r->attribs, C_CURSED_BY_THE_GODS, 0, curse * c = create_curse(NULL, &r->attribs, ct_find("godcursezone"),
100, 100, 0, 0); 100, 100, 0, 0);
set_curseflag(r->attribs, C_CURSED_BY_THE_GODS, 0, CURSE_ISNEW|CURSE_IMMUN); curse_setflag(c, CURSE_ISNEW|CURSE_IMMUNE);
modified = 1; modified = 1;
break; break;
} }
case '2': case '2':
if(!is_cursed_internal(r->attribs, C_PEACE, 0)) { if(!is_cursed_internal(r->attribs, ct_find("peacezone"))) {
create_curse(NULL, &r->attribs, C_PEACE, 0, 100, 2, 0, 0); curse * c = create_curse(NULL, &r->attribs, ct_find("peacezone"), 100, 2, 0, 0);
set_curseflag(r->attribs, C_PEACE, 0, CURSE_IMMUN); curse_setflag(c, CURSE_IMMUNE);
modified = 1; modified = 1;
} }
default: default:

4
src/mapper/map_units.c
View File

@ -948,7 +948,7 @@ showunits(region * r)
building *b; building *b;
ship *sh; ship *sh;
dbllist *eh = NULL, *unten, *oben, *hlp = NULL, *such = NULL, *tmp; dbllist *eh = NULL, *unten, *oben, *hlp = NULL, *such = NULL, *tmp;
int line, ch, bottom, bot, f, f2; int line, ch, bottom, bot, f;
size_t lt; size_t lt;
char *s = NULL, *txt, *suchtext = 0, str[45], lbuf[256]; char *s = NULL, *txt, *suchtext = 0, str[45], lbuf[256];
@ -1511,7 +1511,7 @@ showunits(region * r)
clipregion = r; clipregion = r;
break; break;
case '\023': case '\023':
clipship = findship(f2); clipship = findship(f);
shipregion = r; shipregion = r;
break; break;
} }

2
src/mapper/mapper.c
View File

@ -442,7 +442,7 @@ drawmap(boolean maponly) {
(hl == -5 && has_laen(r)) || (hl == -5 && has_laen(r)) ||
(hl == -6 && fval(r, RF_MALLORN)) || (hl == -6 && fval(r, RF_MALLORN)) ||
(hl == -7 && fval(r, RF_CHAOTIC)) || (hl == -7 && fval(r, RF_CHAOTIC)) ||
(hl == -8 && is_cursed_internal(r->attribs, C_CURSED_BY_THE_GODS, 0)) || (hl == -8 && get_curse(r->attribs, ct_find("godcursezone"))) ||
(hl == -9 && newbie_region(r)) || (hl == -9 && newbie_region(r)) ||
(hl == -10 && dropout_region(r)) || (hl == -10 && dropout_region(r)) ||
(hl >= 0 && factionhere(r, hl)) || (hl >= 0 && factionhere(r, hl)) ||