Generate <>& symbolically. I'm avoiding .../dist/... directories for now.

[bsdgames-darwin.git] / hack / hack.wield.c

diff --git a/hack/hack.wield.c b/hack/hack.wield.c
index e0f40b64339cc7dbb1941f9946faeb21993c265e..ebdef0a4bf070847f34529083199a6857b7dd571 100644 (file)
--- a/hack/hack.wield.c
+++ b/hack/hack.wield.c
@@ -1,57 +1,69 @@
+/*     $NetBSD: hack.wield.c,v 1.5 2001/03/25 20:44:03 jsm Exp $       */
+

 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-static char rcsid[] = "$NetBSD: hack.wield.c,v 1.3 1995/03/23 08:32:06 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.wield.c,v 1.5 2001/03/25 20:44:03 jsm Exp $");
+#endif                         /* not lint */

 
 

-#include       "hack.h"
-extern struct obj zeroobj;
+#include "hack.h"
+#include "extern.h"

 
 

-setuwep(obj) register struct obj *obj; {
+void
+setuwep(obj)
+       struct obj     *obj;
+{

        setworn(obj, W_WEP);
 }
 
        setworn(obj, W_WEP);
 }
 

+int

 dowield()
 {
 dowield()
 {

-       register struct obj *wep;
-       register int res = 0;
+       struct obj     *wep;
+       int             res = 0;

 
        multi = 0;
 
        multi = 0;

-       if(!(wep = getobj("#-)", "wield"))) /* nothing */;
-       else if(uwep == wep)
+       if (!(wep = getobj("#-)", "wield")))    /* nothing */
+               ;
+       else if (uwep == wep)

                pline("You are already wielding that!");
                pline("You are already wielding that!");

-       else if(uwep && uwep->cursed)
+       else if (uwep && uwep->cursed)

                pline("The %s welded to your hand!",
                pline("The %s welded to your hand!",

-                       aobjnam(uwep, "are"));
-       else if(wep == &zeroobj) {
-               if(uwep == 0){
+                     aobjnam(uwep, "are"));
+       else if (wep == &zeroobj) {
+               if (uwep == 0) {

                        pline("You are already empty handed.");
                } else {
                        setuwep((struct obj *) 0);
                        res++;
                        pline("You are empty handed.");
                }
                        pline("You are already empty handed.");
                } else {
                        setuwep((struct obj *) 0);
                        res++;
                        pline("You are empty handed.");
                }

-       } else if(uarms && wep->otyp == TWO_HANDED_SWORD)
-       pline("You cannot wield a two-handed sword and wear a shield.");
-       else if(wep->owornmask & (W_ARMOR | W_RING))
+       } else if (uarms && wep->otyp == TWO_HANDED_SWORD)
+               pline("You cannot wield a two-handed sword and wear a shield.");
+       else if (wep->owornmask & (W_ARMOR | W_RING))

                pline("You cannot wield that!");
        else {
                setuwep(wep);
                res++;
                pline("You cannot wield that!");
        else {
                setuwep(wep);
                res++;

-               if(uwep->cursed)
-                   pline("The %s %s to your hand!",
-                       aobjnam(uwep, "weld"),
-                       (uwep->quan == 1) ? "itself" : "themselves"); /* a3 */
-               else prinv(uwep);
+               if (uwep->cursed)
+                       pline("The %s %s to your hand!",
+                             aobjnam(uwep, "weld"),
+                             (uwep->quan == 1) ? "itself" : "themselves");     /* a3 */
+               else
+                       prinv(uwep);

        }
        }

-       return(res);
+       return (res);

 }
 
 }
 

-corrode_weapon(){
-       if(!uwep || uwep->olet != WEAPON_SYM) return;   /* %% */
-       if(uwep->rustfree)
+void
+corrode_weapon()
+{
+       if (!uwep || uwep->olet != WEAPON_SYM)
+               return;         /* %% */
+       if (uwep->rustfree)

                pline("Your %s not affected.", aobjnam(uwep, "are"));
        else {
                pline("Your %s!", aobjnam(uwep, "corrode"));
                pline("Your %s not affected.", aobjnam(uwep, "are"));
        else {
                pline("Your %s!", aobjnam(uwep, "corrode"));


@@ -59,46 +71,46 @@ corrode_weapon(){
        }
 }
 
        }
 }
 

-chwepon(otmp,amount)
-register struct obj *otmp;
-register amount;
+int
+chwepon(otmp, amount)
+       struct obj     *otmp;
+       int amount;

 {
 {

-register char *color = (amount < 0) ? "black" : "green";
-register char *time;
-       if(!uwep || uwep->olet != WEAPON_SYM) {
+       const char *color = (amount < 0) ? "black" : "green";
+       const char *time;
+       if (!uwep || uwep->olet != WEAPON_SYM) {

                strange_feeling(otmp,
                strange_feeling(otmp,

-                       (amount > 0) ? "Your hands twitch."
-                                    : "Your hands itch.");
-               return(0);
+                               (amount > 0) ? "Your hands twitch."
+                               : "Your hands itch.");
+               return (0);

        }
        }

-
-       if(uwep->otyp == WORM_TOOTH && amount > 0) {
+       if (uwep->otyp == WORM_TOOTH && amount > 0) {

                uwep->otyp = CRYSKNIFE;
                pline("Your weapon seems sharper now.");
                uwep->cursed = 0;
                uwep->otyp = CRYSKNIFE;
                pline("Your weapon seems sharper now.");
                uwep->cursed = 0;

-               return(1);
+               return (1);

        }
        }

-
-       if(uwep->otyp == CRYSKNIFE && amount < 0) {
+       if (uwep->otyp == CRYSKNIFE && amount < 0) {

                uwep->otyp = WORM_TOOTH;
                pline("Your weapon looks duller now.");
                uwep->otyp = WORM_TOOTH;
                pline("Your weapon looks duller now.");

-               return(1);
+               return (1);

        }
        }

-

        /* there is a (soft) upper limit to uwep->spe */
        /* there is a (soft) upper limit to uwep->spe */

-       if(amount > 0 && uwep->spe > 5 && rn2(3)) {
-           pline("Your %s violently green for a while and then evaporate%s.",
-               aobjnam(uwep, "glow"), plur(uwep->quan));
-           while(uwep)         /* let all of them disappear */
-                               /* note: uwep->quan = 1 is nogood if unpaid */
-               useup(uwep);
-           return(1);
+       if (amount > 0 && uwep->spe > 5 && rn2(3)) {
+               pline("Your %s violently green for a while and then evaporate%s.",
+                     aobjnam(uwep, "glow"), plur(uwep->quan));
+               while (uwep)    /* let all of them disappear */
+                       /* note: uwep->quan = 1 is nogood if unpaid */
+                       useup(uwep);
+               return (1);

        }
        }

-       if(!rn2(6)) amount *= 2;
-       time = (amount*amount == 1) ? "moment" : "while";
+       if (!rn2(6))
+               amount *= 2;
+       time = (amount * amount == 1) ? "moment" : "while";

        pline("Your %s %s for a %s.",
        pline("Your %s %s for a %s.",

-               aobjnam(uwep, "glow"), color, time);
+             aobjnam(uwep, "glow"), color, time);

        uwep->spe += amount;
        uwep->spe += amount;

-       if(amount > 0) uwep->cursed = 0;
-       return(1);
+       if (amount > 0)
+               uwep->cursed = 0;
+       return (1);

 }
 }