pull in the recent unconditionals merge from master
This commit is contained in:
Derek S. Ray
1
sys/amiga/.gitattributes
vendored
Normal file
1
sys/amiga/.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
*.p filter=NHtext merge=NHsubst
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 amidos.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 amidos.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 amidos.c $Date: 2009/05/06 10:48:29 $ $Revision: 1.6 $ */
|
||||
/* SCCS Id: @(#)amidos.c 3.5 2000/01/12
|
||||
/* Copyright (c) Olaf Seibert, Nijmegen, The Netherlands, 1988,1990. */
|
||||
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1991,1992,1993,1996. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 amidos.p $Date$ $Revision$ */
|
||||
/* NetHack 3.5 amidos.p $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 amidos.p $Date: 2009/05/06 10:48:29 $ $Revision: 1.4 $ */
|
||||
/* SCCS Id: @(#)amidos.p 3.5 1993/01/08
|
||||
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1992, 1993. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 amigst.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 amigst.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 amigst.c $Date: 2009/05/06 10:48:29 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)amigst.c 3.5 1993/01/08
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, IL, 1992, 1993 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 amimenu.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 amimenu.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 amimenu.c $Date: 2009/05/06 10:48:29 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)amimenu.c 3.5 1996/02/04 */
|
||||
/* Copyright (c) Olaf 'Rhialto' Seibert, 1989 */
|
||||
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1992, 1993, 1996 */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 amirip.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 amirip.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 amirip.c $Date: 2012/01/24 04:26:20 $ $Revision: 1.7 $ */
|
||||
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland 1991,1992,1993,1995,1996. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -182,12 +183,7 @@ time_t when;
|
||||
tomb_text(buf);
|
||||
|
||||
/* Put $ on stone */
|
||||
Sprintf(buf, "%ld Au",
|
||||
#ifndef GOLDOBJ
|
||||
u.ugold);
|
||||
#else
|
||||
done_money);
|
||||
#endif
|
||||
Sprintf(buf, "%ld Au", done_money);
|
||||
buf[STONE_LINE_LEN] = 0; /* It could be a *lot* of gold :-) */
|
||||
tomb_text(buf);
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 amisnd.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 amisnd.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 amisnd.c $Date: 2009/05/06 10:48:30 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)amisnd.c 3.5 2000/01/12*/
|
||||
/* Copyright (c) 1992, 1993, 1995 by Gregg Wonderly */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 amistack.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 amistack.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 amistack.c $Date: 2009/05/06 10:48:30 $ $Revision: 1.4 $ */
|
||||
/* SCCS Id: @(#)amistack.c 3.5 2000/05/03 */
|
||||
/* Copyright (c) Janne Salmijärvi, Tampere, Finland, 2000 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 amitty.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 amitty.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 amitty.c $Date: 2009/05/06 10:48:30 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)amitty.c 3.5 2000/01/12
|
||||
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland 1993,1996 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 amiwind.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 amiwind.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 amiwind.c $Date: 2009/05/06 10:48:30 $ $Revision: 1.5 $ */
|
||||
/* SCCS Id: @(#)amiwind.c 3.5 2000/01/12
|
||||
/* Copyright (c) Olaf Seibert (KosmoSoft), 1989, 1992 */
|
||||
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland 1993,1996 */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 amiwind.p $Date$ $Revision$ */
|
||||
/* NetHack 3.5 amiwind.p $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 amiwind.p $Date: 2009/05/06 10:48:31 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)amiwind.p 3.5 1993/01/08 */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, IL, 1992, 1993 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 cvtsnd.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 cvtsnd.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 cvtsnd.c $Date: 2009/05/06 10:48:31 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)cvtsnd.c 3.5 1995/09/10 */
|
||||
/* Copyright (c) 1995, Andrew Church, Olney, Maryland */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 txt2iff.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 txt2iff.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 txt2iff.c $Date: 2009/05/06 10:48:31 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)txt2iff.c 3.5 1995/07/28 */
|
||||
/* Copyright (c) 1995 by Gregg Wonderly, Naperville, Illinois */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 winami.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 winami.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 winami.c $Date: 2012/01/10 17:47:21 $ $Revision: 1.13 $ */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993,1996. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -578,11 +579,7 @@ amii_player_selection()
|
||||
{
|
||||
flags.initrole = randrole();
|
||||
#if 0 /* OBSOLETE */
|
||||
#ifdef TOURIST
|
||||
strcpy( pl_character, roles[ rnd( 11 ) ] );
|
||||
#else
|
||||
strcpy( pl_character, roles[ rnd( 10 ) ] );
|
||||
#endif
|
||||
#endif
|
||||
aredone = 1;
|
||||
amii_clear_nhwindow( WIN_BASE );
|
||||
@@ -607,11 +604,7 @@ amii_player_selection()
|
||||
case 1: /* Random Character */
|
||||
flags.initrole = randrole();
|
||||
#if 0 /* OBSOLETE */
|
||||
#ifdef TOURIST
|
||||
strcpy( pl_character, roles[ rnd( 11 ) ] );
|
||||
#else
|
||||
strcpy( pl_character, roles[ rnd( 10 ) ] );
|
||||
#endif
|
||||
#endif
|
||||
amii_clear_nhwindow( WIN_BASE );
|
||||
CloseShWindow( cwin );
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 winami.p $Date$ $Revision$ */
|
||||
/* NetHack 3.5 winami.p $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 winami.p $Date: 2009/05/06 10:48:33 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)winami.p 3.5 1993/01/08 */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, IL, 1992, 1993 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 winchar.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 winchar.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 winchar.c $Date: 2009/05/06 10:48:33 $ $Revision: 1.4 $ */
|
||||
/* SCCS Id: @(#)winchar.c 3.5 1993/07/22 */
|
||||
/* Copyright (c) Olaf Seibert (KosmoSoft), 1989, 1992 */
|
||||
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland 1993 */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 windefs.h $Date$ $Revision$ */
|
||||
/* NetHack 3.5 windefs.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 windefs.h $Date: 2009/05/06 10:48:34 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)windefs.h 3.5 1993/04/02 */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 winext.h $Date$ $Revision$ */
|
||||
/* NetHack 3.5 winext.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 winext.h $Date: 2009/05/06 10:48:35 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)winext.h 3.5 2000/01/12 */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 winfuncs.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 winfuncs.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 winfuncs.c $Date: 2012/01/10 17:47:21 $ $Revision: 1.8 $ */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993,1996. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -2080,12 +2081,7 @@ if(u.uz.dlevel != x){
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if(
|
||||
WINVERS_AMIV
|
||||
#ifdef REINCARNATION
|
||||
&& !Is_rogue_level(&u.uz)
|
||||
#endif
|
||||
)
|
||||
if(WINVERS_AMIV && !Is_rogue_level(&u.uz))
|
||||
{
|
||||
amii_curs(win,x,y);
|
||||
amiga_print_glyph(win,0,glyph);
|
||||
@@ -2094,7 +2090,6 @@ if(u.uz.dlevel != x){
|
||||
{
|
||||
/* map glyph to character and color */
|
||||
(void) mapglyph(glyph, &och, &color, &special, x, y);
|
||||
/* XXX next if should be ifdef REINCARNATION */
|
||||
ch = (uchar)och;
|
||||
if( WINVERS_AMIV ){ /* implies Rogue level here */
|
||||
amii_curs(win,x,y);
|
||||
@@ -2105,10 +2100,8 @@ if(u.uz.dlevel != x){
|
||||
|
||||
#ifdef TEXTCOLOR
|
||||
/* Turn off color if rogue level. */
|
||||
# ifdef REINCARNATION
|
||||
if (Is_rogue_level(&u.uz))
|
||||
color = NO_COLOR;
|
||||
# endif
|
||||
|
||||
amiga_print_glyph(win,color,ch);
|
||||
#else
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 winkey.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 winkey.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 winkey.c $Date: 2009/05/06 10:48:37 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)winkey.c 3.5 1993/04/02 */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 winmenu.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 winmenu.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 winmenu.c $Date: 2009/05/06 10:48:38 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)winmenu.c 3.5 1996/02/17 */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993,1996. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 winproto.h $Date$ $Revision$ */
|
||||
/* NetHack 3.5 winproto.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 winproto.h $Date: 2012/01/24 04:26:20 $ $Revision: 1.4 $ */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 winreq.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 winreq.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 winreq.c $Date: 2009/05/06 10:48:41 $ $Revision: 1.4 $ */
|
||||
/* SCCS Id: @(#)winreq.c 3.5 1993/04/02 */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 winstr.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 winstr.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 winstr.c $Date: 2009/05/06 10:48:42 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)winstr.c 3.5 1993/04/02 */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 xpm2iff.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 xpm2iff.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 xpm2iff.c $Date: 2009/05/06 10:48:44 $ $Revision: 1.3 $ */
|
||||
/* SCCS Id: @(#)xpm2iff.c 3.5 1995/08/04 */
|
||||
/* Copyright (c) 1995 by Gregg Wonderly, Naperville, Illinois */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
Reference in New Issue
Block a user