Commit Graph

39 Commits

Author SHA1 Message Date
cohrs
559be58c21 conflicting delayed killers
Introduce a new set of functions to manage delayed killers in the trunk, used
in addressing the various reports of delayed killer confusion.  Since existing
delayed killers are related to player properties, the delayed killers are
keyed by uprop indexes.  I did this to avoid adding yet another set of
similar identifiers.
- the new delayed_killer() is used for stoning, sliming, sickness, and
delayed self-genocide while polymorphed.  Some other timed events don't
use it (and didn't use the old delayed_killer variable) because they
use a fixed message when the timeout occurs.
- A new data structure, struct kinfo, is used to track both delayed and
immediate killers.  This encapsulates all the info involved with
identifying a killer.  The structure contains a buffer, which subsumes the
old killer_buf and several other buffers that didn't/couldn't use killer_buf.
- the killer list is saved and restored as part of the game state.
- the special case of usick_cause was removed and a delayed killer list
entry is now used in its place
- common code dealing with (un)sliming is moved to a new make_slimed function
- attempted to update all make dependencies for new end.c -> lev.h
dependency, sorry if I messed any up
2003-09-29 19:24:20 +00:00
kmhugo
1282e5c623 Synch recent 3.4.2 changes to main trunk
This is merely a synchronization of recent changes for the
Macintosh Carbon port, which were committed to the 3.4.2
branch, to the main trunk.
2003-08-30 00:45:58 +00:00
nethack.allison
99bcdf6a4e expand wincap options to second field
<Someone> wishes to add a couple of new options to the wince port ("run fullscreen" and "do not use CE software keyboard").

The wincap field was full, so this adds a second field for
additional options.
2003-07-17 01:35:31 +00:00
kmhugo
742fc6525b Mac documentation tidbit
Fix a documentation inaccuracy pointed out by Michael.  Intended for
the 3.4.0 source tarball, even though it was submitted after the
code freeze.  Does not affect compiled binaries.
2002-03-20 13:48:22 +00:00
kmhugo
2962e623d0 Mac port update
* Update Mac port to new options system.
* Update Mac-specific documentation.
* Remove hardcoded version strings.
* Remove obsolete popup_dialog.
2002-03-20 06:33:45 +00:00
kmhugo
07512a8d56 Mac resource file update
Changes to the resource file used for the Macintosh port.
Specifically, remove hardcoded version string and popup dialogs.

This is formatted with BinHex so it can be stored on non-Mac
systems without losing the resource fork.  Though it is text,
it is not intended to be human-readable.
2002-03-20 06:30:23 +00:00
dean
d4d051af87 MPW #pragma unused updates 2002-03-09 05:08:27 +00:00
dean
45160f1b46 Remove unused code, fix comment. 2002-03-01 05:29:48 +00:00
nethack.allison
742e1e8c90 3.3.2 to 3.4.0 2002-02-04 16:11:00 +00:00
nethack.allison
cb6a93641b Adjust window-port related option processing
to allow common parsing in the core, and direct access to the
results by the window port.

Notes:

o Adds a new field, wincap, to the window_procs
structure for setting bits related to the preference
features that the window port supports.  This allows
run-time determination of whether a particular option
setting is applicable to the running window port.  A
window-port is free to support as many, or as few,
of the available options as it wants.  Ensure that
only the ones supported have their corresponding bit
set in window_proc.wincap. [see chart in
doc/window.doc for help with that.]

o The settings I stuck into wincap for each window
port are almost certainly not accurate, so each port
team should review them.  You should only include
the ones that you will actually react to and make
adjustments for if the user changes that option.
Without the setting in wincap, the option won't even
show up in the 'O'ptions menu.

o preference_update() added to the window-port
interface, so that the window-port can be notified
if an option of interest (an option with its
corresponding bit set in wincap field) is
changed.

o provided a genl_preference_update() routine in
windows.c and used it for all the existing
window ports since they don't have a functional
one of their own yet.

o this messes around heavily with iflags and the options
arrays in options.c

o I hope I didn't break any port's existing code. I
tried not to.  The Mac however, in particular, should
be looked at because it suffered a namespace collision
with what I was working on around fontname.  It had
Mac specific font stuff in options.c. Please test
the Mac.
2002-02-03 05:31:47 +00:00
kmhugo
ecc3bc422c Macintosh getlin and BUFSZ
Ensure getline() returns no more than BUFSZ characters
on the Macintosh port.
2002-02-02 05:34:17 +00:00
warwick
dc493d6af2 Enough MacOS X documentation to answer FAQs. 2002-01-23 07:57:11 +00:00
kmhugo
bd37d68a51 Mac docs update
This is mostly to test the commit scripts...
2002-01-23 06:41:34 +00:00
kmhugo
87843397c3 Macintosh port update
Several long-awaited updates for the Macintosh port, by Dean
Luick and myself.  This set affects Mac-only files.

* Update the support for MPW compilers.
* Use new system call names provided for in the latest Apple
  Universal Headers.
* Tune up some of the includes for CodeWarrior.
* Define YY_NEVER_INTERACTIVE for the dungeon and level compilers.
* Remove pointless debugging code.
* Clean up some unterminated comments.
2002-01-10 06:53:52 +00:00
jwalz
b43a9990df *** empty log message *** 2002-01-05 21:05:56 +00:00
jwalz
29d2c4e127 *** empty log message *** 2002-01-05 21:05:56 +00:00
jwalz
ccc40f9965 *** empty log message *** 2002-01-05 21:05:56 +00:00
jwalz
716abebb55 *** empty log message *** 2002-01-05 21:05:56 +00:00
jwalz
c1c075ad0a *** empty log message *** 2002-01-05 21:05:56 +00:00
jwalz
49ce683975 *** empty log message *** 2002-01-05 21:05:56 +00:00
jwalz
679a99a721 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
15f97823a5 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
0ad68f8d57 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
2d4731dab9 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
d86d630bac *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
3fc8eb5fef *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
46ec9feac7 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
bfce083291 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
3e4d5cf1a6 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
ce7d10522b *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
352a97e833 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
377d334c69 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
5f6efd8a72 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
633abf9875 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
21b014565d *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
97dffc5ef2 *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
6bb05b31ac *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
93f98fbb1f *** empty log message *** 2002-01-05 21:05:55 +00:00
jwalz
9508285580 *** empty log message *** 2002-01-05 21:05:55 +00:00