Skip to content

Commit 416878a

Browse files
committed
Fix: cmap ordering in tilemap.c (addition of ice trap).
Windows compile threw an error. Oops.
1 parent e162632 commit 416878a

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

doc/evilhack-changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -3392,4 +3392,5 @@ The following changes to date are:
33923392
- New conduct: never forged an artifact
33933393
- Underline peaceful monsters via config (tty and curses)
33943394
- New trap: ice
3395+
- Fix: cmap ordering in tilemap.c (addition of ice trap)
33953396

win/share/tilemap.c

+20-20
Original file line numberDiff line numberDiff line change
@@ -592,28 +592,28 @@ struct {
592592
{S_spear_trap, "spear trap", "spear trap"},
593593
{S_magic_beam_trap, "magic beam trap", "magic beam trap"},
594594
{S_vibrating_square, "vibrating square", "vibrating square"},
595-
{S_vbeam, "vertical beam", "cmap 73"},
596-
{S_hbeam, "horizontal beam", "cmap 74"},
597-
{S_lslant, "left slant beam", "cmap 75"},
598-
{S_rslant, "right slant beam", "cmap 76"},
599-
{S_digbeam, "dig beam", "cmap 77"},
600-
{S_flashbeam, "flash beam", "cmap 78"},
601-
{S_boomleft, "boom left", "cmap 79"},
602-
{S_boomright, "boom right", "cmap 80"},
603-
{S_ss1, "shield1", "cmap 81"},
604-
{S_ss2, "shield2", "cmap 82"},
605-
{S_ss3, "shield3", "cmap 83"},
606-
{S_ss4, "shield4", "cmap 84"},
595+
{S_vbeam, "vertical beam", "cmap 74"},
596+
{S_hbeam, "horizontal beam", "cmap 75"},
597+
{S_lslant, "left slant beam", "cmap 76"},
598+
{S_rslant, "right slant beam", "cmap 77"},
599+
{S_digbeam, "dig beam", "cmap 78"},
600+
{S_flashbeam, "flash beam", "cmap 79"},
601+
{S_boomleft, "boom left", "cmap 80"},
602+
{S_boomright, "boom right", "cmap 81"},
603+
{S_ss1, "shield1", "cmap 82"},
604+
{S_ss2, "shield2", "cmap 83"},
605+
{S_ss3, "shield3", "cmap 84"},
606+
{S_ss4, "shield4", "cmap 85"},
607607
{S_poisoncloud, "poison cloud", "poison cloud"},
608608
{S_goodpos, "valid position", "valid position"},
609-
{S_sw_tl, "swallow top left", "cmap 87"},
610-
{S_sw_tc, "swallow top center", "cmap 88"},
611-
{S_sw_tr, "swallow top right", "cmap 89"},
612-
{S_sw_ml, "swallow middle left", "cmap 90"},
613-
{S_sw_mr, "swallow middle right", "cmap 91"},
614-
{S_sw_bl, "swallow bottom left ", "cmap 92"},
615-
{S_sw_bc, "swallow bottom center", "cmap 93"},
616-
{S_sw_br, "swallow bottom right", "cmap 94"},
609+
{S_sw_tl, "swallow top left", "cmap 88"},
610+
{S_sw_tc, "swallow top center", "cmap 89"},
611+
{S_sw_tr, "swallow top right", "cmap 90"},
612+
{S_sw_ml, "swallow middle left", "cmap 91"},
613+
{S_sw_mr, "swallow middle right", "cmap 92"},
614+
{S_sw_bl, "swallow bottom left ", "cmap 93"},
615+
{S_sw_bc, "swallow bottom center", "cmap 94"},
616+
{S_sw_br, "swallow bottom right", "cmap 95"},
617617
{S_explode1, "explosion top left", "explosion dark 0"},
618618
{S_explode2, "explosion top centre", "explosion dark 1"},
619619
{S_explode3, "explosion top right", "explosion dark 2"},

0 commit comments

Comments
 (0)