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/mac/macfile.c
View File

@@ -228,7 +228,7 @@ macopen(const char *name, int flags, long fileType)
Handle name;
Str255 plnamep;
C2P(plname, plnamep);
C2P(g.plname, plnamep);
name = (Handle)NewString(plnamep);
if (name)
replace_resource(name, 'STR ', PLAYER_NAME_RES_ID,

2
sys/mac/macmain.c
View File

@@ -225,7 +225,7 @@ process_openfile(short src_vol, long src_dir, Str255 fName, OSType ftype)
Handle name = Get1Resource('STR ', PLAYER_NAME_RES_ID);
if (name) {
Str255 save_f_p;
P2C(*(StringHandle) name, plname);
P2C(*(StringHandle) name, g.plname);
set_savefile_name(TRUE);
C2P(fqname(SAVEF, SAVEPREFIX, 0), save_f_p);
force_hdelete(theDirs.dataRefNum, theDirs.dataDirID,

18
sys/mac/macmenu.c
View File

@@ -493,8 +493,8 @@ mac_askname()
SetPortDialogPort(askdialog);
/* Initialize the name text item */
ask_restring(plname, str);
if (plname[0]) {
ask_restring(g.plname, str);
if (g.plname[0]) {
GetDialogItem(askdialog, RSRC_ASK_NAME, &type, &handle, &rect);
SetDialogItemText(handle, str);
}
@@ -502,8 +502,8 @@ mac_askname()
{
Str32 pName;
pName [0] = 0;
if (plname && plname [0]) {
strcpy ((char *) pName, plname);
if (g.plname && g.plname [0]) {
strcpy ((char *) pName, g.plname);
c2pstr ((char *) pName);
} else {
Handle h;
@@ -548,7 +548,7 @@ mac_askname()
if (flags.initrole >= 0)
currrole = flags.initrole;
/* Check for backward compatibility */
else if ((currrole = str2role(pl_character)) < 0)
else if ((currrole = str2role(g.pl_character)) < 0)
currrole = randrole();
/* Initialize the race popup menu */
@@ -735,8 +735,8 @@ mac_askname()
GetDialogItemText(handle, str);
if (str[0] > PL_NSIZ - 1)
str[0] = PL_NSIZ - 1;
BlockMove(&str[1], plname, str[0]);
plname[str[0]] = '\0';
BlockMove(&str[1], g.plname, str[0]);
g.plname[str[0]] = '\0';
/* Destroy the dialog */
for (i = RSRC_ASK_ROLE; i <= RSRC_ASK_MODE; i++) {
@@ -758,14 +758,14 @@ mac_askname()
break;
case 2: /* Debug */
wizard = 1;
strcpy(plname, WIZARD_NAME);
strcpy(g.plname, WIZARD_NAME);
break;
default: /* Quit */
ExitToShell();
}
/* Process the role */
strcpy(pl_character, roles[currrole].name.m);
strcpy(g.pl_character, roles[currrole].name.m);
flags.initrole = currrole;
/* Process the race */

2
sys/mac/macunix.c
View File

@@ -24,7 +24,7 @@ getlock(void)
int fd;
int pid = getpid(); /* Process ID */
Sprintf(lock, "%d%s", getuid(), plname);
Sprintf(lock, "%d%s", getuid(), g.plname);
set_levelfile_name(lock, 0);
if ((fd = open(lock, O_RDWR | O_EXCL | O_CREAT, LEVL_TYPE)) == -1) {