Commit Graph

749 Commits

Author SHA1 Message Date
nethack.allison
ab03144d1c dead key fix
Apparently, " is part of an accented character in US(international) keyboard
layout (additional character specific to the language of an origin - for
example, left and right double quotation marks). The code did not handle it
too well since it maps to 2 ASCII characters instead of one (one of them is
so called "dead" character). We can ignore the dead character as a
workaround for this problem. The patch is attached.

<Someone>.
2002-02-01 06:43:22 +00:00
nethack.allison
1c562198f5 fix crash during Drop unpaid
The patch is attached. Array bounds went unchecked in
the menu page operations (, \ ~)  This resulted in
memory corruption.

The actual crash depends on your luck actually. It will
only crash if  heap headers are corrupted, otherwise it
can go unnoticed.  When you do "Du," the list page size
is 18 (on my screen) with only 2 items in the menu. The
program assigned count of -1 to 18 items in the array
of 2. Ka-boom.  I put bounds checking code in several
places.  The window size does not have anything to do
with it.

<Someone>.
2002-02-01 00:36:54 +00:00
cohrs
dc6392f77f tty pet hiliting may turn off on color changes
check to turn on hilite must come after check to change color, since
changing color uses term_end_color which may turn off inverse video too
2002-01-31 03:21:39 +00:00
nethack.allison
ab9bfc0489 <email deleted>
bugfix: map position was calculated incorrectly when switching into
fit-to-screen mode.
2002-01-31 00:16:32 +00:00
warwick
769396c648 remove debug message 2002-01-30 03:55:41 +00:00
nethack.allison
ad2e81c296 Fixes:
- B1026  [confirmed] win32: setting multiple options
- bugfix: menu: set focus to the item and make it visible when it is
selected  with accelerator key.
- increased menu font size by 1 point
- layout the main window on WM_MOVE message so the menu windows stays with
the main window  (it was not changing the location before)
- got rid of WinCE specific define (ARM)
- handle all keyboard input via WM_KEYDOWN instead WM_CHAR

Files affected: config1.h mhmsg.h mhmain.c mhmenu.c mswproc.c resource.h
winhack.rc

Notes:
 That overrides Yitzhak's mhmenu patch - I don't like the menu prompt on the
title bar since it can be null and in most cases it is. It looks much better
as a header column in the list and is displayed only if present.

I moved ARM-related (processor) defines to wceconf.h  You cannot undef ARM
before windows.h is processed - ARM version won't compile.

.rc files are generated by IDE - you cannot edit them directly or your
changes will be gone next time the file is saved. If anything needs to be
added to winhack.rc file manually it has to be marked by the following
defines or via menu option View->Resource Includes:
#define APSTUDIO_READONLY_SYMBOLS
...
#undef APSTUDIO_READONLY_SYMBOLS
2002-01-27 23:28:02 +00:00
nethack.allison
6e173ddf5f win32gui patches (from Yitzhak)
[...]
One of them deals with the patch you just sent, that changes the name but
does so more extensively, particularly, also in the Save dialog in
mhmain.c.  Another is one of the changes to winhack.rc to make it compile
under Borland.

This also (beyond patches I sent): fixes no Options prompt bug, and fixes
up the menu bar (which I broke in one of my patches).

Tested on msc/bcc tty/win makefiles and vc ide.
2002-01-27 21:37:31 +00:00
nethack.allison
179932310b invisible things due to black colour
Patch to fix invisible orcish helmets, orcish daggers,
mimic (]), ants etc.
2002-01-27 21:02:28 +00:00
nethack.allison
f571601bc2 Change title to prevent Beta tester complaint. 2002-01-27 20:21:20 +00:00
nethack.allison
2457431a71 found another popd command. 2002-01-27 15:19:36 +00:00
nethack.allison
7d06212990 Fix B2001
B2001	<Someone>	[reported]	win32?: giant ant is black square

	Where is the open doorway with the giant ant standing in it?
	There used to be a closed door there, if I recall correctly.
	[now there is just a black square]
	I'm saving the level files at this point, and I will be saving
	the game after I did that, in case you're interested in any save
	files.
2002-01-27 14:14:14 +00:00
nethack.allison
359957ddbc One of the beta testers asked if the win32 scrolling
offset could be configured.  This allows it to be
set from the config file using:
	win32_map_cliparound_margin.
2002-01-27 04:36:39 +00:00
nethack.allison
0ca15b16c0 another follow-up for mhmap.c
Oops, it should have been VERSION_MAJOR < 4,
VERSION_MINOR < 4 and PATCHLEVEL < 2
2002-01-27 03:29:11 +00:00
nethack.allison
fc0e365c2f follow-up for mhmap.c 2002-01-27 03:11:12 +00:00
nethack.allison
775b022819 Change mhmap to use mapglyph() 2002-01-27 02:52:33 +00:00
nethack.allison
7f7c1ff26b FIXES:
- added counting to the menu window. I changed the way it works in the TTY
port though  ("you hear the rumble of distant thunder..." :)  The count
applies to the currently selected item instead of being aplied to the item
to be selected  (in other words a12 instead of 12a). It works better this
way in the graphical port since there is a notion of current menu item.
 I also notes that the count is ignored for PICK_ONE menu - is this by
design?

- somebode mention that text is not scrollable by default - this is fixed.

- fixed player selection dialog to use initXXXX options

-----------------------
B1028 [reported] win32: popup window is too short
The text in the popup window's top line "What do you want to
call the ..." is cut off. Could the window be bigger, so you
can read the entire line?

Fixed.

---------------------
B1027 [reported] win32: select via traditional class char
In a shop (and perhaps elsewhere), I can autoselect a class of
items to drop: a for all types, b for coins, c for weapons, ...,
A for every item, B for blessed items, ... I like the new
possibilities, but I would like to be able to use the old way of
using ! for potions, ) for weapons, etc., as well.

Fixed.

---------------------
B1026 [reported] win32: setting multiple options

I want to set packorder and pickup_types. The first comes up
first, and I type in the order. Then comes the second, without
any hint what is asked of me. A little explanation here would
be appropriate, like "pick up what things automatically?" or
somesuch. When more than one option is set where extra input
is required, some explanation is useful.

Looking into. Apparently something  end_menu() call is ignored by nethackw.

---------------------
B1025 [reported] win32: menu navigation
I press O. Now, when I press "a" to turn on "autodig", not only
is the mark set at "a", but there also appears a dotted
rectangle around option "A" (capitalized). Shouldn't this
rectangle also appear at "a"? Pressing "a" repeatedly toggles
the checkmark, but the rectangle switches between "A" and "a".
My CAPS LOCK is not set. The same goes for B, C, D, ... N,
by the way. Pressing "A" works the other way around: the first
press checks "A" and "rectangles" "a", the next unchecks "A"
and rectangles "A" as well.

Fixed.

---------------------
B1024 [reported] win32: no text in final window
After I clicked away the last screen with information
(challenges, I believe it was), I got an empty text screen, as
big as my screen, without any content. It looked like the text
screens that appear on the right, only it was larger and had
only a large OK button over the full width of the window, and
no cancel button. Why this window?

Fixed. The program did not set window text for RIP window.

---------------------
B1010 [known issue] win32: cosmetic
When I get my list of spells, the columns aren't properly
aligned: if the spell name is longer, the rest of the line
shifts right.

Fixed. Fixed-pitch font is used for menu window.

---------------------
B1004 [reported] win32: numeric keyboard Del/.-key
The Del/.-key on my numeric keyboard doesn't make me rest a turn

Fixed. Added rest on Del.

---------------------
B1003 [reported] win32: focus
When the window has the focus, the window bar isn't highlighted.

This is by design. Menu and text widnows are popup and the main
window is disabled when they are up.
2002-01-25 07:19:21 +00:00
nethack.allison
7406ad3855 Windows Me and Windows XP. 2002-01-25 01:54:44 +00:00
nethack.allison
f9fd221e5f Remove extraneous line from petmark.uu 2002-01-24 23:55:45 +00:00
warwick
654a297052 MacOSX/Qt system tweaks
These changes clean up build warnings and allow the resulting "NetHack"
Application icons to be dragged around freely in the Finder, as is expected
for Mac apps.
2002-01-24 05:49:04 +00:00
warwick
dc493d6af2 Enough MacOS X documentation to answer FAQs. 2002-01-23 07:57:11 +00:00
cohrs
a80a7ab939 X11 buffer overflow avoidance
Don't overflow the buffer passed to getlin().
2002-01-23 06:21:58 +00:00
nethack.allison
6f45c9c5ff Fix some Guidebook mistakes (tex dungeoneer table for one)
Also shorten up levcomp.dsp lines
2002-01-23 04:35:39 +00:00
warwick
fe5a464dc3 Always use maximized window in Qt windowport. 2002-01-23 03:03:37 +00:00
nethack.allison
9d0a5acab1 Extraneous file removed as I head out the door of the office. 2002-01-23 01:21:54 +00:00
warwick
93c5ecf3ea Qt GUI cleanup
Use "Alt+X", not "Alt-X".
This is actually *necessary* on MacOSX.
2002-01-23 01:02:37 +00:00
nethack.allison
f48b00f5f5 It was ignoring the command line parameters
because there was an extraneous argv[1] that was
a repeat of the module name, but in quotation
marks.  The processing in pcmain stops on the first
argument that doesn't start with '-' so my other
arguments got ignored.

 argv[0] 0x00b40800 "C:\test\binary\nethackw.exe"
 argv[1] 0x00b40878 ""C:\test\binary\nethackw.exe""
 argv[2] 0x00b408f0 "-uwizard"
 argv[3] 0x00b40938 "-D"
2002-01-23 00:00:02 +00:00
nethack.allison
1b91f47b4c Remove all uses of pushd/popd
in case someone  wants to build on Windows98 where they don't exist.
They are available in NT or Windows 2000 only (and possibly XP).
2002-01-22 22:54:54 +00:00
nethack.allison
9dd3932af6 rename winhack.dsp to nethackw.dsp
Adjust Install.nt to match.
Modify Makefile.nt to use ../binary directory for output by default,
just like the windows version does.
2002-01-22 13:02:13 +00:00
nethack.allison
6f645f89c0 rename winhack.dsp to nethackw.dsp
Actually removes winhack.dsp and adds nethackw.dsp.
2002-01-22 12:55:49 +00:00
warwick
3c0c8b0516 Fix some crashes in unused tile editor.
tileedit is the program I use to edit tile files (directly).
2002-01-22 08:44:37 +00:00
warwick
dab3df306f Remove win/Qt/nethack.png
Obsoleted by nhsplash.xpm (a text format). The binary still has more detail,
but until someone has a use for it, I'll keep it aside.
2002-01-22 08:41:57 +00:00
warwick
5861942805 Doc fix for Install.Qt
(USER_SOUNDS now undeffed automaticaaly for old versions)
2002-01-22 08:39:00 +00:00
nethack.allison
2d5361e389 From <Someone>,
Fixes:
- menu shortcuts implemented
- most windows close on space (except for menus with
  PICK_ANY style)
- "hilite_pet" option is implemented
- map scrolling is improved somewhat (it now scrolls if
  the char is within 5 spaces from the edge of the map -
  configurable by #define CLIPAROUND_MARGIN)
- added 3  winhack-specific options:

 win32_map_mode:[tiles|ascii4x6|ascii6x8|ascii8x8
                 |ascii16x8|ascii7x12|ascii8x12|ascii15x12
                 |ascii12x16|ascii10x18|fit_to_screen]=20
 win32_align_status:[left|top|right|bottom]
 win32_align_message:[left|top|right|bottom]

Note: aligning status window to left or right edge of the screen does
not look good.
2002-01-22 00:30:58 +00:00
nethack.allison
5dd46c18ae Add petmark.uu 2002-01-22 00:29:35 +00:00
warwick
751cbf93ae Tile un-placehold 2002-01-21 10:41:42 +00:00
warwick
75305dc3b3 Qt compatibility fixes
Fixes for Qt version 2.0 (old).
2002-01-21 05:17:40 +00:00
warwick
58b5454a35 Player selection fix on Qt windowport.
Prompt for player details even if gender or alignment is unspecified.
2002-01-21 05:15:06 +00:00
nethack.allison
fb2f6753d6 From <Someone>
This was caused by  character set incompatibility between message and map
windows. Apparently, Nethack is using  IBM character set (CP 437) but fonts
were create for Windows ANSI codepage. I fixed most of it by changing
character set of the fonts except for the Rogue level. I had to make changes
to src/drawing.c for Rogue level since most of Windows fonts are not capable
of displaying control characters (char. code<0x20)
And of course, disabling IBMGraphics option fixes it all.
2002-01-18 19:14:13 +00:00
nethack.allison
2fef55edc0 Add tile generation sub-project to win32 2002-01-18 12:57:06 +00:00
warwick
d2c3d25462 (Qt) Old version support
Workarounds for Qt 2.1.0beta4 (?)
2002-01-18 08:47:28 +00:00
warwick
72879f0584 Change Mines tiles.
This is a long-overdue change to the Mines wall tiles. I was never happy
with the Mines walls being just brown normal-walls.
2002-01-18 08:16:07 +00:00
nethack.allison
35b46238fc From <Someone>: a couple of improvements to the user interface:
- fixed charset value for fonts
- wrap long lines in the message window (there is a #define to switch it on and off)
- multiple display modes for map
2002-01-18 00:42:04 +00:00
warwick
6ddd18069e Splash-screen fixes:
- change "Warwick Allison + DevTeam" to just "DevTeam".
  - fixes for Qt 3.0.
2002-01-17 06:40:41 +00:00
warwick
f86ab80cfb Changes work with Qt 3.0 (basically just use obsoleted QTableView class
until I get around to replacing it properly).
2002-01-17 04:10:23 +00:00
warwick
5bf430c3d3 Ignore Alt-key navigation to menubar, as it's annoying when you
use Alt-Direction to move around.
2002-01-16 03:09:12 +00:00
nethack.allison
59b7cb4be4 Michael Allison wrote:
> There has been some feedback from others on the development team
> around the tiles:
>   "The Rogue Level should ideally be text-mode. It freaks out the
>    tiled-version-only players when they first get there, but that
>    makes it a good reminder of NetHack's roots."
>
> The other supported tiled ports work this way too.  They display
> regular ASCII characters on the Rogue level, just like Rogue did.

-Adds Rogue-level ascii support.
-Also removes unicode support.

Some other build script tweaks as well.

M. Allison
2002-01-14 12:36:09 +00:00
nethack.allison
50b24456cd > There is a tile in monster.txt that is still
> marked as "placeholder."  It is the tile for Neferet the Green,
> a green-colored wizard for the updated Wizard's quest.
It's not great, but the best I can do without her looking like some
sort of Zombie (most of the tiles try to follow rules - dark-green=zombie,
green=gnome, blue=dwarf, etc. in order that the player can recognize the
patterns, rather than concentrating too much on the details).
2002-01-14 11:43:13 +00:00
nethack.allison
5e1809b939 For his new port contribution, add <Someone> to the dungeoneer list,
and the history info.

Also fix a typo in the win32 stuff (cosmetic only).

M. Allison
2002-01-14 01:44:17 +00:00
nethack.allison
cb6f682e9c more nt 2002-01-13 21:58:30 +00:00
nethack.allison
37cb3b1d3d More NT build changes 2002-01-13 21:22:51 +00:00