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

Merge branch 'master' into win32-x64-working

Browse Source 
Resolved Conflicts:
	src/cmd.c
	src/mkobj.c

 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   dat/Priest.des
	modified:   dat/Rogue.des
	modified:   dat/Valkyrie.des
	modified:   dat/Wizard.des
	modified:   dat/gehennom.des
	modified:   src/cmd.c
	modified:   src/mkobj.c
	modified:   src/steal.c
	modified:   sys/share/lev_yacc.c
	modified:   util/lev_comp.y
This commit is contained in:
nhmall
2015-05-02 13:53:08 -04:00
parent 3f859dd826 04bea10298
commit 77dd76ed17
10 changed files with 210 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/lev_comp.y
View File

@@ -2450,11 +2450,11 @@ ter_selection_x : coord_or_var
{
add_opvars(splev, "o", VA_PASS1(SPO_SEL_FILLRECT));
}
| line_ID coord_or_var '-' coord_or_var
| line_ID coord_or_var ',' coord_or_var
{
add_opvars(splev, "o", VA_PASS1(SPO_SEL_LINE));
}
| randline_ID coord_or_var '-' coord_or_var ',' math_expr_var
| randline_ID coord_or_var ',' coord_or_var ',' math_expr_var
{
/* randline (x1,y1),(x2,y2), roughness */
add_opvars(splev, "o", VA_PASS1(SPO_SEL_RNDLINE));