Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package wumpus for openSUSE:Factory checked
in at 2022-12-19 14:08:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wumpus (Old)
and /work/SRC/openSUSE:Factory/.wumpus.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wumpus"
Mon Dec 19 14:08:23 2022 rev:3 rq:1043750 version:1.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/wumpus/wumpus.changes 2020-03-30
23:07:26.080314307 +0200
+++ /work/SRC/openSUSE:Factory/.wumpus.new.1835/wumpus.changes 2022-12-19
14:08:24.214707677 +0100
@@ -1,0 +2,7 @@
+Sun Dec 18 12:50:30 UTC 2022 - Dirk Müller <dmuel...@suse.com>
+
+- update to 1.9:
+ * Fix packaging error.
+ * Numerous small C fixes by Julian Cowley.
+
+-------------------------------------------------------------------
Old:
----
wumpus-1.7.tar.gz
New:
----
wumpus-1.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wumpus.spec ++++++
--- /var/tmp/diff_new_pack.CpAZcf/_old 2022-12-19 14:08:24.722710309 +0100
+++ /var/tmp/diff_new_pack.CpAZcf/_new 2022-12-19 14:08:24.726710330 +0100
@@ -1,7 +1,7 @@
#
# spec file for package wumpus
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define oname superhack
Name: wumpus
-Version: 1.7
+Version: 1.9
Release: 0
Summary: Faithful transcription of the 1974 Atari Wumpus game
License: BSD-2-Clause
++++++ wumpus-1.7.tar.gz -> wumpus-1.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wumpus-1.7/Makefile new/wumpus-1.9/Makefile
--- old/wumpus-1.7/Makefile 2019-03-26 03:37:13.000000000 +0100
+++ new/wumpus-1.9/Makefile 2022-12-17 05:26:07.000000000 +0100
@@ -1,7 +1,7 @@
#
# Makefile for `Hunt the Wumpus' and `Superhack' games
#
-VERS=1.7
+VERS=1.9
prefix?=/usr
@@ -16,7 +16,7 @@
$(CC) $(CFLAGS) superhack.c -o superhack
clean:
- rm -f wumpus wumpus.o superhack superhack.o TAGS
+ rm -f wumpus wumpus.o superhack superhack.o TAGS *.6
rm -f *~ *.1 *.html *.tar.gz MANIFEST
TAGS:
@@ -53,7 +53,7 @@
dist: wumpus-$(VERS).tar.gz
-release: wumpus-$(VERS).tar.gz wumpus.html
+release: wumpus-$(VERS).tar.gz wumpus.html wumpus.6
shipper version=$(VERS) | sh -e -x
refresh: wumpus.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wumpus-1.7/NEWS new/wumpus-1.9/NEWS
--- old/wumpus-1.7/NEWS 2019-03-26 03:37:13.000000000 +0100
+++ new/wumpus-1.9/NEWS 2022-12-17 05:29:08.000000000 +0100
@@ -1,6 +1,12 @@
= wumpus project news =
-1.6: 2019-03-25::
+1.9: 2022-12-16::
+ Fix packaging error.
+
+1.8: 2022-03-14::
+ Numerous small C fixes by Julian Cowley.
+
+1.7: 2019-03-25::
Added the logo and a historical note about it.
Minor bug fix for suprhack.
Change license from 3-clause BSD to 2-clause BSD and add SPDX tags.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wumpus-1.7/wumpus.6 new/wumpus-1.9/wumpus.6
--- old/wumpus-1.7/wumpus.6 2015-04-04 12:42:04.000000000 +0200
+++ new/wumpus-1.9/wumpus.6 2022-12-17 05:29:18.000000000 +0100
@@ -1,13 +1,13 @@
'\" t
.\" Title: wumpus
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 04/04/2015
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\" Date: 12/16/2022
.\" Manual: Games
.\" Source: wumpus
.\" Language: English
.\"
-.TH "WUMPUS" "6" "04/04/2015" "wumpus" "Games"
+.TH "WUMPUS" "6" "12/16/2022" "wumpus" "Games"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wumpus-1.7/wumpus.c new/wumpus-1.9/wumpus.c
--- old/wumpus-1.7/wumpus.c 2019-03-26 03:37:13.000000000 +0100
+++ new/wumpus-1.9/wumpus.c 2022-03-14 18:51:44.000000000 +0100
@@ -230,16 +230,20 @@
/* 635 PRINT "BATS NEARBY!"
*/
/* 640 NEXT K */
/* 645 NEXT J */
- for (k = 0; k < 3; k++)
+ for (j = WUMPUS; j < LOCS; j++)
{
- int room = cave[loc[YOU]][k];
+ for (k = 0; k < 3; k++)
+ {
+ if (cave[loc[YOU]][k] != loc[j])
+ continue;
- if (room == loc[WUMPUS])
- (void) puts("I SMELL A WUMPUS!");
- else if (room == loc[PIT1] || room == loc[PIT2])
- (void) puts("I FEEL A DRAFT");
- else if (room == loc[BATS1] || room == loc[BATS2])
- (void) puts("BATS NEARBY!");
+ if (j == WUMPUS)
+ (void) puts("I SMELL A WUMPUS!");
+ else if (j == PIT1 || j == PIT2)
+ (void) puts("I FEEL A DRAFT");
+ else if (j == BATS1 || j == BATS2)
+ (void) puts("BATS NEARBY!");
+ }
}
/* 650 PRINT "YOU ARE IN ROOM "L(1)
*/
@@ -334,6 +338,11 @@
{
int k1;
+#ifdef DEBUG
+ (void) printf("Location is %d, looking for tunnel to room %d\n",
+ scratchloc+1, path[k]+1);
+#endif
+
/* 810 FOR K1=1 TO 3 */
for (k1 = 0; k1 < 3; k1++)
{
@@ -351,12 +360,16 @@
*/
scratchloc = path[k];
+#ifdef DEBUG
+ (void) printf("Found tunnel to room %d\n", scratchloc+1);
+#endif
+
/* this simulates logic at 895 in the BASIC code */
check_shot();
if (finished != NOT)
return;
+ goto nextpath;
}
-
/* 820 NEXT K1 */
}
@@ -364,10 +377,18 @@
/* 830 L=S(L,FNB(1)) */
scratchloc = cave[scratchloc][FNB()];
+#ifdef DEBUG
+ (void) printf("No tunnel for room %d, new location is %d\n",
+ path[k]+1, scratchloc+1);
+#endif
+
/* 835 GOTO 900 */
check_shot();
+ if (finished != NOT)
+ return;
/* 840 NEXT K */
+ nextpath: ;
}
if (finished == NOT)
@@ -429,6 +450,10 @@
if (k < 3)
loc[WUMPUS] = cave[loc[WUMPUS]][k];
+#ifdef DEBUG
+ (void) printf("Wumpus location is now room %d\n", loc[WUMPUS]+1);
+#endif
+
/* 955 IF L(2)<>L THEN 970 */
if (loc[WUMPUS] != loc[YOU])
return;
@@ -496,8 +521,11 @@
/* 1080 RETURN */
(void) puts("... OOPS! BUMPED A WUMPUS!");
move_wumpus();
+ if (finished < 0)
+ return;
+ /* Fall through since Wumpus could have been in a pit or bat room */
}
- else if (scratchloc == loc[PIT1] || scratchloc == loc[PIT2])
+ if (scratchloc == loc[PIT1] || scratchloc == loc[PIT2])
{
/* 1085 REM *** PIT *** */
/* 1090 IF L=L(3) THEN 1100 */
@@ -507,8 +535,9 @@
/* 1110 RETURN */
(void) puts("YYYYIIIIEEEE . . . FELL IN PIT");
finished = LOSE;
+ return;
}
- else if (scratchloc == loc[BATS1] || scratchloc == loc[BATS2])
+ if (scratchloc == loc[BATS1] || scratchloc == loc[BATS2])
{
/* 1115 REM *** BATS *** */
/* 1120 IF L=L(5) THEN 1130 */
