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

<email deleted>

Browse Source 
If race is set to random and role is set to something
specific, the Qt interface sometimes hangs trying to
determine an appropriate race/role.

This patch that fixes the problem, and makes 'random'
work more appropriately.
This commit is contained in:
warwick
2002-11-27 04:37:12 +00:00
parent bc88e8440e
commit 876fb8aca1
3 changed files with 1144 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
win/Qt/Info.pli Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.9">
<dict>
<key>CFBundleIconFile</key>
<string>nethack.icns</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>Created by Qt/QMake</string>
<key>CFBundleSignature</key>
<string>ttxt</string>
<key>NOTE</key>
<string>Please, do NOT change this file -- It was generated by Qt/QMake.</string>
</dict>
</plist>

1112
win/Qt/nhicns.uu Normal file
View File

File diff suppressed because it is too large Load Diff

23
win/Qt/qt_win.cpp
View File

@@ -1083,14 +1083,18 @@ NetHackQtPlayerSelector::NetHackQtPlayerSelector(NetHackQtKeyBuffer& ks) :
// Randomize race and role, unless specified in config
int ro = flags.initrole;
if (ro == -1) {
if (ro == ROLE_NONE || ro == ROLE_RANDOM) {
ro = rn2(nrole);
fully_specified_role = FALSE;
if (flags.initrole != ROLE_RANDOM) {
fully_specified_role = FALSE;
}
}
int ra = flags.initrace;
if (ra == -1) {
if (ra == ROLE_NONE || ra == ROLE_RANDOM) {
ra = rn2(nrace);
fully_specified_role = FALSE;
if (flags.initrace != ROLE_RANDOM) {
fully_specified_role = FALSE;
}
}
// make sure we have a valid combination, honoring
@@ -1098,21 +1102,26 @@ NetHackQtPlayerSelector::NetHackQtPlayerSelector(NetHackQtKeyBuffer& ks) :
bool choose_race_first;
#ifdef QT_CHOOSE_RACE_FIRST
choose_race_first = TRUE;
if (flags.initrole != -1 && flags.initrace == -1) {
if (flags.initrole >= 0 && flags.initrace < 0) {
choose_race_first = FALSE;
}
#else
choose_race_first = FALSE;
if (flags.initrace != -1 && flags.initrole == -1) {
if (flags.initrace >= 0 && flags.initrole < 0) {
choose_race_first = TRUE;
}
#endif
while (!validrace(ro,ra)) {
fully_specified_role = FALSE;
if (choose_race_first) {
ro = rn2(nrole);
if (flags.initrole != ROLE_RANDOM) {
fully_specified_role = FALSE;
}
} else {
ra = rn2(nrace);
if (flags.initrace != ROLE_RANDOM) {
fully_specified_role = FALSE;
}
}
}