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

Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2020-12-02 22:02:30 -05:00
parent cfc4612338 3e7283e8fd
commit a03cce0505
3 changed files with 73 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/fixes37.0
View File

@@ -1,4 +1,4 @@
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.370 $ $NHDT-Date: 1606919254 2020/12/02 14:27:34 $
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.371 $ $NHDT-Date: 1606954304 2020/12/03 00:11:44 $
General Fixes and Modified Features
-----------------------------------
@@ -507,6 +507,10 @@ Qt: don't get stuck in a loop after choosing "play" while the character name
field is empty in the character selection widget
Qt: when a new message is issued, pan the message window to its left edge if
player panned it horizontally then didn't manually scroll it back
Qt: there was no way to enter extended command "#version" by typing; command
name matching was waiting to disambiguate it from "#versionshort"
and the only way to that was to type #version<return> but <return>
explicitly triggered rejection, cancelling '#' processing
Qt: {maybe just Qt+OSX:} when viewing a text window ('V' to look at 'history'
for instance), clicking on [Search], entering a search target in the
resulting popup and clicking on [Okay] or typing <return>, the text

85
src/save.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 save.c $NHDT-Date: 1606919257 2020/12/02 14:27:37 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.163 $ */
/* NetHack 3.7 save.c $NHDT-Date: 1606949327 2020/12/02 22:48:47 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.164 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2009. */
/* NetHack may be freely redistributed. See license for details. */
@@ -21,15 +21,12 @@ int dotcnt, dotrow; /* also used in restore */
#endif
static void FDECL(savelevchn, (NHFILE *));
static void FDECL(savedamage, (NHFILE *));
/* static void FDECL(saveobj, (NHFILE *,struct obj *)); */
/* static void FDECL(savemon, (NHFILE *,struct monst *)); */
/* static void FDECL(savelevl, (NHFILE *, BOOLEAN_P)); */
static void FDECL(saveobj, (NHFILE *,struct obj *));
static void FDECL(savemon, (NHFILE *,struct monst *));
static void FDECL(savelevl, (NHFILE *,BOOLEAN_P));
static void FDECL(savedamage, (NHFILE *));
static void FDECL(save_stairs, (NHFILE *));
static void FDECL(saveobj, (NHFILE *,struct obj *));
static void FDECL(saveobjchn, (NHFILE *,struct obj **));
static void FDECL(savemon, (NHFILE *,struct monst *));
static void FDECL(savemonchn, (NHFILE *,struct monst *));
static void FDECL(savetrapchn, (NHFILE *,struct trap *));
static void FDECL(savegamestate, (NHFILE *));
@@ -214,7 +211,7 @@ dosave0()
getlev(onhfp, g.hackpid, ltmp);
close_nhfile(onhfp);
if (nhfp->structlevel)
bwrite(nhfp->fd, (genericptr_t) &ltmp, sizeof ltmp); /* level number*/
bwrite(nhfp->fd, (genericptr_t) &ltmp, sizeof ltmp); /* lvl no. */
savelev(nhfp, ltmp); /* actual level*/
delete_levelfile(ltmp);
}
@@ -242,9 +239,7 @@ NHFILE *nhfp;
unsigned long uid;
struct obj *bc_objs = (struct obj *)0;
if (!g.program_state.saving)
impossible("savegamestate called when not saving or changing levels?");
g.program_state.saving++; /* caller should/did already set this... */
uid = (unsigned long) getuid();
if (nhfp->structlevel) {
bwrite(nhfp->fd, (genericptr_t) &uid, sizeof uid);
@@ -326,8 +321,11 @@ NHFILE *nhfp;
save_msghistory(nhfp);
if (nhfp->structlevel)
bflush(nhfp->fd);
g.program_state.saving--;
return;
}
/* potentially called from goto_level(do.c) as well as savestateinlock() */
boolean
tricked_fileremoved(nhfp, whynot)
NHFILE *nhfp;
@@ -371,8 +369,10 @@ savestateinlock()
* readable by an external utility
*/
nhfp = open_levelfile(0, whynot);
if (tricked_fileremoved(nhfp, whynot))
if (tricked_fileremoved(nhfp, whynot)) {
g.program_state.saving--;
return;
}
if (nhfp->structlevel)
(void) read(nhfp->fd, (genericptr_t) &hpid, sizeof hpid);
@@ -420,6 +420,7 @@ savestateinlock()
}
g.program_state.saving--;
g.havestate = flags.ins_chkpt;
return;
}
#endif
@@ -537,6 +538,7 @@ xchar lev;
bflush(nhfp->fd);
}
g.program_state.saving--;
return;
}
static void
@@ -598,6 +600,7 @@ boolean rlecomp;
if (nhfp->structlevel) {
bwrite(nhfp->fd, (genericptr_t) levl, sizeof levl);
}
return;
}
/* used when saving a level and also when saving dungeon overview data */
@@ -656,6 +659,32 @@ NHFILE *nhfp;
g.level.damagelist = 0;
}
static void
save_stairs(nhfp)
NHFILE *nhfp;
{
stairway *stway = g.stairs;
int buflen = (int) sizeof *stway;
while (stway) {
if (perform_bwrite(nhfp)) {
if (nhfp->structlevel) {
bwrite(nhfp->fd, (genericptr_t) &buflen, sizeof buflen);
bwrite(nhfp->fd, (genericptr_t) stway, sizeof *stway);
}
}
stway = stway->next;
}
if (perform_bwrite(nhfp)) {
if (nhfp->structlevel) {
buflen = -1;
bwrite(nhfp->fd, (genericptr_t) &buflen, sizeof buflen);
}
}
}
/* save one object;
caveat: this is only for perform_bwrite(); caller handles release_data() */
static void
saveobj(nhfp, otmp)
NHFILE *nhfp;
@@ -694,40 +723,14 @@ struct obj *otmp;
}
/* omid used to be indirect via a pointer in oextra but has
become part of oextra itself; 0 means not applicable and
gets saved/restored whenever any other oxtra components do */
gets saved/restored whenever any other oextra components do */
if (nhfp->structlevel)
bwrite(nhfp->fd, (genericptr_t) &OMID(otmp), sizeof OMID(otmp));
}
}
static void
save_stairs(nhfp)
NHFILE *nhfp;
{
stairway *stway = g.stairs;
int buflen = (int) sizeof (stairway);
int len = 0;
while (stway) {
if (perform_bwrite(nhfp)) {
if (nhfp->structlevel) {
len += sizeof(buflen);
bwrite(nhfp->fd, (genericptr_t) &buflen, sizeof buflen);
len += sizeof(stairway);
bwrite(nhfp->fd, (genericptr_t) stway, sizeof(stairway));
}
}
stway = stway->next;
}
if (perform_bwrite(nhfp)) {
if (nhfp->structlevel) {
buflen = -1;
len += sizeof(buflen);
bwrite(nhfp->fd, (genericptr_t) &buflen, sizeof buflen);
}
}
}
/* save an object chain; sets head of list to Null when done;
handles release_data() for each object in the list */
static void
saveobjchn(nhfp, obj_p)
NHFILE *nhfp;

34
win/Qt/qt_xcmd.cpp
View File

@@ -167,26 +167,40 @@ void NetHackQtExtCmdRequestor::keyPressEvent(QKeyEvent *event)
if (promptstr != "#")
prompt->setText(promptstr.left(promptstr.size() - 1));
enableButtons();
/*} else if (uc == '\r' || uc == '\n'; || uc == ' ') {*/
} else if (uc < ' ' || uc > std::max('z', 'Z')) {
} else if ((uc < ' ' && !(uc == '\n' || uc == '\r'))
|| uc > std::max('z', 'Z')) {
reject(); // done()
} else {
promptstr += QChar(uc); // event()->text()
// <return> is necessary if one command is a leading substring
// of another and superfluous otherwise
boolean checkexact = (uc == '\n' || uc == '\r' || uc == ' ');
if (!checkexact)
promptstr += QChar(uc); // event()->text()
QString typedstr = promptstr.mid(1); // skip the '#'
unsigned matches = 0;
unsigned match = 0;
unsigned matchindx = 0;
for (unsigned i=0; extcmdlist[i].ef_txt; i++) {
if (!interesting_command(i))
continue;
if (QString(extcmdlist[i].ef_txt).startsWith(typedstr)) {
++matches;
if (matches >= 2)
break;
match = i;
QString cmdtxt = QString(extcmdlist[i].ef_txt);
if (cmdtxt.startsWith(typedstr)) {
if (checkexact) {
if (cmdtxt == typedstr) {
matchindx = i;
matches = 1;
break;
}
} else {
if (++matches >= 2)
break;
matchindx = i;
}
}
}
if (matches == 1)
done(match+1);
done(matchindx + 1);
else if (checkexact)
reject();
else if (matches >= 2)
prompt->setText(promptstr);
enableButtons();