Mercurial > hg > early-roguelike

comparison xrogue/init.c @ 300:0250220d8cdd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix an assortment of compiler warnings. A few potential bugs were removed in the process. Much code cleanup remains to be done.
author John "Elwin" Edwards
date Fri, 22 Nov 2019 21:18:27 -0500
parents f54901b9c39b
children 32bc72dcbf4f
comparison
equal deleted inserted replaced
299:74351bf23e5e 300:0250220d8cdd
35 /* other time enter a '?' or a '='. For character and item descriptions \ 35 /* other time enter a '?' or a '='. For character and item descriptions \
36 enter a '\\' on any other screen."; 36 enter a '\\' on any other screen.";
37 */ 37 */
38 38
39 struct words rainbow[NCOLORS] = { 39 struct words rainbow[NCOLORS] = {
40 "Amber", "Aquamarine", "Beige", 40 { "Amber" }, { "Aquamarine" }, { "Beige" },
41 "Black", "Blue", "Brown", 41 { "Black" }, { "Blue" }, { "Brown" },
42 "Clear", "Crimson", "Ecru", 42 { "Clear" }, { "Crimson" }, { "Ecru" },
43 "Gold", "Green", "Grey", 43 { "Gold" }, { "Green" }, { "Grey" },
44 "Indigo", "Khaki", "Lavender", 44 { "Indigo" }, { "Khaki" }, { "Lavender" },
45 "Magenta", "Orange", "Pink", 45 { "Magenta" }, { "Orange" }, { "Pink" },
46 "Plaid", "Purple", "Red", 46 { "Plaid" }, { "Purple" }, { "Red" },
47 "Silver", "Saffron", "Scarlet", 47 { "Silver" }, { "Saffron" }, { "Scarlet" },
48 "Tan", "Tangerine", "Topaz", 48 { "Tan" }, { "Tangerine" }, { "Topaz" },
49 "Turquoise", "Vermilion", "Violet", 49 { "Turquoise" }, { "Vermilion" }, { "Violet" },
50 "White", "Yellow", 50 { "White" }, { "Yellow" }
51 }; 51 };
52 52
53 struct words sylls[NSYLLS] = { 53 struct words sylls[NSYLLS] = {
54 "a", "ae", "ak", "an", "ax", "ach", "ano", "ars", "bha", "bar", "bre", 54 {"a"}, {"ae"}, {"ak"}, {"an"}, {"ax"}, {"ach"}, {"ano"}, {"ars"},
55 "cha", "cre", "cum", "cow", "duh", "dha", "e", "ea", "em", "et", "ey", 55 {"bha"}, {"bar"}, {"bre"}, {"cha"}, {"cre"}, {"cum"}, {"cow"}, {"duh"},
56 "eck", "etk", "egg", "exl", "fu", "fen", "fid", "gan", "gle", "h", "ha", 56 {"dha"}, {"e"}, {"ea"}, {"em"}, {"et"}, {"ey"}, {"eck"}, {"etk"},
57 "hr", "ht", "how", "hex", "hip", "hoc", "i", "ia", "ig", "it", "iz", 57 {"egg"}, {"exl"}, {"fu"}, {"fen"}, {"fid"}, {"gan"}, {"gle"}, {"h"},
58 "ion", "ink", "ivi", "iss", "je", "jin", "jha", "jyr", "ka", "kho", "kal", 58 {"ha"}, {"hr"}, {"ht"}, {"how"}, {"hex"}, {"hip"}, {"hoc"}, {"i"},
59 "kli", "lu", "lre", "lta", "lri", "m", "ma", "mh", "mi", "mr", "mar", 59 {"ia"}, {"ig"}, {"it"}, {"iz"}, {"ion"}, {"ink"}, {"ivi"}, {"iss"},
60 "myr", "moh", "mul", "nep", "nes", "o", "oc", "om", "oq", "ox", "orn", 60 {"je"}, {"jin"}, {"jha"}, {"jyr"}, {"ka"}, {"kho"}, {"kal"}, {"kli"},
61 "oxy", "olm", "ode", "po", "pie", "pod", "pot", "qar", "que", "ran", "rah", 61 {"lu"}, {"lre"}, {"lta"}, {"lri"}, {"m"}, {"ma"}, {"mh"}, {"mi"},
62 "rok", "sa", "sat", "sha", "sol", "sri", "ti", "tem", "tar", "tki", "tch", 62 {"mr"}, {"mar"}, {"myr"}, {"moh"}, {"mul"}, {"nep"}, {"nes"}, {"o"},
63 "tox", "u", "ub", "uh", "ur", "uv", "unk", "uwh", "ugh", "uyr", "va", 63 {"oc"}, {"om"}, {"oq"}, {"ox"}, {"orn"}, {"oxy"}, {"olm"}, {"ode"},
64 "vil", "vit", "vom", "vux", "wah", "wex", "xu", "xed", "xen", "ya", "yep", 64 {"po"}, {"pie"}, {"pod"}, {"pot"}, {"qar"}, {"que"}, {"ran"}, {"rah"},
65 "yih", "zef", "zen", "zil", "zym", "-" 65 {"rok"}, {"sa"}, {"sat"}, {"sha"}, {"sol"}, {"sri"}, {"ti"}, {"tem"},
66 {"tar"}, {"tki"}, {"tch"}, {"tox"}, {"u"}, {"ub"}, {"uh"}, {"ur"},
67 {"uv"}, {"unk"}, {"uwh"}, {"ugh"}, {"uyr"}, {"va"}, {"vil"}, {"vit"},
68 {"vom"}, {"vux"}, {"wah"}, {"wex"}, {"xu"}, {"xed"}, {"xen"}, {"ya"},
69 {"yep"}, {"yih"}, {"zef"}, {"zen"}, {"zil"}, {"zym"}, {"-"}
66 }; 70 };
67 71
68 struct words stones[NSTONES] = { 72 struct words stones[NSTONES] = {
69 "Agate", "Alexandrite", "Amethyst", 73 { "Agate" }, { "Alexandrite" }, { "Amethyst" },
70 "Azurite", "Bloodstone", "Cairngorm", 74 { "Azurite" }, { "Bloodstone" }, { "Cairngorm" },
71 "Carnelian", "Chalcedony", "Chrysoberyl", 75 { "Carnelian" }, { "Chalcedony" }, { "Chrysoberyl" },
72 "Chrysolite", "Chrysoprase", "Citrine", 76 { "Chrysolite" }, { "Chrysoprase" }, { "Citrine" },
73 "Coral", "Diamond", "Emerald", 77 { "Coral" }, { "Diamond" }, { "Emerald" },
74 "Garnet", "Heliotrope", "Hematite", 78 { "Garnet" }, { "Heliotrope" }, { "Hematite" },
75 "Hyacinth", "Jacinth", "Jade", 79 { "Hyacinth" }, { "Jacinth" }, { "Jade" },
76 "Jargoon", "Jasper", "Kryptonite", 80 { "Jargoon" }, { "Jasper" }, { "Kryptonite" },
77 "Lapis lazuli", "Malachite", "Mocca stone", 81 { "Lapis lazuli" }, { "Malachite" }, { "Mocca stone" },
78 "Moonstone", "Obsidian", "Olivine", 82 { "Moonstone" }, { "Obsidian" }, { "Olivine" },
79 "Onyx", "Opal", "Pearl", 83 { "Onyx" }, { "Opal" }, { "Pearl" },
80 "Peridot", "Quartz", "Rhodochrosite", 84 { "Peridot" }, { "Quartz" }, { "Rhodochrosite" },
81 "Rhodolite", "Ruby", "Sapphire", 85 { "Rhodolite" }, { "Ruby" }, { "Sapphire" },
82 "Sardonyx", "Serpentine", "Spinel", 86 { "Sardonyx" }, { "Serpentine" }, { "Spinel" },
83 "Tiger eye", "Topaz", "Tourmaline", 87 { "Tiger eye" }, { "Topaz" }, { "Tourmaline" },
84 "Turquoise", "Zircon", 88 { "Turquoise" }, { "Zircon" }
85 }; 89 };
86 90
87 struct words wood[NWOOD] = { 91 struct words wood[NWOOD] = {
88 "Avocado wood", "Balsa", "Banyan", "Birch", 92 {"Avocado wood"}, {"Balsa"}, {"Banyan"}, {"Birch"},
89 "Cedar", "Cherry", "Cinnabar", "Dogwood", 93 {"Cedar"}, {"Cherry"}, {"Cinnabar"}, {"Dogwood"},
90 "Driftwood", "Ebony", "Eucalyptus", "Hemlock", 94 {"Driftwood"}, {"Ebony"}, {"Eucalyptus"}, {"Hemlock"},
91 "Ironwood", "Mahogany", "Manzanita", "Maple", 95 {"Ironwood"}, {"Mahogany"}, {"Manzanita"}, {"Maple"},
92 "Oak", "Pine", "Redwood", "Rosewood", 96 {"Oak"}, {"Pine"}, {"Redwood"}, {"Rosewood"},
93 "Teak", "Walnut", "Aloe", "Sandalwood", 97 {"Teak"}, {"Walnut"}, {"Aloe"}, {"Sandalwood"}
94 }; 98 };
95 99
96 struct words metal[NMETAL] = { 100 struct words metal[NMETAL] = {
97 "Aluminium", "Bone", "Brass", "Bronze", 101 {"Aluminium"}, {"Bone"}, {"Brass"}, {"Bronze"},
98 "Copper", "Chromium", "Iron", "Lead", 102 {"Copper"}, {"Chromium"}, {"Iron"}, {"Lead"},
99 "Magnesium", "Pewter", "Platinum", "Silver", 103 {"Magnesium"}, {"Pewter"}, {"Platinum"}, {"Silver"},
100 "Steel", "Tin", "Titanium", "Zinc", 104 {"Steel"}, {"Tin"}, {"Titanium"}, {"Zinc"}
101 }; 105 };
102 106
103 /* 107 /*
104 * make sure all the percentages specified in the tables add up to the 108 * make sure all the percentages specified in the tables add up to the
105 * right amounts 109 * right amounts