nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Changes needed in various ports due to globals changes.

Browse Source
This commit is contained in:
Bart House
2018-12-24 14:47:51 -08:00
parent 62e1a45b60
commit e5e906dc3b
33 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys/amiga/amirip.c
View File

@@ -186,7 +186,7 @@ time_t when;
SetDrMd(rp, JAM1);
/* Put name on stone */
Sprintf(buf, "%s", plname);
Sprintf(buf, "%s", g.plname);
buf[STONE_LINE_LEN] = 0;
tomb_text(buf);

24
sys/amiga/winami.c
View File

@@ -420,10 +420,10 @@ amii_askname()
amii_getlin("Who are you?", plnametmp);
} while (strlen(plnametmp) == 0);
strncpy(plname, plnametmp, PL_NSIZ - 1); /* Avoid overflowing plname[] */
plname[PL_NSIZ - 1] = 0;
strncpy(g.plname, plnametmp, PL_NSIZ - 1); /* Avoid overflowing plname[] */
g.plname[PL_NSIZ - 1] = 0;
if (*plname == '\33') {
if (*g.plname == '\33') {
clearlocks();
exit_nhwindows(NULL);
nh_terminate(0);
@@ -457,9 +457,9 @@ amii_player_selection()
#if 0 /* Don't query the user ... instead give random character -jhsa */
#if 0 /* OBSOLETE */
if( *pl_character ){
pl_character[ 0 ] = toupper( pl_character[ 0 ] );
if( index( pl_classes, pl_character[ 0 ] ) )
if( *g.pl_character ){
g.pl_character[ 0 ] = toupper( g.pl_character[ 0 ] );
if( index( pl_classes, g.pl_character[ 0 ] ) )
return;
}
#endif
@@ -513,19 +513,19 @@ amii_player_selection()
case VANILLAKEY:
if( index( pl_classes, toupper( code ) ) )
{
pl_character[0] = toupper( code );
g.pl_character[0] = toupper( code );
aredone = 1;
}
else if( code == ' ' || code == '\n' || code == '\r' )
{
flags.initrole = randrole();
#if 0 /* OBSOLETE */
strcpy( pl_character, roles[ rnd( 11 ) ] );
strcpy( g.pl_character, roles[ rnd( 11 ) ] );
#endif
aredone = 1;
amii_clear_nhwindow( WIN_BASE );
CloseShWindow( cwin );
RandomWindow( pl_character );
RandomWindow( g.pl_character );
return;
}
else if( code == 'q' || code == 'Q' )
@@ -545,15 +545,15 @@ amii_player_selection()
case 1: /* Random Character */
flags.initrole = randrole();
#if 0 /* OBSOLETE */
strcpy( pl_character, roles[ rnd( 11 ) ] );
strcpy( g.pl_character, roles[ rnd( 11 ) ] );
#endif
amii_clear_nhwindow( WIN_BASE );
CloseShWindow( cwin );
RandomWindow( pl_character );
RandomWindow( g.pl_character );
return;
default:
pl_character[0] = gd->GadgetID;
g.pl_character[0] = gd->GadgetID;
break;
}
aredone = 1;

2
sys/amiga/winmenu.c
View File

@@ -348,7 +348,7 @@ menu_item **retmip;
nw->Screen = HackScreen;
if (win == WIN_INVEN) {
sprintf(title, "%s the %s's Inventory", plname, pl_character);
sprintf(title, "%s the %s's Inventory", g.plname, g.pl_character);
nw->Title = title;
if (lastinvent.MaxX != 0) {
nw->LeftEdge = lastinvent.MinX;