Mercurial > hg > early-roguelike
diff xrogue/init.c @ 300:0250220d8cdd
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 |
line wrap: on
line diff
--- a/xrogue/init.c Sun Feb 11 15:37:33 2018 -0500 +++ b/xrogue/init.c Fri Nov 22 21:18:27 2019 -0500 @@ -37,67 +37,71 @@ */ struct words rainbow[NCOLORS] = { -"Amber", "Aquamarine", "Beige", -"Black", "Blue", "Brown", -"Clear", "Crimson", "Ecru", -"Gold", "Green", "Grey", -"Indigo", "Khaki", "Lavender", -"Magenta", "Orange", "Pink", -"Plaid", "Purple", "Red", -"Silver", "Saffron", "Scarlet", -"Tan", "Tangerine", "Topaz", -"Turquoise", "Vermilion", "Violet", -"White", "Yellow", +{ "Amber" }, { "Aquamarine" }, { "Beige" }, +{ "Black" }, { "Blue" }, { "Brown" }, +{ "Clear" }, { "Crimson" }, { "Ecru" }, +{ "Gold" }, { "Green" }, { "Grey" }, +{ "Indigo" }, { "Khaki" }, { "Lavender" }, +{ "Magenta" }, { "Orange" }, { "Pink" }, +{ "Plaid" }, { "Purple" }, { "Red" }, +{ "Silver" }, { "Saffron" }, { "Scarlet" }, +{ "Tan" }, { "Tangerine" }, { "Topaz" }, +{ "Turquoise" }, { "Vermilion" }, { "Violet" }, +{ "White" }, { "Yellow" } }; struct words sylls[NSYLLS] = { - "a", "ae", "ak", "an", "ax", "ach", "ano", "ars", "bha", "bar", "bre", - "cha", "cre", "cum", "cow", "duh", "dha", "e", "ea", "em", "et", "ey", - "eck", "etk", "egg", "exl", "fu", "fen", "fid", "gan", "gle", "h", "ha", - "hr", "ht", "how", "hex", "hip", "hoc", "i", "ia", "ig", "it", "iz", - "ion", "ink", "ivi", "iss", "je", "jin", "jha", "jyr", "ka", "kho", "kal", - "kli", "lu", "lre", "lta", "lri", "m", "ma", "mh", "mi", "mr", "mar", - "myr", "moh", "mul", "nep", "nes", "o", "oc", "om", "oq", "ox", "orn", - "oxy", "olm", "ode", "po", "pie", "pod", "pot", "qar", "que", "ran", "rah", - "rok", "sa", "sat", "sha", "sol", "sri", "ti", "tem", "tar", "tki", "tch", - "tox", "u", "ub", "uh", "ur", "uv", "unk", "uwh", "ugh", "uyr", "va", - "vil", "vit", "vom", "vux", "wah", "wex", "xu", "xed", "xen", "ya", "yep", - "yih", "zef", "zen", "zil", "zym", "-" + {"a"}, {"ae"}, {"ak"}, {"an"}, {"ax"}, {"ach"}, {"ano"}, {"ars"}, + {"bha"}, {"bar"}, {"bre"}, {"cha"}, {"cre"}, {"cum"}, {"cow"}, {"duh"}, + {"dha"}, {"e"}, {"ea"}, {"em"}, {"et"}, {"ey"}, {"eck"}, {"etk"}, + {"egg"}, {"exl"}, {"fu"}, {"fen"}, {"fid"}, {"gan"}, {"gle"}, {"h"}, + {"ha"}, {"hr"}, {"ht"}, {"how"}, {"hex"}, {"hip"}, {"hoc"}, {"i"}, + {"ia"}, {"ig"}, {"it"}, {"iz"}, {"ion"}, {"ink"}, {"ivi"}, {"iss"}, + {"je"}, {"jin"}, {"jha"}, {"jyr"}, {"ka"}, {"kho"}, {"kal"}, {"kli"}, + {"lu"}, {"lre"}, {"lta"}, {"lri"}, {"m"}, {"ma"}, {"mh"}, {"mi"}, + {"mr"}, {"mar"}, {"myr"}, {"moh"}, {"mul"}, {"nep"}, {"nes"}, {"o"}, + {"oc"}, {"om"}, {"oq"}, {"ox"}, {"orn"}, {"oxy"}, {"olm"}, {"ode"}, + {"po"}, {"pie"}, {"pod"}, {"pot"}, {"qar"}, {"que"}, {"ran"}, {"rah"}, + {"rok"}, {"sa"}, {"sat"}, {"sha"}, {"sol"}, {"sri"}, {"ti"}, {"tem"}, + {"tar"}, {"tki"}, {"tch"}, {"tox"}, {"u"}, {"ub"}, {"uh"}, {"ur"}, + {"uv"}, {"unk"}, {"uwh"}, {"ugh"}, {"uyr"}, {"va"}, {"vil"}, {"vit"}, + {"vom"}, {"vux"}, {"wah"}, {"wex"}, {"xu"}, {"xed"}, {"xen"}, {"ya"}, + {"yep"}, {"yih"}, {"zef"}, {"zen"}, {"zil"}, {"zym"}, {"-"} }; struct words stones[NSTONES] = { - "Agate", "Alexandrite", "Amethyst", - "Azurite", "Bloodstone", "Cairngorm", - "Carnelian", "Chalcedony", "Chrysoberyl", - "Chrysolite", "Chrysoprase", "Citrine", - "Coral", "Diamond", "Emerald", - "Garnet", "Heliotrope", "Hematite", - "Hyacinth", "Jacinth", "Jade", - "Jargoon", "Jasper", "Kryptonite", - "Lapis lazuli", "Malachite", "Mocca stone", - "Moonstone", "Obsidian", "Olivine", - "Onyx", "Opal", "Pearl", - "Peridot", "Quartz", "Rhodochrosite", - "Rhodolite", "Ruby", "Sapphire", - "Sardonyx", "Serpentine", "Spinel", - "Tiger eye", "Topaz", "Tourmaline", - "Turquoise", "Zircon", + { "Agate" }, { "Alexandrite" }, { "Amethyst" }, + { "Azurite" }, { "Bloodstone" }, { "Cairngorm" }, + { "Carnelian" }, { "Chalcedony" }, { "Chrysoberyl" }, + { "Chrysolite" }, { "Chrysoprase" }, { "Citrine" }, + { "Coral" }, { "Diamond" }, { "Emerald" }, + { "Garnet" }, { "Heliotrope" }, { "Hematite" }, + { "Hyacinth" }, { "Jacinth" }, { "Jade" }, + { "Jargoon" }, { "Jasper" }, { "Kryptonite" }, + { "Lapis lazuli" }, { "Malachite" }, { "Mocca stone" }, + { "Moonstone" }, { "Obsidian" }, { "Olivine" }, + { "Onyx" }, { "Opal" }, { "Pearl" }, + { "Peridot" }, { "Quartz" }, { "Rhodochrosite" }, + { "Rhodolite" }, { "Ruby" }, { "Sapphire" }, + { "Sardonyx" }, { "Serpentine" }, { "Spinel" }, + { "Tiger eye" }, { "Topaz" }, { "Tourmaline" }, + { "Turquoise" }, { "Zircon" } }; struct words wood[NWOOD] = { - "Avocado wood", "Balsa", "Banyan", "Birch", - "Cedar", "Cherry", "Cinnabar", "Dogwood", - "Driftwood", "Ebony", "Eucalyptus", "Hemlock", - "Ironwood", "Mahogany", "Manzanita", "Maple", - "Oak", "Pine", "Redwood", "Rosewood", - "Teak", "Walnut", "Aloe", "Sandalwood", + {"Avocado wood"}, {"Balsa"}, {"Banyan"}, {"Birch"}, + {"Cedar"}, {"Cherry"}, {"Cinnabar"}, {"Dogwood"}, + {"Driftwood"}, {"Ebony"}, {"Eucalyptus"}, {"Hemlock"}, + {"Ironwood"}, {"Mahogany"}, {"Manzanita"}, {"Maple"}, + {"Oak"}, {"Pine"}, {"Redwood"}, {"Rosewood"}, + {"Teak"}, {"Walnut"}, {"Aloe"}, {"Sandalwood"} }; struct words metal[NMETAL] = { - "Aluminium", "Bone", "Brass", "Bronze", - "Copper", "Chromium", "Iron", "Lead", - "Magnesium", "Pewter", "Platinum", "Silver", - "Steel", "Tin", "Titanium", "Zinc", + {"Aluminium"}, {"Bone"}, {"Brass"}, {"Bronze"}, + {"Copper"}, {"Chromium"}, {"Iron"}, {"Lead"}, + {"Magnesium"}, {"Pewter"}, {"Platinum"}, {"Silver"}, + {"Steel"}, {"Tin"}, {"Titanium"}, {"Zinc"} }; /*