• R/O
  • SSH
  • HTTPS

jband: Commit


Commit MetaInfo

Revision119 (tree)
Time2009-06-25 01:46:33
Authorpaulblay

Log Message

More T stuff.

Change Summary

Incremental Difference

--- trunk/JBand/src/death.cpp (revision 118)
+++ trunk/JBand/src/death.cpp (revision 119)
@@ -343,8 +343,8 @@
343343 UNREFERENCED_PARAMETER(title);
344344
345345 /* Get an item */
346- q = L"Examine which item? ";
347- s = L"You have nothing to examine.";
346+ q = __T("Examine which item? ");
347+ s = __T("You have nothing to examine.");
348348
349349 while (get_item(&item, q, s, (USE_INVEN | USE_EQUIP | IS_HARMLESS)))
350350 {
--- trunk/JBand/src/ui-birth.cpp (revision 118)
+++ trunk/JBand/src/ui-birth.cpp (revision 119)
@@ -449,7 +449,7 @@
449449 clear_question();
450450 Term_putstr(QUESTION_COL, QUESTION_ROW, -1, TERM_YELLOW, menu_data->hint);
451451
452- current_menu->cmd_keys = L"?=*\r\n\x18"; /* ?, ,= *, \n, <ctl-X> */
452+ current_menu->cmd_keys = __T("?=*\r\n\x18"); /* ?, ,= *, \n, <ctl-X> */
453453
454454 while (next == BIRTH_RESET)
455455 {
--- trunk/JBand/src/object/obj-util.cpp (revision 118)
+++ trunk/JBand/src/object/obj-util.cpp (revision 119)
@@ -2567,25 +2567,25 @@
25672567 /* Took off weapon */
25682568 if (item == INVEN_WIELD)
25692569 {
2570- act = L"You were wielding";
2570+ act = __T("You were wielding");
25712571 }
25722572
25732573 /* Took off bow */
25742574 else if (item == INVEN_BOW)
25752575 {
2576- act = L"You were holding";
2576+ act = __T("You were holding");
25772577 }
25782578
25792579 /* Took off light */
25802580 else if (item == INVEN_LITE)
25812581 {
2582- act = L"You were holding";
2582+ act = __T("You were holding");
25832583 }
25842584
25852585 /* Took off something */
25862586 else
25872587 {
2588- act = L"You were wearing";
2588+ act = __T("You were wearing");
25892589 }
25902590
25912591 /* Modify, Optimize */
--- trunk/JBand/src/cmd3.cpp (revision 118)
+++ trunk/JBand/src/cmd3.cpp (revision 119)
@@ -1,6 +1,7 @@
11 /* テスト */
22 /*
33 * Debug Status: Not checked.
4+ * - Fixed __T on this page.
45 */
56 /*
67 * File: cmd3.c
@@ -177,13 +178,13 @@
177178
178179 /* Where is the item now */
179180 if (slot == INVEN_WIELD)
180- act = L"You are wielding";
181+ act = __T("You are wielding");
181182 else if (slot == INVEN_BOW)
182- act = L"You are shooting with";
183+ act = __T("You are shooting with");
183184 else if (slot == INVEN_LITE)
184- act = L"Your light source is";
185+ act = __T("Your light source is");
185186 else
186- act = L"You are wearing";
187+ act = __T("You are wearing");
187188
188189 /* Describe the result */
189190 object_desc(o_name, _countof(o_name), o_ptr, TRUE, ODESC_FULL);
@@ -261,7 +262,7 @@
261262 return;
262263 }
263264 /* Message */
264- message_format(MSG_DESTROY, 0, L"You destroy %s.", o_name);
265+ message_format(MSG_DESTROY, 0, __T("You destroy %s."), o_name);
265266
266267 /* Reduce the charges of rods/wands/staves */
267268 reduce_charges(o_ptr, amt);
@@ -297,8 +298,8 @@
297298 const _TCHAR *s;
298299
299300 /* Get an item */
300- q = L"Destroy which item? ";
301- s = L"You have nothing to destroy.";
301+ q = __T("Destroy which item? ");
302+ s = __T("You have nothing to destroy.");
302303 if (!get_item(&item, q, s, (USE_INVEN | USE_EQUIP | USE_FLOOR | CAN_SQUELCH))) return;
303304
304305 /* Deal with squelched items */
@@ -318,7 +319,7 @@
318319 object_desc(o_name, _countof(o_name), &obj_to_destroy, TRUE, ODESC_FULL);
319320
320321 /* Verify destruction */
321- strnfmt(out_val, _countof(out_val), L"Really destroy %s? ", o_name);
322+ strnfmt(out_val, _countof(out_val), __T("Really destroy %s? "), o_name);
322323 if (!get_check(out_val)) return;
323324
324325 /* Tell the game to destroy the item. */
@@ -332,7 +333,7 @@
332333 /* Obtain plural form without a quantity */
333334 object_desc(sval_name, sizeof sval_name, o_ptr, FALSE,
334335 ODESC_BASE | ODESC_PLURAL);
335- strnfmt(out_val, sizeof out_val, L"Ignore %s in future? ",
336+ strnfmt(out_val, sizeof out_val, __T("Ignore %s in future? "),
336337 sval_name);
337338
338339 if (get_check(out_val))
@@ -519,13 +520,13 @@
519520 }
520521 else
521522 {
522- strnfmt(tmp_val, _countof(tmp_val), L"%s%s of",
523- ((y2 < y1) ? L" north" : (y2 > y1) ? L" south" : __T("")),
524- ((x2 < x1) ? L" west" : (x2 > x1) ? L" east" : __T("")));
523+ strnfmt(tmp_val, _countof(tmp_val), __T("%s%s of"),
524+ ((y2 < y1) ? __T(" north") : (y2 > y1) ? __T(" south") : __T("")),
525+ ((x2 < x1) ? __T(" west") : (x2 > x1) ? __T(" east") : __T("")));
525526 }
526527 /* Prepare to ask which way to look */
527528 strnfmt(out_val, _countof(out_val),
528- L"Map sector [%d,%d], which is%s your sector. Direction?",
529+ __T("Map sector [%d,%d], which is%s your sector. Direction?"),
529530 (y2 / PANEL_HGT), (x2 / PANEL_WID), tmp_val);
530531
531532 /* More detail */
@@ -532,7 +533,7 @@
532533 if (OPT(center_player))
533534 {
534535 strnfmt(out_val, _countof(out_val),
535- L"Map sector [%d(%02d),%d(%02d)], which is%s your sector. Direction?",
536+ __T("Map sector [%d(%02d),%d(%02d)], which is%s your sector. Direction?"),
536537 (y2 / PANEL_HGT), (y2 % PANEL_HGT),
537538 (x2 / PANEL_WID), (x2 % PANEL_WID), tmp_val);
538539 }
@@ -552,7 +553,7 @@
552553
553554 /* Error */
554555 if (!dir)
555- bell(L"Illegal direction for locate!");
556+ bell(__T("Illegal direction for locate!"));
556557 }
557558 /* No direction */
558559 if (!dir) break;
@@ -573,101 +574,101 @@
573574 */
574575 static const _TCHAR *ident_info[] =
575576 {
576- L" :A dark grid",
577- L"!:A potion (or oil)",
578- L"\":An amulet (or necklace)",
579- L"#:A wall (or secret door)",
580- L"$:Treasure (gold or gems)",
581- L"%:A vein (magma or quartz)",
577+ __T(" :A dark grid"),
578+ __T("!:A potion (or oil)"),
579+ __T("\":An amulet (or necklace)"),
580+ __T("#:A wall (or secret door)"),
581+ __T("$:Treasure (gold or gems)"),
582+ __T("%:A vein (magma or quartz)"),
582583 /* "&:unused", */
583- L"':An open door",
584- L"(:Soft armor",
585- L"):A shield",
586- L"*:A vein with treasure",
587- L"+:A closed door",
588- L",:Food (or mushroom patch)",
589- L"-:A wand (or rod)",
590- L".:Floor",
591- L"/:A polearm (Axe/Pike/etc)",
584+ __T("':An open door"),
585+ __T("(:Soft armor"),
586+ __T("):A shield"),
587+ __T("*:A vein with treasure"),
588+ __T("+:A closed door"),
589+ __T(",:Food (or mushroom patch)"),
590+ __T("-:A wand (or rod)"),
591+ __T(".:Floor"),
592+ __T("/:A polearm (Axe/Pike/etc)"),
592593 /* "0:unused", */
593- L"1:Entrance to General Store",
594- L"2:Entrance to Armory",
595- L"3:Entrance to Weaponsmith",
596- L"4:Entrance to Temple",
597- L"5:Entrance to Alchemy shop",
598- L"6:Entrance to Magic store",
599- L"7:Entrance to Black Market",
600- L"8:Entrance to your home",
594+ __T("1:Entrance to General Store"),
595+ __T("2:Entrance to Armory"),
596+ __T("3:Entrance to Weaponsmith"),
597+ __T("4:Entrance to Temple"),
598+ __T("5:Entrance to Alchemy shop"),
599+ __T("6:Entrance to Magic store"),
600+ __T("7:Entrance to Black Market"),
601+ __T("8:Entrance to your home"),
601602 /* "9:unused", */
602- L"::Rubble",
603- L";:A glyph of warding",
604- L"<:An up staircase",
605- L"=:A ring",
606- L">:A down staircase",
607- L"?:A scroll",
608- L"@:You",
609- L"A:Angel",
610- L"B:Bird",
611- L"C:Canine",
612- L"D:Ancient Dragon/Wyrm",
613- L"E:Elemental",
614- L"F:Dragon Fly",
615- L"G:Ghost",
616- L"H:Hybrid",
617- L"I:Insect",
618- L"J:Snake",
619- L"K:Killer Beetle",
620- L"L:Lich",
621- L"M:Multi-Headed Reptile",
603+ __T("::Rubble"),
604+ __T(";:A glyph of warding"),
605+ __T("<:An up staircase"),
606+ __T("=:A ring"),
607+ __T(">:A down staircase"),
608+ __T("?:A scroll"),
609+ __T("@:You"),
610+ __T("A:Angel"),
611+ __T("B:Bird"),
612+ __T("C:Canine"),
613+ __T("D:Ancient Dragon/Wyrm"),
614+ __T("E:Elemental"),
615+ __T("F:Dragon Fly"),
616+ __T("G:Ghost"),
617+ __T("H:Hybrid"),
618+ __T("I:Insect"),
619+ __T("J:Snake"),
620+ __T("K:Killer Beetle"),
621+ __T("L:Lich"),
622+ __T("M:Multi-Headed Reptile"),
622623 /* "N:unused", */
623- L"O:Ogre",
624- L"P:Giant Humanoid",
625- L"Q:Quylthulg (Pulsing Flesh Mound)",
626- L"R:Reptile/Amphibian",
627- L"S:Spider/Scorpion/Tick",
628- L"T:Troll",
629- L"U:Major Demon",
630- L"V:Vampire",
631- L"W:Wight/Wraith/etc",
632- L"X:Xorn/Xaren/etc",
633- L"Y:Yeti",
634- L"Z:Zephyr Hound",
635- L"[:Hard armor",
636- L"\\:A hafted weapon (mace/whip/etc)",
637- L"]:Misc. armor",
638- L"^:A trap",
639- L"_:A staff",
624+ __T("O:Ogre"),
625+ __T("P:Giant Humanoid"),
626+ __T("Q:Quylthulg (Pulsing Flesh Mound)"),
627+ __T("R:Reptile/Amphibian"),
628+ __T("S:Spider/Scorpion/Tick"),
629+ __T("T:Troll"),
630+ __T("U:Major Demon"),
631+ __T("V:Vampire"),
632+ __T("W:Wight/Wraith/etc"),
633+ __T("X:Xorn/Xaren/etc"),
634+ __T("Y:Yeti"),
635+ __T("Z:Zephyr Hound"),
636+ __T("[:Hard armor"),
637+ __T("\\:A hafted weapon (mace/whip/etc)"),
638+ __T("]:Misc. armor"),
639+ __T("^:A trap"),
640+ __T("_:A staff"),
640641 /* "`:unused", */
641- L"a:Ant",
642- L"b:Bat",
643- L"c:Centipede",
644- L"d:Dragon",
645- L"e:Floating Eye",
646- L"f:Feline",
647- L"g:Golem",
648- L"h:Hobbit/Elf/Dwarf",
649- L"i:Icky Thing",
650- L"j:Jelly",
651- L"k:Kobold",
652- L"l:Louse",
653- L"m:Mold",
654- L"n:Naga",
655- L"o:Orc",
656- L"p:Person/Human",
657- L"q:Quadruped",
658- L"r:Rodent",
659- L"s:Skeleton",
660- L"t:Townsperson",
661- L"u:Minor Demon",
662- L"v:Vortex",
663- L"w:Worm/Worm-Mass",
642+ __T("a:Ant"),
643+ __T("b:Bat"),
644+ __T("c:Centipede"),
645+ __T("d:Dragon"),
646+ __T("e:Floating Eye"),
647+ __T("f:Feline"),
648+ __T("g:Golem"),
649+ __T("h:Hobbit/Elf/Dwarf"),
650+ __T("i:Icky Thing"),
651+ __T("j:Jelly"),
652+ __T("k:Kobold"),
653+ __T("l:Louse"),
654+ __T("m:Mold"),
655+ __T("n:Naga"),
656+ __T("o:Orc"),
657+ __T("p:Person/Human"),
658+ __T("q:Quadruped"),
659+ __T("r:Rodent"),
660+ __T("s:Skeleton"),
661+ __T("t:Townsperson"),
662+ __T("u:Minor Demon"),
663+ __T("v:Vortex"),
664+ __T("w:Worm/Worm-Mass"),
664665 /* "x:unused", */
665- L"y:Yeek",
666- L"z:Zombie/Mummy",
667- L"{:A missile (arrow/bolt/shot)",
668- L"|:An edged weapon (sword/dagger/etc)",
669- L"}:A launcher (bow/crossbow/sling)",
670- L"~:A tool (or miscellaneous item)",
666+ __T("y:Yeek"),
667+ __T("z:Zombie/Mummy"),
668+ __T("{:A missile (arrow/bolt/shot)"),
669+ __T("|:An edged weapon (sword/dagger/etc)"),
670+ __T("}:A launcher (bow/crossbow/sling)"),
671+ __T("~:A tool (or miscellaneous item)"),
671672 NULL
672673 };
673674
@@ -786,7 +787,7 @@
786787 u16b *who;
787788
788789 /* Get a character, or abort */
789- if (!get_com(L"Enter character to be identified, or control+[ANU]: ", &sym)) return;
790+ if (!get_com(__T("Enter character to be identified, or control+[ANU]: "), &sym)) return;
790791
791792 /* Find that character info, and describe it */
792793 for (i = 0; ident_info[i]; ++i)
@@ -797,25 +798,25 @@
797798 if (sym == KTRL('A'))
798799 {
799800 all = TRUE;
800- _tcscpy_s(buf, _countof(buf), L"Full monster list.");
801+ _tcscpy_s(buf, _countof(buf), __T("Full monster list."));
801802 }
802803 else if (sym == KTRL('U'))
803804 {
804805 all = uniq = TRUE;
805- _tcscpy_s(buf, _countof(buf), L"Unique monster list.");
806+ _tcscpy_s(buf, _countof(buf), __T("Unique monster list."));
806807 }
807808 else if (sym == KTRL('N'))
808809 {
809810 all = norm = TRUE;
810- _tcscpy_s(buf, _countof(buf), L"Non-unique monster list.");
811+ _tcscpy_s(buf, _countof(buf), __T("Non-unique monster list."));
811812 }
812813 else if (ident_info[i])
813814 {
814- strnfmt(buf, _countof(buf), L"%c - %s.", sym, ident_info[i] + 2);
815+ strnfmt(buf, _countof(buf), __T("%c - %s."), sym, ident_info[i] + 2);
815816 }
816817 else
817818 {
818- strnfmt(buf, _countof(buf), L"%c - %s.", sym, L"Unknown Symbol");
819+ strnfmt(buf, _countof(buf), __T("%c - %s."), sym, __T("Unknown Symbol"));
819820 }
820821 /* Display the result */
821822 prt(buf, 0, 0);
@@ -850,14 +851,14 @@
850851 return;
851852 }
852853 /* Buttons */
853- button_add(L"[y]", 'y');
854- button_add(L"[k]", 'k');
854+ button_add(__T("[y]"), 'y');
855+ button_add(__T("[k]"), 'k');
855856 /* Don't collide with the repeat button */
856- button_add(L"[n]", 'q');
857+ button_add(__T("[n]"), 'q');
857858 redraw_stuff();
858859
859860 /* Prompt */
860- put_str(L"Recall details? (y/k/n): ", 0, 40);
861+ put_str(__T("Recall details? (y/k/n): "), 0, 40);
861862
862863 /* Query */
863864 query = inkey_ex();
@@ -903,9 +904,9 @@
903904 i = n - 1;
904905
905906 /* Button */
906- button_add(L"[r]", 'r');
907- button_add(L"[-]", '-');
908- button_add(L"[+]", '+');
907+ button_add(__T("[r]"), 'r');
908+ button_add(__T("[-]"), '-');
909+ button_add(__T("[+]"), '+');
909910 redraw_stuff();
910911
911912 /* Scan the monster memory */
@@ -924,7 +925,7 @@
924925 roff_top(r_idx);
925926
926927 /* Hack -- Complete the prompt */
927- Term_addstr(-1, TERM_WHITE, L" [(r)ecall, ESC]");
928+ Term_addstr(-1, TERM_WHITE, __T(" [(r)ecall, ESC]"));
928929
929930 /* Interact */
930931 while (1)
@@ -939,7 +940,7 @@
939940 screen_roff(who[i]);
940941
941942 /* Hack -- Complete the prompt (again) */
942- Term_addstr(-1, TERM_WHITE, L" [(r)ecall, ESC]");
943+ Term_addstr(-1, TERM_WHITE, __T(" [(r)ecall, ESC]"));
943944 }
944945 /* Command */
945946 query = inkey_ex();
--- trunk/JBand/src/spells2.cpp (revision 118)
+++ trunk/JBand/src/spells2.cpp (revision 119)
@@ -1689,8 +1689,8 @@
16891689 if (num_ac) item_tester_hook = item_tester_hook_armour;
16901690
16911691 /* Get an item */
1692- q = L"Enchant which item? ";
1693- s = L"You have nothing to enchant.";
1692+ q = __T("Enchant which item? ");
1693+ s = __T("You have nothing to enchant.");
16941694 if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR)))
16951695 return (FALSE);
16961696
@@ -1740,8 +1740,8 @@
17401740 item_tester_hook = item_tester_unknown;
17411741
17421742 /* Get an item */
1743- q = L"Identify which item? ";
1744- s = L"You have nothing to identify.";
1743+ q = __T("Identify which item? ");
1744+ s = __T("You have nothing to identify.");
17451745 if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR)))
17461746 return (FALSE);
17471747
@@ -1796,8 +1796,8 @@
17961796 item_tester_hook = item_tester_hook_recharge;
17971797
17981798 /* Get an item */
1799- q = L"Recharge which item? ";
1800- s = L"You have nothing to recharge.";
1799+ q = __T("Recharge which item? ");
1800+ s = __T("You have nothing to recharge.");
18011801 if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR)))
18021802 return (FALSE);
18031803
@@ -3249,7 +3249,7 @@
32493249 if (o_ptr->k_idx && !cursed_p(o_ptr) && k_info[o_ptr->k_idx].cost &&
32503250 !artifact_p(o_ptr) && !ego_item_p(o_ptr))
32513251 {
3252- const _TCHAR *act = L"magical";
3252+ const _TCHAR *act = __T("magical");
32533253 _TCHAR o_name[80];
32543254
32553255 object_desc(o_name, _countof(o_name), o_ptr, FALSE, ODESC_BASE);
@@ -3258,15 +3258,15 @@
32583258 {
32593259 case EGO_BRAND_FIRE:
32603260 case EGO_FLAME:
3261- act = L"fiery";
3261+ act = __T("fiery");
32623262 break;
32633263 case EGO_BRAND_COLD:
32643264 case EGO_FROST:
3265- act = L"frosty";
3265+ act = __T("frosty");
32663266 break;
32673267 case EGO_BRAND_POIS:
32683268 case EGO_AMMO_VENOM:
3269- act = L"sickly";
3269+ act = __T("sickly");
32703270 break;
32713271 }
32723272 /* Describe */
@@ -3344,8 +3344,8 @@
33443344 item_tester_hook = item_tester_hook_ammo;
33453345
33463346 /* Get an item */
3347- q = L"Brand which kind of ammunition? ";
3348- s = L"You have nothing to brand.";
3347+ q = __T("Brand which kind of ammunition? ");
3348+ s = __T("You have nothing to brand.");
33493349 if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR)))
33503350 return (FALSE);
33513351
@@ -3382,8 +3382,8 @@
33823382 item_tester_tval = TV_BOLT;
33833383
33843384 /* Get an item */
3385- q = L"Brand which bolts? ";
3386- s = L"You have no bolts to brand.";
3385+ q = __T("Brand which bolts? ");
3386+ s = __T("You have no bolts to brand.");
33873387 if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR)))
33883388 return (FALSE);
33893389
--- trunk/JBand/src/squelch.cpp (revision 118)
+++ trunk/JBand/src/squelch.cpp (revision 119)
@@ -620,7 +620,7 @@
620620
621621 /* Run menu */
622622 WIPE(&menu, menu);
623- menu.cmd_keys = L"\n\r";
623+ menu.cmd_keys = __T("\n\r");
624624 menu.count = SQUELCH_MAX;
625625 if (oid == TYPE_JEWELRY)
626626 menu.count = area.page_rows = SQUELCH_BAD + 1;
@@ -664,7 +664,7 @@
664664
665665 /* Set up the menu */
666666 WIPE(&menu, menu);
667- menu.cmd_keys = L" \n\r";
667+ menu.cmd_keys = __T(" \n\r");
668668 menu.count = TYPE_MAX;
669669 menu_init(&menu, MN_SKIN_SCROLL, &menu_f, &area);
670670
@@ -784,7 +784,7 @@
784784
785785 /* Set up the menu */
786786 WIPE(&menu, menu);
787- menu.cmd_keys = L" \n\r";
787+ menu.cmd_keys = __T(" \n\r");
788788 menu.count = num;
789789 menu.menu_data = choice;
790790 menu_init(&menu, MN_SKIN_SCROLL, &menu_f, &area);
--- trunk/JBand/src/wizard.cpp (revision 118)
+++ trunk/JBand/src/wizard.cpp (revision 119)
@@ -667,7 +667,7 @@
667667 object_type *i_ptr;
668668 object_type object_type_body;
669669
670- const _TCHAR *q = L"Rolls: %ld, Matches: %ld, Better: %ld, Worse: %ld, Other: %ld";
670+ const _TCHAR *q = __T("Rolls: %ld, Matches: %ld, Better: %ld, Worse: %ld, Other: %ld");
671671
672672
673673 /* Mega-Hack -- allow multiple artifacts XXX XXX XXX */
@@ -888,8 +888,8 @@
888888 bool changed = FALSE;
889889
890890 /* Get an item */
891- q = L"Play with which object? ";
892- s = L"You have nothing to play with.";
891+ q = __T("Play with which object? ");
892+ s = __T("You have nothing to play with.");
893893 if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR))) return;
894894
895895 /* Get the item */
--- trunk/JBand/src/spells1.cpp (revision 118)
+++ trunk/JBand/src/spells1.cpp (revision 119)
@@ -2053,7 +2053,7 @@
20532053 const _TCHAR *note = NULL;
20542054
20552055 /* Assume a default death */
2056- const _TCHAR *note_dies = L" dies.";
2056+ const _TCHAR *note_dies = __T(" dies.");
20572057
20582058 /* Walls protect monsters */
20592059 if (!cave_floor_bold(y,x)) return (FALSE);
@@ -2083,7 +2083,7 @@
20832083 (_tcschr(L"Evg", r_ptr->d_char)))
20842084 {
20852085 /* Special note at death */
2086- note_dies = L" is destroyed.";
2086+ note_dies = __T(" is destroyed.");
20872087 }
20882088
20892089 /* Analyze the damage type */
@@ -2610,7 +2610,7 @@
26102610
26112611 /* Special effect */
26122612 note = L" cringes from the light!";
2613- note_dies = L" shrivels away in the light!";
2613+ note_dies = __T(" shrivels away in the light!");
26142614 }
26152615
26162616 /* Normally no damage */
@@ -2636,7 +2636,7 @@
26362636 {
26372637 if (seen) l_ptr->flags[2] |= (RF2_HURT_LITE);
26382638 note = L" cringes from the light!";
2639- note_dies = L" shrivels away in the light!";
2639+ note_dies = __T(" shrivels away in the light!");
26402640 dam *= 2;
26412641 }
26422642 break;
@@ -2668,7 +2668,7 @@
26682668
26692669 /* Cute little message */
26702670 note = L" loses some skin!";
2671- note_dies = L" dissolves!";
2671+ note_dies = __T(" dissolves!");
26722672 }
26732673
26742674 /* Usually, ignore the effects */
@@ -2854,7 +2854,7 @@
28542854
28552855 /* Message */
28562856 note = L" shudders.";
2857- note_dies = L" dissolves!";
2857+ note_dies = __T(" dissolves!");
28582858 }
28592859
28602860 /* Others ignore */
@@ -2884,7 +2884,7 @@
28842884
28852885 /* Message */
28862886 note = L" shudders.";
2887- note_dies = L" dissolves!";
2887+ note_dies = __T(" dissolves!");
28882888 }
28892889
28902890 /* Others ignore */
@@ -2908,7 +2908,7 @@
29082908
29092909 /* Message */
29102910 note = L" shudders.";
2911- note_dies = L" dissolves!";
2911+ note_dies = __T(" dissolves!");
29122912
29132913 break;
29142914 }
@@ -3589,12 +3589,12 @@
35893589 {
35903590 switch (randint1(6))
35913591 {
3592- case 1: k = A_STR; act = L"strong"; break;
3593- case 2: k = A_INT; act = L"bright"; break;
3594- case 3: k = A_WIS; act = L"wise"; break;
3595- case 4: k = A_DEX; act = L"agile"; break;
3596- case 5: k = A_CON; act = L"hale"; break;
3597- case 6: k = A_CHR; act = L"beautiful"; break;
3592+ case 1: k = A_STR; act = __T("strong"); break;
3593+ case 2: k = A_INT; act = __T("bright"); break;
3594+ case 3: k = A_WIS; act = __T("wise"); break;
3595+ case 4: k = A_DEX; act = __T("agile"); break;
3596+ case 5: k = A_CON; act = __T("hale"); break;
3597+ case 6: k = A_CHR; act = __T("beautiful"); break;
35983598 }
35993599
36003600 msg_format(__T("You're not as %s as you used to be..."), act);
--- trunk/JBand/src/monster/melee1.cpp (revision 118)
+++ trunk/JBand/src/monster/melee1.cpp (revision 119)
@@ -265,7 +265,7 @@
265265 {
266266 case RBM_HIT:
267267 {
268- act = L"hits you.";
268+ act = __T("hits you.");
269269 do_cut = do_stun = 1;
270270 sound_msg = MSG_MON_HIT;
271271 break;
@@ -273,7 +273,7 @@
273273
274274 case RBM_TOUCH:
275275 {
276- act = L"touches you.";
276+ act = __T("touches you.");
277277 sound_msg = MSG_MON_TOUCH;
278278 break;
279279 }
@@ -280,7 +280,7 @@
280280
281281 case RBM_PUNCH:
282282 {
283- act = L"punches you.";
283+ act = __T("punches you.");
284284 do_stun = 1;
285285 sound_msg = MSG_MON_PUNCH;
286286 break;
@@ -288,7 +288,7 @@
288288
289289 case RBM_KICK:
290290 {
291- act = L"kicks you.";
291+ act = __T("kicks you.");
292292 do_stun = 1;
293293 sound_msg = MSG_MON_KICK;
294294 break;
@@ -296,7 +296,7 @@
296296
297297 case RBM_CLAW:
298298 {
299- act = L"claws you.";
299+ act = __T("claws you.");
300300 do_cut = 1;
301301 sound_msg = MSG_MON_CLAW;
302302 break;
@@ -304,7 +304,7 @@
304304
305305 case RBM_BITE:
306306 {
307- act = L"bites you.";
307+ act = __T("bites you.");
308308 do_cut = 1;
309309 sound_msg = MSG_MON_BITE;
310310 break;
@@ -312,7 +312,7 @@
312312
313313 case RBM_STING:
314314 {
315- act = L"stings you.";
315+ act = __T("stings you.");
316316 sound_msg = MSG_MON_STING;
317317 break;
318318 }
@@ -319,13 +319,13 @@
319319
320320 case RBM_XXX1:
321321 {
322- act = L"XXX1's you.";
322+ act = __T("XXX1's you.");
323323 break;
324324 }
325325
326326 case RBM_BUTT:
327327 {
328- act = L"butts you.";
328+ act = __T("butts you.");
329329 do_stun = 1;
330330 sound_msg = MSG_MON_BUTT;
331331 break;
@@ -333,7 +333,7 @@
333333
334334 case RBM_CRUSH:
335335 {
336- act = L"crushes you.";
336+ act = __T("crushes you.");
337337 do_stun = 1;
338338 sound_msg = MSG_MON_CRUSH;
339339 break;
@@ -341,7 +341,7 @@
341341
342342 case RBM_ENGULF:
343343 {
344- act = L"engulfs you.";
344+ act = __T("engulfs you.");
345345 sound_msg = MSG_MON_ENGULF;
346346 break;
347347 }
@@ -348,13 +348,13 @@
348348
349349 case RBM_XXX2:
350350 {
351- act = L"XXX2's you.";
351+ act = __T("XXX2's you.");
352352 break;
353353 }
354354
355355 case RBM_CRAWL:
356356 {
357- act = L"crawls on you.";
357+ act = __T("crawls on you.");
358358 sound_msg = MSG_MON_CRAWL;
359359 break;
360360 }
@@ -361,7 +361,7 @@
361361
362362 case RBM_DROOL:
363363 {
364- act = L"drools on you.";
364+ act = __T("drools on you.");
365365 sound_msg = MSG_MON_DROOL;
366366 break;
367367 }
@@ -368,7 +368,7 @@
368368
369369 case RBM_SPIT:
370370 {
371- act = L"spits on you.";
371+ act = __T("spits on you.");
372372 sound_msg = MSG_MON_SPIT;
373373 break;
374374 }
@@ -375,13 +375,13 @@
375375
376376 case RBM_XXX3:
377377 {
378- act = L"XXX3's on you.";
378+ act = __T("XXX3's on you.");
379379 break;
380380 }
381381
382382 case RBM_GAZE:
383383 {
384- act = L"gazes at you.";
384+ act = __T("gazes at you.");
385385 sound_msg = MSG_MON_GAZE;
386386 break;
387387 }
@@ -388,7 +388,7 @@
388388
389389 case RBM_WAIL:
390390 {
391- act = L"wails at you.";
391+ act = __T("wails at you.");
392392 sound_msg = MSG_MON_WAIL;
393393 break;
394394 }
@@ -395,7 +395,7 @@
395395
396396 case RBM_SPORE:
397397 {
398- act = L"releases spores at you.";
398+ act = __T("releases spores at you.");
399399 sound_msg = MSG_MON_SPORE;
400400 break;
401401 }
@@ -402,13 +402,13 @@
402402
403403 case RBM_XXX4:
404404 {
405- act = L"projects XXX4's at you.";
405+ act = __T("projects XXX4's at you.");
406406 break;
407407 }
408408
409409 case RBM_BEG:
410410 {
411- act = L"begs you for money.";
411+ act = __T("begs you for money.");
412412 sound_msg = MSG_MON_BEG;
413413 break;
414414 }
@@ -429,7 +429,7 @@
429429
430430 case RBM_XXX5:
431431 {
432- act = L"XXX5's you.";
432+ act = __T("XXX5's you.");
433433 break;
434434 }
435435 }
--- trunk/JBand/src/monster/monster1.cpp (revision 118)
+++ trunk/JBand/src/monster/monster1.cpp (revision 119)
@@ -614,38 +614,37 @@
614614 /* Get the effect */
615615 switch (effect)
616616 {
617- case RBE_HURT: q = L"attack"; break;
618- case RBE_POISON: q = L"poison"; break;
619- case RBE_UN_BONUS: q = L"disenchant"; break;
620- case RBE_UN_POWER: q = L"drain charges"; break;
621- case RBE_EAT_GOLD: q = L"steal gold"; break;
622- case RBE_EAT_ITEM: q = L"steal items"; break;
623- case RBE_EAT_FOOD: q = L"eat your food"; break;
624- case RBE_EAT_LITE: q = L"absorb light"; break;
625- case RBE_ACID: q = L"shoot acid"; break;
626- case RBE_ELEC: q = L"electrify"; break;
627- case RBE_FIRE: q = L"burn"; break;
628- case RBE_COLD: q = L"freeze"; break;
629- case RBE_BLIND: q = L"blind"; break;
630- case RBE_CONFUSE: q = L"confuse"; break;
631- case RBE_TERRIFY: q = L"terrify"; break;
632- case RBE_PARALYZE: q = L"paralyze"; break;
633- case RBE_LOSE_STR: q = L"reduce strength"; break;
634- case RBE_LOSE_INT: q = L"reduce intelligence"; break;
635- case RBE_LOSE_WIS: q = L"reduce wisdom"; break;
636- case RBE_LOSE_DEX: q = L"reduce dexterity"; break;
637- case RBE_LOSE_CON: q = L"reduce constitution"; break;
638- case RBE_LOSE_CHR: q = L"reduce charisma"; break;
639- case RBE_LOSE_ALL: q = L"reduce all stats"; break;
640- case RBE_SHATTER: q = L"shatter"; break;
641- case RBE_EXP_10: q = L"lower experience"; break;
642- case RBE_EXP_20: q = L"lower experience"; break;
643- case RBE_EXP_40: q = L"lower experience"; break;
644- case RBE_EXP_80: q = L"lower experience"; break;
645- case RBE_HALLU: q = L"cause hallucinations"; break;
617+ case RBE_HURT: q = __T("attack"); break;
618+ case RBE_POISON: q = __T("poison"); break;
619+ case RBE_UN_BONUS: q = __T("disenchant"); break;
620+ case RBE_UN_POWER: q = __T("drain charges"); break;
621+ case RBE_EAT_GOLD: q = __T("steal gold"); break;
622+ case RBE_EAT_ITEM: q = __T("steal items"); break;
623+ case RBE_EAT_FOOD: q = __T("eat your food"); break;
624+ case RBE_EAT_LITE: q = __T("absorb light"); break;
625+ case RBE_ACID: q = __T("shoot acid"); break;
626+ case RBE_ELEC: q = __T("electrify"); break;
627+ case RBE_FIRE: q = __T("burn"); break;
628+ case RBE_COLD: q = __T("freeze"); break;
629+ case RBE_BLIND: q = __T("blind"); break;
630+ case RBE_CONFUSE: q = __T("confuse"); break;
631+ case RBE_TERRIFY: q = __T("terrify"); break;
632+ case RBE_PARALYZE: q = __T("paralyze"); break;
633+ case RBE_LOSE_STR: q = __T("reduce strength"); break;
634+ case RBE_LOSE_INT: q = __T("reduce intelligence"); break;
635+ case RBE_LOSE_WIS: q = __T("reduce wisdom"); break;
636+ case RBE_LOSE_DEX: q = __T("reduce dexterity"); break;
637+ case RBE_LOSE_CON: q = __T("reduce constitution"); break;
638+ case RBE_LOSE_CHR: q = __T("reduce charisma"); break;
639+ case RBE_LOSE_ALL: q = __T("reduce all stats"); break;
640+ case RBE_SHATTER: q = __T("shatter"); break;
641+ case RBE_EXP_10: q = __T("lower experience"); break;
642+ case RBE_EXP_20: q = __T("lower experience"); break;
643+ case RBE_EXP_40: q = __T("lower experience"); break;
644+ case RBE_EXP_80: q = __T("lower experience"); break;
645+ case RBE_HALLU: q = __T("cause hallucinations"); break;
646646 }
647647
648-
649648 /* Introduce the attack description */
650649 if (!r)
651650 text_out(L"%^s can ", wd_he[msex]);
@@ -813,17 +812,17 @@
813812 {
814813 const _TCHAR *act;
815814
816- if (r_ptr->sleep > 200) act = L"prefers to ignore";
817- else if (r_ptr->sleep > 95) act = L"pays very little attention to";
818- else if (r_ptr->sleep > 75) act = L"pays little attention to";
819- else if (r_ptr->sleep > 45) act = L"tends to overlook";
820- else if (r_ptr->sleep > 25) act = L"takes quite a while to see";
821- else if (r_ptr->sleep > 10) act = L"takes a while to see";
822- else if (r_ptr->sleep > 5) act = L"is fairly observant of";
823- else if (r_ptr->sleep > 3) act = L"is observant of";
824- else if (r_ptr->sleep > 1) act = L"is very observant of";
825- else if (r_ptr->sleep > 0) act = L"is vigilant for";
826- else act = L"is ever vigilant for";
815+ if (r_ptr->sleep > 200) act = __T("prefers to ignore");
816+ else if (r_ptr->sleep > 95) act = __T("pays very little attention to");
817+ else if (r_ptr->sleep > 75) act = __T("pays little attention to");
818+ else if (r_ptr->sleep > 45) act = __T("tends to overlook");
819+ else if (r_ptr->sleep > 25) act = __T("takes quite a while to see");
820+ else if (r_ptr->sleep > 10) act = __T("takes a while to see");
821+ else if (r_ptr->sleep > 5) act = __T("is fairly observant of");
822+ else if (r_ptr->sleep > 3) act = __T("is observant of");
823+ else if (r_ptr->sleep > 1) act = __T("is very observant of");
824+ else if (r_ptr->sleep > 0) act = __T("is vigilant for");
825+ else act = __T("is ever vigilant for");
827826
828827 text_out(L"%^s %s intruders, which %s may notice from ", wd_he[msex], act, wd_he[msex]);
829828 text_out_c(TERM_L_GREEN, L"%d", 10 * r_ptr->aaf);
@@ -1034,7 +1033,7 @@
10341033 q = __T("");
10351034 i = p_ptr->lev;
10361035 if ((i == 8) || (i == 11) || (i == 18))
1037- q = L"n";
1036+ q = __T("n");
10381037
10391038 /* Mention the dependance on the player's level */
10401039 text_out(L" for a%s %lu%s level character. ", q, (long)i, p);
Show on old repository browser