+/* $NetBSD: hack.mkobj.c,v 1.9 2011/08/07 06:03:45 dholland Exp $ */
+
/*
- * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
+ * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
+ * Amsterdam
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Stichting Centrum voor Wiskunde en
+ * Informatica, nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ * Copyright (c) 1982 Jay Fenlason <hack@gnu.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
#ifndef lint
-static char rcsid[] = "$NetBSD: hack.mkobj.c,v 1.3 1995/03/23 08:30:47 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.mkobj.c,v 1.9 2011/08/07 06:03:45 dholland Exp $");
+#endif /* not lint */
#include "hack.h"
+#include "extern.h"
-char mkobjstr[] = "))[[!!!!????%%%%/=**))[[!!!!????%%%%/=**(%";
-struct obj *mkobj(), *mksobj();
+static const char mkobjstr[] = "))[[!!!!????%%%%/=**))[[!!!!????%%%%/=**(%";
-struct obj *
-mkobj_at(let,x,y)
-register let,x,y;
+struct obj *
+mkobj_at(int let, int x, int y)
{
- register struct obj *otmp = mkobj(let);
+ struct obj *otmp = mkobj(let);
otmp->ox = x;
otmp->oy = y;
otmp->nobj = fobj;
fobj = otmp;
- return(otmp);
+ return (otmp);
}
-mksobj_at(otyp,x,y)
-register otyp,x,y;
+void
+mksobj_at(int otyp, int x, int y)
{
- register struct obj *otmp = mksobj(otyp);
+ struct obj *otmp = mksobj(otyp);
otmp->ox = x;
otmp->oy = y;
otmp->nobj = fobj;
fobj = otmp;
}
-struct obj *
-mkobj(let) {
- if(!let)
+struct obj *
+mkobj(int let)
+{
+ if (!let)
let = mkobjstr[rn2(sizeof(mkobjstr) - 1)];
- return(
- mksobj(
- letter(let) ?
- CORPSE + ((let > 'Z') ? (let-'a'+'Z'-'@'+1) : (let-'@'))
- : probtype(let)
- )
- );
+ return (
+ mksobj(
+ letter(let) ?
+ CORPSE + ((let > 'Z') ? (let - 'a' + 'Z' - '@' + 1) : (let - '@'))
+ : probtype(let)
+ )
+ );
}
-
-struct obj zeroobj;
-struct obj *
-mksobj(otyp)
-register otyp;
+struct obj zeroobj;
+
+struct obj *
+mksobj(int otyp)
{
- register struct obj *otmp;
- char let = objects[otyp].oc_olet;
+ struct obj *otmp;
+ char let = objects[otyp].oc_olet;
otmp = newobj(0);
*otmp = zeroobj;
otmp->quan = 1;
otmp->olet = let;
otmp->otyp = otyp;
- otmp->dknown = index("/=!?*", let) ? 0 : 1;
- switch(let) {
+ otmp->dknown = strchr("/=!?*", let) ? 0 : 1;
+ switch (let) {
case WEAPON_SYM:
- otmp->quan = (otmp->otyp <= ROCK) ? rn1(6,6) : 1;
- if(!rn2(11)) otmp->spe = rnd(3);
- else if(!rn2(10)) {
+ otmp->quan = (otmp->otyp <= ROCK) ? rn1(6, 6) : 1;
+ if (!rn2(11))
+ otmp->spe = rnd(3);
+ else if (!rn2(10)) {
otmp->cursed = 1;
otmp->spe = -rnd(3);
}
break;
case FOOD_SYM:
- if(otmp->otyp >= CORPSE) break;
+ if (otmp->otyp >= CORPSE)
+ break;
#ifdef NOT_YET_IMPLEMENTED
/* if tins are to be identified, need to adapt doname() etc */
- if(otmp->otyp == TIN)
+ if (otmp->otyp == TIN)
otmp->spe = rnd(...);
-#endif NOT_YET_IMPLEMENTED
- /* fall into next case */
+#endif /* NOT_YET_IMPLEMENTED */
+ /* FALLTHROUGH */
case GEM_SYM:
otmp->quan = rn2(6) ? 1 : 2;
+ break;
case TOOL_SYM:
case CHAIN_SYM:
case BALL_SYM:
case AMULET_SYM:
break;
case ARMOR_SYM:
- if(!rn2(8)) otmp->cursed = 1;
- if(!rn2(10)) otmp->spe = rnd(3);
- else if(!rn2(9)) {
+ if (!rn2(8))
+ otmp->cursed = 1;
+ if (!rn2(10))
+ otmp->spe = rnd(3);
+ else if (!rn2(9)) {
otmp->spe = -rnd(3);
otmp->cursed = 1;
}
break;
case WAND_SYM:
- if(otmp->otyp == WAN_WISHING) otmp->spe = 3; else
- otmp->spe = rn1(5,
- (objects[otmp->otyp].bits & NODIR) ? 11 : 4);
+ if (otmp->otyp == WAN_WISHING)
+ otmp->spe = 3;
+ else
+ otmp->spe = rn1(5,
+ (objects[otmp->otyp].bits & NODIR) ? 11 : 4);
break;
case RING_SYM:
- if(objects[otmp->otyp].bits & SPEC) {
- if(!rn2(3)) {
+ if (objects[otmp->otyp].bits & SPEC) {
+ if (!rn2(3)) {
otmp->cursed = 1;
otmp->spe = -rnd(2);
- } else otmp->spe = rnd(2);
- } else if(otmp->otyp == RIN_TELEPORTATION ||
- otmp->otyp == RIN_AGGRAVATE_MONSTER ||
- otmp->otyp == RIN_HUNGER || !rn2(9))
+ } else
+ otmp->spe = rnd(2);
+ } else if (otmp->otyp == RIN_TELEPORTATION ||
+ otmp->otyp == RIN_AGGRAVATE_MONSTER ||
+ otmp->otyp == RIN_HUNGER || !rn2(9))
otmp->cursed = 1;
break;
default:
panic("impossible mkobj");
}
otmp->owt = weight(otmp);
- return(otmp);
+ return (otmp);
}
-letter(c) {
- return(('@' <= c && c <= 'Z') || ('a' <= c && c <= 'z'));
+int
+letter(int c)
+{
+ return (('@' <= c && c <= 'Z') || ('a' <= c && c <= 'z'));
}
-weight(obj)
-register struct obj *obj;
+int
+weight(struct obj *obj)
{
-register int wt = objects[obj->otyp].oc_weight;
- return(wt ? wt*obj->quan : (obj->quan + 1)/2);
+ int wt = objects[obj->otyp].oc_weight;
+ return (wt ? wt * obj->quan : (obj->quan + 1) / 2);
}
-mkgold(num,x,y)
-register long num;
+void
+mkgold(long num, int x, int y)
{
- register struct gold *gold;
- register long amount = (num ? num : 1 + (rnd(dlevel+2) * rnd(30)));
+ struct gold *gold;
+ long amount = (num ? num : 1 + (rnd(dlevel + 2) * rnd(30)));
- if(gold = g_at(x,y))
+ if ((gold = g_at(x, y)) != NULL)
gold->amount += amount;
else {
gold = newgold();
git.ckatri.com / bsdgames-darwin.git / blobdiff