Commit Graph

5108 Commits

Author SHA1 Message Date
nhmall
07f6dec128 try to add pilemark support
Changes to be committed:
	modified:   Files
	modified:   sys/winnt/Makefile.msc
	modified:   win/win32/mhmap.c
	new file:   win/win32/pilemark.uu
	modified:   win/win32/resource.h
	modified:   win/win32/winMS.h
	modified:   win/win32/winhack.rc
2015-06-14 18:33:32 -04:00
nhmall
2cf54119a9 Merge branch 'master' into win32-x64-working 2015-06-14 16:46:41 -04:00
nhmall
4c3fca4367 tribute formatting cleanup and additions
Changes to be committed:
	modified:   dat/tribute

I've also added some of Boudewijn's suggestions and
added his name in a comment for easy reference
when validating the content agains the book.
2015-06-14 15:57:19 -04:00
Pasi Kallinen
e0cf17e660 Fix the shapechanger fix again 2015-06-14 11:48:10 +03:00
Pasi Kallinen
5d3ca5bb35 Ensure there are candles in Vlad's tower 2015-06-14 10:58:55 +03:00
Pasi Kallinen
0c3ee5025e Shapechangers got a completely random form
mtmp->cham was NON_PM, which select_newcham_form interpreted as a completely
random form.  This also resulted Vlad getting a random shape, and not getting
the Candelabrum, making the game unwinnable.
2015-06-14 10:40:25 +03:00
nhmall
87c22180f2 rolling back after criticism of approach 2015-06-13 22:31:31 -04:00
nhmall
fc2ea1bf93 more tribute fixup
One book had the top and bottom credits.
2015-06-13 21:20:08 -04:00
nhmall
8b9667e8fb typo on quote count for Reaper Man
Changes to be committed:
	modified:   dat/tribute
2015-06-13 21:07:28 -04:00
nhmall
13bc96ca98 avoid error
The presence of [...] in middle of tribute quote
wasn't handle correctly in the new formatting code.
2015-06-13 20:59:40 -04:00
nhmall
fb09ce0a22 more quotes - Reaper Man
Changes to be committed:
	modified:   dat/tribute
2015-06-13 19:46:06 -04:00
nhmall
58f3611ec1 Ensure more consistent formatting of tribute passages
Changes to be committed:
	modified:   src/files.c
2015-06-13 19:18:01 -04:00
nhmall
e3850d8606 start new tribute content handling 2015-06-13 09:33:40 -04:00
nhmall
37f0eafa93 support for link-time option in #version
Changes to be committed:
	modified:   src/version.c
	modified:   sys/share/cppregex.cpp
	modified:   sys/share/pmatchregex.c
	modified:   sys/share/posixregex.c
	modified:   util/makedefs.c

Some options in 3.6.0 are determined by what you link with.
The choice of regex support is one.
Let #version show that linked option along with the compile-time options.
2015-06-12 19:23:18 -04:00
nhmall
5e913f90f8 Makefile typos in sys/winnt/Makfile.msc 2015-06-12 15:42:41 -04:00
Pasi Kallinen
6439e46413 Copypaste mistake: Message types, not menu colors. 2015-06-12 20:32:35 +03:00
nhmall
f93059bcb6 beta complaint 2 (again) 2015-06-12 13:11:10 -04:00
nhmall
37643001b6 beta complaint 2 2015-06-12 13:08:51 -04:00
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