• R/O
  • SSH
  • HTTPS

jband: Commit


Commit MetaInfo

Revision121 (tree)
Time2009-06-25 05:56:33
Authorpaulblay

Log Message

More T stuff.

Change Summary

Incremental Difference

--- trunk/JBand/src/randname.cpp (revision 120)
+++ trunk/JBand/src/randname.cpp (revision 121)
@@ -1,5 +1,9 @@
11 /* テスト */
22 /*
3+ * Debug Status: Not checked.
4+ * - Fixed __T on this page.
5+ */
6+/*
37 * File: randname.c
48 * Purpose: Random name generation
59 *
@@ -27,105 +31,106 @@
2731 */
2832 static const _TCHAR *tolkien_names[] =
2933 {
30- L"adanedhel", L"adurant", L"aeglos", L"aegnor", L"aelin", L"aeluin",
31- L"aerandir", L"aerin", L"agarwaen", L"aglareb", L"aglarond", L"aglon",
32- L"ainulindale", L"ainur", L"alcarinque", L"aldaron", L"aldudenie",
33- L"almaren", L"alqualonde", L"aman", L"amandil", L"amarie", L"amarth",
34- L"amlach", L"amon", L"amras", L"amrod", L"anach", L"anar", L"anarion",
35- L"ancalagon", L"ancalimon", L"anarrima", L"andor", L"andram", L"androth",
36- L"anduin", L"andunie", L"anfauglir", L"anfauglith", L"angainor", L"angband",
37- L"anghabar", L"anglachel", L"angrenost", L"angrim", L"angrist", L"angrod",
38- L"anguirel", L"annael", L"annatar", L"annon", L"annuminas", L"apanonar",
39- L"aradan", L"aragorn", L"araman", L"aranel", L"aranruth", L"aranwe", L"aras",
40- L"aratan", L"aratar", L"arathorn", L"arda", L"ardgalen", L"aredhel",
41- L"arfeiniel", L"argonath", L"arien", L"armenelos", L"arminas", L"arnor",
42- L"aros", L"arossiach", L"arthad", L"arvernien", L"arwen", L"ascar",
43- L"astaldo", L"atalante", L"atanamir", L"atanatari", L"atani", L"aule",
44- L"avallone", L"avari", L"avathar", L"balan", L"balar", L"balrog", L"barad",
45- L"baragund", L"barahir", L"baran", L"baranduin", L"bar", L"bauglir",
46- L"beleg", L"belegaer", L"belegost", L"belegund", L"beleriand", L"belfalas",
47- L"belthil", L"belthronding", L"beor", L"beraid", L"bereg", L"beren",
48- L"boromir", L"boron", L"bragollach", L"brandir", L"bregolas", L"bregor",
49- L"brethil", L"brilthor", L"brithiach", L"brithombar", L"brithon", L"cabed",
50- L"calacirya", L"calaquendi", L"calenardhon", L"calion", L"camlost",
51- L"caragdur", L"caranthir", L"carcharoth", L"cardolan", L"carnil",
52- L"celeborn", L"celebrant", L"celebrimbor", L"celebrindal", L"celebros",
53- L"celegorm", L"celon", L"cirdan", L"cirith", L"cirth", L"ciryatan",
54- L"ciryon", L"coimas", L"corollaire", L"crissaegrim", L"cuarthal",
55- L"cuivienen", L"culurien", L"curufin", L"curufinwe", L"curunir",
56- L"cuthalion", L"daedeloth", L"daeron", L"dagnir", L"dagor", L"dagorlad",
57- L"dairuin", L"danwedh", L"delduwath", L"denethor", L"dimbar", L"dimrost",
58- L"dinen", L"dior", L"dirnen", L"dolmed", L"doriath", L"dorlas",
59- L"dorthonion", L"draugluin", L"drengist", L"duath", L"duinath", L"duilwen",
60- L"dunedain", L"dungortheb", L"earendil", L"earendur", L"earnil", L"earnur",
61- L"earrame", L"earwen", L"echor", L"echoriath", L"ecthelion", L"edain",
62- L"edrahil", L"eglador", L"eglarest", L"eglath", L"eilinel", L"eithel",
63- L"ekkaia", L"elbereth", L"eldalie", L"eldalieva", L"eldamar", L"eldar",
64- L"eledhwen", L"elemmire", L"elende", L"elendil", L"elendur", L"elenna",
65- L"elentari", L"elenwe", L"elerrina", L"elleth", L"elmoth", L"elostirion",
66- L"elrond", L"elros", L"elu", L"eluchil", L"elured", L"elurin", L"elwe",
67- L"elwing", L"emeldir", L"endor", L"engrin", L"engwar", L"eol", L"eonwe",
68- L"ephel", L"erchamion", L"ereb", L"ered", L"erech", L"eregion", L"ereinion",
69- L"erellont", L"eressea", L"eriador", L"eru", L"esgalduin", L"este", L"estel",
70- L"estolad", L"ethir", L"ezellohar", L"faelivrin", L"falas", L"falathar",
71- L"falathrim", L"falmari", L"faroth", L"fauglith", L"feanor", L"feanturi",
72- L"felagund", L"finarfin", L"finduilas", L"fingolfin", L"fingon", L"finwe",
73- L"firimar", L"formenos", L"fornost", L"frodo", L"fuin", L"fuinur",
74- L"gabilgathol", L"galad", L"galadriel", L"galathilion", L"galdor", L"galen",
75- L"galvorn", L"gandalf", L"gaurhoth", L"gelion", L"gelmir", L"gelydh", L"gil",
76- L"gildor", L"giliath", L"ginglith", L"girith", L"glaurung", L"glingal",
77- L"glirhuin", L"gloredhel", L"glorfindel", L"golodhrim", L"gondolin",
78- L"gondor", L"gonnhirrim", L"gorgoroth", L"gorlim", L"gorthaur", L"gorthol",
79- L"gothmog", L"guilin", L"guinar", L"guldur", L"gundor", L"gurthang",
80- L"gwaith", L"gwareth", L"gwindor", L"hadhodrond", L"hador", L"haladin",
81- L"haldad", L"haldan", L"haldar", L"haldir", L"haleth", L"halmir", L"handir",
82- L"harad", L"hareth", L"hathaldir", L"hathol", L"haudh", L"helcar",
83- L"helcaraxe", L"helevorn", L"helluin", L"herumor", L"herunumen",
84- L"hildorien", L"himlad", L"himring", L"hirilorn", L"hisilome",
85- L"hithaeglir", L"hithlum", L"hollin", L"huan", L"hunthor", L"huor", L"hurin",
86- L"hyarmendacil", L"hyarmentir", L"iant", L"iaur", L"ibun", L"idril",
87- L"illuin", L"ilmare", L"ilmen", L"iluvatar", L"imlach", L"imladris", L"indis",
88- L"ingwe", L"irmo", L"isil", L"isildur", L"istari", L"ithil", L"ivrin",
89- L"kelvar", L"kementari", L"ladros", L"laiquendi", L"lalaith", L"lamath",
90- L"lammoth", L"lanthir", L"laurelin", L"leithian", L"legolin", L"lembas",
91- L"lenwe", L"linaewen", L"lindon", L"lindorie", L"loeg", L"lomelindi",
92- L"lomin", L"lomion", L"lorellin", L"lorien", L"lorindol", L"losgar",
93- L"lothlann", L"lothlorien", L"luin", L"luinil", L"lumbar", L"luthien",
94- L"mablung", L"maedhros", L"maeglin", L"maglor", L"magor", L"mahanaxar",
95- L"mahtan", L"maiar", L"malduin", L"malinalda", L"mandos", L"manwe", L"mardil",
96- L"melian", L"melkor", L"menegroth", L"meneldil", L"menelmacar",
97- L"meneltarma", L"minas", L"minastir", L"mindeb", L"mindolluin", L"mindon",
98- L"minyatur", L"mirdain", L"miriel", L"mithlond", L"mithrandir", L"mithrim",
99- L"mordor", L"morgoth", L"morgul", L"moria", L"moriquendi", L"mormegil",
100- L"morwen", L"nahar", L"naeramarth", L"namo", L"nandor", L"nargothrond",
101- L"narog", L"narsil", L"narsilion", L"narya", L"nauglamir", L"naugrim",
102- L"ndengin", L"neithan", L"neldoreth", L"nenar", L"nenning", L"nenuial",
103- L"nenya", L"nerdanel", L"nessa", L"nevrast", L"nibin", L"nienna", L"nienor",
104- L"nimbrethil", L"nimloth", L"nimphelos", L"nimrais", L"nimras",
105- L"ningloron", L"niniel", L"ninniach", L"ninquelote", L"niphredil",
106- L"nirnaeth", L"nivrim", L"noegyth", L"nogrod", L"noldolante", L"noldor",
107- L"numenor", L"nurtale", L"obel", L"ohtar", L"oiolosse", L"oiomure", L"olorin",
108- L"olvar", L"olwe", L"ondolinde", L"orfalch", L"ormal", L"orocarni",
109- L"orodreth", L"orodruin", L"orome", L"oromet", L"orthanc", L"osgiliath",
110- L"osse", L"ossiriand", L"palantir", L"pelargir", L"pelori", L"periannath",
111- L"quendi", L"quenta", L"quenya", L"radagast", L"radhruin", L"ragnor",
112- L"ramdal", L"rana", L"rathloriel", L"rauros", L"region", L"rerir",
113- L"rhovanion", L"rhudaur", L"rhun", L"rhunen", L"rian", L"ringil", L"ringwil",
114- L"romenna", L"rudh", L"rumil", L"saeros", L"salmar", L"saruman", L"sauron",
115- L"serech", L"seregon", L"serinde", L"shelob", L"silmarien", L"silmaril",
116- L"silpion", L"sindar", L"singollo", L"sirion", L"soronume", L"sul", L"sulimo",
117- L"talath", L"taniquetil", L"tar", L"taras", L"tarn", L"tathren", L"taur",
118- L"tauron", L"teiglin", L"telchar", L"telemnar", L"teleri", L"telperion",
119- L"telumendil", L"thalion", L"thalos", L"thangorodrim", L"thargelion",
120- L"thingol", L"thoronath", L"thorondor", L"thranduil", L"thuringwethil",
121- L"tilion", L"tintalle", L"tinuviel", L"tirion", L"tirith", L"tol", L"tulkas",
122- L"tumhalad", L"tumladen", L"tuna", L"tuor", L"turambar", L"turgon", L"turin",
123- L"uial", L"uilos", L"uinen", L"ulairi", L"ulmo", L"ulumuri", L"umanyar",
124- L"umarth", L"umbar", L"ungoliant", L"urthel", L"uruloki", L"utumno", L"vaire",
125- L"valacirca", L"valandil", L"valaquenta", L"valar", L"valaraukar",
126- L"valaroma", L"valier", L"valimar", L"valinor", L"valinoreva", L"valmar",
127- L"vana", L"vanyar", L"varda", L"vasa", L"vilya", L"vingilot", L"vinyamar",
128- L"voronwe", L"wethrin", L"wilwarin", L"yavanna",
34+ __T("adanedhel"), __T("adurant"), __T("aeglos"), __T("aegnor"), __T("aelin"), __T("aeluin"),
35+ __T("aerandir"), __T("aerin"), __T("agarwaen"), __T("aglareb"), __T("aglarond"), __T("aglon"),
36+ __T("ainulindale"), __T("ainur"), __T("alcarinque"), __T("aldaron"), __T("aldudenie"),
37+ __T("almaren"), __T("alqualonde"), __T("aman"), __T("amandil"), __T("amarie"), __T("amarth"),
38+ __T("amlach"), __T("amon"), __T("amras"), __T("amrod"), __T("anach"), __T("anar"),
39+ __T("anarion"), __T("ancalagon"), __T("ancalimon"), __T("anarrima"), __T("andor"),
40+ __T("andram"), __T("androth"), __T("anduin"), __T("andunie"), __T("anfauglir"),
41+ __T("anfauglith"), __T("angainor"), __T("angband"), __T("anghabar"), __T("anglachel"),
42+ __T("angrenost"), __T("angrim"), __T("angrist"), __T("angrod"), __T("anguirel"), __T("annael"),
43+ __T("annatar"), __T("annon"), __T("annuminas"), __T("apanonar"), __T("aradan"), __T("aragorn"),
44+ __T("araman"), __T("aranel"), __T("aranruth"), __T("aranwe"), __T("aras"), __T("aratan"),
45+ __T("aratar"), __T("arathorn"), __T("arda"), __T("ardgalen"), __T("aredhel"), __T("arfeiniel"),
46+ __T("argonath"), __T("arien"), __T("armenelos"), __T("arminas"), __T("arnor"), __T("aros"),
47+ __T("arossiach"), __T("arthad"), __T("arvernien"), __T("arwen"), __T("ascar"), __T("astaldo"),
48+ __T("atalante"), __T("atanamir"), __T("atanatari"), __T("atani"), __T("aule"), __T("avallone"),
49+ __T("avari"), __T("avathar"), __T("balan"), __T("balar"), __T("balrog"), __T("barad"),
50+ __T("baragund"), __T("barahir"), __T("baran"), __T("baranduin"), __T("bar"), __T("bauglir"),
51+ __T("beleg"), __T("belegaer"), __T("belegost"), __T("belegund"), __T("beleriand"),
52+ __T("belfalas"), __T("belthil"), __T("belthronding"), __T("beor"), __T("beraid"), __T("bereg"), __T("beren"),
53+ __T("boromir"), __T("boron"), __T("bragollach"), __T("brandir"), __T("bregolas"), __T("bregor"),
54+ __T("brethil"), __T("brilthor"), __T("brithiach"), __T("brithombar"), __T("brithon"), __T("cabed"),
55+ __T("calacirya"), __T("calaquendi"), __T("calenardhon"), __T("calion"), __T("camlost"),
56+ __T("caragdur"), __T("caranthir"), __T("carcharoth"), __T("cardolan"), __T("carnil"),
57+ __T("celeborn"), __T("celebrant"), __T("celebrimbor"), __T("celebrindal"), __T("celebros"),
58+ __T("celegorm"), __T("celon"), __T("cirdan"), __T("cirith"), __T("cirth"), __T("ciryatan"),
59+ __T("ciryon"), __T("coimas"), __T("corollaire"), __T("crissaegrim"), __T("cuarthal"),
60+ __T("cuivienen"), __T("culurien"), __T("curufin"), __T("curufinwe"), __T("curunir"),
61+ __T("cuthalion"), __T("daedeloth"), __T("daeron"), __T("dagnir"), __T("dagor"), __T("dagorlad"),
62+ __T("dairuin"), __T("danwedh"), __T("delduwath"), __T("denethor"), __T("dimbar"), __T("dimrost"),
63+ __T("dinen"), __T("dior"), __T("dirnen"), __T("dolmed"), __T("doriath"), __T("dorlas"),
64+ __T("dorthonion"), __T("draugluin"), __T("drengist"), __T("duath"), __T("duinath"), __T("duilwen"),
65+ __T("dunedain"), __T("dungortheb"), __T("earendil"), __T("earendur"), __T("earnil"), __T("earnur"),
66+ __T("earrame"), __T("earwen"), __T("echor"), __T("echoriath"), __T("ecthelion"), __T("edain"),
67+ __T("edrahil"), __T("eglador"), __T("eglarest"), __T("eglath"), __T("eilinel"), __T("eithel"),
68+ __T("ekkaia"), __T("elbereth"), __T("eldalie"), __T("eldalieva"), __T("eldamar"), __T("eldar"),
69+ __T("eledhwen"), __T("elemmire"), __T("elende"), __T("elendil"), __T("elendur"), __T("elenna"),
70+ __T("elentari"), __T("elenwe"), __T("elerrina"), __T("elleth"), __T("elmoth"), __T("elostirion"),
71+ __T("elrond"), __T("elros"), __T("elu"), __T("eluchil"), __T("elured"), __T("elurin"), __T("elwe"),
72+ __T("elwing"), __T("emeldir"), __T("endor"), __T("engrin"), __T("engwar"), __T("eol"), __T("eonwe"),
73+ __T("ephel"), __T("erchamion"), __T("ereb"), __T("ered"), __T("erech"), __T("eregion"), __T("ereinion"),
74+ __T("erellont"), __T("eressea"), __T("eriador"), __T("eru"), __T("esgalduin"), __T("este"), __T("estel"),
75+ __T("estolad"), __T("ethir"), __T("ezellohar"), __T("faelivrin"), __T("falas"), __T("falathar"),
76+ __T("falathrim"), __T("falmari"), __T("faroth"), __T("fauglith"), __T("feanor"), __T("feanturi"),
77+ __T("felagund"), __T("finarfin"), __T("finduilas"), __T("fingolfin"), __T("fingon"), __T("finwe"),
78+ __T("firimar"), __T("formenos"), __T("fornost"), __T("frodo"), __T("fuin"), __T("fuinur"),
79+ __T("gabilgathol"), __T("galad"), __T("galadriel"), __T("galathilion"), __T("galdor"), __T("galen"),
80+ __T("galvorn"), __T("gandalf"), __T("gaurhoth"), __T("gelion"), __T("gelmir"), __T("gelydh"), __T("gil"),
81+ __T("gildor"), __T("giliath"), __T("ginglith"), __T("girith"), __T("glaurung"), __T("glingal"),
82+ __T("glirhuin"), __T("gloredhel"), __T("glorfindel"), __T("golodhrim"), __T("gondolin"),
83+ __T("gondor"), __T("gonnhirrim"), __T("gorgoroth"), __T("gorlim"), __T("gorthaur"), __T("gorthol"),
84+ __T("gothmog"), __T("guilin"), __T("guinar"), __T("guldur"), __T("gundor"), __T("gurthang"),
85+ __T("gwaith"), __T("gwareth"), __T("gwindor"), __T("hadhodrond"), __T("hador"), __T("haladin"),
86+ __T("haldad"), __T("haldan"), __T("haldar"), __T("haldir"), __T("haleth"), __T("halmir"), __T("handir"),
87+ __T("harad"), __T("hareth"), __T("hathaldir"), __T("hathol"), __T("haudh"), __T("helcar"),
88+ __T("helcaraxe"), __T("helevorn"), __T("helluin"), __T("herumor"), __T("herunumen"),
89+ __T("hildorien"), __T("himlad"), __T("himring"), __T("hirilorn"), __T("hisilome"),
90+ __T("hithaeglir"), __T("hithlum"), __T("hollin"), __T("huan"), __T("hunthor"), __T("huor"), __T("hurin"),
91+ __T("hyarmendacil"), __T("hyarmentir"), __T("iant"), __T("iaur"), __T("ibun"), __T("idril"),
92+ __T("illuin"), __T("ilmare"), __T("ilmen"), __T("iluvatar"), __T("imlach"), __T("imladris"), __T("indis"),
93+ __T("ingwe"), __T("irmo"), __T("isil"), __T("isildur"), __T("istari"), __T("ithil"), __T("ivrin"),
94+ __T("kelvar"), __T("kementari"), __T("ladros"), __T("laiquendi"), __T("lalaith"), __T("lamath"),
95+ __T("lammoth"), __T("lanthir"), __T("laurelin"), __T("leithian"), __T("legolin"), __T("lembas"),
96+ __T("lenwe"), __T("linaewen"), __T("lindon"), __T("lindorie"), __T("loeg"), __T("lomelindi"),
97+ __T("lomin"), __T("lomion"), __T("lorellin"), __T("lorien"), __T("lorindol"), __T("losgar"),
98+ __T("lothlann"), __T("lothlorien"), __T("luin"), __T("luinil"), __T("lumbar"), __T("luthien"),
99+ __T("mablung"), __T("maedhros"), __T("maeglin"), __T("maglor"), __T("magor"), __T("mahanaxar"),
100+ __T("mahtan"), __T("maiar"), __T("malduin"), __T("malinalda"), __T("mandos"), __T("manwe"), __T("mardil"),
101+ __T("melian"), __T("melkor"), __T("menegroth"), __T("meneldil"), __T("menelmacar"),
102+ __T("meneltarma"), __T("minas"), __T("minastir"), __T("mindeb"), __T("mindolluin"), __T("mindon"),
103+ __T("minyatur"), __T("mirdain"), __T("miriel"), __T("mithlond"), __T("mithrandir"), __T("mithrim"),
104+ __T("mordor"), __T("morgoth"), __T("morgul"), __T("moria"), __T("moriquendi"), __T("mormegil"),
105+ __T("morwen"), __T("nahar"), __T("naeramarth"), __T("namo"), __T("nandor"), __T("nargothrond"),
106+ __T("narog"), __T("narsil"), __T("narsilion"), __T("narya"), __T("nauglamir"), __T("naugrim"),
107+ __T("ndengin"), __T("neithan"), __T("neldoreth"), __T("nenar"), __T("nenning"), __T("nenuial"),
108+ __T("nenya"), __T("nerdanel"), __T("nessa"), __T("nevrast"), __T("nibin"), __T("nienna"), __T("nienor"),
109+ __T("nimbrethil"), __T("nimloth"), __T("nimphelos"), __T("nimrais"), __T("nimras"),
110+ __T("ningloron"), __T("niniel"), __T("ninniach"), __T("ninquelote"), __T("niphredil"),
111+ __T("nirnaeth"), __T("nivrim"), __T("noegyth"), __T("nogrod"), __T("noldolante"), __T("noldor"),
112+ __T("numenor"), __T("nurtale"), __T("obel"), __T("ohtar"), __T("oiolosse"), __T("oiomure"), __T("olorin"),
113+ __T("olvar"), __T("olwe"), __T("ondolinde"), __T("orfalch"), __T("ormal"), __T("orocarni"),
114+ __T("orodreth"), __T("orodruin"), __T("orome"), __T("oromet"), __T("orthanc"), __T("osgiliath"),
115+ __T("osse"), __T("ossiriand"), __T("palantir"), __T("pelargir"), __T("pelori"), __T("periannath"),
116+ __T("quendi"), __T("quenta"), __T("quenya"), __T("radagast"), __T("radhruin"), __T("ragnor"),
117+ __T("ramdal"), __T("rana"), __T("rathloriel"), __T("rauros"), __T("region"), __T("rerir"),
118+ __T("rhovanion"), __T("rhudaur"), __T("rhun"), __T("rhunen"), __T("rian"), __T("ringil"), __T("ringwil"),
119+ __T("romenna"), __T("rudh"), __T("rumil"), __T("saeros"), __T("salmar"), __T("saruman"), __T("sauron"),
120+ __T("serech"), __T("seregon"), __T("serinde"), __T("shelob"), __T("silmarien"), __T("silmaril"),
121+ __T("silpion"), __T("sindar"), __T("singollo"), __T("sirion"), __T("soronume"), __T("sul"), __T("sulimo"),
122+ __T("talath"), __T("taniquetil"), __T("tar"), __T("taras"), __T("tarn"), __T("tathren"), __T("taur"),
123+ __T("tauron"), __T("teiglin"), __T("telchar"), __T("telemnar"), __T("teleri"), __T("telperion"),
124+ __T("telumendil"), __T("thalion"), __T("thalos"), __T("thangorodrim"), __T("thargelion"),
125+ __T("thingol"), __T("thoronath"), __T("thorondor"), __T("thranduil"), __T("thuringwethil"),
126+ __T("tilion"), __T("tintalle"), __T("tinuviel"), __T("tirion"), __T("tirith"), __T("tol"), __T("tulkas"),
127+ __T("tumhalad"), __T("tumladen"), __T("tuna"), __T("tuor"), __T("turambar"), __T("turgon"), __T("turin"),
128+ __T("uial"), __T("uilos"), __T("uinen"), __T("ulairi"), __T("ulmo"), __T("ulumuri"), __T("umanyar"),
129+ __T("umarth"), __T("umbar"), __T("ungoliant"), __T("urthel"), __T("uruloki"), __T("utumno"), __T("vaire"),
130+ __T("valacirca"), __T("valandil"), __T("valaquenta"), __T("valar"), __T("valaraukar"),
131+ __T("valaroma"), __T("valier"), __T("valimar"), __T("valinor"), __T("valinoreva"), __T("valmar"),
132+ __T("vana"), __T("vanyar"), __T("varda"), __T("vasa"), __T("vilya"), __T("vingilot"), __T("vinyamar"),
133+ __T("voronwe"), __T("wethrin"), __T("wilwarin"), __T("yavanna"),
129134 NULL
130135 };
131136
@@ -132,101 +137,101 @@
132137 /* These are (mostly) picked at random from a Latin word list. */
133138 static const _TCHAR *scroll_names[] =
134139 {
135- L"abracadabra", L"piffpaffpouf", L"izzy", L"wizzy", L"letsgetsbusy",
136- L"justlikethat", L"hocus", L"pocus", L"shazam", L"please", L"abduco",
137- L"absorbeo", L"abutor", L"accipio", L"acerbus", L"adamo", L"adeo", L"adficio",
138- L"adinventitias", L"admitto", L"adsidue", L"adsumo", L"advenio", L"aeger",
139- L"aegrus", L"aestivus", L"aggero", L"ago", L"alioqui", L"aliquantum",
140- L"aliquot", L"alter", L"ambianis", L"amissio", L"amoveo", L"andegavense",
141- L"animus", L"antepono", L"appareo", L"appropinquo", L"ara", L"arca", L"arguo",
142- L"articulus", L"ascit", L"astrum", L"atrebatum", L"attonbitus", L"audax",
143- L"aureus", L"autus", L"averto", L"bardus", L"bene", L"bibo", L"bonus",
144- L"breviter", L"calamitas", L"callidus", L"canonus", L"caput", L"caritas",
145- L"casso", L"catervatim", L"causa", L"cedo", L"celeriter", L"centum",
146- L"certus", L"charisma", L"cimentarius", L"cito", L"clamor", L"claustrum",
147- L"coerceo", L"cogo", L"colloco", L"coma", L"cometissa", L"commeo",
148- L"commissum", L"commoneo", L"compatior", L"compes", L"compositio",
149- L"comprovincialis", L"concido", L"conculco", L"condico", L"confiteor",
150- L"conicio", L"conor", L"conservo", L"consisto", L"constans", L"construo",
151- L"consueta", L"consulto", L"consuo", L"contamino", L"contemptio",
152- L"contentus", L"contineo", L"contradictio", L"conventus", L"copiose",
153- L"corrigo", L"corturiacum", L"crastinus", L"creo", L"cribrum", L"cruentus",
154- L"cubicularius", L"cui", L"culpa", L"cum", L"cunctus", L"cur", L"curiosus",
155- L"currus", L"curto", L"custodiae", L"debeo", L"decimus", L"decumbo",
156- L"defendo", L"defleo", L"degenero", L"delego", L"delinquo", L"demonstro",
157- L"dens", L"depono", L"deprecor", L"derelinquo", L"desino", L"despero",
158- L"detego", L"devito", L"diabolus", L"didicerat", L"differo", L"dignitas",
159- L"dilabor", L"diluculo", L"diripio", L"disco", L"dissimilis", L"districtus",
160- L"diutius", L"divitiae", L"dolens", L"domesticus", L"donec", L"duco",
161- L"dulcidine", L"duro", L"ecclesia", L"edo", L"efficio", L"ego", L"elemosina",
162- L"eluvies", L"emineo", L"emptio", L"epistula", L"equus", L"erogo", L"erudio",
163- L"etsi", L"ex", L"excito", L"excuso", L"exesto", L"exhorresco", L"eximo",
164- L"exorior", L"experior", L"expiscor", L"explico", L"exsequor", L"exstinguo",
165- L"extra", L"fabula", L"facio", L"faenum", L"famulus", L"fautor", L"felix",
166- L"ferme", L"festinus", L"fides", L"fines", L"flamma", L"fluo", L"formo",
167- L"fortiter", L"foveo", L"frequentia", L"frugalitas", L"fuga", L"fultus",
168- L"furor", L"galea", L"genus", L"glacialis", L"gratia", L"gravatus",
169- L"gregatim", L"hactenus", L"harum", L"heniis", L"hic", L"his", L"hoc",
170- L"honorabilis", L"horum", L"huic", L"humanitas", L"hunnam", L"iam", L"idem",
171- L"ignavus", L"illa", L"illarum", L"illi", L"illis", L"illius", L"illorum",
172- L"illum", L"imitor", L"immortalis", L"impedito", L"impendo", L"imperium",
173- L"importunus", L"ex", L"in", L"incertus", L"includo", L"incorruptus", L"inda",
174- L"indignatio", L"induco", L"inexpugnabilis", L"infecunditas", L"infenso",
175- L"infero", L"inficio", L"infigo", L"infirmitas", L"infitior", L"inflatus",
176- L"infligo", L"infortunatus", L"ingemuo", L"inicio", L"innotesco", L"inquis",
177- L"insciens", L"insidiae", L"insperatus", L"instructus", L"insurgo",
178- L"intentio", L"interdum", L"intueor", L"invado", L"invetero", L"invisus",
179- L"ipsemet", L"irritus", L"ita", L"iucunditas", L"iugis", L"iussu", L"jaculum",
180- L"juventus", L"labiosus", L"laboriose", L"labruscum", L"lacertosus",
181- L"lacrimo", L"lacto", L"laedo", L"laetificus", L"laevus", L"lamentatio",
182- L"laqueus", L"laudo", L"lectus", L"lemiscus", L"lenitas", L"lentesco", L"leo",
183- L"lesciense", L"leto", L"levidensis", L"levo", L"liber", L"libere", L"licet",
184- L"lino", L"loci", L"longe", L"lucerna", L"ludio", L"lupus", L"macero",
185- L"maculo", L"maero", L"magus", L"malmundarium", L"mandatum", L"manus",
186- L"matera", L"me", L"mei", L"memor", L"mensa", L"meridianus", L"mica",
187- L"millies", L"minuo", L"miser", L"mitigo", L"modio", L"molestia",
188- L"monasteriense", L"monstrum", L"morior", L"moveo", L"multo", L"mundus",
189- L"munus", L"mutuo", L"nascor", L"navigo", L"necesse", L"nemo", L"neque",
190- L"niger", L"nisi", L"nivellensem", L"noceo", L"non", L"nos", L"nota", L"novus",
191- L"nunc", L"nusquam", L"obdormio", L"oblivio", L"obviam", L"occupo", L"odium",
192- L"omitto", L"onus", L"oporotheca", L"opportunitatus", L"ops", L"orator",
193- L"orior", L"ostium", L"pactum", L"palam", L"par", L"parens", L"paro",
194- L"passer", L"patiens", L"patruus", L"pax", L"pecus", L"penitus", L"per",
195- L"percutio", L"perfectus", L"periclitatus", L"periurium", L"perpetro",
196- L"perseverantia", L"persuadeo", L"pertineo", L"peruro", L"pessimus",
197- L"pestis", L"phasma", L"pictoratus", L"pirus", L"placide", L"plagiarius",
198- L"plecto", L"plico", L"pluma", L"plures", L"pluvia", L"polenta", L"pomum",
199- L"porta", L"postea", L"postulo", L"potius", L"praebeo", L"praecido",
200- L"praeda", L"praefinio", L"praenuntio", L"praesentia", L"praesto",
201- L"praetereo", L"pravitas", L"premo", L"primitus", L"principatus", L"prius",
202- L"pro", L"procedo", L"procurator", L"proficio", L"profor", L"progenero",
203- L"progressio", L"proinde", L"prolecto", L"proloquor", L"prominens",
204- L"promitto", L"promptu", L"promus", L"propello", L"propositum", L"prorsus",
205- L"prosum", L"proveho", L"prudens", L"pudendus", L"puerilis", L"pugnax",
206- L"pulex", L"pulpa", L"pumilius", L"punitor", L"purgatio", L"puteo",
207- L"pyropus", L"quadrigae", L"quae", L"quaesitio", L"qualiscumque", L"quam",
208- L"quando", L"quantum", L"quantuslibet", L"quas", L"quater", L"quercus",
209- L"queror", L"quibus", L"quicquid", L"quin", L"quisnam", L"quo", L"quodammodo",
210- L"quorum", L"radicitus", L"recedo", L"recolo", L"rectum", L"redarguo",
211- L"redeo", L"refectorium", L"rego", L"relinquo", L"remaneo", L"rependo",
212- L"repeto", L"reprehendo", L"resisto", L"retraho", L"revoco", L"rigor",
213- L"rotomagense", L"rursus", L"sacrilegus", L"saeta", L"saluto",
214- L"sanctimonialis", L"sanitas", L"sapienter", L"satis", L"scaldus", L"scelus",
215- L"scio", L"se", L"secundum", L"secus", L"seductor", L"sententia",
216- L"sepulchrum", L"sermo", L"servus", L"siccus", L"silens", L"silva",
217- L"simulatio", L"singultus", L"sive", L"soleo", L"sollicitudo", L"solum",
218- L"somnio", L"sopor", L"speciosus", L"spero", L"spolium", L"statim", L"stipes",
219- L"studio", L"sub", L"subseco", L"succendo", L"suggero", L"summissus",
220- L"super", L"superne", L"suppellex", L"suppono", L"suscito", L"tabellae",
221- L"tactus", L"tam", L"tandem", L"taruennam", L"tempero", L"templum", L"tendo",
222- L"tenus", L"teres", L"tergum", L"tero", L"tertius", L"textor", L"thema",
223- L"thymbra", L"titulus", L"torqueo", L"toties", L"traiectum", L"trellum",
224- L"tricesimus", L"tristis", L"tubineus", L"tungris", L"turpe", L"ubi",
225- L"ultra", L"undique", L"unus", L"usque", L"ut", L"utilitas", L"utroque",
226- L"vado", L"validus", L"vehementer", L"vendolius", L"ventus", L"verecundia",
227- L"versus", L"vesica", L"vestio", L"vicissitudo", L"video", L"vilicus",
228- L"vindico", L"virga", L"vis", L"vivo", L"voco", L"volo", L"voluntas", L"volva",
229- L"voro", L"vulariter", L"vulnus", L"vultus",
140+ __T("abracadabra"), __T("piffpaffpouf"), __T("izzy"), __T("wizzy"), __T("letsgetsbusy"),
141+ __T("justlikethat"), __T("hocus"), __T("pocus"), __T("shazam"), __T("please"), __T("abduco"),
142+ __T("absorbeo"), __T("abutor"), __T("accipio"), __T("acerbus"), __T("adamo"), __T("adeo"), __T("adficio"),
143+ __T("adinventitias"), __T("admitto"), __T("adsidue"), __T("adsumo"), __T("advenio"), __T("aeger"),
144+ __T("aegrus"), __T("aestivus"), __T("aggero"), __T("ago"), __T("alioqui"), __T("aliquantum"),
145+ __T("aliquot"), __T("alter"), __T("ambianis"), __T("amissio"), __T("amoveo"), __T("andegavense"),
146+ __T("animus"), __T("antepono"), __T("appareo"), __T("appropinquo"), __T("ara"), __T("arca"), __T("arguo"),
147+ __T("articulus"), __T("ascit"), __T("astrum"), __T("atrebatum"), __T("attonbitus"), __T("audax"),
148+ __T("aureus"), __T("autus"), __T("averto"), __T("bardus"), __T("bene"), __T("bibo"), __T("bonus"),
149+ __T("breviter"), __T("calamitas"), __T("callidus"), __T("canonus"), __T("caput"), __T("caritas"),
150+ __T("casso"), __T("catervatim"), __T("causa"), __T("cedo"), __T("celeriter"), __T("centum"),
151+ __T("certus"), __T("charisma"), __T("cimentarius"), __T("cito"), __T("clamor"), __T("claustrum"),
152+ __T("coerceo"), __T("cogo"), __T("colloco"), __T("coma"), __T("cometissa"), __T("commeo"),
153+ __T("commissum"), __T("commoneo"), __T("compatior"), __T("compes"), __T("compositio"),
154+ __T("comprovincialis"), __T("concido"), __T("conculco"), __T("condico"), __T("confiteor"),
155+ __T("conicio"), __T("conor"), __T("conservo"), __T("consisto"), __T("constans"), __T("construo"),
156+ __T("consueta"), __T("consulto"), __T("consuo"), __T("contamino"), __T("contemptio"),
157+ __T("contentus"), __T("contineo"), __T("contradictio"), __T("conventus"), __T("copiose"),
158+ __T("corrigo"), __T("corturiacum"), __T("crastinus"), __T("creo"), __T("cribrum"), __T("cruentus"),
159+ __T("cubicularius"), __T("cui"), __T("culpa"), __T("cum"), __T("cunctus"), __T("cur"), __T("curiosus"),
160+ __T("currus"), __T("curto"), __T("custodiae"), __T("debeo"), __T("decimus"), __T("decumbo"),
161+ __T("defendo"), __T("defleo"), __T("degenero"), __T("delego"), __T("delinquo"), __T("demonstro"),
162+ __T("dens"), __T("depono"), __T("deprecor"), __T("derelinquo"), __T("desino"), __T("despero"),
163+ __T("detego"), __T("devito"), __T("diabolus"), __T("didicerat"), __T("differo"), __T("dignitas"),
164+ __T("dilabor"), __T("diluculo"), __T("diripio"), __T("disco"), __T("dissimilis"), __T("districtus"),
165+ __T("diutius"), __T("divitiae"), __T("dolens"), __T("domesticus"), __T("donec"), __T("duco"),
166+ __T("dulcidine"), __T("duro"), __T("ecclesia"), __T("edo"), __T("efficio"), __T("ego"), __T("elemosina"),
167+ __T("eluvies"), __T("emineo"), __T("emptio"), __T("epistula"), __T("equus"), __T("erogo"), __T("erudio"),
168+ __T("etsi"), __T("ex"), __T("excito"), __T("excuso"), __T("exesto"), __T("exhorresco"), __T("eximo"),
169+ __T("exorior"), __T("experior"), __T("expiscor"), __T("explico"), __T("exsequor"), __T("exstinguo"),
170+ __T("extra"), __T("fabula"), __T("facio"), __T("faenum"), __T("famulus"), __T("fautor"), __T("felix"),
171+ __T("ferme"), __T("festinus"), __T("fides"), __T("fines"), __T("flamma"), __T("fluo"), __T("formo"),
172+ __T("fortiter"), __T("foveo"), __T("frequentia"), __T("frugalitas"), __T("fuga"), __T("fultus"),
173+ __T("furor"), __T("galea"), __T("genus"), __T("glacialis"), __T("gratia"), __T("gravatus"),
174+ __T("gregatim"), __T("hactenus"), __T("harum"), __T("heniis"), __T("hic"), __T("his"), __T("hoc"),
175+ __T("honorabilis"), __T("horum"), __T("huic"), __T("humanitas"), __T("hunnam"), __T("iam"), __T("idem"),
176+ __T("ignavus"), __T("illa"), __T("illarum"), __T("illi"), __T("illis"), __T("illius"), __T("illorum"),
177+ __T("illum"), __T("imitor"), __T("immortalis"), __T("impedito"), __T("impendo"), __T("imperium"),
178+ __T("importunus"), __T("ex"), __T("in"), __T("incertus"), __T("includo"), __T("incorruptus"), __T("inda"),
179+ __T("indignatio"), __T("induco"), __T("inexpugnabilis"), __T("infecunditas"), __T("infenso"),
180+ __T("infero"), __T("inficio"), __T("infigo"), __T("infirmitas"), __T("infitior"), __T("inflatus"),
181+ __T("infligo"), __T("infortunatus"), __T("ingemuo"), __T("inicio"), __T("innotesco"), __T("inquis"),
182+ __T("insciens"), __T("insidiae"), __T("insperatus"), __T("instructus"), __T("insurgo"),
183+ __T("intentio"), __T("interdum"), __T("intueor"), __T("invado"), __T("invetero"), __T("invisus"),
184+ __T("ipsemet"), __T("irritus"), __T("ita"), __T("iucunditas"), __T("iugis"), __T("iussu"), __T("jaculum"),
185+ __T("juventus"), __T("labiosus"), __T("laboriose"), __T("labruscum"), __T("lacertosus"),
186+ __T("lacrimo"), __T("lacto"), __T("laedo"), __T("laetificus"), __T("laevus"), __T("lamentatio"),
187+ __T("laqueus"), __T("laudo"), __T("lectus"), __T("lemiscus"), __T("lenitas"), __T("lentesco"), __T("leo"),
188+ __T("lesciense"), __T("leto"), __T("levidensis"), __T("levo"), __T("liber"), __T("libere"), __T("licet"),
189+ __T("lino"), __T("loci"), __T("longe"), __T("lucerna"), __T("ludio"), __T("lupus"), __T("macero"),
190+ __T("maculo"), __T("maero"), __T("magus"), __T("malmundarium"), __T("mandatum"), __T("manus"),
191+ __T("matera"), __T("me"), __T("mei"), __T("memor"), __T("mensa"), __T("meridianus"), __T("mica"),
192+ __T("millies"), __T("minuo"), __T("miser"), __T("mitigo"), __T("modio"), __T("molestia"),
193+ __T("monasteriense"), __T("monstrum"), __T("morior"), __T("moveo"), __T("multo"), __T("mundus"),
194+ __T("munus"), __T("mutuo"), __T("nascor"), __T("navigo"), __T("necesse"), __T("nemo"), __T("neque"),
195+ __T("niger"), __T("nisi"), __T("nivellensem"), __T("noceo"), __T("non"), __T("nos"), __T("nota"), __T("novus"),
196+ __T("nunc"), __T("nusquam"), __T("obdormio"), __T("oblivio"), __T("obviam"), __T("occupo"), __T("odium"),
197+ __T("omitto"), __T("onus"), __T("oporotheca"), __T("opportunitatus"), __T("ops"), __T("orator"),
198+ __T("orior"), __T("ostium"), __T("pactum"), __T("palam"), __T("par"), __T("parens"), __T("paro"),
199+ __T("passer"), __T("patiens"), __T("patruus"), __T("pax"), __T("pecus"), __T("penitus"), __T("per"),
200+ __T("percutio"), __T("perfectus"), __T("periclitatus"), __T("periurium"), __T("perpetro"),
201+ __T("perseverantia"), __T("persuadeo"), __T("pertineo"), __T("peruro"), __T("pessimus"),
202+ __T("pestis"), __T("phasma"), __T("pictoratus"), __T("pirus"), __T("placide"), __T("plagiarius"),
203+ __T("plecto"), __T("plico"), __T("pluma"), __T("plures"), __T("pluvia"), __T("polenta"), __T("pomum"),
204+ __T("porta"), __T("postea"), __T("postulo"), __T("potius"), __T("praebeo"), __T("praecido"),
205+ __T("praeda"), __T("praefinio"), __T("praenuntio"), __T("praesentia"), __T("praesto"),
206+ __T("praetereo"), __T("pravitas"), __T("premo"), __T("primitus"), __T("principatus"), __T("prius"),
207+ __T("pro"), __T("procedo"), __T("procurator"), __T("proficio"), __T("profor"), __T("progenero"),
208+ __T("progressio"), __T("proinde"), __T("prolecto"), __T("proloquor"), __T("prominens"),
209+ __T("promitto"), __T("promptu"), __T("promus"), __T("propello"), __T("propositum"), __T("prorsus"),
210+ __T("prosum"), __T("proveho"), __T("prudens"), __T("pudendus"), __T("puerilis"), __T("pugnax"),
211+ __T("pulex"), __T("pulpa"), __T("pumilius"), __T("punitor"), __T("purgatio"), __T("puteo"),
212+ __T("pyropus"), __T("quadrigae"), __T("quae"), __T("quaesitio"), __T("qualiscumque"), __T("quam"),
213+ __T("quando"), __T("quantum"), __T("quantuslibet"), __T("quas"), __T("quater"), __T("quercus"),
214+ __T("queror"), __T("quibus"), __T("quicquid"), __T("quin"), __T("quisnam"), __T("quo"), __T("quodammodo"),
215+ __T("quorum"), __T("radicitus"), __T("recedo"), __T("recolo"), __T("rectum"), __T("redarguo"),
216+ __T("redeo"), __T("refectorium"), __T("rego"), __T("relinquo"), __T("remaneo"), __T("rependo"),
217+ __T("repeto"), __T("reprehendo"), __T("resisto"), __T("retraho"), __T("revoco"), __T("rigor"),
218+ __T("rotomagense"), __T("rursus"), __T("sacrilegus"), __T("saeta"), __T("saluto"),
219+ __T("sanctimonialis"), __T("sanitas"), __T("sapienter"), __T("satis"), __T("scaldus"), __T("scelus"),
220+ __T("scio"), __T("se"), __T("secundum"), __T("secus"), __T("seductor"), __T("sententia"),
221+ __T("sepulchrum"), __T("sermo"), __T("servus"), __T("siccus"), __T("silens"), __T("silva"),
222+ __T("simulatio"), __T("singultus"), __T("sive"), __T("soleo"), __T("sollicitudo"), __T("solum"),
223+ __T("somnio"), __T("sopor"), __T("speciosus"), __T("spero"), __T("spolium"), __T("statim"), __T("stipes"),
224+ __T("studio"), __T("sub"), __T("subseco"), __T("succendo"), __T("suggero"), __T("summissus"),
225+ __T("super"), __T("superne"), __T("suppellex"), __T("suppono"), __T("suscito"), __T("tabellae"),
226+ __T("tactus"), __T("tam"), __T("tandem"), __T("taruennam"), __T("tempero"), __T("templum"), __T("tendo"),
227+ __T("tenus"), __T("teres"), __T("tergum"), __T("tero"), __T("tertius"), __T("textor"), __T("thema"),
228+ __T("thymbra"), __T("titulus"), __T("torqueo"), __T("toties"), __T("traiectum"), __T("trellum"),
229+ __T("tricesimus"), __T("tristis"), __T("tubineus"), __T("tungris"), __T("turpe"), __T("ubi"),
230+ __T("ultra"), __T("undique"), __T("unus"), __T("usque"), __T("ut"), __T("utilitas"), __T("utroque"),
231+ __T("vado"), __T("validus"), __T("vehementer"), __T("vendolius"), __T("ventus"), __T("verecundia"),
232+ __T("versus"), __T("vesica"), __T("vestio"), __T("vicissitudo"), __T("video"), __T("vilicus"),
233+ __T("vindico"), __T("virga"), __T("vis"), __T("vivo"), __T("voco"), __T("volo"), __T("voluntas"), __T("volva"),
234+ __T("voro"), __T("vulariter"), __T("vulnus"), __T("vultus"),
230235 NULL
231236 };
232237
@@ -318,11 +323,9 @@
318323 /* Unreachable - stops compiler warning */
319324 }
320325 }
321-
322326 build_prob(lprobs, wordlist);
323327 cached_type = name_type;
324328 }
325-
326329 /* Generate the actual word wanted. */
327330 while (!found_word)
328331 {
@@ -348,7 +351,6 @@
348351 r -= lprobs[c_prev][c_cur][c_next];
349352 c_next++;
350353 }
351-
352354 if (c_next == E_WORD)
353355 {
354356 /* If we've reached the end, we check if we've
@@ -380,11 +382,9 @@
380382 }
381383 }
382384 }
383-
384385 return lnum;
385386 }
386387
387-
388388 /*
389389 * To run standalone tests, #define RANDNAME_TESTING and link with
390390 * with just z-rand.c from Angband.
@@ -394,7 +394,6 @@
394394 #include <stdio.h>
395395 #include <time.h>
396396
397-
398397 bool is_a_vowel(int ch)
399398 {
400399 switch (ch)
--- trunk/JBand/src/pathfind.cpp (revision 120)
+++ trunk/JBand/src/pathfind.cpp (revision 121)
@@ -1,4 +1,8 @@
11 /* テスト */
2+/*
3+ * Debug Status: Now testing init_angband()
4+ * - Fixed __T on this page.
5+ */
26 /*
37 * File: pathfind.c
48 * Purpose: Pathfinding and running code.
@@ -86,18 +90,11 @@
8690 {
8791 terrain[y - oy][x - ox] = MAX_PF_LENGTH;
8892 }
89-#if 0
90- else if (terrain[y-oy][x-ox] != MAX_PF_LENGTH)
91- {
92- bell(L"Target blocked");
93- return (FALSE);
94- }
95-#endif
9693 terrain[y - oy][x - ox] = MAX_PF_LENGTH;
9794 }
9895 else
9996 {
100- bell(L"Target out of range.");
97+ bell(__T("Target out of range."));
10198 return (FALSE);
10299 }
103100 /*
@@ -133,7 +130,7 @@
133130 /* Failure */
134131 if (terrain[y - oy][x - ox] == MAX_PF_LENGTH)
135132 {
136- bell(L"Target space unreachable.");
133+ bell(__T("Target space unreachable."));
137134 return (FALSE);
138135 }
139136 /* Success */
@@ -153,12 +150,12 @@
153150 /* Should never happend */
154151 if (dir == 10)
155152 {
156- bell(L"Wtf ?");
153+ bell(__T("Wtf ?"));
157154 return (FALSE);
158155 }
159156 else if (dir == 5)
160157 {
161- bell(L"Heyyy !");
158+ bell(__T("Heyyy !"));
162159 return (FALSE);
163160 }
164161 pf_result[pf_result_index++] = '0' + (char)(10 - dir);
--- trunk/JBand/src/signals.cpp (revision 120)
+++ trunk/JBand/src/signals.cpp (revision 121)
@@ -1,5 +1,9 @@
11 /* テスト */
22 /*
3+ * Debug Status: Not checked.
4+ * - Skipped fixing __T as all code is for non-Windows systems.
5+ */
6+/*
37 * File: signals.c
48 * Purpose: Handle various OS signals
59 *
@@ -76,9 +80,7 @@
7680
7781 /* Flush the term */
7882 Term_fresh();
79-
8083 #endif
81-
8284 /* Restore handler */
8385 (void)(*signal_aux)(sig, handle_signal_suspend);
8486
@@ -86,7 +88,6 @@
8688 errno = save_errno;
8789 }
8890
89-
9091 /*
9192 * Handle signals -- simple (interrupt and quit)
9293 *
@@ -109,15 +110,12 @@
109110 /* Disable handler */
110111 (void)(*signal_aux)(sig, SIG_IGN);
111112
112-
113113 /* Nothing to save, just quit */
114114 if (!character_generated || character_saved) quit(NULL);
115115
116-
117116 /* Count the signals */
118117 signal_count++;
119118
120-
121119 /* Terminate dead characters */
122120 if (p_ptr->is_dead)
123121 {
@@ -129,7 +127,6 @@
129127 /* Quit */
130128 quit(L"interrupt");
131129 }
132-
133130 /* Allow suicide (after 5) */
134131 else if (signal_count >= 5)
135132 {
@@ -151,7 +148,6 @@
151148 /* Quit */
152149 quit(L"interrupt");
153150 }
154-
155151 /* Give warning (after 4) */
156152 else if (signal_count >= 4)
157153 {
@@ -167,7 +163,6 @@
167163 /* Flush */
168164 Term_fresh();
169165 }
170-
171166 /* Give warning (after 2) */
172167 else if (signal_count >= 2)
173168 {
@@ -182,7 +177,6 @@
182177 errno = save_errno;
183178 }
184179
185-
186180 /*
187181 * Handle signal -- abort, kill, etc
188182 */
@@ -191,11 +185,9 @@
191185 /* Disable handler */
192186 (void)(*signal_aux)(sig, SIG_IGN);
193187
194-
195188 /* Nothing to save, just quit */
196189 if (!character_generated || character_saved) quit(NULL);
197190
198-
199191 /* Clear the bottom line */
200192 Term_erase(0, 23, 255);
201193
@@ -237,9 +229,6 @@
237229 quit(L"software bug");
238230 }
239231
240-
241-
242-
243232 /*
244233 * Ignore SIGTSTP signals (keyboard suspend)
245234 */
@@ -264,7 +253,6 @@
264253
265254 }
266255
267-
268256 /*
269257 * Prepare to handle the relevant signals
270258 */
@@ -353,10 +341,8 @@
353341
354342 }
355343
356-
357344 #else /* HANDLE_SIGNALS */
358345
359-
360346 /*
361347 * Do nothing
362348 */
@@ -379,4 +365,3 @@
379365 }
380366
381367 #endif /* HANDLE_SIGNALS */
382-
--- trunk/JBand/src/load.cpp (revision 120)
+++ trunk/JBand/src/load.cpp (revision 121)
@@ -1,4 +1,8 @@
11 /* テスト */
2+/*
3+ * Debug Status: Now testing init_angband()
4+ * - Fixed __T on this page.
5+ */
26 /*
37 * File: load.c
48 * Purpose: Old-style savefile loading
@@ -50,7 +54,6 @@
5054 rd_byte(&ver);
5155 rd_s16b(&o_ptr->k_idx);
5256 }
53-
5457 /* Paranoia */
5558 if ((o_ptr->k_idx < 0) || (o_ptr->k_idx >= z_info->k_max))
5659 return (-1);
@@ -95,7 +98,6 @@
9598 {
9699 rd_u16b(&o_ptr->ident);
97100 }
98-
99101 rd_byte(&o_ptr->marked);
100102
101103 rd_byte(&o_ptr->origin);
@@ -141,7 +143,6 @@
141143 (f[2] & TR2_OBVIOUS_MASK);
142144 }
143145 }
144-
145146 /* Monster holding object */
146147 rd_s16b(&o_ptr->held_m_idx);
147148
@@ -161,7 +162,6 @@
161162 o_ptr->k_idx = 0;
162163 return 0;
163164 }
164-
165165 /* Repair non "wearable" items */
166166 if (!wearable_p(o_ptr))
167167 {
@@ -184,7 +184,6 @@
184184 /* All done */
185185 return (0);
186186 }
187-
188187 /* Paranoia */
189188 if (o_ptr->name1)
190189 {
@@ -199,7 +198,6 @@
199198 /* Verify that artifact */
200199 if (!a_ptr->name) o_ptr->name1 = 0;
201200 }
202-
203201 /* Paranoia */
204202 if (o_ptr->name2)
205203 {
@@ -214,7 +212,6 @@
214212 /* Verify that ego-item */
215213 if (!e_ptr->name) o_ptr->name2 = 0;
216214 }
217-
218215 /* Get the standard fields */
219216 o_ptr->ac = k_ptr->ac;
220217 o_ptr->dd = k_ptr->dd;
@@ -242,7 +239,6 @@
242239 /* Get the new artifact weight */
243240 o_ptr->weight = a_ptr->weight;
244241 }
245-
246242 /* Ego items */
247243 if (o_ptr->name2)
248244 {
@@ -265,7 +261,6 @@
265261 if (!o_ptr->pval) o_ptr->pval = 1;
266262 }
267263 }
268-
269264 /* Success */
270265 return (0);
271266 }
@@ -291,7 +286,6 @@
291286 {
292287 rd_u32b(&Rand_state[i]);
293288 }
294-
295289 /* Accept */
296290 Rand_quick = FALSE;
297291
@@ -298,8 +292,6 @@
298292 return 0;
299293 }
300294
301-
302-
303295 /*
304296 * Read options
305297 *
@@ -326,7 +318,6 @@
326318 u32b window_mask[ANGBAND_TERM_MAX];
327319 UNREFERENCED_PARAMETER(version);
328320
329-
330321 /*** Oops ***/
331322
332323 /* Ignore old options */
@@ -347,7 +338,6 @@
347338 rd_u16b(&tmp16u);
348339 lazymove_delay = (tmp16u < 1000) ? tmp16u : 0;
349340
350-
351341 /*** Normal Options ***/
352342
353343 /* Read the option flags */
@@ -374,7 +364,6 @@
374364 op_ptr->opt[i] = FALSE;
375365 }
376366 }
377-
378367 /*** Window Options ***/
379368
380369 /* Read the window flags */
@@ -382,13 +371,11 @@
382371 {
383372 rd_u32b(&window_flag[n]);
384373 }
385-
386374 /* Read the window masks */
387375 for (n = 0; n < ANGBAND_TERM_MAX; n++)
388376 {
389377 rd_u32b(&window_mask[n]);
390378 }
391-
392379 /* Analyze the options */
393380 for (n = 0; n < ANGBAND_TERM_MAX; n++)
394381 {
@@ -406,7 +393,6 @@
406393 }
407394 }
408395 }
409-
410396 /* Set up the subwindows */
411397 subwindows_set_flags(window_flag, ANGBAND_TERM_MAX);
412398
@@ -413,8 +399,6 @@
413399 return 0;
414400 }
415401
416-
417-
418402 /*
419403 * Read the saved messages
420404 */
@@ -442,12 +426,9 @@
442426 /* Save the message */
443427 message_add(buf, tmp16u);
444428 }
445-
446429 return 0;
447430 }
448431
449-
450-
451432 int rd_monster_memory(u32b version)
452433 {
453434 int r_idx;
@@ -472,7 +453,6 @@
472453 monster_race *r_ptr = &r_info[r_idx];
473454 monster_lore *l_ptr = &l_list[r_idx];
474455
475-
476456 /* Count sights/deaths/kills */
477457 rd_s16b(&l_ptr->sights);
478458 rd_s16b(&l_ptr->deaths);
@@ -514,11 +494,9 @@
514494 for (i = 0; i < RACE_FLAG_SPELL_STRICT_UB; i++)
515495 l_ptr->spell_flags[i] &= r_ptr->spell_flags[i];
516496 }
517-
518497 return 0;
519498 }
520499
521-
522500 int rd_object_memory(u32b version)
523501 {
524502 int i;
@@ -534,7 +512,6 @@
534512 note(format(__T("Too many (%u) object kinds!"), tmp16u));
535513 return (-1);
536514 }
537-
538515 /* Read the object memory */
539516 for (i = 0; i < tmp16u; i++)
540517 {
@@ -548,11 +525,9 @@
548525 k_ptr->squelch = (tmp8u & 0x04) ? TRUE : FALSE;
549526 k_ptr->everseen = (tmp8u & 0x08) ? TRUE : FALSE;
550527 }
551-
552528 return 0;
553529 }
554530
555-
556531 int rd_quests(u32b version)
557532 {
558533 int i;
@@ -568,7 +543,6 @@
568543 note(format(__T("Too many (%u) quests!"), tmp16u));
569544 return (-1);
570545 }
571-
572546 /* Load the Quests */
573547 for (i = 0; i < tmp16u; i++)
574548 {
@@ -580,7 +554,6 @@
580554 rd_byte(&tmp8u);
581555 rd_byte(&tmp8u);
582556 }
583-
584557 return 0;
585558 }
586559
@@ -612,14 +585,11 @@
612585 rd_byte(&tmp8u);
613586 rd_byte(&tmp8u);
614587 }
615-
616588 return 0;
617589 }
618590
619-
620591 static u32b randart_version;
621592
622-
623593 /*
624594 * Read the "extra" information
625595 */
@@ -630,7 +600,6 @@
630600 byte num;
631601 UNREFERENCED_PARAMETER(version);
632602
633-
634603 rd_string(op_ptr->full_name, sizeof(op_ptr->full_name));
635604 rd_string(p_ptr->died_from, 80);
636605 rd_string(p_ptr->history, 250);
@@ -700,7 +669,6 @@
700669 note(format(__T("Invalid player level (%d)."), p_ptr->lev));
701670 return (-1);
702671 }
703-
704672 rd_s16b(&p_ptr->mhp);
705673 rd_s16b(&p_ptr->chp);
706674 rd_u16b(&p_ptr->chp_frac);
@@ -753,9 +721,8 @@
753721
754722 /* Discard unused entries */
755723 strip_bytes(2 * (num - TMD_MAX));
756- note(L"Discarded unsupported timed effects");
724+ note(__T("Discarded unsupported timed effects"));
757725 }
758-
759726 /* Future use */
760727 strip_bytes(40);
761728
@@ -762,7 +729,6 @@
762729 return 0;
763730 }
764731
765-
766732 /*
767733 * Read squelch and autoinscription submenu for all known objects
768734 */
@@ -786,7 +752,6 @@
786752 for (i = 0; i < SQUELCH_BYTES; i++)
787753 rd_byte(&squelch_level[i]);
788754 }
789-
790755 /* Read the number of saved ego-item */
791756 rd_u16b(&file_e_max);
792757
@@ -801,7 +766,6 @@
801766 e_info[i].everseen |= (flags & 0x02);
802767 }
803768 }
804-
805769 /* Read the current number of auto-inscriptions */
806770 rd_u16b(&inscriptions_count);
807771
@@ -815,7 +779,6 @@
815779
816780 inscriptions[i].inscription_idx = quark_add(tmp);
817781 }
818-
819782 return 0;
820783 }
821784
@@ -845,7 +808,6 @@
845808 rd_u16b(&p_ptr->total_winner);
846809 rd_u16b(&p_ptr->noscore);
847810
848-
849811 /* Read "death" */
850812 rd_byte(&tmp8u);
851813 p_ptr->is_dead = tmp8u;
@@ -886,7 +848,6 @@
886848 return 0;
887849 }
888850
889-
890851 int rd_player_spells(u32b version)
891852 {
892853 int i;
@@ -915,7 +876,6 @@
915876 return (0);
916877 }
917878
918-
919879 /*
920880 * Read the random artifacts
921881 */
@@ -951,7 +911,6 @@
951911 note(format(__T("Incompatible random artifacts version!")));
952912 return (-1);
953913 }
954-
955914 /* Initialize randarts */
956915 do_randart(seed_randart, TRUE);
957916 }
@@ -969,7 +928,6 @@
969928 note(format(__T("Too many (%u) random artifacts!"), artifact_count));
970929 return (-1);
971930 }
972-
973931 /* Mark the old artifacts as "empty" */
974932 for (i = 0; i < z_info->a_max; i++)
975933 {
@@ -978,7 +936,6 @@
978936 a_ptr->tval = 0;
979937 a_ptr->sval = 0;
980938 }
981-
982939 /* Read the artifacts */
983940 for (i = 0; i < artifact_count; i++)
984941 {
@@ -1012,9 +969,8 @@
1012969 rd_u16b(&a_ptr->time_dice);
1013970 rd_u16b(&a_ptr->time_sides);
1014971 }
1015-
1016- /* Initialize only the randart names */
1017- do_randart(seed_randart, FALSE);
972+ /* Initialize only the randart names */
973+ do_randart(seed_randart, FALSE);
1018974 }
1019975 else
1020976 {
@@ -1051,12 +1007,9 @@
10511007 }
10521008 }
10531009 }
1054-
10551010 return (0);
10561011 }
10571012
1058-
1059-
10601013 /*
10611014 * Read the player inventory
10621015 *
@@ -1090,10 +1043,9 @@
10901043 /* Read the item */
10911044 if (rd_item(i_ptr))
10921045 {
1093- note(L"Error reading item");
1046+ note(__T("Error reading item"));
10941047 return (-1);
10951048 }
1096-
10971049 /* Hack -- verify item */
10981050 if (!i_ptr->k_idx) continue;;
10991051
@@ -1112,19 +1064,16 @@
11121064 /* One more item */
11131065 p_ptr->equip_cnt++;
11141066 }
1115-
11161067 /* Warning -- backpack is full */
11171068 else if (p_ptr->inven_cnt == INVEN_PACK)
11181069 {
11191070 /* Oops */
1120- note(L"Too many items in the inventory!");
1071+ note(__T("Too many items in the inventory!"));
11211072
11221073 /* Fail */
11231074 return (-1);
11241075 }
1125-
1126- /* Carry inventory */
1127- else
1076+ else /* Carry inventory */
11281077 {
11291078 /* Get a slot */
11301079 n = slot++;
@@ -1139,12 +1088,10 @@
11391088 p_ptr->inven_cnt++;
11401089 }
11411090 }
1142-
11431091 /* Success */
11441092 return (0);
11451093 }
11461094
1147-
11481095 int rd_stores(u32b version)
11491096 {
11501097 int i;
@@ -1173,10 +1120,9 @@
11731120 /* Paranoia */
11741121 if (own >= z_info->b_max)
11751122 {
1176- note(L"Illegal store owner!");
1123+ note(__T("Illegal store owner!"));
11771124 return (-1);
11781125 }
1179-
11801126 st_ptr->owner = own;
11811127
11821128 /* Read the items */
@@ -1194,10 +1140,9 @@
11941140 /* Read the item */
11951141 if (rd_item(i_ptr))
11961142 {
1197- note(L"Error reading item");
1143+ note(__T("Error reading item"));
11981144 return (-1);
11991145 }
1200-
12011146 /* Accept any valid items */
12021147 if ((st_ptr->stock_num < STORE_INVEN_MAX) &&
12031148 (i_ptr->k_idx))
@@ -1209,13 +1154,9 @@
12091154 }
12101155 }
12111156 }
1212-
12131157 return 0;
12141158 }
12151159
1216-
1217-
1218-
12191160 /*
12201161 * Read the dungeon
12211162 *
@@ -1263,7 +1204,6 @@
12631204 rd_u16b(&tmp16u);
12641205 rd_u16b(&tmp16u);
12651206
1266-
12671207 /* Ignore illegal dungeons */
12681208 if ((depth < 0) || (depth >= MAX_DEPTH))
12691209 {
@@ -1287,7 +1227,6 @@
12871227 return (1);
12881228 }
12891229
1290-
12911230 /*** Run length decoding ***/
12921231
12931232 /* Load the dungeon data */
@@ -1314,7 +1253,6 @@
13141253 }
13151254 }
13161255 }
1317-
13181256 /* Load the dungeon data */
13191257 for (x = y = 0; y < DUNGEON_HGT; )
13201258 {
@@ -1339,8 +1277,6 @@
13391277 }
13401278 }
13411279 }
1342-
1343-
13441280 /*** Run length decoding ***/
13451281
13461282 /* Load the dungeon data */
@@ -1367,8 +1303,6 @@
13671303 }
13681304 }
13691305 }
1370-
1371-
13721306 /*** Player ***/
13731307
13741308 /* Load depth */
@@ -1381,18 +1315,11 @@
13811315 note(format(__T("Cannot place player (%d,%d)!"), py, px));
13821316 return (-1);
13831317 }
1384-
13851318 /*** Success ***/
13861319
13871320 /* The dungeon is ready */
13881321 character_dungeon = TRUE;
1389-
1390-#if 0
1391- /* Regenerate town in old versions */
1392- if (p_ptr->depth == 0)
1393- character_dungeon = FALSE;
1394-#endif
1395-
1322+
13961323 return 0;
13971324 }
13981325
@@ -1415,7 +1342,6 @@
14151342 note(format(__T("Too many (%d) object entries!"), limit));
14161343 return (-1);
14171344 }
1418-
14191345 /* Read the dungeon items */
14201346 for (i = 1; i < limit; i++)
14211347 {
@@ -1425,7 +1351,6 @@
14251351 s16b o_idx;
14261352 object_type *o_ptr;
14271353
1428-
14291354 /* Get the object */
14301355 i_ptr = &object_type_body;
14311356
@@ -1435,10 +1360,9 @@
14351360 /* Read the item */
14361361 if (rd_item(i_ptr))
14371362 {
1438- note(L"Error reading item");
1363+ note(__T("Error reading item"));
14391364 return (-1);
14401365 }
1441-
14421366 /* Make an object */
14431367 o_idx = o_pop();
14441368
@@ -1448,7 +1372,6 @@
14481372 note(format(__T("Cannot place object %d!"), i));
14491373 return (-1);
14501374 }
1451-
14521375 /* Get the object */
14531376 o_ptr = &o_list[o_idx];
14541377
@@ -1470,11 +1393,9 @@
14701393 cave_o_idx[y][x] = o_idx;
14711394 }
14721395 }
1473-
14741396 return 0;
14751397 }
14761398
1477-
14781399 int rd_monsters(u32b version)
14791400 {
14801401 int i;
@@ -1526,7 +1447,6 @@
15261447 return (-1);
15271448 }
15281449 }
1529-
15301450 /* Reacquire objects */
15311451 for (i = 1; i < o_max; ++i)
15321452 {
@@ -1542,10 +1462,9 @@
15421462 /* Verify monster index */
15431463 if (o_ptr->held_m_idx > z_info->m_max)
15441464 {
1545- note(L"Invalid monster index");
1465+ note(__T("Invalid monster index"));
15461466 return (-1);
15471467 }
1548-
15491468 /* Get the monster */
15501469 m_ptr = &mon_list[o_ptr->held_m_idx];
15511470
@@ -1555,11 +1474,9 @@
15551474 /* Link the monster to the object */
15561475 m_ptr->hold_o_idx = i;
15571476 }
1558-
15591477 return 0;
15601478 }
15611479
1562-
15631480 int rd_ghost(u32b version)
15641481 {
15651482 _TCHAR buf[64];
@@ -1580,7 +1497,6 @@
15801497 return 0;
15811498 }
15821499
1583-
15841500 int rd_history(u32b version)
15851501 {
15861502 u32b tmp32u;
@@ -1607,6 +1523,5 @@
16071523
16081524 history_add_full(type, art_name, dlev, clev, turn, text);
16091525 }
1610-
16111526 return 0;
16121527 }
--- trunk/JBand/src/option.cpp (revision 120)
+++ trunk/JBand/src/option.cpp (revision 121)
@@ -1,4 +1,8 @@
11 /* テスト */
2+/*
3+ * Debug Status: Now testing init_angband()
4+ * - Fixed __T on this page.
5+ */
26 /*
37 * File: options.c
48 * Purpose: Options table and definitions.
@@ -45,7 +49,6 @@
4549 OPT_NONE,
4650 OPT_NONE,
4751 },
48-
4952 /* Display */
5053 {
5154 OPT_hp_changes_color,
@@ -65,7 +68,6 @@
6568 OPT_NONE,
6669 OPT_NONE,
6770 },
68-
6971 /* Warning */
7072 {
7173 OPT_disturb_move,
@@ -85,7 +87,6 @@
8587 OPT_NONE,
8688 OPT_NONE,
8789 },
88-
8990 /* Birth/Difficulty */
9091 {
9192 OPT_birth_maximize,
@@ -105,7 +106,6 @@
105106 OPT_birth_no_stairs,
106107 OPT_birth_feelings
107108 },
108-
109109 /* Cheat */
110110 {
111111 OPT_cheat_peek,
@@ -127,7 +127,6 @@
127127 }
128128 };
129129
130-
131130 typedef struct
132131 {
133132 const _TCHAR *name;
@@ -137,30 +136,30 @@
137136
138137 static option_entry options[OPT_MAX] =
139138 {
140-{ L"rogue_like_commands", L"Rogue-like commands", FALSE }, /* 0 */
141-{ L"quick_messages", L"Activate quick messages", TRUE }, /* 1 */
142-{ L"use_sound", L"Use sound", FALSE }, /* 2 */
143-{ L"pickup_detail", L"Be verbose when picking things up", TRUE }, /* 3 */
144-{ L"use_old_target", L"Use old target by default", FALSE }, /* 4 */
145-{ L"pickup_always", L"Always pickup items", FALSE }, /* 5 */
146-{ L"pickup_inven", L"Always pickup items matching inventory", TRUE }, /* 6 */
139+{ __T("rogue_like_commands"), __T("Rogue-like commands"), FALSE }, /* 0 */
140+{ __T("quick_messages"), __T("Activate quick messages"), TRUE }, /* 1 */
141+{ __T("use_sound"), __T("Use sound"), FALSE }, /* 2 */
142+{ __T("pickup_detail"), __T("Be verbose when picking things up"), TRUE }, /* 3 */
143+{ __T("use_old_target"), __T("Use old target by default"), FALSE }, /* 4 */
144+{ __T("pickup_always"), __T("Always pickup items"), FALSE }, /* 5 */
145+{ __T("pickup_inven"), __T("Always pickup items matching inventory"), TRUE }, /* 6 */
147146 { NULL, NULL, FALSE }, /* 8 */
148147 { NULL, NULL, FALSE }, /* 8 */
149148 { NULL, NULL, FALSE }, /* 9 */
150-{ L"show_labels", L"Show labels in equipment listings", TRUE }, /* 10 */
151-{ L"show_lists", L"Always show lists", TRUE }, /* 11 */
149+{ __T("show_labels"), __T("Show labels in equipment listings"), TRUE }, /* 10 */
150+{ __T("show_lists"), __T("Always show lists"), TRUE }, /* 11 */
152151 { NULL, NULL, FALSE }, /* 12 */
153152 { NULL, NULL, FALSE }, /* 13 */
154-{ L"ring_bell", L"Audible bell (on errors, etc)", TRUE }, /* 14 */
155-{ L"show_flavors", L"Show flavors in object descriptions", TRUE }, /* 15 */
153+{ __T("ring_bell"), __T("Audible bell (on errors, etc)"), TRUE }, /* 14 */
154+{ __T("show_flavors"), __T("Show flavors in object descriptions"), TRUE }, /* 15 */
156155 { NULL, NULL, FALSE }, /* 16 */
157156 { NULL, NULL, FALSE }, /* 17 */
158157 { NULL, NULL, FALSE }, /* 18 */
159158 { NULL, NULL, FALSE }, /* 19 */
160-{ L"disturb_move", L"Disturb whenever any monster moves", FALSE }, /* 20 */
161-{ L"disturb_near", L"Disturb whenever viewable monster moves", TRUE }, /* 21 */
162-{ L"disturb_detect", L"Disturb whenever leaving trap detected area", TRUE }, /* 22 */
163-{ L"disturb_state", L"Disturb whenever player state changes", TRUE }, /* 23 */
159+{ __T("disturb_move"), __T("Disturb whenever any monster moves"), FALSE }, /* 20 */
160+{ __T("disturb_near"), __T("Disturb whenever viewable monster moves"), TRUE }, /* 21 */
161+{ __T("disturb_detect"), __T("Disturb whenever leaving trap detected area"), TRUE }, /* 22 */
162+{ __T("disturb_state"), __T("Disturb whenever player state changes"), TRUE }, /* 23 */
164163 { NULL, NULL, FALSE }, /* 24 */
165164 { NULL, NULL, FALSE }, /* 25 */
166165 { NULL, NULL, FALSE }, /* 26 */
@@ -175,8 +174,8 @@
175174 { NULL, NULL, FALSE }, /* 35 */
176175 { NULL, NULL, FALSE }, /* 36 */
177176 { NULL, NULL, FALSE }, /* 37 */
178-{ L"view_perma_grids", L"Map remembers all perma-lit grids", TRUE }, /* 38 */
179-{ L"view_torch_grids", L"Map remembers all torch-lit grids", TRUE }, /* 39 */
177+{ __T("view_perma_grids"), __T("Map remembers all perma-lit grids"), TRUE }, /* 38 */
178+{ __T("view_torch_grids"), __T("Map remembers all torch-lit grids"), TRUE }, /* 39 */
180179 { NULL, NULL, TRUE }, /* 40 */
181180 { NULL, NULL, TRUE }, /* 41 */
182181 { NULL, NULL, FALSE }, /* 42 */
@@ -189,33 +188,33 @@
189188 { NULL, NULL, FALSE }, /* 49 */
190189 { NULL, NULL, FALSE }, /* 50 */
191190 { NULL, NULL, FALSE }, /* 51 */
192-{ L"flush_failure", L"Flush input on various failures", TRUE }, /* 52 */
193-{ L"flush_disturb", L"Flush input whenever disturbed", FALSE }, /* 53 */
191+{ __T("flush_failure"), __T("Flush input on various failures"), TRUE }, /* 52 */
192+{ __T("flush_disturb"), __T("Flush input whenever disturbed"), FALSE }, /* 53 */
194193 { NULL, NULL, FALSE }, /* 54 */
195194 { NULL, NULL, FALSE }, /* 55 */
196195 { NULL, NULL, FALSE }, /* 56 */
197196 { NULL, NULL, FALSE }, /* 57 */
198197 { NULL, NULL, FALSE }, /* 58 */
199-{ L"hilite_player", L"Hilite the player with the cursor", FALSE }, /* 59 */
200-{ L"view_yellow_lite", L"Use special colors for torch lite", FALSE }, /* 60 */
201-{ L"view_bright_lite", L"Use special colors for field of view", TRUE }, /* 61 */
202-{ L"view_granite_lite", L"Use special colors for wall grids", FALSE }, /* 62 */
203-{ L"view_special_lite", L"Use special colors for floor grids", TRUE }, /* 63 */
204-{ L"easy_open", L"Open/Disarm/Close without direction", FALSE }, /* 64 */
205-{ L"easy_alter", L"Open/Disarm doors/traps on movement", FALSE }, /* 65 */
198+{ __T("hilite_player"), __T("Hilite the player with the cursor"), FALSE }, /* 59 */
199+{ __T("view_yellow_lite"), __T("Use special colors for torch lite"), FALSE }, /* 60 */
200+{ __T("view_bright_lite"), __T("Use special colors for field of view"), TRUE }, /* 61 */
201+{ __T("view_granite_lite"), __T("Use special colors for wall grids"), FALSE }, /* 62 */
202+{ __T("view_special_lite"), __T("Use special colors for floor grids"), TRUE }, /* 63 */
203+{ __T("easy_open"), __T("Open/Disarm/Close without direction"), FALSE }, /* 64 */
204+{ __T("easy_alter"), __T("Open/Disarm doors/traps on movement"), FALSE }, /* 65 */
206205 { NULL, NULL, FALSE }, /* 66 */
207-{ L"show_piles", L"Show stacks using special attr/char", FALSE }, /* 67 */
208-{ L"center_player", L"Center map continuously", FALSE }, /* 68 */
206+{ __T("show_piles"), __T("Show stacks using special attr/char"), FALSE }, /* 67 */
207+{ __T("center_player"), __T("Center map continuously"), FALSE }, /* 68 */
209208 { NULL, NULL, FALSE }, /* 69 */
210209 { NULL, NULL, FALSE }, /* 70 */
211-{ L"auto_more", L"Automatically clear '-more-' prompts", FALSE }, /* 71 */
210+{ __T("auto_more"), __T("Automatically clear '-more-' prompts"), FALSE }, /* 71 */
212211 { NULL, NULL, FALSE }, /* 72 */
213212 { NULL, NULL, FALSE }, /* 73 */
214-{ L"hp_changes_color", L"Player color indicates low hit points", FALSE }, /* 74 */
215-{ L"hide_squelchable", L"Hide items set as squelchable", FALSE }, /* 75 */
216-{ L"squelch_worthless", L"Automatically squelch worthless items", FALSE }, /* 76 */
217-{ L"mouse_movement", L"Allow mouse clicks to move the player", FALSE }, /* 77 */
218-{ L"mouse_buttons", L"Show mouse status line buttons", FALSE }, /* 78 */
213+{ __T("hp_changes_color"), __T("Player color indicates low hit points"), FALSE }, /* 74 */
214+{ __T("hide_squelchable"), __T("Hide items set as squelchable"), FALSE }, /* 75 */
215+{ __T("squelch_worthless"), __T("Automatically squelch worthless items"), FALSE }, /* 76 */
216+{ __T("mouse_movement"), __T("Allow mouse clicks to move the player"), FALSE }, /* 77 */
217+{ __T("mouse_buttons"), __T("Show mouse status line buttons"), FALSE }, /* 78 */
219218 { NULL, NULL, FALSE }, /* 79 */
220219 { NULL, NULL, FALSE }, /* 80 */
221220 { NULL, NULL, FALSE }, /* 81 */
@@ -265,25 +264,25 @@
265264 { NULL, NULL, FALSE }, /* 125 */
266265 { NULL, NULL, FALSE }, /* 126 */
267266 { NULL, NULL, FALSE }, /* 127 */
268-{ L"birth_maximize", L"Maximise effect of race/class bonuses", TRUE }, /* 128 */
269-{ L"birth_randarts", L"Randomise the artifacts (except a very few)", FALSE }, /* 129 */
270-{ L"birth_money", L"Start with more money instead of equipment", FALSE }, /* 130 */
271-{ L"birth_ironman", L"Restrict the use of stairs/recall", FALSE }, /* 131 */
272-{ L"birth_no_stores", L"Restrict the use of stores/home", FALSE }, /* 132 */
273-{ L"birth_no_artifacts", L"Restrict creation of artifacts", FALSE }, /* 133 */
274-{ L"birth_no_stacking", L"Don't stack objects on the floor", FALSE }, /* 134 */
275-{ L"birth_no_preserve", L"Lose artifacts when leaving level", FALSE }, /* 135 */
276-{ L"birth_no_stairs", L"Don't generate connected stairs", FALSE }, /* 136 */
277-{ L"birth_feelings", L"Don't show level feelings", FALSE }, /* 137 */
267+{ __T("birth_maximize"), __T("Maximise effect of race/class bonuses"), TRUE }, /* 128 */
268+{ __T("birth_randarts"), __T("Randomise the artifacts (except a very few)"), FALSE }, /* 129 */
269+{ __T("birth_money"), __T("Start with more money instead of equipment"), FALSE }, /* 130 */
270+{ __T("birth_ironman"), __T("Restrict the use of stairs/recall"), FALSE }, /* 131 */
271+{ __T("birth_no_stores"), __T("Restrict the use of stores/home"), FALSE }, /* 132 */
272+{ __T("birth_no_artifacts"), __T("Restrict creation of artifacts"), FALSE }, /* 133 */
273+{ __T("birth_no_stacking"), __T("Don't stack objects on the floor"), FALSE }, /* 134 */
274+{ __T("birth_no_preserve"), __T("Lose artifacts when leaving level"), FALSE }, /* 135 */
275+{ __T("birth_no_stairs"), __T("Don't generate connected stairs"), FALSE }, /* 136 */
276+{ __T("birth_feelings"), __T("Don't show level feelings"), FALSE }, /* 137 */
278277 { NULL, NULL, FALSE }, /* 138 */
279278 { NULL, NULL, FALSE }, /* 139 */
280279 { NULL, NULL, FALSE }, /* 140 */
281-{ L"birth_ai_sound", L"Monsters chase current location", TRUE }, /* 141 */
282-{ L"birth_ai_smell", L"Monsters chase recent locations", TRUE }, /* 142 */
283-{ L"birth_ai_packs", L"Monsters act smarter in groups", TRUE }, /* 143 */
284-{ L"birth_ai_learn", L"Monsters learn from their mistakes", FALSE }, /* 144 */
285-{ L"birth_ai_cheat", L"Monsters exploit player's weaknesses", FALSE }, /* 145 */
286-{ L"birth_ai_smart", L"Monsters behave more intelligently (broken)", FALSE }, /* 146 */
280+{ __T("birth_ai_sound"), __T("Monsters chase current location"), TRUE }, /* 141 */
281+{ __T("birth_ai_smell"), __T("Monsters chase recent locations"), TRUE }, /* 142 */
282+{ __T("birth_ai_packs"), __T("Monsters act smarter in groups"), TRUE }, /* 143 */
283+{ __T("birth_ai_learn"), __T("Monsters learn from their mistakes"), FALSE }, /* 144 */
284+{ __T("birth_ai_cheat"), __T("Monsters exploit player's weaknesses"), FALSE }, /* 145 */
285+{ __T("birth_ai_smart"), __T("Monsters behave more intelligently (broken)"), FALSE }, /* 146 */
287286 { NULL, NULL, FALSE }, /* 147 */
288287 { NULL, NULL, FALSE }, /* 148 */
289288 { NULL, NULL, FALSE }, /* 149 */
@@ -297,12 +296,12 @@
297296 { NULL, NULL, FALSE }, /* 157 */
298297 { NULL, NULL, FALSE }, /* 158 */
299298 { NULL, NULL, FALSE }, /* 159 */
300-{ L"cheat_peek", L"Cheat: Peek into object creation", FALSE }, /* 160 */
301-{ L"cheat_hear", L"Cheat: Peek into monster creation", FALSE }, /* 161 */
302-{ L"cheat_room", L"Cheat: Peek into dungeon creation", FALSE }, /* 162 */
303-{ L"cheat_xtra", L"Cheat: Peek into something else", FALSE }, /* 163 */
304-{ L"cheat_know", L"Cheat: Know complete monster info", FALSE }, /* 164 */
305-{ L"cheat_live", L"Cheat: Allow player to avoid death", FALSE }, /* 165 */
299+{ __T("cheat_peek"), __T("Cheat: Peek into object creation"), FALSE }, /* 160 */
300+{ __T("cheat_hear"), __T("Cheat: Peek into monster creation"), FALSE }, /* 161 */
301+{ __T("cheat_room"), __T("Cheat: Peek into dungeon creation"), FALSE }, /* 162 */
302+{ __T("cheat_xtra"), __T("Cheat: Peek into something else"), FALSE }, /* 163 */
303+{ __T("cheat_know"), __T("Cheat: Know complete monster info"), FALSE }, /* 164 */
304+{ __T("cheat_live"), __T("Cheat: Allow player to avoid death"), FALSE }, /* 165 */
306305 { NULL, NULL, FALSE }, /* 166 */
307306 { NULL, NULL, FALSE }, /* 167 */
308307 { NULL, NULL, FALSE }, /* 168 */
@@ -329,25 +328,25 @@
329328 { NULL, NULL, FALSE }, /* 189 */
330329 { NULL, NULL, FALSE }, /* 190 */
331330 { NULL, NULL, FALSE }, /* 191 */
332-{ L"adult_maximize", L"Maximize effect of race/class bonuses", TRUE }, /* 192 */
333-{ L"adult_randarts", L"Randomize some of the artifacts (beta)", FALSE }, /* 193 */
331+{ __T("adult_maximize"), __T("Maximize effect of race/class bonuses"), TRUE }, /* 192 */
332+{ __T("adult_randarts"), __T("Randomize some of the artifacts (beta)"), FALSE }, /* 193 */
334333 { NULL, NULL, FALSE }, /* 194 */
335-{ L"adult_ironman", L"Restrict the use of stairs/recall", FALSE }, /* 195 */
336-{ L"adult_no_stores", L"Restrict the use of stores/home", FALSE }, /* 196 */
337-{ L"adult_no_artifacts", L"Restrict creation of artifacts", FALSE }, /* 197 */
338-{ L"adult_no_stacking", L"Don't stack objects on the floor", FALSE }, /* 198 */
339-{ L"adult_no_preserve", L"Lose artifacts when leaving level", FALSE }, /* 199 */
340-{ L"adult_no_stairs", L"Don't generate connected stairs", FALSE }, /* 200 */
334+{ __T("adult_ironman"), __T("Restrict the use of stairs/recall"), FALSE }, /* 195 */
335+{ __T("adult_no_stores"), __T("Restrict the use of stores/home"), FALSE }, /* 196 */
336+{ __T("adult_no_artifacts"), __T("Restrict creation of artifacts"), FALSE }, /* 197 */
337+{ __T("adult_no_stacking"), __T("Don't stack objects on the floor"), FALSE }, /* 198 */
338+{ __T("adult_no_preserve"), __T("Lose artifacts when leaving level"), FALSE }, /* 199 */
339+{ __T("adult_no_stairs"), __T("Don't generate connected stairs"), FALSE }, /* 200 */
341340 { NULL, NULL, FALSE }, /* 201 */
342341 { NULL, NULL, FALSE }, /* 202 */
343342 { NULL, NULL, FALSE }, /* 203 */
344343 { NULL, NULL, FALSE }, /* 204 */
345-{ L"adult_ai_sound", L"Adult: Monsters chase current location", TRUE }, /* 205 */
346-{ L"adult_ai_smell", L"Adult: Monsters chase recent locations", TRUE }, /* 206 */
347-{ L"adult_ai_packs", L"Adult: Monsters act smarter in groups", TRUE }, /* 207 */
348-{ L"adult_ai_learn", L"Adult: Monsters learn from their mistakes", FALSE }, /* 208 */
349-{ L"adult_ai_cheat", L"Adult: Monsters exploit players weaknesses", FALSE }, /* 209 */
350-{ L"adult_ai_smart", L"Adult: Monsters behave more intelligently (broken)", FALSE }, /* 210 */
344+{ __T("adult_ai_sound"), __T("Adult: Monsters chase current location"), TRUE }, /* 205 */
345+{ __T("adult_ai_smell"), __T("Adult: Monsters chase recent locations"), TRUE }, /* 206 */
346+{ __T("adult_ai_packs"), __T("Adult: Monsters act smarter in groups"), TRUE }, /* 207 */
347+{ __T("adult_ai_learn"), __T("Adult: Monsters learn from their mistakes"), FALSE }, /* 208 */
348+{ __T("adult_ai_cheat"), __T("Adult: Monsters exploit players weaknesses"), FALSE }, /* 209 */
349+{ __T("adult_ai_smart"), __T("Adult: Monsters behave more intelligently (broken)"), FALSE }, /* 210 */
351350 { NULL, NULL, FALSE }, /* 211 */
352351 { NULL, NULL, FALSE }, /* 212 */
353352 { NULL, NULL, FALSE }, /* 213 */
@@ -361,12 +360,13 @@
361360 { NULL, NULL, FALSE }, /* 221 */
362361 { NULL, NULL, FALSE }, /* 222 */
363362 { NULL, NULL, FALSE }, /* 223 */
364-{ L"score_peek", L"Score: Peek into object creation", FALSE }, /* 224 */
365-{ L"score_hear", L"Score: Peek into monster creation", FALSE }, /* 225 */
366-{ L"score_room", L"Score: Peek into dungeon creation", FALSE }, /* 226 */
367-{ L"score_xtra", L"Score: Peek into something else", FALSE }, /* 227 */
368-{ L"score_know", L"Score: Know complete monster info", FALSE }, /* 228 */
369-{ L"score_live", L"Score: Allow player to avoid death", FALSE }, /* 229 */{ NULL, NULL, FALSE }, /* 230 */
363+{ __T("score_peek"), __T("Score: Peek into object creation"), FALSE }, /* 224 */
364+{ __T("score_hear"), __T("Score: Peek into monster creation"), FALSE }, /* 225 */
365+{ __T("score_room"), __T("Score: Peek into dungeon creation"), FALSE }, /* 226 */
366+{ __T("score_xtra"), __T("Score: Peek into something else"), FALSE }, /* 227 */
367+{ __T("score_know"), __T("Score: Know complete monster info"), FALSE }, /* 228 */
368+{ __T("score_live"), __T("Score: Allow player to avoid death"), FALSE }, /* 229 */
369+{ NULL, NULL, FALSE }, /* 230 */
370370 { NULL, NULL, FALSE }, /* 231 */
371371 { NULL, NULL, FALSE }, /* 232 */
372372 { NULL, NULL, FALSE }, /* 233 */
--- trunk/JBand/src/save.cpp (revision 120)
+++ trunk/JBand/src/save.cpp (revision 121)
@@ -1,4 +1,8 @@
11 /* テスト */
2+/*
3+ * Debug Status: Now testing init_angband()
4+ * - Fixed __T on this page.
5+ */
26 /*
37 * File: save.c
48 * Purpose: Old-style savefile saving
@@ -103,7 +107,6 @@
103107 wr_u32b(Rand_state[i]);
104108 }
105109
106-
107110 /*
108111 * Write the "options"
109112 */
@@ -116,11 +119,9 @@
116119 u32b window_flag[ANGBAND_TERM_MAX];
117120 u32b window_mask[ANGBAND_TERM_MAX];
118121
119-
120122 /* XXX */
121123 for (i = 0; i < 4; i++) wr_u32b(0L);
122124
123-
124125 /*** Special Options ***/
125126
126127 wr_byte(op_ptr->delay_factor);
@@ -127,7 +128,6 @@
127128 wr_byte(op_ptr->hitpoint_warn);
128129 wr_u16b(lazymove_delay);
129130
130-
131131 /*** Normal options ***/
132132
133133 /* Reset */
@@ -136,7 +136,6 @@
136136 flag[i] = 0L;
137137 mask[i] = 0L;
138138 }
139-
140139 /* Analyze the options */
141140 for (i = 0; i < OPT_MAX; i++)
142141 {
@@ -153,7 +152,6 @@
153152 /* Set mask */
154153 mask[os] |= (1L << ob);
155154 }
156-
157155 /* Dump the flags */
158156 for (i = 0; i < 8; i++) wr_u32b(flag[i]);
159157
@@ -160,7 +158,6 @@
160158 /* Dump the masks */
161159 for (i = 0; i < 8; i++) wr_u32b(mask[i]);
162160
163-
164161 /*** Window options ***/
165162
166163 /* Reset */
@@ -182,7 +179,6 @@
182179 }
183180 }
184181 }
185-
186182 /* Dump the flags */
187183 for (i = 0; i < ANGBAND_TERM_MAX; i++) wr_u32b(window_flag[i]);
188184
@@ -190,7 +186,6 @@
190186 for (i = 0; i < ANGBAND_TERM_MAX; i++) wr_u32b(window_mask[i]);
191187 }
192188
193-
194189 void wr_messages(void)
195190 {
196191 s16b i;
@@ -208,7 +203,6 @@
208203 }
209204 }
210205
211-
212206 void wr_monster_memory(void)
213207 {
214208 int i, r_idx;
@@ -257,7 +251,6 @@
257251 }
258252 }
259253
260-
261254 void wr_object_memory(void)
262255 {
263256 int k_idx;
@@ -277,7 +270,6 @@
277270 }
278271 }
279272
280-
281273 void wr_quests(void)
282274 {
283275 int i;
@@ -295,7 +287,6 @@
295287 }
296288 }
297289
298-
299290 void wr_artifacts(void)
300291 {
301292 int i;
@@ -314,7 +305,6 @@
314305 }
315306 }
316307
317-
318308 void wr_player(void)
319309 {
320310 int i;
@@ -353,7 +343,6 @@
353343
354344 wr_u32b(p_ptr->au);
355345
356-
357346 wr_u32b(p_ptr->max_exp);
358347 wr_u32b(p_ptr->exp);
359348 wr_u16b(p_ptr->exp_frac);
@@ -397,7 +386,6 @@
397386 for (i = 0; i < 10; i++) wr_u32b(0L);
398387 }
399388
400-
401389 void wr_squelch(void)
402390 {
403391 int i;
@@ -417,7 +405,6 @@
417405 if (e_info[i].everseen) flags |= 0x02;
418406 wr_byte(flags);
419407 }
420-
421408 /* Write the current number of auto-inscriptions */
422409 wr_u16b(inscriptions_count);
423410
@@ -427,11 +414,9 @@
427414 wr_s16b(inscriptions[i].kind_idx);
428415 wr_string(quark_str(inscriptions[i].inscription_idx));
429416 }
430-
431417 return;
432418 }
433419
434-
435420 void wr_misc(void)
436421 {
437422
@@ -447,18 +432,15 @@
447432 wr_u32b(0L);
448433 wr_u32b(0L);
449434
450-
451435 /* Write the "object seeds" */
452436 wr_u32b(seed_flavor);
453437 wr_u32b(seed_town);
454438
455-
456439 /* Special stuff */
457440 wr_u16b(p_ptr->panic_save);
458441 wr_u16b(p_ptr->total_winner);
459442 wr_u16b(p_ptr->noscore);
460443
461-
462444 /* Write death */
463445 wr_byte(p_ptr->is_dead);
464446
@@ -472,7 +454,6 @@
472454 wr_s32b(turn);
473455 }
474456
475-
476457 void wr_player_hp(void)
477458 {
478459 int i;
@@ -482,7 +463,6 @@
482463 wr_s16b(p_ptr->player_hp[i]);
483464 }
484465
485-
486466 void wr_player_spells(void)
487467 {
488468 int i;
@@ -496,7 +476,6 @@
496476 wr_byte(p_ptr->spell_order[i]);
497477 }
498478
499-
500479 /*
501480 * Dump the random artifacts
502481 */
@@ -543,7 +522,6 @@
543522 }
544523 }
545524
546-
547525 void wr_inventory(void)
548526 {
549527 int i;
@@ -562,12 +540,10 @@
562540 /* Dump object */
563541 wr_item(o_ptr);
564542 }
565-
566543 /* Add a sentinel */
567544 wr_u16b(0xFFFF);
568545 }
569546
570-
571547 void wr_stores(void)
572548 {
573549 int i;
@@ -598,14 +574,11 @@
598574 }
599575 }
600576
601-
602-
603577 /*
604578 * The cave grid flags that get saved in the savefile
605579 */
606580 #define IMPORTANT_FLAGS (CAVE_MARK | CAVE_GLOW | CAVE_ICKY | CAVE_ROOM)
607581
608-
609582 /*
610583 * Write the current dungeon
611584 */
@@ -618,7 +591,6 @@
618591 byte count;
619592 byte prev_char;
620593
621-
622594 if (p_ptr->is_dead)
623595 return;
624596
@@ -634,7 +606,6 @@
634606 wr_u16b(0);
635607 wr_u16b(0);
636608
637-
638609 /*** Simple "Run-Length-Encoding" of cave ***/
639610
640611 /* Note that this will induce two wasted bytes */
@@ -657,15 +628,12 @@
657628 prev_char = tmp8u;
658629 count = 1;
659630 }
660-
661- /* Continue the run */
662- else
631+ else /* Continue the run */
663632 {
664633 count++;
665634 }
666635 }
667636 }
668-
669637 /* Flush the data (if any) */
670638 if (count)
671639 {
@@ -672,7 +640,6 @@
672640 wr_byte((byte)count);
673641 wr_byte((byte)prev_char);
674642 }
675-
676643 /** Now dump the cave_info2[][] stuff **/
677644
678645 /* Note that this will induce two wasted bytes */
@@ -695,15 +662,12 @@
695662 prev_char = tmp8u;
696663 count = 1;
697664 }
698-
699- /* Continue the run */
700- else
665+ else /* Continue the run */
701666 {
702667 count++;
703668 }
704669 }
705670 }
706-
707671 /* Flush the data (if any) */
708672 if (count)
709673 {
@@ -710,8 +674,6 @@
710674 wr_byte((byte)count);
711675 wr_byte((byte)prev_char);
712676 }
713-
714-
715677 /*** Simple "Run-Length-Encoding" of cave ***/
716678
717679 /* Note that this will induce two wasted bytes */
@@ -734,15 +696,12 @@
734696 prev_char = tmp8u;
735697 count = 1;
736698 }
737-
738- /* Continue the run */
739- else
699+ else /* Continue the run */
740700 {
741701 count++;
742702 }
743703 }
744704 }
745-
746705 /* Flush the data (if any) */
747706 if (count)
748707 {
@@ -749,8 +708,6 @@
749708 wr_byte((byte)count);
750709 wr_byte((byte)prev_char);
751710 }
752-
753-
754711 /*** Compact ***/
755712
756713 /* Compact the objects */
@@ -760,7 +717,6 @@
760717 compact_monsters(0);
761718 }
762719
763-
764720 void wr_objects(void)
765721 {
766722 int i;
@@ -781,7 +737,6 @@
781737 }
782738 }
783739
784-
785740 void wr_monsters(void)
786741 {
787742 int i;
@@ -812,7 +767,6 @@
812767 }
813768 }
814769
815-
816770 void wr_ghost(void)
817771 {
818772 int i;
@@ -823,13 +777,12 @@
823777 /* XXX */
824778
825779 /* Name */
826- wr_string(L"Broken Ghost");
780+ wr_string(__T("Broken Ghost"));
827781
828782 /* Hack -- stupid data */
829783 for (i = 0; i < 60; i++) wr_byte(0);
830784 }
831785
832-
833786 void wr_history(void)
834787 {
835788 size_t i;
--- trunk/JBand/src/snd-sdl.cpp (revision 120)
+++ trunk/JBand/src/snd-sdl.cpp (revision 121)
@@ -41,13 +41,11 @@
4141 _TCHAR *paths[MAX_SAMPLES]; /* Relative pathnames for samples */
4242 } sample_list;
4343
44-
4544 /*
4645 * Just need an array of SampInfos
4746 */
4847 static sample_list samples[MSG_MAX];
4948
50-
5149 /*
5250 * Shut down the sound system and free resources.
5351 */
@@ -76,7 +74,6 @@
7674 SDL_Quit();
7775 }
7876
79-
8077 /*
8178 * Initialise SDL and open the mixer
8279 */
@@ -97,7 +94,6 @@
9794 plog_fmt(L"Couldn't initialize SDL: %s", SDL_GetError());
9895 return FALSE;
9996 }
100-
10197 /* Try to open the audio */
10298 if (Mix_OpenAudio(audio_rate, audio_format, audio_channels, 4096) < 0)
10399 {
@@ -104,13 +100,10 @@
104100 plog_fmt(L"Couldn't open mixer: %s", SDL_GetError());
105101 return FALSE;
106102 }
107-
108103 /* Success */
109104 return TRUE;
110105 }
111106
112-
113-
114107 /*
115108 * Read sound.cfg and map events to sounds; then load all the sounds into
116109 * memory to avoid I/O latency later.
@@ -121,12 +114,10 @@
121114 _TCHAR buffer[2048];
122115 ang_file *fff;
123116
124-
125117 /* Initialise the mixer */
126118 if (!open_audio())
127119 return FALSE;
128120
129-
130121 /* Build the "sound" path */
131122 path_build(path, _countof(path), ANGBAND_DIR_XTRA, "sound");
132123 ANGBAND_DIR_XTRA_SOUND = _tcsdup(path);
@@ -142,7 +133,6 @@
142133 path, strerror(errno));
143134 return FALSE;
144135 }
145-
146136 /* Parse the file */
147137 /* Lines are always of the form "name = sample [sample ...]" */
148138 while (file_getl(fff, buffer, _countof(buffer)))
@@ -167,7 +157,6 @@
167157 msg_name = buffer;
168158 search[0] = 0;
169159
170-
171160 /* Make sure this is a valid event name */
172161 for (event = MSG_MAX - 1; event >= 0; event--)
173162 {
@@ -192,7 +181,6 @@
192181 {
193182 next_token = NULL;
194183 }
195-
196184 /*
197185 * Now we find all the sample names and add them one by one
198186 */
@@ -223,7 +211,6 @@
223211 goto next_token;
224212 }
225213 }
226-
227214 /* Imcrement the sample count */
228215 samples[event].num++;
229216
@@ -250,11 +237,9 @@
250237 }
251238 }
252239 }
253-
254240 /* Close the file */
255241 file_close(fff);
256242
257-
258243 /* Success */
259244 return TRUE;
260245 }
@@ -287,7 +272,6 @@
287272 /* Load */
288273 wave = Mix_LoadWAV(filename);
289274 }
290-
291275 /* Check to see if we have a wave again */
292276 if (!wave)
293277 {
@@ -294,12 +278,10 @@
294278 plog(L"SDL sound load failed.");
295279 return;
296280 }
297-
298281 /* Actually play the thing */
299282 Mix_PlayChannel(-1, wave, 0);
300283 }
301284
302-
303285 /*
304286 * Init the SDL sound "module".
305287 */
@@ -317,7 +299,6 @@
317299 continue;
318300 }
319301 }
320-
321302 /* Load sound preferences if requested */
322303 if (!sound_sdl_init(no_cache_audio))
323304 {
@@ -326,7 +307,6 @@
326307 /* Failure */
327308 return (1);
328309 }
329-
330310 /* Enable sound */
331311 sound_hook = play_sound;
332312 atexit(close_audio);
--- trunk/JBand/src/spells1.cpp (revision 120)
+++ trunk/JBand/src/spells1.cpp (revision 121)
@@ -1,4 +1,8 @@
11 /* テスト */
2+/*
3+ * Debug Status: Now testing init_angband()
4+ * - Fixed __T on this page.
5+ */
26 /*
37 * File: spells1.c
48 * Purpose: Some spell effects, and the project() function
@@ -73,7 +77,6 @@
7377 /* Done */
7478 break;
7579 }
76-
7780 /* Result */
7881 return (r_idx);
7982 }
@@ -120,7 +123,6 @@
120123 d = distance(oy, ox, ny, nx);
121124 if ((d >= min) && (d <= dis)) break;
122125 }
123-
124126 /* Ignore illegal locations */
125127 if (!in_bounds_fully(ny, nx)) continue;
126128
@@ -139,7 +141,6 @@
139141 /* Stop looking */
140142 break;
141143 }
142-
143144 /* Increase the maximum distance */
144145 dis = dis * 2;
145146
@@ -146,7 +147,6 @@
146147 /* Decrease the minimum distance */
147148 min = min / 2;
148149 }
149-
150150 /* Sound */
151151 sound(MSG_TPOTHER);
152152
@@ -193,7 +193,6 @@
193193 d = distance(py, px, y, x);
194194 if ((d >= min) && (d <= dis)) break;
195195 }
196-
197196 /* Ignore illegal locations */
198197 if (!in_bounds_fully(y, x)) continue;
199198
@@ -209,7 +208,6 @@
209208 /* Stop looking */
210209 break;
211210 }
212-
213211 /* Increase the maximum distance */
214212 dis = dis * 2;
215213
@@ -216,7 +214,6 @@
216214 /* Decrease the minimum distance */
217215 min = min / 2;
218216 }
219-
220217 /* Sound */
221218 sound(MSG_TELEPORT);
222219
@@ -267,7 +264,6 @@
267264 dis++;
268265 }
269266 }
270-
271267 /* Sound */
272268 sound(MSG_TELEPORT);
273269
@@ -291,7 +287,7 @@
291287
292288 if (!p_ptr->depth)
293289 {
294- message(MSG_TPLEVEL, 0, L"You sink through the floor.");
290+ message(MSG_TPLEVEL, 0, __T("You sink through the floor."));
295291
296292 /* New depth */
297293 p_ptr->depth++;
@@ -302,7 +298,7 @@
302298
303299 else if (is_quest(p_ptr->depth) || (p_ptr->depth >= MAX_DEPTH-1))
304300 {
305- message(MSG_TPLEVEL, 0, L"You rise up through the ceiling.");
301+ message(MSG_TPLEVEL, 0, __T("You rise up through the ceiling."));
306302
307303 /* New depth */
308304 p_ptr->depth--;
@@ -313,7 +309,7 @@
313309
314310 else if (randint0(100) < 50)
315311 {
316- message(MSG_TPLEVEL, 0, L"You rise up through the ceiling.");
312+ message(MSG_TPLEVEL, 0, __T("You rise up through the ceiling."));
317313
318314 /* New depth */
319315 p_ptr->depth--;
@@ -321,10 +317,9 @@
321317 /* Leaving */
322318 p_ptr->leaving = TRUE;
323319 }
324-
325320 else
326321 {
327- message(MSG_TPLEVEL, 0, L"You sink through the floor.");
322+ message(MSG_TPLEVEL, 0, __T("You sink through the floor."));
328323
329324 /* New depth */
330325 p_ptr->depth++;
@@ -381,7 +376,7 @@
381376 *
382377 * It is moving (or has moved) from (x,y) to (nx,ny).
383378 *
384- * If the distance is not "one", we (may) return L"*".
379+ * If the distance is not "one", we (may) return "*".
385380 */
386381 static u16b bolt_pict(int y, int x, int ny, int nx, int typ)
387382 {
@@ -448,7 +443,6 @@
448443 a = misc_to_attr[base+k];
449444 c = misc_to_char[base+k] + add;
450445 }
451-
452446 /* Create pict */
453447 return (PICT(a,c));
454448 }
@@ -487,7 +481,7 @@
487481 if (p_ptr->chp < 0)
488482 {
489483 /* Hack -- Note death */
490- message(MSG_DEATH, 0, L"You die.");
484+ message(MSG_DEATH, 0, __T("You die."));
491485 message_flush();
492486
493487 /* Note cause of death */
@@ -511,10 +505,10 @@
511505 /* Hack -- bell on first notice */
512506 if (old_chp > warning)
513507 {
514- bell(L"Low hitpoint warning!");
508+ bell(__T("Low hitpoint warning!"));
515509 }
516510 /* Message */
517- message(MSG_HITPOINT_WARN, 0, L"*** LOW HITPOINT WARNING! ***");
511+ message(MSG_HITPOINT_WARN, 0, __T("*** LOW HITPOINT WARNING! ***"));
518512 message_flush();
519513 }
520514 }
@@ -547,7 +541,6 @@
547541 {
548542 return (TRUE);
549543 }
550-
551544 /* Staffs/Scrolls are wood/paper */
552545 case TV_STAFF:
553546 case TV_SCROLL:
@@ -554,13 +547,11 @@
554547 {
555548 return (TRUE);
556549 }
557-
558550 /* Ouch */
559551 case TV_CHEST:
560552 {
561553 return (TRUE);
562554 }
563-
564555 /* Junk is useless */
565556 case TV_SKELETON:
566557 case TV_BOTTLE:
@@ -569,7 +560,6 @@
569560 return (TRUE);
570561 }
571562 }
572-
573563 return (FALSE);
574564 }
575565
@@ -587,7 +577,6 @@
587577 return (TRUE);
588578 }
589579 }
590-
591580 return (FALSE);
592581 }
593582
@@ -614,7 +603,6 @@
614603 {
615604 return (TRUE);
616605 }
617-
618606 /* Books */
619607 case TV_MAGIC_BOOK:
620608 case TV_PRAYER_BOOK:
@@ -621,13 +609,11 @@
621609 {
622610 return (TRUE);
623611 }
624-
625612 /* Chests */
626613 case TV_CHEST:
627614 {
628615 return (TRUE);
629616 }
630-
631617 /* Staffs/Scrolls burn */
632618 case TV_STAFF:
633619 case TV_SCROLL:
@@ -635,7 +621,6 @@
635621 return (TRUE);
636622 }
637623 }
638-
639624 return (FALSE);
640625 }
641626
@@ -772,7 +757,6 @@
772757
773758 break;
774759 }
775-
776760 /* Wearable items */
777761 case TV_HELM:
778762 case TV_CROWN:
@@ -797,7 +781,6 @@
797781
798782 break;
799783 }
800-
801784 /* Rods are tough */
802785 case TV_ROD:
803786 {
@@ -806,7 +789,6 @@
806789 break;
807790 }
808791 }
809-
810792 /* Damage instead of destroy */
811793 if (damage)
812794 {
@@ -819,7 +801,6 @@
819801 /* Casualty count */
820802 amt = o_ptr->number;
821803 }
822-
823804 /* Count the casualties */
824805 else for (amt = j = 0; j < o_ptr->number; ++j)
825806 {
@@ -833,13 +814,13 @@
833814 object_desc(o_name, _countof(o_name), o_ptr, FALSE, ODESC_FULL);
834815
835816 /* Message */
836- message_format(MSG_DESTROY, 0, L"%sour %s (%c) %s %s!",
837- ((o_ptr->number > 1) ?
838- ((amt == o_ptr->number) ? L"All of y" :
839- (amt > 1 ? L"Some of y" : L"One of y")) : L"Y"),
840- o_name, index_to_label(i),
841- ((amt > 1) ? L"were" : L"was"),
842- (damage ? L"damaged" : L"destroyed"));
817+ message_format(MSG_DESTROY, 0, __T("%sour %s (%c) %s %s!"),
818+ ((o_ptr->number > 1) ?
819+ ((amt == o_ptr->number) ? __T("All of y") :
820+ (amt > 1 ? __T("Some of y") : __T("One of y"))) : __T("Y")),
821+ o_name, index_to_label(i),
822+ ((amt > 1) ? __T("were") : __T("was")),
823+ (damage ? __T("damaged") : __T("destroyed")));
843824
844825 /* Damage already done? */
845826 if (damage) continue;
@@ -855,7 +836,6 @@
855836 {
856837 o_ptr->pval -= o_ptr->pval * amt / o_ptr->number;
857838 }
858-
859839 /* Destroy "amt" items */
860840 inven_item_increase(i, -amt);
861841 inven_item_optimize(i);
@@ -865,7 +845,6 @@
865845 }
866846 }
867847 }
868-
869848 /* Return the casualty count */
870849 return (k);
871850 }
@@ -1157,7 +1136,6 @@
11571136 /* Something happened */
11581137 if (max != p_ptr->stat_max[stat]) res = TRUE;
11591138 }
1160-
11611139 /* Apply changes */
11621140 if (res)
11631141 {
@@ -1168,7 +1146,6 @@
11681146 /* Recalculate bonuses */
11691147 p_ptr->update |= (PU_BONUS);
11701148 }
1171-
11721149 /* Done */
11731150 return (res);
11741151 }
@@ -1190,7 +1167,6 @@
11901167 /* Success */
11911168 return (TRUE);
11921169 }
1193-
11941170 /* Nothing to restore */
11951171 return (FALSE);
11961172 }
@@ -1226,7 +1202,6 @@
12261202 case 7: t = INVEN_HANDS; break;
12271203 case 8: t = INVEN_FEET; break;
12281204 }
1229-
12301205 /* Get the item */
12311206 o_ptr = &inventory[t];
12321207
@@ -1239,7 +1214,6 @@
12391214 /* Nothing to notice */
12401215 return (FALSE);
12411216 }
1242-
12431217 /* Describe the object */
12441218 object_desc(o_name, _countof(o_name), o_ptr, FALSE, ODESC_BASE);
12451219
@@ -1249,12 +1223,11 @@
12491223 /* Message */
12501224 msg_format(__T("Your %s (%c) resist%s disenchantment!"),
12511225 o_name, index_to_label(t),
1252- ((o_ptr->number != 1) ? __T("") : L"s"));
1226+ ((o_ptr->number != 1) ? __T("") : __T("s")));
12531227
12541228 /* Notice */
12551229 return (TRUE);
12561230 }
1257-
12581231 /* Disenchant tohit */
12591232 if (o_ptr->to_h > 0) o_ptr->to_h--;
12601233 if ((o_ptr->to_h > 5) && (randint0(100) < 20)) o_ptr->to_h--;
@@ -1270,7 +1243,7 @@
12701243 /* Message */
12711244 msg_format(__T("Your %s (%c) %s disenchanted!"),
12721245 o_name, index_to_label(t),
1273- ((o_ptr->number != 1) ? L"were" : L"was"));
1246+ (o_ptr->number != 1) ? __T("were") : __T("was"));
12741247
12751248 /* Recalculate bonuses */
12761249 p_ptr->update |= (PU_BONUS);
@@ -1296,13 +1269,11 @@
12961269 teleport_player(200);
12971270 break;
12981271 }
1299-
13001272 case 4: case 5:
13011273 {
13021274 teleport_player_to(m_ptr->fy, m_ptr->fx);
13031275 break;
13041276 }
1305-
13061277 case 6:
13071278 {
13081279 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
@@ -1310,12 +1281,10 @@
13101281 msg_print(__T("You resist the effects!"));
13111282 break;
13121283 }
1313-
13141284 /* Teleport Level */
13151285 teleport_player_level();
13161286 break;
13171287 }
1318-
13191288 case 7:
13201289 {
13211290 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
@@ -1364,7 +1333,7 @@
13641333 * Note that we determine if the player can "see" anything that happens
13651334 * by taking into account: blindness, line-of-sight, and illumination.
13661335 *
1367- * We return L"TRUE" if the effect of the projection is "obvious".
1336+ * We return "TRUE" if the effect of the projection is "obvious".
13681337 *
13691338 * Hack -- We also "see" grids which are "memorized".
13701339 *
@@ -1402,7 +1371,6 @@
14021371 {
14031372 break;
14041373 }
1405-
14061374 /* Destroy Traps (and Locks) */
14071375 case GF_KILL_TRAP:
14081376 {
@@ -1417,7 +1385,6 @@
14171385 obvious = TRUE;
14181386 }
14191387 }
1420-
14211388 /* Destroy traps */
14221389 if ((cave_feat[y][x] == FEAT_INVIS) ||
14231390 ((cave_feat[y][x] >= FEAT_TRAP_HEAD) &&
@@ -1429,7 +1396,6 @@
14291396 msg_print(__T("There is a bright flash of light!"));
14301397 obvious = TRUE;
14311398 }
1432-
14331399 /* Forget the trap */
14341400 cave_info[y][x] &= ~(CAVE_MARK);
14351401
@@ -1436,7 +1402,6 @@
14361402 /* Destroy the trap */
14371403 cave_set_feat(y, x, FEAT_FLOOR);
14381404 }
1439-
14401405 /* Locked doors are unlocked */
14411406 else if ((cave_feat[y][x] >= FEAT_DOOR_HEAD + 0x01) &&
14421407 (cave_feat[y][x] <= FEAT_DOOR_HEAD + 0x07))
@@ -1451,10 +1416,8 @@
14511416 obvious = TRUE;
14521417 }
14531418 }
1454-
14551419 break;
14561420 }
1457-
14581421 /* Destroy Doors (and traps) */
14591422 case GF_KILL_DOOR:
14601423 {
@@ -1482,7 +1445,6 @@
14821445 p_ptr->update |= (PU_UPDATE_VIEW | PU_MONSTERS);
14831446 }
14841447 }
1485-
14861448 /* Forget the door */
14871449 cave_info[y][x] &= ~(CAVE_MARK);
14881450
@@ -1489,10 +1451,8 @@
14891451 /* Destroy the feature */
14901452 cave_set_feat(y, x, FEAT_FLOOR);
14911453 }
1492-
14931454 break;
14941455 }
1495-
14961456 /* Destroy walls (and doors) */
14971457 case GF_KILL_WALL:
14981458 {
@@ -1511,7 +1471,6 @@
15111471 msg_print(__T("The wall turns into mud!"));
15121472 obvious = TRUE;
15131473 }
1514-
15151474 /* Forget the wall */
15161475 cave_info[y][x] &= ~(CAVE_MARK);
15171476
@@ -1518,7 +1477,6 @@
15181477 /* Destroy the wall */
15191478 cave_set_feat(y, x, FEAT_FLOOR);
15201479 }
1521-
15221480 /* Quartz / Magma with treasure */
15231481 else if (cave_feat[y][x] >= FEAT_MAGMA_H)
15241482 {
@@ -1529,7 +1487,6 @@
15291487 msg_print(__T("You have found something!"));
15301488 obvious = TRUE;
15311489 }
1532-
15331490 /* Forget the wall */
15341491 cave_info[y][x] &= ~(CAVE_MARK);
15351492
@@ -1539,7 +1496,6 @@
15391496 /* Place some gold */
15401497 place_gold(y, x, p_ptr->depth);
15411498 }
1542-
15431499 /* Quartz / Magma */
15441500 else if (cave_feat[y][x] >= FEAT_MAGMA)
15451501 {
@@ -1549,7 +1505,6 @@
15491505 msg_print(__T("The vein turns into mud!"));
15501506 obvious = TRUE;
15511507 }
1552-
15531508 /* Forget the wall */
15541509 cave_info[y][x] &= ~(CAVE_MARK);
15551510
@@ -1556,7 +1511,6 @@
15561511 /* Destroy the wall */
15571512 cave_set_feat(y, x, FEAT_FLOOR);
15581513 }
1559-
15601514 /* Rubble */
15611515 else if (cave_feat[y][x] == FEAT_RUBBLE)
15621516 {
@@ -1582,12 +1536,10 @@
15821536 msg_print(__T("There was something buried in the rubble!"));
15831537 obvious = TRUE;
15841538 }
1585-
15861539 /* Place gold */
15871540 place_object(y, x, p_ptr->depth, FALSE, FALSE);
15881541 }
15891542 }
1590-
15911543 /* Destroy doors (and secret doors) */
15921544 else /* if (cave_feat[y][x] >= FEAT_DOOR_HEAD) */
15931545 {
@@ -1597,7 +1549,6 @@
15971549 msg_print(__T("The door turns into mud!"));
15981550 obvious = TRUE;
15991551 }
1600-
16011552 /* Forget the wall */
16021553 cave_info[y][x] &= ~(CAVE_MARK);
16031554
@@ -1604,7 +1555,6 @@
16041555 /* Destroy the feature */
16051556 cave_set_feat(y, x, FEAT_FLOOR);
16061557 }
1607-
16081558 /* Update the visuals */
16091559 p_ptr->update |= (PU_UPDATE_VIEW | PU_MONSTERS);
16101560
@@ -1613,7 +1563,6 @@
16131563
16141564 break;
16151565 }
1616-
16171566 /* Make doors */
16181567 case GF_MAKE_DOOR:
16191568 {
@@ -1631,7 +1580,6 @@
16311580
16321581 break;
16331582 }
1634-
16351583 /* Make traps */
16361584 case GF_MAKE_TRAP:
16371585 {
@@ -1643,7 +1591,6 @@
16431591
16441592 break;
16451593 }
1646-
16471594 /* Lite up the grid */
16481595 case GF_LITE_WEAK:
16491596 case GF_LITE:
@@ -1659,14 +1606,11 @@
16591606 /* Observe */
16601607 obvious = TRUE;
16611608 }
1662-
16631609 /* Fully update the visuals */
16641610 p_ptr->update |= (PU_FORGET_VIEW | PU_UPDATE_VIEW | PU_MONSTERS);
16651611 }
1666-
16671612 break;
16681613 }
1669-
16701614 /* Darken the grid */
16711615 case GF_DARK_WEAK:
16721616 case GF_DARK:
@@ -1680,7 +1624,6 @@
16801624 if (cave_feat[y][x] <= FEAT_INVIS)
16811625 cave_info[y][x] &= ~(CAVE_MARK);
16821626 }
1683-
16841627 /* Grid is in line of sight */
16851628 if (player_has_los_bold(y, x))
16861629 {
@@ -1690,12 +1633,10 @@
16901633 /* Fully update the visuals */
16911634 p_ptr->update |= (PU_FORGET_VIEW | PU_UPDATE_VIEW | PU_MONSTERS);
16921635 }
1693-
16941636 /* All done */
16951637 break;
16961638 }
16971639 }
1698-
16991640 /* Return "Anything seen?" */
17001641 return (obvious);
17011642 }
@@ -1714,7 +1655,7 @@
17141655 *
17151656 * Hack -- We also "see" objects which are "memorized".
17161657 *
1717- * We return L"TRUE" if the effect of the projection is "obvious".
1658+ * We return __T("TRUE" if the effect of the projection is "obvious".
17181659 */
17191660 static bool project_o(int who, int r, int y, int x, int dam, int typ)
17201661 {
@@ -1730,11 +1671,6 @@
17301671 UNREFERENCED_PARAMETER(r);
17311672 UNREFERENCED_PARAMETER(dam);
17321673
1733-#if 0 /* unused */
1734- /* Reduce damage by distance */
1735- dam = (dam + r) / (r + 1);
1736-#endif /* 0 */
1737-
17381674 /* Scan all objects in the grid */
17391675 for (this_o_idx = cave_o_idx[y][x]; this_o_idx; this_o_idx = next_o_idx)
17401676 {
@@ -1771,12 +1707,11 @@
17711707 if (hates_acid(o_ptr))
17721708 {
17731709 do_kill = TRUE;
1774- note_kill = (plural ? L" melt!" : L" melts!");
1710+ note_kill = (plural ? __T(" melt!") : __T(" melts!"));
17751711 if (f[2] & (TR2_IGNORE_ACID)) ignore = TRUE;
17761712 }
17771713 break;
17781714 }
1779-
17801715 /* Elec -- Rings and Wands */
17811716 case GF_ELEC:
17821717 {
@@ -1783,12 +1718,11 @@
17831718 if (hates_elec(o_ptr))
17841719 {
17851720 do_kill = TRUE;
1786- note_kill = (plural ? L" are destroyed!" : L" is destroyed!");
1721+ note_kill = (plural ? __T(" are destroyed!") : __T(" is destroyed!"));
17871722 if (f[2] & (TR2_IGNORE_ELEC)) ignore = TRUE;
17881723 }
17891724 break;
17901725 }
1791-
17921726 /* Fire -- Flammable objects */
17931727 case GF_FIRE:
17941728 {
@@ -1795,24 +1729,22 @@
17951729 if (hates_fire(o_ptr))
17961730 {
17971731 do_kill = TRUE;
1798- note_kill = (plural ? L" burn up!" : L" burns up!");
1732+ note_kill = plural ? __T(" burn up!") : __T(" burns up!");
17991733 if (f[2] & (TR2_IGNORE_FIRE)) ignore = TRUE;
18001734 }
18011735 break;
18021736 }
1803-
18041737 /* Cold -- potions and flasks */
18051738 case GF_COLD:
18061739 {
18071740 if (hates_cold(o_ptr))
18081741 {
1809- note_kill = (plural ? L" shatter!" : L" shatters!");
1742+ note_kill = plural ? __T(" shatter!") : __T(" shatters!");
18101743 do_kill = TRUE;
18111744 if (f[2] & (TR2_IGNORE_COLD)) ignore = TRUE;
18121745 }
18131746 break;
18141747 }
1815-
18161748 /* Fire + Elec */
18171749 case GF_PLASMA:
18181750 {
@@ -1819,7 +1751,7 @@
18191751 if (hates_fire(o_ptr))
18201752 {
18211753 do_kill = TRUE;
1822- note_kill = (plural ? L" burn up!" : L" burns up!");
1754+ note_kill = plural ? __T(" burn up!") : __T(" burns up!");
18231755 if (f[2] & (TR2_IGNORE_FIRE)) ignore = TRUE;
18241756 }
18251757 if (hates_elec(o_ptr))
@@ -1826,12 +1758,11 @@
18261758 {
18271759 ignore = FALSE;
18281760 do_kill = TRUE;
1829- note_kill = (plural ? L" are destroyed!" : L" is destroyed!");
1761+ note_kill = plural ? __T(" are destroyed!") : __T(" is destroyed!");
18301762 if (f[2] & (TR2_IGNORE_ELEC)) ignore = TRUE;
18311763 }
18321764 break;
18331765 }
1834-
18351766 /* Fire + Cold */
18361767 case GF_METEOR:
18371768 {
@@ -1838,7 +1769,7 @@
18381769 if (hates_fire(o_ptr))
18391770 {
18401771 do_kill = TRUE;
1841- note_kill = (plural ? L" burn up!" : L" burns up!");
1772+ note_kill = plural ? __T(" burn up!") : __T(" burns up!");
18421773 if (f[2] & (TR2_IGNORE_FIRE)) ignore = TRUE;
18431774 }
18441775 if (hates_cold(o_ptr))
@@ -1845,12 +1776,11 @@
18451776 {
18461777 ignore = FALSE;
18471778 do_kill = TRUE;
1848- note_kill = (plural ? L" shatter!" : L" shatters!");
1779+ note_kill = plural ? __T(" shatter!") : __T(" shatters!");
18491780 if (f[2] & (TR2_IGNORE_COLD)) ignore = TRUE;
18501781 }
18511782 break;
18521783 }
1853-
18541784 /* Hack -- break potions and such */
18551785 case GF_ICE:
18561786 case GF_SHARD:
@@ -1859,20 +1789,18 @@
18591789 {
18601790 if (hates_cold(o_ptr))
18611791 {
1862- note_kill = (plural ? L" shatter!" : L" shatters!");
1792+ note_kill = plural ? __T(" shatter!") : __T(" shatters!");
18631793 do_kill = TRUE;
18641794 }
18651795 break;
18661796 }
1867-
18681797 /* Mana -- destroys everything */
18691798 case GF_MANA:
18701799 {
18711800 do_kill = TRUE;
1872- note_kill = (plural ? L" are destroyed!" : L" is destroyed!");
1801+ note_kill = plural ? __T(" are destroyed!") : __T(" is destroyed!");
18731802 break;
18741803 }
1875-
18761804 /* Holy Orb -- destroys cursed non-artifacts */
18771805 case GF_HOLY_ORB:
18781806 {
@@ -1879,11 +1807,10 @@
18791807 if (cursed_p(o_ptr))
18801808 {
18811809 do_kill = TRUE;
1882- note_kill = (plural ? L" are destroyed!" : L" is destroyed!");
1810+ note_kill = plural ? __T(" are destroyed!") : __T(" is destroyed!");
18831811 }
18841812 break;
18851813 }
1886-
18871814 /* Unlock chests */
18881815 case GF_KILL_TRAP:
18891816 case GF_KILL_DOOR:
@@ -1908,11 +1835,9 @@
19081835 }
19091836 }
19101837 }
1911-
19121838 break;
19131839 }
19141840 }
1915-
19161841 /* Attempt to destroy the object */
19171842 if (do_kill)
19181843 {
@@ -1922,7 +1847,6 @@
19221847 obvious = TRUE;
19231848 object_desc(o_name, _countof(o_name), o_ptr, FALSE, ODESC_BASE);
19241849 }
1925-
19261850 /* Artifacts, and other objects, get to resist */
19271851 if (is_art || ignore)
19281852 {
@@ -1930,18 +1854,15 @@
19301854 if (o_ptr->marked && !squelch_hide_item(o_ptr))
19311855 {
19321856 msg_format(__T("The %s %s unaffected!"),
1933- o_name, (plural ? L"are" : L"is"));
1857+ o_name, plural ? __T("are") : __T("is"));
19341858 }
19351859 }
1936-
19371860 /* Kill it */
19381861 else
19391862 {
19401863 /* Describe if needed */
19411864 if (o_ptr->marked && note_kill && !squelch_hide_item(o_ptr))
1942- {
1943- message_format(MSG_DESTROY, 0, L"The %s%s", o_name, note_kill);
1944- }
1865+ message_format(MSG_DESTROY, 0, __T("The %s%s"), o_name, note_kill);
19451866
19461867 /* Delete the object */
19471868 delete_object_idx(this_o_idx);
@@ -1951,7 +1872,6 @@
19511872 }
19521873 }
19531874 }
1954-
19551875 /* Return "Anything seen?" */
19561876 return (obvious);
19571877 }
@@ -2007,7 +1927,7 @@
20071927 * to make a spell have "no effect" just set "note" to NULL. You should
20081928 * also set "notice" to FALSE, or the player will learn what the spell does.
20091929 *
2010- * We attempt to return L"TRUE" if the player saw anything "useful" happen.
1930+ * We attempt to return "TRUE" if the player saw anything "useful" happen.
20111931 */
20121932 static bool project_m(int who, int r, int y, int x, int dam, int typ)
20131933 {
@@ -2080,7 +2000,7 @@
20802000 /* Some monsters get "destroyed" */
20812001 if ((r_ptr->flags[2] & (RF2_DEMON | RF2_UNDEAD)) ||
20822002 (r_ptr->flags[1] & (RF1_STUPID)) ||
2083- (_tcschr(L"Evg", r_ptr->d_char)))
2003+ (_tcschr(__T("Evg"), r_ptr->d_char)))
20842004 {
20852005 /* Special note at death */
20862006 note_dies = __T(" is destroyed.");
@@ -2095,7 +2015,6 @@
20952015 if (seen) obvious = TRUE;
20962016 break;
20972017 }
2098-
20992018 /* Acid */
21002019 case GF_ACID:
21012020 {
@@ -2102,13 +2021,12 @@
21022021 if (seen) obvious = TRUE;
21032022 if (r_ptr->flags[2] & (RF2_IM_ACID))
21042023 {
2105- note = L" resists a lot.";
2024+ note = __T(" resists a lot.");
21062025 dam /= 9;
21072026 if (seen) l_ptr->flags[2] |= (RF2_IM_ACID);
21082027 }
21092028 break;
21102029 }
2111-
21122030 /* Electricity */
21132031 case GF_ELEC:
21142032 {
@@ -2115,13 +2033,12 @@
21152033 if (seen) obvious = TRUE;
21162034 if (r_ptr->flags[2] & (RF2_IM_ELEC))
21172035 {
2118- note = L" resists a lot.";
2036+ note = __T(" resists a lot.");
21192037 dam /= 9;
21202038 if (seen) l_ptr->flags[2] |= (RF2_IM_ELEC);
21212039 }
21222040 break;
21232041 }
2124-
21252042 /* Fire damage */
21262043 case GF_FIRE:
21272044 {
@@ -2128,13 +2045,12 @@
21282045 if (seen) obvious = TRUE;
21292046 if (r_ptr->flags[2] & (RF2_IM_FIRE))
21302047 {
2131- note = L" resists a lot.";
2048+ note = __T(" resists a lot.");
21322049 dam /= 9;
21332050 if (seen) l_ptr->flags[2] |= (RF2_IM_FIRE);
21342051 }
21352052 break;
21362053 }
2137-
21382054 /* Cold */
21392055 case GF_COLD:
21402056 {
@@ -2141,13 +2057,12 @@
21412057 if (seen) obvious = TRUE;
21422058 if (r_ptr->flags[2] & (RF2_IM_COLD))
21432059 {
2144- note = L" resists a lot.";
2060+ note = __T(" resists a lot.");
21452061 dam /= 9;
21462062 if (seen) l_ptr->flags[2] |= (RF2_IM_COLD);
21472063 }
21482064 break;
21492065 }
2150-
21512066 /* Poison */
21522067 case GF_POIS:
21532068 {
@@ -2154,13 +2069,12 @@
21542069 if (seen) obvious = TRUE;
21552070 if (r_ptr->flags[2] & (RF2_IM_POIS))
21562071 {
2157- note = L" resists a lot.";
2072+ note = __T(" resists a lot.");
21582073 dam /= 9;
21592074 if (seen) l_ptr->flags[2] |= (RF2_IM_POIS);
21602075 }
21612076 break;
21622077 }
2163-
21642078 /* Holy Orb -- hurts Evil */
21652079 case GF_HOLY_ORB:
21662080 {
@@ -2168,12 +2082,11 @@
21682082 if (r_ptr->flags[2] & (RF2_EVIL))
21692083 {
21702084 dam *= 2;
2171- note = L" is hit hard.";
2085+ note = __T(" is hit hard.");
21722086 if (seen) l_ptr->flags[2] |= (RF2_EVIL);
21732087 }
21742088 break;
21752089 }
2176-
21772090 /* Arrow -- no defense XXX */
21782091 case GF_ARROW:
21792092 {
@@ -2180,7 +2093,6 @@
21802093 if (seen) obvious = TRUE;
21812094 break;
21822095 }
2183-
21842096 /* Plasma */
21852097 case GF_PLASMA:
21862098 {
@@ -2187,13 +2099,12 @@
21872099 if (seen) obvious = TRUE;
21882100 if (r_ptr->flags[2] & RF2_RES_PLAS)
21892101 {
2190- note = L" resists.";
2102+ note = __T(" resists.");
21912103 dam *= 3; dam /= (randint1(6)+6);
21922104 if (seen) l_ptr->flags[2] |= RF2_RES_PLAS;
21932105 }
21942106 break;
21952107 }
2196-
21972108 /* Nether -- see above */
21982109 case GF_NETHER:
21992110 {
@@ -2200,24 +2111,23 @@
22002111 if (seen) obvious = TRUE;
22012112 if (r_ptr->flags[2] & (RF2_UNDEAD))
22022113 {
2203- note = L" is immune.";
2114+ note = __T(" is immune.");
22042115 dam = 0;
22052116 if (seen) l_ptr->flags[2] |= (RF2_UNDEAD);
22062117 }
22072118 else if (r_ptr->spell_flags[0] & (RSF0_BR_NETH))
22082119 {
2209- note = L" resists.";
2120+ note = __T(" resists.");
22102121 dam *= 3; dam /= (randint1(6)+6);
22112122 }
22122123 else if (r_ptr->flags[2] & (RF2_EVIL))
22132124 {
22142125 dam /= 2;
2215- note = L" resists somewhat.";
2126+ note = __T(" resists somewhat.");
22162127 if (seen) l_ptr->flags[2] |= (RF2_EVIL);
22172128 }
22182129 break;
22192130 }
2220-
22212131 /* Water damage */
22222132 case GF_WATER:
22232133 {
@@ -2224,13 +2134,12 @@
22242134 if (seen) obvious = TRUE;
22252135 if (r_ptr->flags[2] & RF2_IM_WATER)
22262136 {
2227- note = L" is immune.";
2137+ note = __T(" is immune.");
22282138 dam = 0;
22292139 if (seen) l_ptr->flags[2] |= RF2_IM_WATER;
22302140 }
22312141 break;
22322142 }
2233-
22342143 /* Chaos -- Chaos breathers resist */
22352144 case GF_CHAOS:
22362145 {
@@ -2239,13 +2148,12 @@
22392148 do_conf = (5 + randint1(11) + r) / (r + 1);
22402149 if (r_ptr->spell_flags[0] & (RSF0_BR_CHAO))
22412150 {
2242- note = L" resists.";
2151+ note = __T(" resists.");
22432152 dam *= 3; dam /= (randint1(6)+6);
22442153 do_poly = FALSE;
22452154 }
22462155 break;
22472156 }
2248-
22492157 /* Shards -- Shard breathers resist */
22502158 case GF_SHARD:
22512159 {
@@ -2252,12 +2160,11 @@
22522160 if (seen) obvious = TRUE;
22532161 if (r_ptr->spell_flags[0] & (RSF0_BR_SHAR))
22542162 {
2255- note = L" resists.";
2163+ note = __T(" resists.");
22562164 dam *= 3; dam /= (randint1(6)+6);
22572165 }
22582166 break;
22592167 }
2260-
22612168 /* Sound -- Sound breathers resist */
22622169 case GF_SOUND:
22632170 {
@@ -2265,12 +2172,11 @@
22652172 do_stun = (10 + randint1(15) + r) / (r + 1);
22662173 if (r_ptr->spell_flags[0] & (RSF0_BR_SOUN))
22672174 {
2268- note = L" resists.";
2175+ note = __T(" resists.");
22692176 dam *= 2; dam /= (randint1(6)+6);
22702177 }
22712178 break;
22722179 }
2273-
22742180 /* Confusion */
22752181 case GF_CONFUSION:
22762182 {
@@ -2278,17 +2184,16 @@
22782184 do_conf = (10 + randint1(15) + r) / (r + 1);
22792185 if (r_ptr->spell_flags[0] & (RSF0_BR_CONF))
22802186 {
2281- note = L" resists.";
2187+ note = __T(" resists.");
22822188 dam *= 2; dam /= (randint1(6)+6);
22832189 }
22842190 else if (r_ptr->flags[2] & (RF2_NO_CONF))
22852191 {
2286- note = L" resists somewhat.";
2192+ note = __T(" resists somewhat.");
22872193 dam /= 2;
22882194 }
22892195 break;
22902196 }
2291-
22922197 /* Disenchantment */
22932198 case GF_DISENCHANT:
22942199 {
@@ -2295,13 +2200,12 @@
22952200 if (seen) obvious = TRUE;
22962201 if (r_ptr->flags[2] & RF2_RES_DISE)
22972202 {
2298- note = L" resists.";
2203+ note = __T(" resists.");
22992204 dam *= 3; dam /= (randint1(6)+6);
23002205 if (seen) l_ptr->flags[2] |= RF2_RES_DISE;
23012206 }
23022207 break;
23032208 }
2304-
23052209 /* Nexus */
23062210 case GF_NEXUS:
23072211 {
@@ -2308,13 +2212,12 @@
23082212 if (seen) obvious = TRUE;
23092213 if (r_ptr->flags[2] & RF2_RES_NEXUS)
23102214 {
2311- note = L" resists.";
2215+ note = __T(" resists.");
23122216 dam *= 3; dam /= (randint1(6)+6);
23132217 if (seen) l_ptr->flags[2] |= RF2_RES_NEXUS;
23142218 }
23152219 break;
23162220 }
2317-
23182221 /* Force */
23192222 case GF_FORCE:
23202223 {
@@ -2322,12 +2225,11 @@
23222225 do_stun = (randint1(15) + r) / (r + 1);
23232226 if (r_ptr->spell_flags[0] & (RSF0_BR_WALL))
23242227 {
2325- note = L" resists.";
2228+ note = __T(" resists.");
23262229 dam *= 3; dam /= (randint1(6)+6);
23272230 }
23282231 break;
23292232 }
2330-
23312233 /* Inertia -- breathers resist */
23322234 case GF_INERTIA:
23332235 {
@@ -2334,12 +2236,11 @@
23342236 if (seen) obvious = TRUE;
23352237 if (r_ptr->spell_flags[0] & (RSF0_BR_INER))
23362238 {
2337- note = L" resists.";
2239+ note = __T(" resists.");
23382240 dam *= 3; dam /= (randint1(6)+6);
23392241 }
23402242 break;
23412243 }
2342-
23432244 /* Time -- breathers resist */
23442245 case GF_TIME:
23452246 {
@@ -2346,12 +2247,11 @@
23462247 if (seen) obvious = TRUE;
23472248 if (r_ptr->spell_flags[0] & (RSF0_BR_TIME))
23482249 {
2349- note = L" resists.";
2250+ note = __T(" resists.");
23502251 dam *= 3; dam /= (randint1(6)+6);
23512252 }
23522253 break;
23532254 }
2354-
23552255 /* Gravity -- breathers resist */
23562256 case GF_GRAVITY:
23572257 {
@@ -2363,13 +2263,12 @@
23632263
23642264 if (r_ptr->spell_flags[0] & (RSF0_BR_GRAV))
23652265 {
2366- note = L" resists.";
2266+ note = __T(" resists.");
23672267 dam *= 3; dam /= (randint1(6)+6);
23682268 do_dist = 0;
23692269 }
23702270 break;
23712271 }
2372-
23732272 /* Pure damage */
23742273 case GF_MANA:
23752274 {
@@ -2376,7 +2275,6 @@
23762275 if (seen) obvious = TRUE;
23772276 break;
23782277 }
2379-
23802278 /* Meteor -- powerful magic missile */
23812279 case GF_METEOR:
23822280 {
@@ -2383,7 +2281,6 @@
23832281 if (seen) obvious = TRUE;
23842282 break;
23852283 }
2386-
23872284 /* Ice -- Cold + Cuts + Stun */
23882285 case GF_ICE:
23892286 {
@@ -2391,19 +2288,18 @@
23912288 do_stun = (randint1(15) + 1) / (r + 1);
23922289 if (r_ptr->flags[2] & (RF2_IM_COLD))
23932290 {
2394- note = L" resists a lot.";
2291+ note = __T(" resists a lot.");
23952292 dam /= 9;
23962293 if (seen) l_ptr->flags[2] |= (RF2_IM_COLD);
23972294 }
23982295 break;
23992296 }
2400-
24012297 /* Drain Life */
24022298 case GF_OLD_DRAIN:
24032299 {
24042300 if (seen) obvious = TRUE;
24052301 if ((r_ptr->flags[2] & (RF2_UNDEAD | RF2_DEMON)) ||
2406- (_tcschr(L"Egv", r_ptr->d_char)))
2302+ (_tcschr(__T("Egv"), r_ptr->d_char)))
24072303 {
24082304 if (r_ptr->flags[2] & (RF2_UNDEAD))
24092305 {
@@ -2413,15 +2309,12 @@
24132309 {
24142310 if (seen) l_ptr->flags[2] |= (RF2_DEMON);
24152311 }
2416-
2417- note = L" is unaffected!";
2312+ note = __T(" is unaffected!");
24182313 obvious = FALSE;
24192314 dam = 0;
24202315 }
2421-
24222316 break;
24232317 }
2424-
24252318 /* Polymorph monster (Use "dam" as "power") */
24262319 case GF_OLD_POLY:
24272320 {
@@ -2434,17 +2327,15 @@
24342327 if ((r_ptr->flags[0] & (RF0_UNIQUE)) ||
24352328 (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
24362329 {
2437- note = L" is unaffected!";
2330+ note = __T(" is unaffected!");
24382331 do_poly = FALSE;
24392332 obvious = FALSE;
24402333 }
2441-
24422334 /* No "real" damage */
24432335 dam = 0;
24442336
24452337 break;
24462338 }
2447-
24482339 /* Clone monsters (Ignore "dam") */
24492340 case GF_OLD_CLONE:
24502341 {
@@ -2459,15 +2350,13 @@
24592350 /* Attempt to clone. */
24602351 if (multiply_monster(cave_m_idx[y][x]))
24612352 {
2462- note = L" spawns!";
2353+ note = __T(" spawns!");
24632354 }
2464-
24652355 /* No "real" damage */
24662356 dam = 0;
24672357
24682358 break;
24692359 }
2470-
24712360 /* Heal Monster (use "dam" as amount of healing) */
24722361 case GF_OLD_HEAL:
24732362 {
@@ -2486,13 +2375,12 @@
24862375 if (p_ptr->health_who == cave_m_idx[y][x]) p_ptr->redraw |= (PR_HEALTH);
24872376
24882377 /* Message */
2489- note = L" looks healthier.";
2378+ note = __T(" looks healthier.");
24902379
24912380 /* No "real" damage */
24922381 dam = 0;
24932382 break;
24942383 }
2495-
24962384 /* Speed Monster (Ignore "dam") */
24972385 case GF_OLD_SPEED:
24982386 {
@@ -2500,13 +2388,12 @@
25002388
25012389 /* Speed up */
25022390 if (m_ptr->mspeed < 150) m_ptr->mspeed += 10;
2503- note = L" starts moving faster.";
2391+ note = __T(" starts moving faster.");
25042392
25052393 /* No "real" damage */
25062394 dam = 0;
25072395 break;
25082396 }
2509-
25102397 /* Slow Monster (Use "dam" as "power") */
25112398 case GF_OLD_SLOW:
25122399 {
@@ -2516,22 +2403,18 @@
25162403 if ((r_ptr->flags[0] & (RF0_UNIQUE)) ||
25172404 (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
25182405 {
2519- note = L" is unaffected!";
2406+ note = __T(" is unaffected!");
25202407 obvious = FALSE;
25212408 }
2522-
2523- /* Normal monsters slow down */
2524- else
2409+ else /* Normal monsters slow down */
25252410 {
25262411 if (m_ptr->mspeed > 60) m_ptr->mspeed -= 10;
2527- note = L" starts moving slower.";
2412+ note = __T(" starts moving slower.");
25282413 }
2529-
25302414 /* No "real" damage */
25312415 dam = 0;
25322416 break;
25332417 }
2534-
25352418 /* Sleep (Use "dam" as "power") */
25362419 case GF_OLD_SLEEP:
25372420 {
@@ -2547,23 +2430,20 @@
25472430 {
25482431 if (seen) l_ptr->flags[2] |= (RF2_NO_SLEEP);
25492432 }
2550-
25512433 /* No obvious effect */
2552- note = L" is unaffected!";
2434+ note = __T(" is unaffected!");
25532435 obvious = FALSE;
25542436 }
25552437 else
25562438 {
25572439 /* Go to sleep (much) later */
2558- note = L" falls asleep!";
2440+ note = __T(" falls asleep!");
25592441 do_sleep = 500;
25602442 }
2561-
25622443 /* No "real" damage */
25632444 dam = 0;
25642445 break;
25652446 }
2566-
25672447 /* Confusion (Use "dam" as "power") */
25682448 case GF_OLD_CONF:
25692449 {
@@ -2582,20 +2462,17 @@
25822462 {
25832463 if (seen) l_ptr->flags[2] |= (RF2_NO_CONF);
25842464 }
2585-
25862465 /* Resist */
25872466 do_conf = 0;
25882467
25892468 /* No obvious effect */
2590- note = L" is unaffected!";
2469+ note = __T(" is unaffected!");
25912470 obvious = FALSE;
25922471 }
2593-
25942472 /* No "real" damage */
25952473 dam = 0;
25962474 break;
25972475 }
2598-
25992476 /* Lite, but only hurts susceptible creatures */
26002477 case GF_LITE_WEAK:
26012478 {
@@ -2609,20 +2486,16 @@
26092486 if (seen) l_ptr->flags[2] |= (RF2_HURT_LITE);
26102487
26112488 /* Special effect */
2612- note = L" cringes from the light!";
2489+ note = __T(" cringes from the light!");
26132490 note_dies = __T(" shrivels away in the light!");
26142491 }
2615-
2616- /* Normally no damage */
2617- else
2492+ else /* Normally no damage */
26182493 {
26192494 /* No damage */
26202495 dam = 0;
26212496 }
2622-
26232497 break;
26242498 }
2625-
26262499 /* Lite -- opposite of Dark */
26272500 case GF_LITE:
26282501 {
@@ -2629,19 +2502,18 @@
26292502 if (seen) obvious = TRUE;
26302503 if (r_ptr->spell_flags[0] & (RSF0_BR_LITE))
26312504 {
2632- note = L" resists.";
2505+ note = __T(" resists.");
26332506 dam *= 2; dam /= (randint1(6)+6);
26342507 }
26352508 else if (r_ptr->flags[2] & (RF2_HURT_LITE))
26362509 {
26372510 if (seen) l_ptr->flags[2] |= (RF2_HURT_LITE);
2638- note = L" cringes from the light!";
2511+ note = __T(" cringes from the light!");
26392512 note_dies = __T(" shrivels away in the light!");
26402513 dam *= 2;
26412514 }
26422515 break;
26432516 }
2644-
26452517 /* Dark -- opposite of Lite */
26462518 case GF_DARK:
26472519 {
@@ -2648,12 +2520,11 @@
26482520 if (seen) obvious = TRUE;
26492521 if (r_ptr->spell_flags[0] & (RSF0_BR_DARK))
26502522 {
2651- note = L" resists.";
2523+ note = __T(" resists.");
26522524 dam *= 2; dam /= (randint1(6)+6);
26532525 }
26542526 break;
26552527 }
2656-
26572528 /* Stone to Mud */
26582529 case GF_KILL_WALL:
26592530 {
@@ -2667,20 +2538,16 @@
26672538 if (seen) l_ptr->flags[2] |= (RF2_HURT_ROCK);
26682539
26692540 /* Cute little message */
2670- note = L" loses some skin!";
2541+ note = __T(" loses some skin!");
26712542 note_dies = __T(" dissolves!");
26722543 }
2673-
2674- /* Usually, ignore the effects */
2675- else
2544+ else /* Usually, ignore the effects */
26762545 {
26772546 /* No damage */
26782547 dam = 0;
26792548 }
2680-
26812549 break;
26822550 }
2683-
26842551 /* Teleport undead (Use "dam" as "power") */
26852552 case GF_AWAY_UNDEAD:
26862553 {
@@ -2691,19 +2558,15 @@
26912558 if (seen) l_ptr->flags[2] |= (RF2_UNDEAD);
26922559 do_dist = dam;
26932560 }
2694-
2695- /* Others ignore */
2696- else
2561+ else /* Others ignore */
26972562 {
26982563 /* Irrelevant */
26992564 skipped = TRUE;
27002565 }
2701-
27022566 /* No "real" damage */
27032567 dam = 0;
27042568 break;
27052569 }
2706-
27072570 /* Teleport evil (Use "dam" as "power") */
27082571 case GF_AWAY_EVIL:
27092572 {
@@ -2714,19 +2577,15 @@
27142577 if (seen) l_ptr->flags[2] |= (RF2_EVIL);
27152578 do_dist = dam;
27162579 }
2717-
2718- /* Others ignore */
2719- else
2580+ else /* Others ignore */
27202581 {
27212582 /* Irrelevant */
27222583 skipped = TRUE;
27232584 }
2724-
27252585 /* No "real" damage */
27262586 dam = 0;
27272587 break;
27282588 }
2729-
27302589 /* Teleport monster (Use "dam" as "power") */
27312590 case GF_AWAY_ALL:
27322591 {
@@ -2740,7 +2599,6 @@
27402599 dam = 0;
27412600 break;
27422601 }
2743-
27442602 /* Turn undead (Use "dam" as "power") */
27452603 case GF_TURN_UNDEAD:
27462604 {
@@ -2760,14 +2618,12 @@
27602618 if (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)
27612619 {
27622620 /* No obvious effect */
2763- note = L" is unaffected!";
2621+ note = __T(" is unaffected!");
27642622 obvious = FALSE;
27652623 do_fear = 0;
27662624 }
27672625 }
2768-
2769- /* Others ignore */
2770- else
2626+ else /* Others ignore */
27712627 {
27722628 /* Irrelevant */
27732629 skipped = TRUE;
@@ -2777,7 +2633,6 @@
27772633 dam = 0;
27782634 break;
27792635 }
2780-
27812636 /* Turn evil (Use "dam" as "power") */
27822637 case GF_TURN_EVIL:
27832638 {
@@ -2797,12 +2652,11 @@
27972652 if (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10)
27982653 {
27992654 /* No obvious effect */
2800- note = L" is unaffected!";
2655+ note = __T(" is unaffected!");
28012656 obvious = FALSE;
28022657 do_fear = 0;
28032658 }
28042659 }
2805-
28062660 /* Others ignore */
28072661 else
28082662 {
@@ -2809,12 +2663,10 @@
28092663 /* Irrelevant */
28102664 skipped = TRUE;
28112665 }
2812-
28132666 /* No "real" damage */
28142667 dam = 0;
28152668 break;
28162669 }
2817-
28182670 /* Turn monster (Use "dam" as "power") */
28192671 case GF_TURN_ALL:
28202672 {
@@ -2830,16 +2682,14 @@
28302682 (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
28312683 {
28322684 /* No obvious effect */
2833- note = L" is unaffected!";
2685+ note = __T(" is unaffected!");
28342686 obvious = FALSE;
28352687 do_fear = 0;
28362688 }
2837-
28382689 /* No "real" damage */
28392690 dam = 0;
28402691 break;
28412692 }
2842-
28432693 /* Dispel undead */
28442694 case GF_DISP_UNDEAD:
28452695 {
@@ -2853,12 +2703,10 @@
28532703 if (seen) obvious = TRUE;
28542704
28552705 /* Message */
2856- note = L" shudders.";
2706+ note = __T(" shudders.");
28572707 note_dies = __T(" dissolves!");
28582708 }
2859-
2860- /* Others ignore */
2861- else
2709+ else /* Others ignore */
28622710 {
28632711 /* Irrelevant */
28642712 skipped = TRUE;
@@ -2866,10 +2714,8 @@
28662714 /* No damage */
28672715 dam = 0;
28682716 }
2869-
28702717 break;
28712718 }
2872-
28732719 /* Dispel evil */
28742720 case GF_DISP_EVIL:
28752721 {
@@ -2883,10 +2729,9 @@
28832729 if (seen) obvious = TRUE;
28842730
28852731 /* Message */
2886- note = L" shudders.";
2732+ note = __T(" shudders.");
28872733 note_dies = __T(" dissolves!");
28882734 }
2889-
28902735 /* Others ignore */
28912736 else
28922737 {
@@ -2896,10 +2741,8 @@
28962741 /* No damage */
28972742 dam = 0;
28982743 }
2899-
29002744 break;
29012745 }
2902-
29032746 /* Dispel monster */
29042747 case GF_DISP_ALL:
29052748 {
@@ -2907,12 +2750,11 @@
29072750 if (seen) obvious = TRUE;
29082751
29092752 /* Message */
2910- note = L" shudders.";
2753+ note = __T(" shudders.");
29112754 note_dies = __T(" dissolves!");
29122755
29132756 break;
29142757 }
2915-
29162758 /* Default */
29172759 default:
29182760 {
@@ -2925,7 +2767,6 @@
29252767 break;
29262768 }
29272769 }
2928-
29292770 /* Absolutely no effect */
29302771 if (skipped) return (FALSE);
29312772
@@ -2938,7 +2779,6 @@
29382779 /* Uniques may only be killed by the player */
29392780 if ((who > 0) && (dam > m_ptr->hp)) dam = m_ptr->hp;
29402781 }
2941-
29422782 /* Check for death */
29432783 if (dam > m_ptr->hp)
29442784 {
@@ -2945,12 +2785,11 @@
29452785 /* Extract method of death */
29462786 note = note_dies;
29472787 }
2948-
29492788 /* Mega-Hack -- Handle "polymorph" -- monsters get a saving throw */
29502789 else if (do_poly && (randint1(90) > r_ptr->level))
29512790 {
29522791 /* Default -- assume no polymorph */
2953- note = L" is unaffected!";
2792+ note = __T(" is unaffected!");
29542793
29552794 /* Pick a "new" monster race */
29562795 tmp = poly_r_idx(m_ptr->r_idx);
@@ -2962,7 +2801,7 @@
29622801 if (seen) obvious = TRUE;
29632802
29642803 /* Monster polymorphs */
2965- note = L" changes!";
2804+ note = __T(" changes!");
29662805
29672806 /* Turn off the damage */
29682807 dam = 0;
@@ -2982,7 +2821,6 @@
29822821 r_ptr = &r_info[m_ptr->r_idx];
29832822 }
29842823 }
2985-
29862824 /* Handle "teleport" */
29872825 else if (do_dist)
29882826 {
@@ -2990,7 +2828,7 @@
29902828 if (seen) obvious = TRUE;
29912829
29922830 /* Message */
2993- note = L" disappears!";
2831+ note = __T(" disappears!");
29942832
29952833 /* Teleport */
29962834 teleport_away(cave_m_idx[y][x], do_dist);
@@ -2999,7 +2837,6 @@
29992837 y = m_ptr->fy;
30002838 x = m_ptr->fx;
30012839 }
3002-
30032840 /* Sound and Impact breathers never stun */
30042841 else if (do_stun &&
30052842 !(r_ptr->spell_flags[0] & (RSF0_BR_SOUN | RSF0_BR_WALL)))
@@ -3010,19 +2847,17 @@
30102847 /* Get confused */
30112848 if (m_ptr->stunned)
30122849 {
3013- note = L" is more dazed.";
2850+ note = __T(" is more dazed.");
30142851 tmp = m_ptr->stunned + (do_stun / 2);
30152852 }
30162853 else
30172854 {
3018- note = L" is dazed.";
2855+ note = __T(" is dazed.");
30192856 tmp = do_stun;
30202857 }
3021-
30222858 /* Apply stun */
30232859 m_ptr->stunned = (tmp < 200) ? tmp : 200;
30242860 }
3025-
30262861 /* Confusion and Chaos breathers (and sleepers) never confuse */
30272862 else if (do_conf &&
30282863 !(r_ptr->flags[2] & (RF2_NO_CONF)) &&
@@ -3034,21 +2869,18 @@
30342869 /* Already partially confused */
30352870 if (m_ptr->confused)
30362871 {
3037- note = L" looks more confused.";
2872+ note = __T(" looks more confused.");
30382873 tmp = m_ptr->confused + (do_conf / 2);
30392874 }
3040-
30412875 /* Was not confused */
30422876 else
30432877 {
3044- note = L" looks confused.";
2878+ note = __T(" looks confused.");
30452879 tmp = do_conf;
30462880 }
3047-
30482881 /* Apply confusion */
30492882 m_ptr->confused = (tmp < 200) ? tmp : 200;
30502883 }
3051-
30522884 /* Fear */
30532885 if (do_fear)
30542886 {
@@ -3058,7 +2890,6 @@
30582890 /* Set fear */
30592891 m_ptr->monfear = (tmp < 200) ? tmp : 200;
30602892 }
3061-
30622893 /* If another monster did the damage, hurt the monster by hand */
30632894 if (who > 0)
30642895 {
@@ -3083,9 +2914,7 @@
30832914 /* Give detailed messages if destroyed */
30842915 if (note) msg_format(__T("%^s%s"), m_name, note);
30852916 }
3086-
3087- /* Damaged monster */
3088- else
2917+ else /* Damaged monster */
30892918 {
30902919 /* Give detailed messages if visible or destroyed */
30912920 if (note && seen) msg_format(__T("%^s%s"), m_name, note);
@@ -3097,9 +2926,7 @@
30972926 if (do_sleep) m_ptr->csleep = do_sleep;
30982927 }
30992928 }
3100-
3101- /* If the player did it, give him experience, check fear */
3102- else
2929+ else /* If the player did it, give him experience, check fear */
31032930 {
31042931 bool fear = FALSE;
31052932
@@ -3108,9 +2935,7 @@
31082935 {
31092936 /* Dead monster */
31102937 }
3111-
3112- /* Damaged monster */
3113- else
2938+ else /* Damaged monster */
31142939 {
31152940 /* Give detailed messages if visible or destroyed */
31162941 if (note && seen) msg_format(__T("%^s%s"), m_name, note);
@@ -3123,14 +2948,12 @@
31232948 {
31242949 /* Message */
31252950 message_format(MSG_FLEE, m_ptr->r_idx,
3126- L"%^s flees in terror!", m_name);
2951+ __T("%^s flees in terror!"), m_name);
31272952 }
3128-
31292953 /* Hack -- handle sleep */
31302954 if (do_sleep) m_ptr->csleep = do_sleep;
31312955 }
31322956 }
3133-
31342957 /* Verify this code XXX XXX XXX */
31352958
31362959 /* Update the monster */
@@ -3145,7 +2968,6 @@
31452968 /* Window stuff */
31462969 p_ptr->redraw |= (PR_MONSTER);
31472970 }
3148-
31492971 /* Track it */
31502972 project_m_n++;
31512973 project_m_x = x;
@@ -3167,7 +2989,7 @@
31672989 * is reduced (see "project_m()" above). This can happen if a monster breathes
31682990 * at the player and hits a wall instead.
31692991 *
3170- * We return L"TRUE" if any "obvious" effects were observed.
2992+ * We return "TRUE" if any "obvious" effects were observed.
31712993 *
31722994 * Actually, for historical reasons, we just assume that the effects were
31732995 * obvious. XXX XXX XXX
@@ -3225,7 +3047,6 @@
32253047 acid_dam(dam, killer);
32263048 break;
32273049 }
3228-
32293050 /* Standard damage -- hurts inventory too */
32303051 case GF_FIRE:
32313052 {
@@ -3233,7 +3054,6 @@
32333054 fire_dam(dam, killer);
32343055 break;
32353056 }
3236-
32373057 /* Standard damage -- hurts inventory too */
32383058 case GF_COLD:
32393059 {
@@ -3241,7 +3061,6 @@
32413061 cold_dam(dam, killer);
32423062 break;
32433063 }
3244-
32453064 /* Standard damage -- hurts inventory too */
32463065 case GF_ELEC:
32473066 {
@@ -3249,7 +3068,6 @@
32493068 elec_dam(dam, killer);
32503069 break;
32513070 }
3252-
32533071 /* Standard damage -- also poisons player */
32543072 case GF_POIS:
32553073 {
@@ -3259,7 +3077,6 @@
32593077 dam = RES_POIS_ADJ(dam, NOT_USED);
32603078 object_notice_flag(1, TR1_RES_POIS);
32613079 }
3262-
32633080 if (p_ptr->timed[TMD_OPP_POIS])
32643081 dam = RES_POIS_ADJ(dam, NOT_USED);
32653082
@@ -3270,7 +3087,6 @@
32703087 }
32713088 break;
32723089 }
3273-
32743090 /* Standard damage */
32753091 case GF_MISSILE:
32763092 {
@@ -3278,7 +3094,6 @@
32783094 take_hit(dam, killer);
32793095 break;
32803096 }
3281-
32823097 /* Holy Orb -- Player only takes partial damage */
32833098 case GF_HOLY_ORB:
32843099 {
@@ -3287,7 +3102,6 @@
32873102 take_hit(dam, killer);
32883103 break;
32893104 }
3290-
32913105 /* Arrow -- no dodging XXX */
32923106 case GF_ARROW:
32933107 {
@@ -3295,11 +3109,11 @@
32953109 take_hit(dam, killer);
32963110 break;
32973111 }
3298-
32993112 /* Plasma -- No resist XXX */
33003113 case GF_PLASMA:
33013114 {
3302- if (blind) msg_print(__T("You are hit by something!"));
3115+ if (blind)
3116+ msg_print(__T("You are hit by something!"));
33033117 take_hit(dam, killer);
33043118 if (!p_ptr->state.resist_sound)
33053119 {
@@ -3312,11 +3126,11 @@
33123126 }
33133127 break;
33143128 }
3315-
33163129 /* Nether -- drain experience */
33173130 case GF_NETHER:
33183131 {
3319- if (blind) msg_print(__T("You are hit by something strange!"));
3132+ if (blind)
3133+ msg_print(__T("You are hit by something strange!"));
33203134 if (p_ptr->state.resist_nethr)
33213135 {
33223136 dam = RES_NETH_ADJ(dam, RANDOMISE);
@@ -3349,7 +3163,6 @@
33493163 take_hit(dam, killer);
33503164 break;
33513165 }
3352-
33533166 /* Water -- stun/confuse */
33543167 case GF_WATER:
33553168 {
@@ -3367,7 +3180,6 @@
33673180 take_hit(dam, killer);
33683181 break;
33693182 }
3370-
33713183 /* Chaos -- many effects */
33723184 case GF_CHAOS:
33733185 {
@@ -3416,11 +3228,9 @@
34163228 object_notice_flag(1, TR1_RES_NETHR);
34173229 object_notice_flag(1, TR1_RES_CHAOS);
34183230 }
3419-
34203231 take_hit(dam, killer);
34213232 break;
34223233 }
3423-
34243234 /* Shards -- mostly cutting */
34253235 case GF_SHARD:
34263236 {
@@ -3437,7 +3247,6 @@
34373247 take_hit(dam, killer);
34383248 break;
34393249 }
3440-
34413250 /* Sound -- mostly stunning */
34423251 case GF_SOUND:
34433252 {
@@ -3455,7 +3264,6 @@
34553264 take_hit(dam, killer);
34563265 break;
34573266 }
3458-
34593267 /* Pure confusion */
34603268 case GF_CONFUSION:
34613269 {
@@ -3472,7 +3280,6 @@
34723280 take_hit(dam, killer);
34733281 break;
34743282 }
3475-
34763283 /* Disenchantment -- see above */
34773284 case GF_DISENCHANT:
34783285 {
@@ -3489,7 +3296,6 @@
34893296 take_hit(dam, killer);
34903297 break;
34913298 }
3492-
34933299 /* Nexus -- see above */
34943300 case GF_NEXUS:
34953301 {
@@ -3506,7 +3312,6 @@
35063312 take_hit(dam, killer);
35073313 break;
35083314 }
3509-
35103315 /* Force -- mostly stun */
35113316 case GF_FORCE:
35123317 {
@@ -3519,7 +3324,6 @@
35193324 take_hit(dam, killer);
35203325 break;
35213326 }
3522-
35233327 /* Inertia -- slowness */
35243328 case GF_INERTIA:
35253329 {
@@ -3528,7 +3332,6 @@
35283332 take_hit(dam, killer);
35293333 break;
35303334 }
3531-
35323335 /* Lite -- blinding */
35333336 case GF_LITE:
35343337 {
@@ -3549,7 +3352,6 @@
35493352 take_hit(dam, killer);
35503353 break;
35513354 }
3552-
35533355 /* Dark -- blinding */
35543356 case GF_DARK:
35553357 {
@@ -3570,7 +3372,6 @@
35703372 take_hit(dam, killer);
35713373 break;
35723374 }
3573-
35743375 /* Time -- bolt fewer effects XXX */
35753376 case GF_TIME:
35763377 {
@@ -3584,7 +3385,6 @@
35843385 lose_exp(100 + (p_ptr->exp / 100) * MON_DRAIN_LIFE);
35853386 break;
35863387 }
3587-
35883388 case 6: case 7: case 8: case 9:
35893389 {
35903390 switch (randint1(6))
@@ -3604,7 +3404,6 @@
36043404 p_ptr->update |= (PU_BONUS);
36053405 break;
36063406 }
3607-
36083407 case 10:
36093408 {
36103409 msg_print(__T("You're not as powerful as you used to be..."));
@@ -3911,7 +3710,6 @@
39113710 flg &= ~(PROJECT_THRU);
39123711 }
39133712 }
3914-
39153713 /* Hack -- Assume there will be no blast (max radius 16) */
39163714 for (dist = 0; dist < 16; dist++) gm[dist] = 0;
39173715
@@ -3955,7 +3753,6 @@
39553753 gx[grids] = x;
39563754 grids++;
39573755 }
3958-
39593756 /* Only do visuals if requested */
39603757 if (!blind && !(flg & (PROJECT_HIDE)))
39613758 {
--- trunk/JBand/src/load-old.cpp (revision 120)
+++ trunk/JBand/src/load-old.cpp (revision 121)
@@ -1,7 +1,7 @@
11 /* テスト */
22 /*
3- * Debug Status: Functions in this file remain nastily broken.
4- * - working on rd_string()
3+ * Debug Status: Functions on this page have been commented out
4+ * as there are no old version files to load.
55 */
66 /*
77 * File: load.c
Show on old repository browser