nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Remove vestiges of old overlay source split

Browse Source 
[trunk only]
This commit is contained in:
nethack.allison
2003-09-05 02:45:18 +00:00
parent 1a94dcfca3
commit 416412f92b
66 changed files with 25 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/trap.c
View File

@@ -30,16 +30,6 @@ STATIC_OVL boolean FDECL(keep_saddle_with_steedcorpse,
(unsigned, struct obj *, struct obj *));
#endif
#ifndef OVLB
STATIC_VAR const char *a_your[2];
STATIC_VAR const char *A_Your[2];
STATIC_VAR const char *the_your[2];
STATIC_VAR const char tower_of_flame[];
STATIC_VAR const char *A_gush_of_water_hits;
STATIC_VAR const char * const blindgas[6];
#else
STATIC_VAR const char * const a_your[2] = { "a", "your" };
STATIC_VAR const char * const A_Your[2] = { "A", "Your" };
STATIC_VAR const char * const the_your[2] = { "the", "your" };
@@ -48,10 +38,6 @@ STATIC_VAR const char * const A_gush_of_water_hits = "A gush of water hits";
STATIC_VAR const char * const blindgas[6] =
{"humid", "odorless", "pungent", "chilling", "acrid", "biting"};
#endif /* OVLB */
#ifdef OVLB
/* called when you're hit by fire (dofiretrap,buzz,zapyourself,explode) */
boolean /* returns TRUE if hit on torso */
burnarmor(victim)
@@ -1292,9 +1278,6 @@ struct trap *trap;
seetrap(trap); /* and it isn't concealed */
}
#endif /* OVLB */
#ifdef OVL3
/*
* Move obj from (x1,y1) to (x2,y2)
*
@@ -1534,9 +1517,6 @@ int style;
return 2;
}
#endif /* OVL3 */
#ifdef OVLB
void
seetrap(trap)
register struct trap *trap;
@@ -1547,9 +1527,6 @@ seetrap(trap)
}
}
#endif /* OVLB */
#ifdef OVL3
STATIC_OVL int
mkroll_launch(ttmp, x, y, otyp, ocount)
struct trap *ttmp;
@@ -1634,8 +1611,6 @@ schar dx,dy;
cc->y = y;
return TRUE;
}
#endif /* OVL3 */
#ifdef OVL1
int
mintrap(mtmp)
@@ -2152,9 +2127,6 @@ glovecheck: target = which_armor(mtmp, W_ARMG);
return mtmp->mtrapped;
}
#endif /* OVL1 */
#ifdef OVLB
/* Combine cockatrice checks into single functions to avoid repeating code. */
void
instapetrify(str)
@@ -2980,8 +2952,6 @@ dountrap() /* disarm a trap */
}
return untrap(FALSE);
}
#endif /* OVLB */
#ifdef OVL2
/* Probability of disabling a trap. Helge Hafting */
STATIC_OVL int
@@ -3576,8 +3546,6 @@ boolean force;
return(1);
}
}
#endif /* OVL2 */
#ifdef OVLB
/* only called when the player is doing something to the chest directly */
boolean
@@ -3758,9 +3726,6 @@ boolean disarm;
return FALSE;
}
#endif /* OVLB */
#ifdef OVL0
struct trap *
t_at(x,y)
register int x, y;
@@ -3773,9 +3738,6 @@ register int x, y;
return((struct trap *)0);
}
#endif /* OVL0 */
#ifdef OVLB
void
deltrap(trap)
register struct trap *trap;
@@ -3994,6 +3956,4 @@ burn_stuff:
return(FALSE);
}
#endif /* OVLB */
/*trap.c*/