Commit Graph
5240 Commits
Author SHA1 Message Date
nhmall bfb4ce4dd6 beta complaints 1 2015-06-12 12:59:30 -04:00
nhmall d40b9b22de Merge branch 'master' into win32-x64-working 2015-06-12 07:12:10 -04:00
nhmall 23cbe049be some bk_glyph code iflags.use_background_glyph only 2015-06-12 07:10:46 -04:00
nhmall 017e826837 Merge branch 'master' into win32-x64-working
Conflicts:
	src/options.c
2015-06-11 22:24:42 -04:00
PatR 0bf3231f29 role selection: priest/priestess' prompt
Change "Shall I pick your priest/priestess' race, gender, ..." prompt
to "... priest/priestess's ...".

Unfortunately that makes it long enough to push the cursor onto the
next line for basic 80 column display.  If caveman/cavewoman's wasn't
already longer I think I would have left the clumsier phrasing/spelling.
2015-06-11 18:47:57 -07:00
PatR af54125c22 characteristics disclosure
Change end of game disclosure's display for strength, dexterity, &c to
always show the maximum possible value instead of only when the final
value was less than maximum.  For both end of game and ^X, change the
description from "limit" to "innate limit" if the current value exceeds
limit due to worn items (gauntlets of power, +N ring of adornment, &c).
2015-06-11 18:19:09 -07:00
nhmall f2daf4f7f8 punctuation in failed messages 2015-06-11 21:11:41 -04:00
PatR 12c013ee28 more menustyle
Make the list of menustyle values in the game match their order in the
revised documentation:  traditional, combination, full, partial.
2015-06-11 14:09:17 -07:00
PatR 9bf715c815 menustyle documentation
Reorder the description of the values for the menustyle option, swapping
'full' and 'partial' since 'full' is closer in operation to 'combination'.
2015-06-11 13:35:41 -07:00
Pasi Kallinen 4ead443847 Remove unused variable 2015-06-11 19:36:08 +03:00
Pasi Kallinen 183bf0fbf2 Fix unused variable thinko 2015-06-11 19:34:49 +03:00
nhmall 2e3a109826 alter beta identifier 2015-06-11 08:25:56 -04:00
nhmall b2a1d142ab back as it was except when iflags.use_background_glyph is set 2015-06-11 08:19:29 -04:00
nhmall 30db04802c add flag to allow conditional exec of related
Changes to be committed:
	modified:   include/flag.h
	modified:   src/display.c
	modified:   src/options.c
2015-06-11 08:14:06 -04:00
nhmall 379f8abb54 stop light penetration on sokoban, gehennom tiles
Changes to be committed:
	modified:   win/share/monsters.txt
	modified:   win/share/objects.txt
	modified:   win/share/other.txt
2015-06-11 07:27:08 -04:00
Alex Kompel 6a04c7ff18 win32_gui: "no flickering" patch broke text mode 2015-06-10 23:33:22 -07:00
Alex Kompel 979cf90a0d win32_gui: correctly handle NO_GLYPH as backgroung glyph 2015-06-10 23:12:18 -07:00
Alex Kompel ad654cdc61 win32_gui: flicker mitigation
- do not invalidate window area if tile has not actually changed
   - do not erase backround when invalidating the tile
   - use NO_GLYPH for uninitialized map areas (as opposed to -1)
2015-06-10 19:18:56 -07:00
nhmall 3b158eaa4a Merge branch 'master' into win32-x64-working 2015-06-10 21:11:15 -04:00
nhmall a3b1833ab9 menucolors
Error reported in display.c in current master code is gone,
but the menucolors stuff generated the following warnings when TEXTCOLOR wasn't defined.

..\win\tty\wintty.c(1688) : warning C4013: 'term_start_color' undefined; assuming extern returning int
..\win\tty\wintty.c(1711) : warning C4013: 'term_end_color' undefined; assuming extern returning int
2015-06-10 21:07:19 -04:00
nhmall 0fd193838a punctuation in dat/tribute 2015-06-10 20:52:03 -04:00
nhmall 00d25adab2 actual field is always around anyway
Changes to be committed:
	modified:   include/flag.h
2015-06-10 20:48:29 -04:00
nhmall 4c3abcbd11 more tribute quotes
Changes to be committed:
	modified:   dat/tribute
2015-06-10 20:36:17 -04:00
PatR c9013bdc6a tribute passage 'summary'
When reading a passage from a tribute novel, put the final attribution
line "[$TITLE, by Terry Pratchett]" into message history, comparable to
the summary line for deliver-by-window quest messages.
2015-06-10 16:23:19 -07:00
nhmall 81d7d4ab22 Merge branch 'master' into win32-x64-working
Conflicts:
	src/display.c
2015-06-10 19:19:37 -04:00
nhmall f446e1477c Files didn't match sys/unix/hints
Changes to be committed:
	modified:   Files
2015-06-10 19:15:36 -04:00
nhmall cff16290af Merge branch 'macosx-build' 2015-06-10 18:57:23 -04:00
nhmall 18e7d6ff62 another punctuation bit 2015-06-10 08:10:56 -04:00
nhmall 8032eb111f punctuation bit 2015-06-10 08:09:03 -04:00
nhmall 4b79a03125 more quotes from books without quotes 2015-06-10 07:56:12 -04:00
nhmall a0f769ae56 commit out NO_GLYPH return until win32 supports it
Changes to be committed:
	modified:   src/display.c
2015-06-10 04:35:05 -04:00
nhmall b51b8d072d Merge branch 'background_tiles' into win32-x64-working
Conflicts:
	src/display.c
2015-06-10 04:18:44 -04:00
nhmall a848660a38 more background tile work
- newsym() should always show glyph even if foreground glyph has not changed
- get_bk_glyph should operate on type of floor not on type of glyph.
2015-06-10 04:13:13 -04:00
PatR 1592cb3d10 tribute: The Last Hero
Flesh out _The_Last_Hero_.  Due to its publishing history (no ordinary
paperback, some lists of "other books by this author" miscategorize it
as being co-written by the illustrator) it's most likely not as widely
read as the other Discworld books.
2015-06-10 00:54:07 -07:00
nhmall b9ab9aae2a use NO_GLYPH as an indicator to ignore background glyph
Changes to be committed:
	modified:   doc/window.doc
	modified:   src/display.c
2015-06-09 21:56:28 -04:00
nhmall 5e6d5a8766 Merge branch 'master' into win32-x64-working
Conflicts:
	src/display.c
2015-06-09 21:41:49 -04:00
nhmall 721a0796ea Merge branch 'master' into background_tiles
Conflicts:
	src/display.c
2015-06-09 21:38:21 -04:00
nhmall b2f9ba5de3 default to original background
Changes to be committed:
	modified:   src/display.c

The work for getting this working fully is now moving to the background_tiles branch.
In master, we just return the standard lit room tile for now, no change in behavior.
No ports utilize the new parameter as yet.
2015-06-09 21:33:08 -04:00
Pasi Kallinen b4cc349a46 X11: Hilight piles of objects 2015-06-09 19:59:38 +03:00
Alex Kompel 403f6e3081 win32_gui: improve logDebug performance 2015-06-09 08:53:21 -07:00
Alex Kompel afa0e95e66 win32_gui: implement background glyph rendering
try to use system TrasnparentBlt (or not)
2015-06-09 08:34:11 -07:00
Pasi Kallinen e15f7be909 Add the mapglyph special flags to window doc 2015-06-09 17:46:30 +03:00
Pasi Kallinen 174e6f47b3 TTY: Hilight piles of objects
Add MG_OBJPILE flag, which windowports can use to check if a location
has more than one object stack. If use_inverse is on, TTY will use
inverse to show such piles.  If a boulder is the topmost item on a pile,
then the object pile flag is not used; mainly because boulders are "solid",
boulders dropped by monsters are nearly always over other objects, and so
that special levels such a Sokoban can "hide" items under the boulders.

TODO: a "pilemark", analogous to "petmark", perhaps a green plus sign,
which can be used by windowports with tiles.
2015-06-09 16:54:48 +03:00
nhmall 580d98b473 many contributors to this please
Changes to be committed:
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
2015-06-09 05:29:25 -04:00
nhmall 2601583121 more refinement of background glyph
Changes to be committed:
	modified:   src/display.c
2015-06-09 04:54:19 -04:00
nhmall cdfbba20bd be more discerning on the backgrounds presented
Changes to be committed:
	modified:   src/display.c
2015-06-09 04:35:05 -04:00
nhmall d5631bc448 Merge branch 'master' into AlexK-misc 2015-06-08 21:11:54 -04:00
nhmall 85e80f1e3e provide bkglyphs
Changes to be committed:
	modified:   src/display.c
2015-06-08 20:10:43 -04:00
nhmall c3a77914a9 Modify the window interface for print_glyph
Changes to be committed:
	modified:   doc/window.doc
	modified:   include/qt_win.h
	modified:   include/trampoli.h
	modified:   include/winX.h
	modified:   include/wingem.h
	modified:   include/winprocs.h
	modified:   include/wintty.h
	modified:   src/display.c
	modified:   src/windows.c
	modified:   sys/amiga/winami.p
	modified:   sys/amiga/winfuncs.c
	modified:   sys/amiga/winproto.h
	modified:   sys/wince/mswproc.c
	modified:   sys/wince/winMS.h
	modified:   win/Qt/qt_win.cpp
	modified:   win/X11/winmap.c
	modified:   win/chain/wc_chainin.c
	modified:   win/chain/wc_chainout.c
	modified:   win/chain/wc_trace.c
	modified:   win/gem/wingem.c
	modified:   win/gem/wingem1.c
	modified:   win/gnome/gnbind.c
	modified:   win/tty/wintty.c
	modified:   win/win32/mswproc.c
	modified:   win/win32/winMS.h

print_glyph now takes a second parameter.

Tiles on tiled ports always looked odd on places like the plane of air
where the background color of the tile didn't match the general background
of the surrounding area.

3.6 made that even worse and more glaringly noticeable with the introduction
of darkened room tiles.

The code to actually send something useful through the new parameter
for window ports to take advantage if they want will follow.
2015-06-08 19:37:26 -04:00
Pasi Kallinen 9070d129de Use MAKE variable instead of hardcoding make 2015-06-06 20:25:32 +03:00