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

patch: #defines

Browse Source 
This is a fairly trivial code change but should have been done long ago...
This commit is contained in:
arromdee
2006-02-09 03:26:59 +00:00
parent 02a2e8b6ef
commit 83807a84f5
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes35.0
View File

@@ -118,6 +118,7 @@ don't see objects or read engraving when hero changes location (random
polymorphed spellbooks may turn blank or be too faint to read
avoid inappropriate message when using a cursed lamp while blind
player polymorphed as a guardian naga spit the wrong kind of venom
put #define for potion occupant chance and cursed wand zap chance in one place
Platform- and/or Interface-Specific Fixes

4
include/hack.h
View File

@@ -306,6 +306,10 @@ NEARDATA extern coord bhitpos; /* place where throw or zap hits or stops */
#define RANDOM_TIN (-2)
#define HEALTHY_TIN (-3)
/* Some misc definitions */
#define POTION_OCCUPANT_CHANCE(n) (13 + 2*(n))
#define WAND_BACKFIRE_CHANCE 100
/* Flags to control menus */
#define MENUTYPELEN sizeof("traditional ")
#define MENU_TRADITIONAL 0

3
src/muse.c
View File

@@ -67,7 +67,6 @@ struct obj *obj;
static const char *empty = "The potion turns out to be empty.";
const char *potion_descr;
struct monst *mtmp;
#define POTION_OCCUPANT_CHANCE(n) (13 + 2*(n)) /* also in potion.c */
potion_descr = OBJ_DESCR(objects[obj->otyp]);
if (potion_descr && !strcmp(potion_descr, "milky")) {
@@ -121,7 +120,7 @@ struct obj *obj;
return 2;
}
}
if (obj->oclass == WAND_CLASS && obj->cursed && !rn2(100)) {
if (obj->oclass == WAND_CLASS && obj->cursed && !rn2(WAND_BACKFIRE_CHANCE)) {
int dam = d(obj->spe+2, 6);
if (!Deaf) {

2
src/potion.c
View File

@@ -400,8 +400,6 @@ dodrink()
if(!otmp) return(0);
otmp->in_use = TRUE; /* you've opened the stopper */
#define POTION_OCCUPANT_CHANCE(n) (13 + 2*(n)) /* also in muse.c */
potion_descr = OBJ_DESCR(objects[otmp->otyp]);
if (potion_descr) {
if (!strcmp(potion_descr, "milky") &&

2
src/zap.c
View File

@@ -1932,7 +1932,7 @@ dozap()
/* zappable addition done by GAN 11/03/86 */
if(!zappable(obj)) pline(nothing_happens);
else if(obj->cursed && !rn2(100)) {
else if(obj->cursed && !rn2(WAND_BACKFIRE_CHANCE)) {
backfire(obj); /* the wand blows up in your face! */
exercise(A_STR, FALSE);
return(1);