Fix format strings for short arguments to scanf. Avoid dangling else.

Bump revision.

11 files changed, 312 insertions, 3 deletions

diff --git a/games/digger/Makefile b/games/digger/Makefile
index 96910bf6d13..12a31704696 100644
--- a/games/digger/Makefile
+++ b/games/digger/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2012/10/06 11:54:35 asau Exp $
+# $NetBSD: Makefile,v 1.18 2013/10/10 00:07:23 joerg Exp $
 #
 
 DISTNAME=		digger-20020314
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		games
 MASTER_SITES=		http://www.digger.org/
 
diff --git a/games/digger/distinfo b/games/digger/distinfo
index 0a17eab06e4..a22f822b38a 100644
--- a/games/digger/distinfo
+++ b/games/digger/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/01/08 13:11:13 obache Exp $
+$NetBSD: distinfo,v 1.5 2013/10/10 00:07:23 joerg Exp $
 
 SHA1 (digger-20020314.tar.gz) = 4fef6bb91b3c3a4d18a66b94864455299cd19016
 RMD160 (digger-20020314.tar.gz) = 85f0adeb867f1aceef154412e0752c51dd7f6809
@@ -7,3 +7,12 @@ SHA1 (patch-aa) = 07ad1bb5100d389fca04584f511de9feee45edc7
 SHA1 (patch-ab) = 524341c6e188731d22675e75fd3a6cafbaa00537
 SHA1 (patch-ac) = 0491f8edaa2d1b13fc69c09dd74fe59f3f3618ef
 SHA1 (patch-ad) = ab3ddf3f65d9fcbed15732fef0d62a549334af23
+SHA1 (patch-bags.c) = 6edaca6b71e58bd91d93e4a3d57b8a58ab8c8043
+SHA1 (patch-digger.c) = a9de4241a50bae75c269c708d7477420cd0135da
+SHA1 (patch-main.c) = 2e08ef00007455de956a39969aed51ca5b25ad34
+SHA1 (patch-monster.c) = 1ee82bdc882806019b1badeeb7811f3a4e5e1481
+SHA1 (patch-newsnd.c) = 6a9f2a49bb7af7995b39435c998b06e9fc8ef667
+SHA1 (patch-record.c) = ef33cf255dbca44983e0647312932b3c0c3553a8
+SHA1 (patch-scores.c) = ad879ec595e65448f91dce27a45949969b79355b
+SHA1 (patch-sound.c) = 062f8e58283fd1e06631abca0e065cd165403f79
+SHA1 (patch-sprite.c) = 6ae1352afd28e97a5755de2b20b10aa92f98b990
diff --git a/games/digger/patches/patch-bags.c b/games/digger/patches/patch-bags.c
new file mode 100644
index 00000000000..0b5e6488033
--- /dev/null
+++ b/games/digger/patches/patch-bags.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-bags.c,v 1.1 2013/10/10 00:07:23 joerg Exp $
+
+--- bags.c.orig	2013-10-09 23:18:02.000000000 +0000
++++ bags.c
+@@ -168,7 +168,7 @@ void updatebag(Sint4 bag)
+       break;
+     case DIR_RIGHT:
+     case DIR_LEFT:
+-      if (xr==0)
++      if (xr==0) {
+         if (y<180 && (getfield(h,v+1)&0xfdf)!=0xfdf) {
+           bagdat[bag].dir=DIR_DOWN;
+           bagdat[bag].wt=0;
+@@ -176,6 +176,7 @@ void updatebag(Sint4 bag)
+         }
+         else
+           baghitground(bag);
++      }
+       break;
+     case DIR_DOWN:
+       if (yr==0)
+@@ -188,11 +189,12 @@ void updatebag(Sint4 bag)
+             baghitground(bag);
+       checkmonscared(bagdat[bag].h);
+   }
+-  if (bagdat[bag].dir!=DIR_NONE)
++  if (bagdat[bag].dir!=DIR_NONE) {
+     if (bagdat[bag].dir!=DIR_DOWN && pushcount!=0)
+       pushcount--;
+     else
+       pushbag(bag,bagdat[bag].dir);
++  }
+ }
+ 
+ void baghitground(Sint4 bag)
diff --git a/games/digger/patches/patch-digger.c b/games/digger/patches/patch-digger.c
new file mode 100644
index 00000000000..a25f5aceffa
--- /dev/null
+++ b/games/digger/patches/patch-digger.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-digger.c,v 1.1 2013/10/10 00:07:23 joerg Exp $
+
+--- digger.c.orig	2013-10-09 23:14:54.000000000 +0000
++++ digger.c
+@@ -153,7 +153,7 @@ void dodigger(void)
+       drawexplosion(n);
+     else
+       updatefire(n);
+-    if (digvisible)
++    if (digvisible) {
+       if (digdat[n].alive)
+         if (digdat[n].bagtime!=0) {
+           drawdig(n,digdat[n].mdir,digdat[n].x,digdat[n].y,
+@@ -165,6 +165,7 @@ void dodigger(void)
+           updatedigger(n);
+       else
+         diggerdie(n);
++    }
+     if (digdat[n].emocttime>0)
+       digdat[n].emocttime--;
+   }
diff --git a/games/digger/patches/patch-main.c b/games/digger/patches/patch-main.c
new file mode 100644
index 00000000000..e178f8511e8
--- /dev/null
+++ b/games/digger/patches/patch-main.c
@@ -0,0 +1,44 @@
+$NetBSD: patch-main.c,v 1.1 2013/10/10 00:07:23 joerg Exp $
+
+--- main.c.orig	2013-10-09 23:12:38.000000000 +0000
++++ main.c
+@@ -602,11 +602,12 @@ void parsecmd(int argc,char *argv[])
+       if (word[1]=='L' || word[1]=='l' || word[1]=='R' || word[1]=='r' ||
+           word[1]=='P' || word[1]=='p' || word[1]=='S' || word[1]=='s' ||
+           word[1]=='E' || word[1]=='e' || word[1]=='G' || word[1]=='g' ||
+-          word[1]=='A' || word[1]=='a' || word[1]=='I' || word[1]=='i')
++          word[1]=='A' || word[1]=='a' || word[1]=='I' || word[1]=='i') {
+         if (word[2]==':')
+           i=3;
+         else
+           i=2;
++      }
+       if (word[1]=='L' || word[1]=='l') {
+         j=0;
+         while (word[i]!=0)
+@@ -639,7 +640,7 @@ void parsecmd(int argc,char *argv[])
+         gs=TRUE;
+       }
+       if (word[1]=='I' || word[1]=='i')
+-        sscanf(word+i,"%u",&startlev);
++        sscanf(word+i,"%hu",&startlev);
+       if (word[1]=='U' || word[1]=='u')
+         unlimlives=TRUE;
+ #ifndef _WINDOWS        
+@@ -705,13 +706,14 @@ void parsecmd(int argc,char *argv[])
+         ginit();
+         gpal(0);
+       }
+-      if (word[1]=='K' || word[1]=='k')
++      if (word[1]=='K' || word[1]=='k') {
+         if (word[2]=='A' || word[2]=='a')
+           redefkeyb(TRUE);
+         else
+           redefkeyb(FALSE);
++      }
+       if (word[1]=='A' || word[1]=='a') {
+-        sscanf(word+i,"%u,%x,%u,%u,%u,%u",&sound_device,&sound_port,&sound_irq,
++        sscanf(word+i,"%hu,%hx,%hu,%hu,%hu,%hu",&sound_device,&sound_port,&sound_irq,
+                &sound_dma,&sound_rate,&sound_length);
+         killsound();
+         volume=1;
diff --git a/games/digger/patches/patch-monster.c b/games/digger/patches/patch-monster.c
new file mode 100644
index 00000000000..613e44d5b6f
--- /dev/null
+++ b/games/digger/patches/patch-monster.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-monster.c,v 1.1 2013/10/10 00:07:23 joerg Exp $
+
+--- monster.c.orig	2013-10-09 23:17:45.000000000 +0000
++++ monster.c
+@@ -394,7 +394,7 @@ void monai(Sint4 mon)
+ 
+   /* Collision with Digger */
+ 
+-  if (clfirst[4]!=-1 && isalive())
++  if (clfirst[4]!=-1 && isalive()) {
+     if (bonusmode) {
+       killmon(mon);
+       i=clfirst[4];
+@@ -413,6 +413,7 @@ void monai(Sint4 mon)
+         i=clcoll[i];
+       }
+     }
++  }
+ 
+   /* Update co-ordinates */
+ 
diff --git a/games/digger/patches/patch-newsnd.c b/games/digger/patches/patch-newsnd.c
new file mode 100644
index 00000000000..8bca0e7d6e4
--- /dev/null
+++ b/games/digger/patches/patch-newsnd.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-newsnd.c,v 1.1 2013/10/10 00:07:23 joerg Exp $
+
+--- newsnd.c.orig	2013-10-09 23:17:26.000000000 +0000
++++ newsnd.c
+@@ -207,7 +207,7 @@ samp getsample(void)
+ 
+   if (i8flag && i8pulse<=0) {
+     f=TRUE;
+-    if (spkrmode!=0)
++    if (spkrmode!=0) {
+       if (spkrmode!=1)
+         t2sw=!t2sw;
+       else {
+@@ -215,6 +215,7 @@ samp getsample(void)
+         t2sw=TRUE;
+         f=FALSE;
+       }
++    }
+   }
+ 
+   if (i8pulse>0) {
diff --git a/games/digger/patches/patch-record.c b/games/digger/patches/patch-record.c
new file mode 100644
index 00000000000..41b55d45035
--- /dev/null
+++ b/games/digger/patches/patch-record.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-record.c,v 1.1 2013/10/10 00:07:23 joerg Exp $
+
+--- record.c.orig	2013-10-09 23:15:59.000000000 +0000
++++ record.c
+@@ -337,11 +337,12 @@ void recsavedrf(void)
+   char nambuf[80],init[4];
+   if (!drfvalid)
+     return;
+-  if (gotname)
++  if (gotname) {
+     if ((recf=fopen(rname,"wt"))==NULL)
+       gotname=FALSE;
+     else
+       gotfile=TRUE;
++  }
+   if (!gotname) {
+     if (nplayers==2)
+       recf=fopen(DEFAULTSN,"wt"); /* Should get a name, really */
diff --git a/games/digger/patches/patch-scores.c b/games/digger/patches/patch-scores.c
new file mode 100644
index 00000000000..43e79ef8d7b
--- /dev/null
+++ b/games/digger/patches/patch-scores.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-scores.c,v 1.1 2013/10/10 00:07:23 joerg Exp $
+
+--- scores.c.orig	2013-10-09 23:15:30.000000000 +0000
++++ scores.c
+@@ -159,11 +159,12 @@ void writecurscore(int col)
+ void drawscores(void)
+ {
+   writenum(scdat[0].score,0,0,6,3);
+-  if (nplayers==2 || diggers==2)
++  if (nplayers==2 || diggers==2) {
+     if (scdat[1].score<100000l)
+       writenum(scdat[1].score,236,0,6,3);
+     else
+       writenum(scdat[1].score,248,0,6,3);
++  }
+ }
+ 
+ void addscore(int n,Sint4 score)
diff --git a/games/digger/patches/patch-sound.c b/games/digger/patches/patch-sound.c
new file mode 100644
index 00000000000..b671f793dc9
--- /dev/null
+++ b/games/digger/patches/patch-sound.c
@@ -0,0 +1,105 @@
+$NetBSD: patch-sound.c,v 1.1 2013/10/10 00:07:23 joerg Exp $
+
+--- sound.c.orig	2013-10-09 23:16:12.000000000 +0000
++++ sound.c
+@@ -240,7 +240,7 @@ void soundfalloff(void)
+ 
+ void soundfallupdate(void)
+ {
+-  if (soundfallflag)
++  if (soundfallflag) {
+     if (soundfalln<1) {
+       soundfalln++;
+       if (soundfallf)
+@@ -255,6 +255,7 @@ void soundfallupdate(void)
+       else
+         soundfallf=TRUE;
+     }
++  }
+ }
+ 
+ 
+@@ -276,13 +277,14 @@ void soundbreakoff(void)
+ 
+ void soundbreakupdate(void)
+ {
+-  if (soundbreakflag)
++  if (soundbreakflag) {
+     if (soundbreakduration!=0) {
+       soundbreakduration--;
+       t2val=soundbreakvalue;
+     }
+     else
+       soundbreakflag=FALSE;
++  }
+ }
+ 
+ 
+@@ -344,7 +346,7 @@ void soundfireupdate(void)
+   bool f=FALSE;
+   for (n=0;n<FIREBALLS;n++) {
+     sff[n]=FALSE;
+-    if (soundfireflag[n])
++    if (soundfireflag[n]) {
+       if (soundfiren[n]==1) {
+         soundfiren[n]=0;
+         soundfirevalue[n]+=soundfirevalue[n]/55;
+@@ -355,6 +357,7 @@ void soundfireupdate(void)
+       }
+       else
+         soundfiren[n]++;
++    }
+   }
+   if (f) {
+     do {
+@@ -390,7 +393,7 @@ void soundexplodeupdate(void)
+   bool f=FALSE;
+   for (n=0;n<FIREBALLS;n++) {
+     sef[n]=FALSE;
+-    if (soundexplodeflag[n])
++    if (soundexplodeflag[n]) {
+       if (soundexplodeduration[n]!=0) {
+         soundexplodevalue[n]=soundexplodevalue[n]-(soundexplodevalue[n]>>3);
+         soundexplodeduration[n]--;
+@@ -399,6 +402,7 @@ void soundexplodeupdate(void)
+       }
+       else
+         soundexplodeflag[n]=FALSE;
++    }
+   }
+   if (f) {
+     do {
+@@ -480,7 +484,7 @@ void soundemeraldoff(void)
+ 
+ void soundemeraldupdate(void)
+ {
+-  if (soundemeraldflag)
++  if (soundemeraldflag) {
+     if (soundemeraldduration!=0) {
+       if (soundemeraldn==0 || soundemeraldn==1)
+         t2val=emerfreq;
+@@ -492,6 +496,7 @@ void soundemeraldupdate(void)
+     }
+     else
+       soundemeraldoff();
++  }
+ }
+ 
+ 
+@@ -552,7 +557,7 @@ void soundeatmoff(void)
+ 
+ void soundeatmupdate(void)
+ {
+-  if (soundeatmflag)
++  if (soundeatmflag) {
+     if (soundeatmn!=0) {
+       if (soundeatmduration!=0) {
+         if ((soundeatmduration%4)==1)
+@@ -570,6 +575,7 @@ void soundeatmupdate(void)
+     }
+     else
+       soundeatmflag=FALSE;
++  }
+ }
+ 
+ 
diff --git a/games/digger/patches/patch-sprite.c b/games/digger/patches/patch-sprite.c
new file mode 100644
index 00000000000..7d994994432
--- /dev/null
+++ b/games/digger/patches/patch-sprite.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-sprite.c,v 1.1 2013/10/10 00:07:23 joerg Exp $
+
+--- sprite.c.orig	2013-10-09 23:15:14.000000000 +0000
++++ sprite.c
+@@ -262,10 +262,11 @@ void bcollides(int spr)
+     next=-1;
+     for (spc=firstt[i];spc<lastt[i];spc++)
+       if (sprenf[spc] && spc!=spr)
+-        if (bcollide(spr,spc))
++        if (bcollide(spr,spc)) {
+           if (next==-1)
+             first[i]=next=spc;
+           else
+             coll[next=(coll[next]=spc)]=-1;
++        }
+   }
+ }