• R/O
  • SSH
  • HTTPS

jband: Commit


Commit MetaInfo

Revision115 (tree)
Time2009-06-24 20:49:35
Authorpaulblay

Log Message

More T stuff.

Change Summary

Incremental Difference

--- trunk/JBand/src/death.cpp (revision 114)
+++ trunk/JBand/src/death.cpp (revision 115)
@@ -206,9 +206,9 @@
206206
207207 /* Check result */
208208 if (err)
209- msg_print(L"Character dump failed!");
209+ msg_print(__T("Character dump failed!"));
210210 else
211- msg_print(L"Character dump successful.");
211+ msg_print(__T("Character dump successful."));
212212
213213 /* Flush messages */
214214 message_flush();
@@ -248,7 +248,7 @@
248248 Term_clear();
249249 item_tester_full = TRUE;
250250 show_equip();
251- prt(L"You are using: -more-", 0, 0);
251+ prt(__T("You are using: -more-"), 0, 0);
252252 (void)anykey();
253253 }
254254 /* Inventory -- if any */
@@ -257,7 +257,7 @@
257257 Term_clear();
258258 item_tester_full = TRUE;
259259 show_inven();
260- prt(L"You are carrying: -more-", 0, 0);
260+ prt(__T("You are carrying: -more-"), 0, 0);
261261 (void)anykey();
262262 }
263263 /* Home -- if anything there */
@@ -457,7 +457,7 @@
457457 /* Save dead player */
458458 if (!old_save())
459459 {
460- msg_print(L"death save failed!");
460+ msg_print(__T("death save failed!"));
461461 message_flush();
462462 }
463463 /* Get time of death */
--- trunk/JBand/src/ui-birth.cpp (revision 114)
+++ trunk/JBand/src/ui-birth.cpp (revision 115)
@@ -111,7 +111,7 @@
111111 int next = BIRTH_QUICKSTART;
112112
113113 /* Prompt for it */
114- prt(L"New character based on previous one:", 0, 0);
114+ prt(__T("New character based on previous one:"), 0, 0);
115115 prt(prompt, Term->hgt - 1, Term->wid / 2 - _tcslen(prompt) / 2);
116116
117117 /* Buttons */
@@ -730,12 +730,10 @@
730730 {
731731 next = BIRTH_BACK;
732732 }
733-
734733 else if (ch == 'r' || ch == 'R')
735734 {
736735 cmd_insert(CMD_RESET_STATS, FALSE);
737736 }
738-
739737 /* Done */
740738 else if ((ch == '\r') || (ch == '\n'))
741739 {
@@ -758,7 +756,6 @@
758756 {
759757 cmd_insert(CMD_SELL_STAT, stat);
760758 }
761-
762759 /* Increase stat (if possible) */
763760 if (ch == 6)
764761 {
@@ -765,7 +762,6 @@
765762 cmd_insert(CMD_BUY_STAT, stat);
766763 }
767764 }
768-
769765 return next;
770766 }
771767
@@ -786,7 +782,6 @@
786782 {
787783 next = BIRTH_BACK;
788784 }
789-
790785 return next;
791786 }
792787
@@ -832,7 +827,6 @@
832827 cmd_insert(CMD_ACCEPT_CHARACTER);
833828 next = BIRTH_COMPLETE;
834829 }
835-
836830 /* Buttons */
837831 button_kill_all();
838832 redraw_stuff();
@@ -843,8 +837,6 @@
843837 return next;
844838 }
845839
846-
847-
848840 /* ------------------------------------------------------------------------
849841 * Things that relate to the world outside this file: receiving game events
850842 * and being asked for game commands.
@@ -883,7 +875,6 @@
883875
884876 break;
885877 }
886-
887878 case BIRTH_QUICKSTART:
888879 {
889880 display_player(0);
@@ -890,7 +881,6 @@
890881 next = get_quickstart_command();
891882 break;
892883 }
893-
894884 case BIRTH_SEX_CHOICE:
895885 case BIRTH_CLASS_CHOICE:
896886 case BIRTH_RACE_CHOICE:
@@ -908,7 +898,6 @@
908898 menu = &race_menu;
909899 command = CMD_CHOOSE_RACE;
910900 }
911-
912901 if (current_stage > BIRTH_RACE_CHOICE)
913902 {
914903 menu_refresh(&race_menu);
@@ -915,7 +904,6 @@
915904 menu = &class_menu;
916905 command = CMD_CHOOSE_CLASS;
917906 }
918-
919907 if (current_stage > BIRTH_CLASS_CHOICE)
920908 {
921909 menu_refresh(&class_menu);
@@ -922,7 +910,6 @@
922910 menu = &roller_menu;
923911 command = CMD_NULL;
924912 }
925-
926913 next = menu_question(current_stage, menu, command);
927914
928915 if (next == BIRTH_BACK)
@@ -961,7 +948,6 @@
961948
962949 break;
963950 }
964-
965951 case BIRTH_NAME_CHOICE:
966952 {
967953 if (prev < BIRTH_NAME_CHOICE)
@@ -973,7 +959,6 @@
973959
974960 break;
975961 }
976-
977962 case BIRTH_FINAL_CONFIRM:
978963 {
979964 if (prev < BIRTH_FINAL_CONFIRM)
@@ -985,13 +970,11 @@
985970
986971 break;
987972 }
988-
989973 default:
990974 {
991975 /* Remove dodgy compiler warning, */
992976 }
993977 }
994-
995978 prev = current_stage;
996979 current_stage = next;
997980
@@ -1022,10 +1005,8 @@
10221005 free_birth_menus();
10231006 }
10241007
1025-
10261008 void ui_init_birthstate_handlers(void)
10271009 {
10281010 event_add_handler(EVENT_ENTER_BIRTH, ui_enter_birthscreen, NULL);
10291011 event_add_handler(EVENT_LEAVE_BIRTH, ui_leave_birthscreen, NULL);
10301012 }
1031-
--- trunk/JBand/src/cmd1.cpp (revision 114)
+++ trunk/JBand/src/cmd1.cpp (revision 115)
@@ -1,4 +1,8 @@
11 /* テスト */
2+/*
3+ * Debug Status: Not checked.
4+ * - Fixed __T on this page.
5+ */
26 /*
37 * File: cmd1.c
48 * Purpose: Searching, movement, and pickup
@@ -75,7 +79,7 @@
7579 pick_trap(y, x);
7680
7781 /* Message */
78- msg_print(L"You have found a trap.");
82+ msg_print(__T("You have found a trap."));
7983
8084 /* Disturb */
8185 disturb(0, 0);
@@ -85,7 +89,7 @@
8589 if (cave_feat[y][x] == FEAT_SECRET)
8690 {
8791 /* Message */
88- msg_print(L"You have found a secret door.");
92+ msg_print(__T("You have found a secret door."));
8993
9094 /* Pick a door */
9195 place_closed_door(y, x);
@@ -98,19 +102,22 @@
98102 for (o_ptr = get_first_object(y, x); o_ptr; o_ptr = get_next_object(o_ptr))
99103 {
100104 /* Skip non-chests */
101- if (o_ptr->tval != TV_CHEST) continue;
105+ if (o_ptr->tval != TV_CHEST)
106+ continue;
102107
103108 /* Skip disarmed chests */
104- if (o_ptr->pval <= 0) continue;
109+ if (o_ptr->pval <= 0)
110+ continue;
105111
106112 /* Skip non-trapped chests */
107- if (!chest_traps[o_ptr->pval]) continue;
113+ if (!chest_traps[o_ptr->pval])
114+ continue;
108115
109116 /* Identify once */
110117 if (!object_known_p(o_ptr))
111118 {
112119 /* Message */
113- msg_print(L"You have discovered a trap on the chest!");
120+ msg_print(__T("You have discovered a trap on the chest!"));
114121
115122 /* Know the trap */
116123 object_known(o_ptr);
@@ -177,7 +184,7 @@
177184 int i, count, total, k_idx;
178185
179186 /* Build a message */
180- strnfmt(buf, _countof(buf), L"You have found %ld gold pieces worth of ", total_gold);
187+ strnfmt(buf, _countof(buf), __T("You have found %ld gold pieces worth of "), total_gold);
181188
182189 /* Count the types of treasure present */
183190 for (total = 0, i = 0; i < SV_GOLD_MAX; i++)
@@ -184,7 +191,6 @@
184191 {
185192 if (treasure[i]) total++;
186193 }
187-
188194 /* List the treasure types */
189195 for (count = 0, i = 0; i < SV_GOLD_MAX; i++)
190196 {
@@ -201,7 +207,6 @@
201207 object_kind_name(tmp, _countof(tmp), k_idx, TRUE);
202208
203209 /* Build up the pickup string */
204-// my_strcat(buf, tmp, _countof(buf));
205210 _tcscat_s(buf, _countof(buf), tmp);
206211
207212 /* Added another kind of treasure */
@@ -209,21 +214,17 @@
209214
210215 /* Add a comma if necessary */
211216 if ((total > 2) && (count < total))
212-// my_strcat(buf, L",", _countof(buf));
213- _tcscat_s(buf, _countof(buf), L",");
217+ _tcscat_s(buf, _countof(buf), __T(","));
214218
215219 /* Add an "and" if necessary */
216220 if ((total >= 2) && (count == total-1))
217-// my_strcat(buf, L" and", _countof(buf));
218- _tcscat_s(buf, _countof(buf), L" and");
221+ _tcscat_s(buf, _countof(buf), __T(" and"));
219222
220223 /* Add a space or period if necessary */
221224 if (count < total)
222-// my_strcat(buf, L" ", _countof(buf));
223- _tcscat_s(buf, _countof(buf), L" ");
225+ _tcscat_s(buf, _countof(buf), __T(" "));
224226 else
225-// my_strcat(buf, L".", _countof(buf));
226- _tcscat_s(buf, _countof(buf), L".");
227+ _tcscat_s(buf, _countof(buf), __T("."));
227228 }
228229
229230 /* Determine which sound to play */
@@ -251,12 +252,16 @@
251252 static bool auto_pickup_okay(const object_type *o_ptr)
252253 {
253254 /* Bad wounds prelude autopickup */
254- if (p_ptr->chp < (p_ptr->mhp * op_ptr->hitpoint_warn / 10)) return FALSE;
255+ if (p_ptr->chp < (p_ptr->mhp * op_ptr->hitpoint_warn / 10))
256+ return FALSE;
255257
256- if (!inven_carry_okay(o_ptr)) return FALSE;
258+ if (!inven_carry_okay(o_ptr))
259+ return FALSE;
257260
258- if (OPT(pickup_inven) && inven_stack_okay(o_ptr)) return TRUE;
259- if (OPT(pickup_always) || check_for_inscrip(o_ptr, L"=g")) return TRUE;
261+ if (OPT(pickup_inven) && inven_stack_okay(o_ptr))
262+ return TRUE;
263+ if (OPT(pickup_always) || check_for_inscrip(o_ptr, __T("=g")))
264+ return TRUE;
260265
261266 return FALSE;
262267 }
@@ -290,9 +295,8 @@
290295 object_desc(o_name, _countof(o_name), o_ptr, TRUE, ODESC_FULL);
291296
292297 /* Message */
293- msg_format(L"You have %s (%c).", o_name, index_to_label(slot));
298+ msg_format(__T("You have %s (%c)."), o_name, index_to_label(slot));
294299 }
295-
296300 /* Log if picking up an artifact. */
297301 if (artifact_p(o_ptr))
298302 history_add_artifact(o_ptr->name1, object_known_p(o_ptr));
@@ -373,10 +377,12 @@
373377 next_o_idx = o_ptr->next_o_idx;
374378
375379 /* Ignore all hidden objects and non-objects */
376- if (squelch_hide_item(o_ptr) || !o_ptr->k_idx) continue;
380+ if (squelch_hide_item(o_ptr) || !o_ptr->k_idx)
381+ continue;
377382
378383 /* XXX Hack -- Enforce limit */
379- if (floor_num >= N_ELEMENTS(floor_list)) break;
384+ if (floor_num >= N_ELEMENTS(floor_list))
385+ break;
380386
381387 /* Hack -- disturb */
382388 disturb(0, 0);
@@ -390,7 +396,6 @@
390396
391397 continue;
392398 }
393-
394399 /* Tally objects and store them in an array. */
395400
396401 /* Remember this object index */
@@ -403,7 +408,6 @@
403408 if (inven_carry_okay(o_ptr))
404409 can_pickup++;
405410 }
406-
407411 /* There are no objects left */
408412 if (!floor_num)
409413 return objs_picked_up;
@@ -414,13 +418,15 @@
414418 /* Mention the objects if player is not picking them up. */
415419 if (pickup == 0 || !can_pickup)
416420 {
417- const _TCHAR *p = L"see";
421+ const _TCHAR *p = __T("see");
418422
419423 /* One object */
420424 if (floor_num == 1)
421425 {
422- if (!can_pickup) p = L"have no room for";
423- else if (blind) p = L"feel";
426+ if (!can_pickup)
427+ p = __T("have no room for");
428+ else if (blind)
429+ p = __T("feel");
424430
425431 /* Get the object */
426432 o_ptr = &o_list[floor_o_idx];
@@ -431,7 +437,7 @@
431437
432438 /* Message */
433439 message_flush();
434- msg_format(L"You %s %s.", p, o_name);
440+ msg_format(__T("You %s %s."), p, o_name);
435441 }
436442 else
437443 {
@@ -438,8 +444,8 @@
438444 /* Optionally, display more information about floor items */
439445 if (OPT(pickup_detail))
440446 {
441- if (!can_pickup) p = L"have no room for the following objects";
442- else if (blind) p = L"feel something on the floor";
447+ if (!can_pickup) p = __T("have no room for the following objects");
448+ else if (blind) p = __T("feel something on the floor");
443449
444450 /* Scan all marked objects in the grid */
445451 floor_num = scan_floor(floor_list, N_ELEMENTS(floor_list), py, px, 0x03);
@@ -451,7 +457,7 @@
451457 show_floor(floor_list, floor_num, FALSE);
452458
453459 /* Display prompt */
454- prt(format(L"You %s: ", p), 0, 0);
460+ prt(format(__T("You %s: "), p), 0, 0);
455461
456462 /* Move cursor back to character, if needed */
457463 if (OPT(hilite_player)) move_cursor_relative(p_ptr->py, p_ptr->px);
@@ -462,23 +468,19 @@
462468 /* Restore screen */
463469 screen_load();
464470 }
465-
466- /* Show less detail */
467- else
471+ else /* Show less detail */
468472 {
469473 message_flush();
470474
471475 if (!can_pickup)
472- msg_print(L"You have no room for any of the items on the floor.");
476+ msg_print(__T("You have no room for any of the items on the floor."));
473477 else
474- msg_format(L"You %s a pile of %d items.", (blind ? L"feel" : L"see"), floor_num);
478+ msg_format(__T("You %s a pile of %d items."), (blind ? __T("feel") : __T("see")), floor_num);
475479 }
476480 }
477-
478481 /* Done */
479482 return (objs_picked_up);
480483 }
481-
482484 /* We can pick up objects. Menus are not requested (yet). */
483485 if (pickup == 1)
484486 {
@@ -491,7 +493,6 @@
491493 else
492494 this_o_idx = floor_o_idx;
493495 }
494-
495496 /* Display a list if requested. */
496497 if (pickup == 2)
497498 {
@@ -502,8 +503,8 @@
502503 item_tester_hook = inven_carry_okay;
503504
504505 /* Get an object or exit. */
505- q = L"Get which item?";
506- s = L"You see nothing there.";
506+ q = __T("Get which item?");
507+ s = __T("You see nothing there.");
507508 if (!get_item(&item, q, s, USE_FLOOR))
508509 return (objs_picked_up);
509510
@@ -513,7 +514,6 @@
513514 /* With a list, we do not need explicit pickup messages */
514515 msg = FALSE;
515516 }
516-
517517 /* Pick up object, if legal */
518518 if (this_o_idx)
519519 {
@@ -523,7 +523,6 @@
523523 /* Indicate an object picked up. */
524524 objs_picked_up = 1;
525525 }
526-
527526 /*
528527 * If requested, call this function recursively. Count objects picked
529528 * up. Force the display of a menu in all cases.
@@ -572,10 +571,8 @@
572571 /* Reset the command count */
573572 p_ptr->command_arg = 0;
574573 }
575-
576574 do_cmd_alter_aux(dir);
577575 }
578-
579576 /* Cannot walk through walls */
580577 else if (!cave_floor_bold(y, x))
581578 {
@@ -588,42 +585,35 @@
588585 /* Rubble */
589586 if (cave_feat[y][x] == FEAT_RUBBLE)
590587 {
591- message(MSG_HITWALL, 0, L"You feel a pile of rubble blocking your way.");
588+ message(MSG_HITWALL, 0, __T("You feel a pile of rubble blocking your way."));
592589 cave_info[y][x] |= (CAVE_MARK);
593590 lite_spot(y, x);
594591 }
595-
596592 /* Closed door */
597593 else if (cave_feat[y][x] < FEAT_SECRET)
598594 {
599- message(MSG_HITWALL, 0, L"You feel a door blocking your way.");
595+ message(MSG_HITWALL, 0, __T("You feel a door blocking your way."));
600596 cave_info[y][x] |= (CAVE_MARK);
601597 lite_spot(y, x);
602598 }
603-
604- /* Wall (or secret door) */
605- else
599+ else /* Wall (or secret door) */
606600 {
607- message(MSG_HITWALL, 0, L"You feel a wall blocking your way.");
601+ message(MSG_HITWALL, 0, __T("You feel a wall blocking your way."));
608602 cave_info[y][x] |= (CAVE_MARK);
609603 lite_spot(y, x);
610604 }
611605 }
612-
613- /* Mention known obstacles */
614- else
606+ else /* Mention known obstacles */
615607 {
616608 if (cave_feat[y][x] == FEAT_RUBBLE)
617- message(MSG_HITWALL, 0, L"There is a pile of rubble blocking your way.");
609+ message(MSG_HITWALL, 0, __T("There is a pile of rubble blocking your way."));
618610 else if (cave_feat[y][x] < FEAT_SECRET)
619- message(MSG_HITWALL, 0, L"There is a door blocking your way.");
611+ message(MSG_HITWALL, 0, __T("There is a door blocking your way."));
620612 else
621- message(MSG_HITWALL, 0, L"There is a wall blocking your way.");
613+ message(MSG_HITWALL, 0, __T("There is a wall blocking your way."));
622614 }
623615 }
624-
625- /* Normal movement */
626- else
616+ else /* Normal movement */
627617 {
628618 /* Sound XXX XXX XXX */
629619 /* sound(MSG_WALK); */
@@ -633,7 +623,8 @@
633623 new_dtrap = ((cave_info2[y][x] & (CAVE2_DTRAP)) != 0);
634624
635625 /* Note the change in the detect status */
636- if (old_dtrap != new_dtrap) p_ptr->redraw |= (PR_DTRAP);
626+ if (old_dtrap != new_dtrap)
627+ p_ptr->redraw |= (PR_DTRAP);
637628
638629 /* Disturb player if the player is about to leave the area */
639630 if (OPT(disturb_detect) &&
@@ -642,7 +633,6 @@
642633 disturb(0, 0);
643634 return;
644635 }
645-
646636 /* Move player */
647637 monster_swap(py, px, y, x);
648638
@@ -657,13 +647,11 @@
657647 {
658648 search();
659649 }
660-
661650 /* Continuous Searching */
662651 if (p_ptr->searching)
663652 {
664653 search();
665654 }
666-
667655 /* Handle "store doors" */
668656 if ((cave_feat[y][x] >= FEAT_SHOP_HEAD) &&
669657 (cave_feat[y][x] <= FEAT_SHOP_TAIL))
@@ -673,14 +661,11 @@
673661
674662 cmd_insert(CMD_ENTER_STORE);
675663 }
676-
677- /* All other grids (including traps) */
678- else
664+ else /* All other grids (including traps) */
679665 {
680666 /* Handle objects (later) */
681667 p_ptr->notice |= (PN_PICKUP);
682668 }
683-
684669 /* Discover invisible traps */
685670 if (cave_feat[y][x] == FEAT_INVIS)
686671 {
@@ -688,7 +673,7 @@
688673 disturb(0, 0);
689674
690675 /* Message */
691- msg_print(L"You found a trap!");
676+ msg_print(__T("You found a trap!"));
692677
693678 /* Pick a trap */
694679 pick_trap(y, x);
@@ -696,7 +681,6 @@
696681 /* Hit the trap */
697682 hit_trap(y, x);
698683 }
699-
700684 /* Set off an visible trap */
701685 else if ((cave_feat[y][x] >= FEAT_TRAP_HEAD) &&
702686 (cave_feat[y][x] <= FEAT_TRAP_TAIL))
--- trunk/JBand/src/cmd3.cpp (revision 114)
+++ trunk/JBand/src/cmd3.cpp (revision 115)
@@ -101,7 +101,7 @@
101101 item_tester_full = FALSE;
102102
103103 /* Prompt for a command */
104- prt(L"(Equipment) Command: ", 0, 0);
104+ prt(__T("(Equipment) Command: "), 0, 0);
105105
106106 /* Hack -- Get a new command */
107107 p_ptr->command_new = inkey();
@@ -194,7 +194,7 @@
194194 {
195195 /* Warn the player */
196196 sound(MSG_CURSED);
197- msg_print(L"Oops! It feels deathly cold!");
197+ msg_print(__T("Oops! It feels deathly cold!"));
198198
199199 /* Sense the object */
200200 object_notice_curses(o_ptr);
@@ -348,13 +348,13 @@
348348 j_ptr->timeout += o_ptr->timeout ? o_ptr->timeout : o_ptr->pval;
349349
350350 /* Message */
351- msg_print(L"You fuel your lamp.");
351+ msg_print(__T("You fuel your lamp."));
352352
353353 /* Comment */
354354 if (j_ptr->timeout >= FUEL_LAMP)
355355 {
356356 j_ptr->timeout = FUEL_LAMP;
357- msg_print(L"Your lamp is full.");
357+ msg_print(__T("Your lamp is full."));
358358 }
359359 /* Refilled from a lantern */
360360 if (o_ptr->sval == SV_LITE_LANTERN)
@@ -428,17 +428,17 @@
428428 j_ptr->timeout += o_ptr->timeout + 5;
429429
430430 /* Message */
431- msg_print(L"You combine the torches.");
431+ msg_print(__T("You combine the torches."));
432432
433433 /* Over-fuel message */
434434 if (j_ptr->timeout >= FUEL_TORCH)
435435 {
436436 j_ptr->timeout = FUEL_TORCH;
437- msg_print(L"Your torch is fully fueled.");
437+ msg_print(__T("Your torch is fully fueled."));
438438 }
439439 else /* Refuel message */
440440 {
441- msg_print(L"Your torch glows more brightly.");
441+ msg_print(__T("Your torch glows more brightly."));
442442 }
443443 /* Decrease the item (from the pack) */
444444 if (item >= 0)
@@ -468,11 +468,11 @@
468468 /* Target set */
469469 if (target_set_interactive(TARGET_KILL, -1, -1))
470470 {
471- msg_print(L"Target Selected.");
471+ msg_print(__T("Target Selected."));
472472 }
473473 else /* Target aborted */
474474 {
475- msg_print(L"Target Aborted.");
475+ msg_print(__T("Target Aborted."));
476476 }
477477 }
478478
@@ -484,7 +484,7 @@
484484 /* Look around */
485485 if (target_set_interactive(TARGET_LOOK, -1, -1))
486486 {
487- msg_print(L"Target Selected.");
487+ msg_print(__T("Target Selected."));
488488 }
489489 }
490490
--- trunk/JBand/src/spells2.cpp (revision 114)
+++ trunk/JBand/src/spells2.cpp (revision 115)
@@ -53,13 +53,13 @@
5353
5454 /* Print a nice message */
5555 if (num < 5)
56- msg_print(L"You feel a little better.");
56+ msg_print(__T("You feel a little better."));
5757 else if (num < 15)
58- msg_print(L"You feel better.");
58+ msg_print(__T("You feel better."));
5959 else if (num < 35)
60- msg_print(L"You feel much better.");
60+ msg_print(__T("You feel much better."));
6161 else
62- msg_print(L"You feel very good.");
62+ msg_print(__T("You feel very good."));
6363
6464 /* Notice */
6565 return (TRUE);
@@ -106,7 +106,7 @@
106106
107107 if (cave_feat[py][px] != FEAT_FLOOR)
108108 {
109- msg_print(L"There is no clear floor on which to cast the spell.");
109+ msg_print(__T("There is no clear floor on which to cast the spell."));
110110 return;
111111 }
112112
@@ -349,7 +349,7 @@
349349 if (p_ptr->exp < p_ptr->max_exp)
350350 {
351351 /* Message */
352- msg_print(L"You feel your life energies returning.");
352+ msg_print(__T("You feel your life energies returning."));
353353
354354 /* Restore the experience */
355355 p_ptr->exp = p_ptr->max_exp;
@@ -771,7 +771,7 @@
771771 Term_clear();
772772
773773 /* Label the information */
774- prt(L" Your Attributes:", 1, 0);
774+ prt(__T(" Your Attributes:"), 1, 0);
775775
776776 /* Dump the info */
777777 for (k = 2, j = 0; j < i; j++)
@@ -782,7 +782,7 @@
782782 /* Page wrap */
783783 if ((k == max_x) && (j+1 < i))
784784 {
785- prt(L"-- more --", k, 0);
785+ prt(__T("-- more --"), k, 0);
786786 anykey();
787787
788788 /* Clear the screen */
@@ -789,7 +789,7 @@
789789 Term_clear();
790790
791791 /* Label the information */
792- prt(L" Your Attributes:", 1, 0);
792+ prt(__T(" Your Attributes:"), 1, 0);
793793
794794 /* Reset */
795795 k = 2;
@@ -813,7 +813,7 @@
813813 /* Ironman */
814814 if (OPT(adult_ironman) && !p_ptr->total_winner)
815815 {
816- msg_print(L"Nothing happens.");
816+ msg_print(__T("Nothing happens."));
817817 return;
818818 }
819819 /* Activate recall */
@@ -830,12 +830,12 @@
830830 p_ptr->max_depth = p_ptr->depth;
831831 }
832832 p_ptr->word_recall = (s16b) randint0(20) + 15;
833- msg_print(L"The air about you becomes charged...");
833+ msg_print(__T("The air about you becomes charged..."));
834834 }
835835 else /* Deactivate recall */
836836 {
837837 p_ptr->word_recall = 0;
838- msg_print(L"A tension leaves the air around you...");
838+ msg_print(__T("A tension leaves the air around you..."));
839839 }
840840 /* Redraw status line */
841841 p_ptr->redraw = PR_STATUS;
@@ -958,7 +958,6 @@
958958 cave_info2[y][x] |= (CAVE2_DTRAP);
959959 }
960960 }
961-
962961 /* Rescan the map for the new dtrap edge */
963962 for (y = y1 - 1; y < y2 + 1; y++)
964963 {
@@ -972,9 +971,9 @@
972971 }
973972 /* Describe */
974973 if (detect)
975- msg_print(L"You sense the presence of traps!");
974+ msg_print(__T("You sense the presence of traps!"));
976975 else /* Trap detection always makes you aware, even if no traps are present */
977- msg_print(L"You sense no traps.");
976+ msg_print(__T("You sense no traps."));
978977
979978 /* Mark the redraw flag */
980979 p_ptr->redraw |= (PR_DTRAP);
@@ -1044,10 +1043,10 @@
10441043 }
10451044 }
10461045 /* Describe */
1047- if (doors && !stairs) msg_print(L"You sense the presence of doors!");
1048- else if (!doors && stairs) msg_print(L"You sense the presence of stairs!");
1049- else if (doors && stairs) msg_print(L"You sense the presence of doors and stairs!");
1050- else if (aware && !doors && !stairs) msg_print(L"You sense no doors or stairs.");
1046+ if (doors && !stairs) msg_print(__T("You sense the presence of doors!"));
1047+ else if (!doors && stairs) msg_print(__T("You sense the presence of stairs!"));
1048+ else if (doors && stairs) msg_print(__T("You sense the presence of doors and stairs!"));
1049+ else if (aware && !doors && !stairs) msg_print(__T("You sense no doors or stairs."));
10511050
10521051 /* Result */
10531052 return (doors || stairs);
@@ -1132,13 +1131,13 @@
11321131 objects = TRUE;
11331132 }
11341133 if (gold_buried)
1135- msg_print(L"You sense the presence of buried treasure!");
1134+ msg_print(__T("You sense the presence of buried treasure!"));
11361135
11371136 if (objects)
1138- msg_print(L"You sense the presence of objects!");
1137+ msg_print(__T("You sense the presence of objects!"));
11391138
11401139 if (aware && !gold_buried && !objects)
1141- msg_print(L"You sense no treasure or objects.");
1140+ msg_print(__T("You sense no treasure or objects."));
11421141
11431142 return gold_buried || objects;
11441143 }
@@ -1209,9 +1208,9 @@
12091208 }
12101209 }
12111210 if (detect)
1212- msg_print(L"You sense the presence of magic objects!");
1211+ msg_print(__T("You sense the presence of magic objects!"));
12131212 else if (aware && !detect)
1214- msg_print(L"You sense no magic objects.");
1213+ msg_print(__T("You sense no magic objects."));
12151214
12161215 return detect;
12171216 }
@@ -1269,9 +1268,9 @@
12691268 }
12701269
12711270 if (flag)
1272- msg_print(L"You sense the presence of monsters!");
1271+ msg_print(__T("You sense the presence of monsters!"));
12731272 else if (aware && !flag)
1274- msg_print(L"You sense no monsters.");
1273+ msg_print(__T("You sense no monsters."));
12751274
12761275 /* Result */
12771276 return flag;
@@ -1340,9 +1339,9 @@
13401339 }
13411340 }
13421341 if (flag)
1343- msg_print(L"You sense the presence of invisible creatures!");
1342+ msg_print(__T("You sense the presence of invisible creatures!"));
13441343 else if (aware && !flag)
1345- msg_print(L"You sense no invisible creatures.");
1344+ msg_print(__T("You sense no invisible creatures."));
13461345
13471346 return (flag);
13481347 }
@@ -1410,9 +1409,9 @@
14101409 }
14111410
14121411 if (flag)
1413- msg_print(L"You sense the presence of evil creatures!");
1412+ msg_print(__T("You sense the presence of evil creatures!"));
14141413 else if (aware && !flag)
1415- msg_print(L"You sense no evil creatures.");
1414+ msg_print(__T("You sense no evil creatures."));
14161415
14171416 return flag;
14181417 }
@@ -1446,7 +1445,7 @@
14461445 /* XXX XXX XXX */
14471446 if (!cave_valid_bold(py, px))
14481447 {
1449- msg_print(L"The object resists the spell.");
1448+ msg_print(__T("The object resists the spell."));
14501449 return;
14511450 }
14521451 /* XXX XXX XXX */
@@ -1588,7 +1587,7 @@
15881587 (!(f[2] & (TR2_PERMA_CURSE))) &&
15891588 (o_ptr->to_h >= 0) && (randint0(100) < 25))
15901589 {
1591- msg_print(L"The curse is broken!");
1590+ msg_print(__T("The curse is broken!"));
15921591
15931592 /* Uncurse the object */
15941593 uncurse_object(o_ptr);
@@ -1615,7 +1614,7 @@
16151614 (!(f[2] & (TR2_PERMA_CURSE))) &&
16161615 (o_ptr->to_d >= 0) && (randint0(100) < 25))
16171616 {
1618- msg_print(L"The curse is broken!");
1617+ msg_print(__T("The curse is broken!"));
16191618
16201619 /* Uncurse the object */
16211620 uncurse_object(o_ptr);
@@ -1642,7 +1641,7 @@
16421641 (!(f[2] & (TR2_PERMA_CURSE))) &&
16431642 (o_ptr->to_a >= 0) && (randint0(100) < 25))
16441643 {
1645- msg_print(L"The curse is broken!");
1644+ msg_print(__T("The curse is broken!"));
16461645
16471646 /* Uncurse the object */
16481647 uncurse_object(o_ptr);
@@ -1717,7 +1716,7 @@
17171716 if (OPT(flush_failure)) flush();
17181717
17191718 /* Message */
1720- msg_print(L"The enchantment failed.");
1719+ msg_print(__T("The enchantment failed."));
17211720 }
17221721 /* Something happened */
17231722 return (TRUE);
@@ -1813,8 +1812,8 @@
18131812 /* Back-fire */
18141813 if ((i <= 1) || one_in_(i))
18151814 {
1816- msg_print(L"The recharge backfires!");
1817- msg_print(L"There is a bright flash of light.");
1815+ msg_print(__T("The recharge backfires!"));
1816+ msg_print(__T("There is a bright flash of light."));
18181817
18191818 /* Reduce the charges of rods/wands/staves */
18201819 reduce_charges(o_ptr, 1);
@@ -2009,9 +2008,9 @@
20092008 }
20102009 /* Messages */
20112010 if (speed)
2012- msg_print(L"You feel a sudden stirring nearby!");
2011+ msg_print(__T("You feel a sudden stirring nearby!"));
20132012 else if (sleep)
2014- msg_print(L"You hear a sudden stirring in the distance!");
2013+ msg_print(__T("You hear a sudden stirring in the distance!"));
20152014 }
20162015
20172016 /*
@@ -2130,7 +2129,7 @@
21302129 _TCHAR m_name[80];
21312130
21322131 /* Start the message */
2133- if (!probe) msg_print(L"Probing...");
2132+ if (!probe) msg_print(__T("Probing..."));
21342133
21352134 /* Get "the monster" or "something" */
21362135 monster_desc(m_name, _countof(m_name), m_ptr, MDESC_IND1);
@@ -2148,7 +2147,7 @@
21482147 /* Done */
21492148 if (probe)
21502149 {
2151- msg_print(L"That's all.");
2150+ msg_print(__T("That's all."));
21522151 }
21532152 /* Result */
21542153 return (probe);
@@ -2173,7 +2172,7 @@
21732172 /* No effect in town */
21742173 if (!p_ptr->depth)
21752174 {
2176- msg_print(L"The ground shakes for a moment.");
2175+ msg_print(__T("The ground shakes for a moment."));
21772176 return;
21782177 }
21792178 /* Big area of affect */
@@ -2252,7 +2251,7 @@
22522251 if (flag)
22532252 {
22542253 /* Message */
2255- msg_print(L"There is a searing blast of light!");
2254+ msg_print(__T("There is a searing blast of light!"));
22562255
22572256 /* Blind the player */
22582257 if (!p_ptr->state.resist_blind && !p_ptr->state.resist_lite)
@@ -2304,7 +2303,7 @@
23042303 /* No effect in town */
23052304 if (!p_ptr->depth)
23062305 {
2307- msg_print(L"The ground shakes for a moment.");
2306+ msg_print(__T("The ground shakes for a moment."));
23082307 return;
23092308 }
23102309 /* Paranoia -- Enforce maximum range */
@@ -2379,18 +2378,18 @@
23792378 {
23802379 case 1:
23812380 {
2382- msg_print(L"The cave ceiling collapses!");
2381+ msg_print(__T("The cave ceiling collapses!"));
23832382 break;
23842383 }
23852384 case 2:
23862385 {
2387- msg_print(L"The cave floor twists in an unnatural way!");
2386+ msg_print(__T("The cave floor twists in an unnatural way!"));
23882387 break;
23892388 }
23902389 default:
23912390 {
2392- msg_print(L"The cave quakes!");
2393- msg_print(L"You are pummeled with debris!");
2391+ msg_print(__T("The cave quakes!"));
2392+ msg_print(__T("You are pummeled with debris!"));
23942393 break;
23952394 }
23962395 }
@@ -2398,7 +2397,7 @@
23982397 if (!sn)
23992398 {
24002399 /* Message and damage */
2401- msg_print(L"You are severely crushed!");
2400+ msg_print(__T("You are severely crushed!"));
24022401 damage = 300;
24032402 }
24042403 else /* Destroy the grid, and push the player to safety */
@@ -2408,13 +2407,13 @@
24082407 {
24092408 case 1:
24102409 {
2411- msg_print(L"You nimbly dodge the blast!");
2410+ msg_print(__T("You nimbly dodge the blast!"));
24122411 damage = 0;
24132412 break;
24142413 }
24152414 case 2:
24162415 {
2417- msg_print(L"You are bashed by rubble!");
2416+ msg_print(__T("You are bashed by rubble!"));
24182417 damage = damroll(10, 4);
24192418 (void)inc_timed(TMD_STUN, randint1(50), TRUE);
24202419 break;
@@ -2421,7 +2420,7 @@
24212420 }
24222421 case 3:
24232422 {
2424- msg_print(L"You are crushed between the floor and ceiling!");
2423+ msg_print(__T("You are crushed between the floor and ceiling!"));
24252424 damage = damroll(10, 4);
24262425 (void)inc_timed(TMD_STUN, randint1(50), TRUE);
24272426 break;
@@ -2841,7 +2840,7 @@
28412840 /* Hack -- Message */
28422841 if (!p_ptr->timed[TMD_BLIND])
28432842 {
2844- msg_print(L"You are surrounded by a white light.");
2843+ msg_print(__T("You are surrounded by a white light."));
28452844 }
28462845 /* Hook into the "project()" function */
28472846 (void)project(-1, rad, py, px, dam, GF_LITE_WEAK, flg);
@@ -2867,7 +2866,7 @@
28672866 /* Hack -- Message */
28682867 if (!p_ptr->timed[TMD_BLIND])
28692868 {
2870- msg_print(L"Darkness surrounds you.");
2869+ msg_print(__T("Darkness surrounds you."));
28712870 }
28722871 /* Hook into the "project()" function */
28732872 (void)project(-1, rad, py, px, dam, GF_DARK_WEAK, flg);
@@ -3288,7 +3287,7 @@
32883287 else
32893288 {
32903289 if (OPT(flush_failure)) flush();
3291- msg_print(L"The Branding failed.");
3290+ msg_print(__T("The Branding failed."));
32923291 }
32933292 }
32943293
@@ -3409,7 +3408,7 @@
34093408 case 2:
34103409 {
34113410 /* Message */
3412- msg_print(L"You are surrounded by a malignant aura.");
3411+ msg_print(__T("You are surrounded by a malignant aura."));
34133412
34143413 /* Decrease all stats (permanently) */
34153414 (void)dec_stat(A_STR, TRUE);
@@ -3429,7 +3428,7 @@
34293428 case 3:
34303429 {
34313430 /* Message */
3432- msg_print(L"You are surrounded by a powerful aura.");
3431+ msg_print(__T("You are surrounded by a powerful aura."));
34333432
34343433 /* Dispel monsters */
34353434 dispel_monsters(1000);
--- trunk/JBand/src/init1.cpp (revision 114)
+++ trunk/JBand/src/init1.cpp (revision 115)
@@ -3992,7 +3992,7 @@
39923992 r_ptr = (monster_race*)head->info_ptr + 547;
39933993 if (r_ptr->power)
39943994 {
3995- /* msg_print(L"Monster power array already filled - returning."); */
3995+ /* msg_print(__T("Monster power array already filled - returning.")); */
39963996 return 0;
39973997 }
39983998 #endif
@@ -4288,7 +4288,7 @@
42884288 {
42894289 count++;
42904290 dupcheck[i] = cacheme;
4291- /* msg_print(L"Found a new slay combo on an ego item"); */
4291+ /* msg_print(__T("Found a new slay combo on an ego item")); */
42924292 }
42934293 }
42944294 }
@@ -4313,7 +4313,7 @@
43134313 slay_cache[count].flags = cacheme;
43144314 slay_cache[count].value = 0;
43154315 count++;
4316- /* msg_print(L"Cached a slay combination"); */
4316+ /* msg_print(__T("Cached a slay combination")); */
43174317 }
43184318 }
43194319 }
--- trunk/JBand/src/wiz-stats.cpp (revision 114)
+++ trunk/JBand/src/wiz-stats.cpp (revision 115)
@@ -281,7 +281,7 @@
281281
282282 void stats_collect(void)
283283 {
284- msg_print(L"Statistics generation not turned on in this build.");
284+ msg_print(__T("Statistics generation not turned on in this build."));
285285 }
286286
287287 #endif /* WITH_STATS */
--- trunk/JBand/src/squelch.cpp (revision 114)
+++ trunk/JBand/src/squelch.cpp (revision 115)
@@ -657,7 +657,7 @@
657657 clear_from(0);
658658
659659 /* Help text */
660- prt(L"Quality squelch menu", 0, 0);
660+ prt(__T("Quality squelch menu"), 0, 0);
661661
662662 Term_gotoxy(1, 1);
663663 text_out_to_screen(TERM_L_RED, L"Use the movement keys to navigate, and Enter to change settings.");
@@ -677,8 +677,6 @@
677677 return;
678678 }
679679
680-
681-
682680 /*** Sval-dependent menu ***/
683681
684682 /*
@@ -693,7 +691,6 @@
693691 byte attr = (cursor ? TERM_L_BLUE : TERM_WHITE);
694692 UNREFERENCED_PARAMETER(width);
695693
696-
697694 /* Acquire the "name" of object "i" */
698695 object_kind_name(buf, _countof(buf), idx, TRUE);
699696
@@ -718,11 +715,9 @@
718715
719716 return TRUE;
720717 }
721-
722718 return FALSE;
723719 }
724720
725-
726721 /*
727722 * Display list of svals to be squelched.
728723 */
@@ -740,7 +735,6 @@
740735 u16b *choice;
741736 UNREFERENCED_PARAMETER(desc);
742737
743-
744738 /* Create the array */
745739 choice = C_ZNEW(z_info->k_max, u16b);
746740
@@ -757,7 +751,6 @@
757751 /* Add this item to our possibles list */
758752 choice[num++] = i;
759753 }
760-
761754 /* Return here if there are no objects */
762755 if (!num)
763756 {
@@ -764,8 +757,6 @@
764757 FREE(choice);
765758 return FALSE;
766759 }
767-
768-
769760 /* Save the screen and clear it */
770761 screen_save();
771762 clear_from(0);
@@ -810,7 +801,6 @@
810801 return TRUE;
811802 }
812803
813-
814804 /* Returns TRUE if there's anything to display a menu of */
815805 static bool seen_tval(int tval)
816806 {
@@ -827,12 +817,9 @@
827817
828818 return TRUE;
829819 }
830-
831-
832820 return FALSE;
833821 }
834822
835-
836823 /* Extra options on the "item options" menu */
837824 struct
838825 {
@@ -911,7 +898,6 @@
911898 }
912899 }
913900
914-
915901 static const menu_iter options_item_iter =
916902 {
917903 tag_options_item,
@@ -920,7 +906,6 @@
920906 NULL
921907 };
922908
923-
924909 /*
925910 * Display and handle the main squelching menu.
926911 */
@@ -962,7 +947,6 @@
962947 }
963948 }
964949 }
965-
966950 /* Load screen and finish */
967951 screen_load();
968952 p_ptr->notice |= PN_SQUELCH;
--- trunk/JBand/src/wizard.cpp (revision 114)
+++ trunk/JBand/src/wizard.cpp (revision 115)
@@ -336,31 +336,31 @@
336336 prt(format(L"ident = %04x timeout = %-d",
337337 o_ptr->ident, o_ptr->timeout), 8, j);
338338
339- prt(L"+------------FLAGS0------------+", 10, j);
340- prt(L"AFFECT..........SLAY.......BRAND", 11, j);
341- prt(L" ae xxxpaefc", 12, j);
342- prt(L"siwdcc ssidsasmnvudotgddduoclio", 13, j);
343- prt(L"tnieoh trnipthgiinmrrnrrmniierl", 14, j);
344- prt(L"rtsxna..lcfgdkttmldncltggndsdced", 15, j);
339+ prt(__T("+------------FLAGS0------------+"), 10, j);
340+ prt(__T("AFFECT..........SLAY.......BRAND"), 11, j);
341+ prt(__T(" ae xxxpaefc"), 12, j);
342+ prt(__T("siwdcc ssidsasmnvudotgddduoclio"), 13, j);
343+ prt(__T("tnieoh trnipthgiinmrrnrrmniierl"), 14, j);
344+ prt(__T("rtsxna..lcfgdkttmldncltggndsdced"), 15, j);
345345 prt_binary(f[0], 16, j);
346346
347- prt(L"+------------FLAGS1------------+", 17, j);
348- prt(L"SUST........IMM.RESIST.........", 18, j);
349- prt(L" afecaefcpfldbc s n ", 19, j);
350- prt(L"siwdcc cilocliooeialoshnecd", 20, j);
351- prt(L"tnieoh irelierliatrnnnrethi", 21, j);
352- prt(L"rtsxna......decddcedsrekdfddxhss", 22, j);
347+ prt(__T("+------------FLAGS1------------+"), 17, j);
348+ prt(__T("SUST........IMM.RESIST........."), 18, j);
349+ prt(__T(" afecaefcpfldbc s n "), 19, j);
350+ prt(__T("siwdcc cilocliooeialoshnecd"), 20, j);
351+ prt(__T("tnieoh irelierliatrnnnrethi"), 21, j);
352+ prt(__T("rtsxna......decddcedsrekdfddxhss"), 22, j);
353353 prt_binary(f[1], 23, j);
354354
355- prt(L"+------------FLAGS2------------+", 10, j+32);
356- prt(L"s ts hn tadiiii aiehs hp", 11, j+32);
357- prt(L"lf eefoo egrgggg bcnaih vr", 12, j+32);
358- prt(L"we lerlf ilgannnn ltssdo ym", 13, j+32);
359- prt(L"da reiedu merirrrr eityew ccc", 14, j+32);
360- prt(L"itlepnele ppanaefc svaktm uuu", 15, j+32);
361- prt(L"ghigavail aoveclio saanyo rrr", 16, j+32);
362- prt(L"seteticf craxierl etropd sss", 17, j+32);
363- prt(L"trenhste tttpdced detwes eee", 18, j+32);
355+ prt(__T("+------------FLAGS2------------+"), 10, j+32);
356+ prt(__T("s ts hn tadiiii aiehs hp"), 11, j+32);
357+ prt(__T("lf eefoo egrgggg bcnaih vr"), 12, j+32);
358+ prt(__T("we lerlf ilgannnn ltssdo ym"), 13, j+32);
359+ prt(__T("da reiedu merirrrr eityew ccc"), 14, j+32);
360+ prt(__T("itlepnele ppanaefc svaktm uuu"), 15, j+32);
361+ prt(__T("ghigavail aoveclio saanyo rrr"), 16, j+32);
362+ prt(__T("seteticf craxierl etropd sss"), 17, j+32);
363+ prt(__T("trenhste tttpdced detwes eee"), 18, j+32);
364364 prt_binary(f[2], 19, j+32);
365365 }
366366
@@ -853,7 +853,7 @@
853853 {
854854 if (cursed_p(o_ptr))
855855 {
856- msg_print(L"Resetting existing curses.");
856+ msg_print(__T("Resetting existing curses."));
857857 o_ptr->flags[2] &= ~TR2_CURSE_MASK;
858858 }
859859 if (get_check(L"Set light curse? "))
@@ -940,7 +940,7 @@
940940 if (changed)
941941 {
942942 /* Message */
943- msg_print(L"Changes accepted.");
943+ msg_print(__T("Changes accepted."));
944944
945945 /* Change */
946946 object_copy(o_ptr, i_ptr);
@@ -958,7 +958,7 @@
958958 /* Ignore change */
959959 else
960960 {
961- msg_print(L"Changes ignored.");
961+ msg_print(__T("Changes ignored."));
962962 }
963963 }
964964
@@ -1013,7 +1013,7 @@
10131013 drop_near(i_ptr, -1, py, px);
10141014
10151015 /* All done */
1016- msg_print(L"Allocated.");
1016+ msg_print(__T("Allocated."));
10171017 }
10181018
10191019 /*
@@ -1072,7 +1072,7 @@
10721072 drop_near(i_ptr, -1, p_ptr->py, p_ptr->px);
10731073
10741074 /* All done */
1075- msg_print(L"Allocated.");
1075+ msg_print(__T("Allocated."));
10761076 }
10771077
10781078 /*
@@ -1462,7 +1462,7 @@
14621462 drop_near(i_ptr, -1, py, px);
14631463 }
14641464 }
1465- msg_print(L"Done.");
1465+ msg_print(__T("Done."));
14661466 }
14671467
14681468 /*
@@ -1553,7 +1553,7 @@
15531553 screen_save();
15541554
15551555 /* Prompt */
1556- prt(L"Create which artifact? ", 0, 0);
1556+ prt(__T("Create which artifact? "), 0, 0);
15571557
15581558 /* Get the name */
15591559 if (askfor_aux(name, _countof(name), NULL))
@@ -1651,7 +1651,7 @@
16511651 screen_save();
16521652
16531653 /* Prompt */
1654- prt(L"Summon which monster? ", 0, 0);
1654+ prt(__T("Summon which monster? "), 0, 0);
16551655
16561656 /* Get the name */
16571657 if (askfor_aux(name, _countof(name), NULL))
@@ -1764,10 +1764,10 @@
17641764 /* Oops */
17651765 default:
17661766 {
1767- msg_print(L"That is not a valid debug command.");
1767+ msg_print(__T("That is not a valid debug command."));
17681768 break;
17691769 }
17701770 }
17711771 }
17721772
1773-#endif
\ No newline at end of file
1773+#endif
--- trunk/JBand/src/cmd0.cpp (revision 114)
+++ trunk/JBand/src/cmd0.cpp (revision 115)
@@ -1,4 +1,8 @@
11 /* テスト */
2+/*
3+ * Debug Status: Not checked.
4+ * - Fixed __T on this page.
5+ */
26 /*
37 * File: cmd0.c
48 * Purpose: Deal with command processing.
@@ -54,7 +58,6 @@
5458 /* Useful typedef */
5559 typedef void do_cmd_type(void);
5660
57-
5861 /* Forward declare these, because they're really defined later */
5962 static do_cmd_type do_cmd_wizard, do_cmd_try_debug,
6063 do_cmd_mouseclick, do_cmd_port,
@@ -77,124 +80,121 @@
7780 do_cmd_type *hook;
7881 } command_type;
7982
80-
8183 /* Magic use */
8284 static command_type cmd_magic[] =
8385 {
84- { L"Gain new spells or prayers", 'G', CMD_NULL, textui_cmd_study },
85- { L"Browse a book", 'b', CMD_NULL, do_cmd_browse },
86- { L"Cast a spell", 'm', CMD_NULL, textui_cmd_cast },
87- { L"Pray a prayer", 'p', CMD_NULL, textui_cmd_pray }
86+ { __T("Gain new spells or prayers"), 'G', CMD_NULL, textui_cmd_study },
87+ { __T("Browse a book"), 'b', CMD_NULL, do_cmd_browse },
88+ { __T("Cast a spell"), 'm', CMD_NULL, textui_cmd_cast },
89+ { __T("Pray a prayer"), 'p', CMD_NULL, textui_cmd_pray }
8890 };
8991
9092 /* General actions */
9193 static command_type cmd_action[] =
9294 {
93- { L"Search for traps/doors", 's', CMD_SEARCH, NULL},
94- { L"Disarm a trap or chest", 'D', CMD_NULL, textui_cmd_disarm },
95- { L"Rest for a while", 'R', CMD_NULL, textui_cmd_rest },
96- { L"Look around", 'l', CMD_NULL, do_cmd_look },
97- { L"Target monster or location", '*', CMD_NULL, do_cmd_target },
98- { L"Dig a tunnel", 'T', CMD_NULL, textui_cmd_tunnel },
99- { L"Go up staircase", '<', CMD_GO_UP, NULL },
100- { L"Go down staircase", '>', CMD_GO_DOWN, NULL },
101- { L"Toggle search mode", 'S', CMD_TOGGLE_SEARCH, NULL },
102- { L"Open a door or a chest", 'o', CMD_NULL, textui_cmd_open },
103- { L"Close a door", 'c', CMD_NULL, textui_cmd_close },
104- { L"Jam a door shut", 'j', CMD_NULL, textui_cmd_spike },
105- { L"Bash a door open", 'B', CMD_NULL, textui_cmd_bash }
95+ { __T("Search for traps/doors"), 's', CMD_SEARCH, NULL},
96+ { __T("Disarm a trap or chest"), 'D', CMD_NULL, textui_cmd_disarm },
97+ { __T("Rest for a while"), 'R', CMD_NULL, textui_cmd_rest },
98+ { __T("Look around"), 'l', CMD_NULL, do_cmd_look },
99+ { __T("Target monster or location"), '*', CMD_NULL, do_cmd_target },
100+ { __T("Dig a tunnel"), 'T', CMD_NULL, textui_cmd_tunnel },
101+ { __T("Go up staircase"), '<', CMD_GO_UP, NULL },
102+ { __T("Go down staircase"), '>', CMD_GO_DOWN, NULL },
103+ { __T("Toggle search mode"), 'S', CMD_TOGGLE_SEARCH, NULL },
104+ { __T("Open a door or a chest"), 'o', CMD_NULL, textui_cmd_open },
105+ { __T("Close a door"), 'c', CMD_NULL, textui_cmd_close },
106+ { __T("Jam a door shut"), 'j', CMD_NULL, textui_cmd_spike },
107+ { __T("Bash a door open"), 'B', CMD_NULL, textui_cmd_bash }
106108 };
107109
108110 /* Item use commands */
109111 static command_type cmd_item_use[] =
110112 {
111- { L"Read a scroll", 'r', CMD_NULL, textui_cmd_read_scroll },
112- { L"Quaff a potion", 'q', CMD_NULL, textui_cmd_quaff_potion },
113- { L"Use a staff", 'u', CMD_NULL, textui_cmd_use_staff },
114- { L"Aim a wand", 'a', CMD_NULL, textui_cmd_aim_wand },
115- { L"Zap a rod", 'z', CMD_NULL, textui_cmd_zap_rod },
116- { L"Activate an object", 'A', CMD_NULL, textui_cmd_activate },
117- { L"Eat some food", 'E', CMD_NULL, textui_cmd_eat_food },
118- { L"Fuel your light source", 'F', CMD_NULL, textui_cmd_refill },
119- { L"Fire your missile weapon", 'f', CMD_NULL, textui_cmd_fire },
120- { L"Throw an item", 'v', CMD_NULL, textui_cmd_throw }
113+ { __T("Read a scroll"), 'r', CMD_NULL, textui_cmd_read_scroll },
114+ { __T("Quaff a potion"), 'q', CMD_NULL, textui_cmd_quaff_potion },
115+ { __T("Use a staff"), 'u', CMD_NULL, textui_cmd_use_staff },
116+ { __T("Aim a wand"), 'a', CMD_NULL, textui_cmd_aim_wand },
117+ { __T("Zap a rod"), 'z', CMD_NULL, textui_cmd_zap_rod },
118+ { __T("Activate an object"), 'A', CMD_NULL, textui_cmd_activate },
119+ { __T("Eat some food"), 'E', CMD_NULL, textui_cmd_eat_food },
120+ { __T("Fuel your light source"), 'F', CMD_NULL, textui_cmd_refill },
121+ { __T("Fire your missile weapon"), 'f', CMD_NULL, textui_cmd_fire },
122+ { __T("Throw an item"), 'v', CMD_NULL, textui_cmd_throw }
121123 };
122124
123125 /* Item management commands */
124126 static command_type cmd_item_manage[] =
125127 {
126- { L"Display equipment listing", 'e', CMD_NULL, do_cmd_equip },
127- { L"Display inventory listing", 'i', CMD_NULL, do_cmd_inven },
128- { L"Pick up objects", 'g', CMD_PICKUP, NULL },
129- { L"Wear/wield an item", 'w', CMD_NULL, textui_cmd_wield },
130- { L"Take/unwield off an item", 't', CMD_NULL, textui_cmd_takeoff },
131- { L"Drop an item", 'd', CMD_NULL, textui_cmd_drop },
132- { L"Destroy an item", 'k', CMD_NULL, textui_cmd_destroy },
133- { L"Examine an item", 'I', CMD_NULL, do_cmd_observe },
134- { L"Inscribe an object", '{', CMD_NULL, textui_cmd_inscribe },
135- { L"Uninscribe an object", '}', CMD_NULL, textui_cmd_uninscribe }
128+ { __T("Display equipment listing"), 'e', CMD_NULL, do_cmd_equip },
129+ { __T("Display inventory listing"), 'i', CMD_NULL, do_cmd_inven },
130+ { __T("Pick up objects"), 'g', CMD_PICKUP, NULL },
131+ { __T("Wear/wield an item"), 'w', CMD_NULL, textui_cmd_wield },
132+ { __T("Take/unwield off an item"), 't', CMD_NULL, textui_cmd_takeoff },
133+ { __T("Drop an item"), 'd', CMD_NULL, textui_cmd_drop },
134+ { __T("Destroy an item"), 'k', CMD_NULL, textui_cmd_destroy },
135+ { __T("Examine an item"), 'I', CMD_NULL, do_cmd_observe },
136+ { __T("Inscribe an object"), '{', CMD_NULL, textui_cmd_inscribe },
137+ { __T("Uninscribe an object"), '}', CMD_NULL, textui_cmd_uninscribe }
136138 };
137139
138140 /* Information access commands */
139141 static command_type cmd_info[] =
140142 {
141- { L"Full dungeon map", 'M', CMD_NULL, do_cmd_view_map },
142- { L"Display visible item list", ']', CMD_NULL, do_cmd_itemlist },
143- { L"Display visible monster list", '[', CMD_NULL, do_cmd_monlist },
144- { L"Locate player on map", 'L', CMD_NULL, do_cmd_locate },
145- { L"Help", '?', CMD_NULL, do_cmd_help },
146- { L"Identify symbol", '/', CMD_NULL, do_cmd_query_symbol },
147- { L"Character description", 'C', CMD_NULL, do_cmd_change_name },
148- { L"Check knowledge", '~', CMD_NULL, do_cmd_knowledge },
149- { L"Repeat level feeling", KTRL('F'), CMD_NULL, do_cmd_feeling },
150- { L"Show previous message", KTRL('O'), CMD_NULL, do_cmd_message_one },
151- { L"Show previous messages", KTRL('P'), CMD_NULL, do_cmd_messages }
143+ { __T("Full dungeon map"), 'M', CMD_NULL, do_cmd_view_map },
144+ { __T("Display visible item list"), ']', CMD_NULL, do_cmd_itemlist },
145+ { __T("Display visible monster list"), '[', CMD_NULL, do_cmd_monlist },
146+ { __T("Locate player on map"), 'L', CMD_NULL, do_cmd_locate },
147+ { __T("Help"), '?', CMD_NULL, do_cmd_help },
148+ { __T("Identify symbol"), '/', CMD_NULL, do_cmd_query_symbol },
149+ { __T("Character description"), 'C', CMD_NULL, do_cmd_change_name },
150+ { __T("Check knowledge"), '~', CMD_NULL, do_cmd_knowledge },
151+ { __T("Repeat level feeling"), KTRL('F'), CMD_NULL, do_cmd_feeling },
152+ { __T("Show previous message"), KTRL('O'), CMD_NULL, do_cmd_message_one },
153+ { __T("Show previous messages"), KTRL('P'), CMD_NULL, do_cmd_messages }
152154 };
153155
154156 /* Utility/assorted commands */
155157 static command_type cmd_util[] =
156158 {
157- { L"Interact with options", '=', CMD_NULL, do_cmd_xxx_options },
158- { L"Port-specific preferences", '!', CMD_NULL, do_cmd_port },
159- { L"Save and don't quit", KTRL('S'), CMD_SAVE, NULL },
160- { L"Save and quit", KTRL('X'), CMD_QUIT, NULL },
161- { L"Quit (commit suicide)", 'Q', CMD_NULL, textui_cmd_suicide },
162- { L"Redraw the screen", KTRL('R'), CMD_NULL, do_cmd_redraw },
163- { L"Load \"screen dump\"", '(', CMD_NULL, do_cmd_load_screen },
164- { L"Save \"screen dump\"", ')', CMD_NULL, do_cmd_save_screen },
165- { L"Switch langage", KTRL('L'), CMD_NULL, do_cmd_switch_lang }
159+ { __T("Interact with options"), '=', CMD_NULL, do_cmd_xxx_options },
160+ { __T("Port-specific preferences"), '!', CMD_NULL, do_cmd_port },
161+ { __T("Save and don't quit"), KTRL('S'), CMD_SAVE, NULL },
162+ { __T("Save and quit"), KTRL('X'), CMD_QUIT, NULL },
163+ { __T("Quit (commit suicide)"), 'Q', CMD_NULL, textui_cmd_suicide },
164+ { __T("Redraw the screen"), KTRL('R'), CMD_NULL, do_cmd_redraw },
165+ { __T("Load \"screen dump\""), '(', CMD_NULL, do_cmd_load_screen },
166+ { __T("Save \"screen dump\""), ')', CMD_NULL, do_cmd_save_screen },
167+ { __T("Switch langage"), KTRL('L'), CMD_NULL, do_cmd_switch_lang }
166168 };
167169
168170 /* Commands that shouldn't be shown to the user */
169171 static command_type cmd_hidden[] =
170172 {
171- { L"Take notes", ':', CMD_NULL, do_cmd_note },
172- { L"Version info", 'V', CMD_NULL, do_cmd_version },
173- { L"Load a single pref line", '"', CMD_NULL, do_cmd_pref },
174- { L"Mouse click", MOUSEY, CMD_NULL, do_cmd_mouseclick },
175- { L"Enter a store", '_', CMD_ENTER_STORE, NULL },
176- { L"Toggle windows", KTRL('E'), CMD_NULL, toggle_inven_equip }, /* XXX */
177- { L"Alter a grid", '+', CMD_NULL, textui_cmd_alter },
178- { L"Walk", ';', CMD_NULL, textui_cmd_walk },
179- { L"Jump into a trap", '-', CMD_NULL, textui_cmd_jump },
180- { L"Start running", '.', CMD_NULL, textui_cmd_run },
181- { L"Stand still", ',', CMD_HOLD, NULL },
182- { L"Check knowledge", '|', CMD_NULL, do_cmd_knowledge },
183- { L"Display menu of actions", '\n', CMD_NULL, do_cmd_menu },
184- { L"Display menu of actions", '\r', CMD_NULL, do_cmd_menu },
185- { L"Toggle wizard mode", KTRL('W'), CMD_NULL, do_cmd_wizard },
186- { L"Repeat previous command", KTRL('V'), CMD_REPEAT, NULL },
173+ { __T("Take notes"), ':', CMD_NULL, do_cmd_note },
174+ { __T("Version info"), 'V', CMD_NULL, do_cmd_version },
175+ { __T("Load a single pref line"), '"', CMD_NULL, do_cmd_pref },
176+ { __T("Mouse click"), MOUSEY, CMD_NULL, do_cmd_mouseclick },
177+ { __T("Enter a store"), '_', CMD_ENTER_STORE, NULL },
178+ { __T("Toggle windows"), KTRL('E'), CMD_NULL, toggle_inven_equip }, /* XXX */
179+ { __T("Alter a grid"), '+', CMD_NULL, textui_cmd_alter },
180+ { __T("Walk"), ';', CMD_NULL, textui_cmd_walk },
181+ { __T("Jump into a trap"), '-', CMD_NULL, textui_cmd_jump },
182+ { __T("Start running"), '.', CMD_NULL, textui_cmd_run },
183+ { __T("Stand still"), ',', CMD_HOLD, NULL },
184+ { __T("Check knowledge"), '|', CMD_NULL, do_cmd_knowledge },
185+ { __T("Display menu of actions"), '\n', CMD_NULL, do_cmd_menu },
186+ { __T("Display menu of actions"), '\r', CMD_NULL, do_cmd_menu },
187+ { __T("Toggle wizard mode"), KTRL('W'), CMD_NULL, do_cmd_wizard },
188+ { __T("Repeat previous command"), KTRL('V'), CMD_REPEAT, NULL },
187189
188190 #ifdef ALLOW_DEBUG
189- { L"Debug mode commands", KTRL('A'), CMD_NULL, do_cmd_try_debug },
191+ { __T("Debug mode commands"), KTRL('A'), CMD_NULL, do_cmd_try_debug },
190192 #endif
191193 #ifdef ALLOW_BORG
192- { L"Borg commands", KTRL('Z'), CMD_NULL, do_cmd_try_borg }
194+ { __T("Borg commands"), KTRL('Z'), CMD_NULL, do_cmd_try_borg }
193195 #endif
194196 };
195197
196-
197-
198198 /*
199199 * A categorised list of all the command lists.
200200 */
@@ -246,12 +246,12 @@
246246 if (!(p_ptr->noscore & NOSCORE_WIZARD))
247247 {
248248 /* Mention effects */
249- msg_print(L"You are about to enter 'wizard' mode for the very first time!");
250- msg_print(L"This is a form of cheating, and your game will not be scored!");
249+ msg_print(__T("You are about to enter 'wizard' mode for the very first time!"));
250+ msg_print(__T("This is a form of cheating, and your game will not be scored!"));
251251 message_flush();
252252
253253 /* Verify request */
254- if (!get_check(L"Are you sure you want to enter wizard mode? "))
254+ if (!get_check(__T("Are you sure you want to enter wizard mode? ")))
255255 return;
256256
257257 /* Mark savefile */
@@ -262,12 +262,12 @@
262262 if (p_ptr->wizard)
263263 {
264264 p_ptr->wizard = FALSE;
265- msg_print(L"Wizard mode off.");
265+ msg_print(__T("Wizard mode off."));
266266 }
267267 else
268268 {
269269 p_ptr->wizard = TRUE;
270- msg_print(L"Wizard mode on.");
270+ msg_print(__T("Wizard mode on."));
271271 }
272272
273273 /* Update monsters */
@@ -288,12 +288,12 @@
288288 if (!(p_ptr->noscore & NOSCORE_DEBUG))
289289 {
290290 /* Mention effects */
291- msg_print(L"You are about to use the dangerous, unsupported, debug commands!");
292- msg_print(L"Your machine may crash, and your savefile may become corrupted!");
291+ msg_print(__T("You are about to use the dangerous, unsupported, debug commands!"));
292+ msg_print(__T("Your machine may crash, and your savefile may become corrupted!"));
293293 message_flush();
294294
295295 /* Verify request */
296- if (!get_check(L"Are you sure you want to use the debug commands? "))
296+ if (!get_check(__T("Are you sure you want to use the debug commands? ")))
297297 return;
298298
299299 /* Mark savefile */
@@ -317,12 +317,12 @@
317317 if (!(p_ptr->noscore & NOSCORE_BORG))
318318 {
319319 /* Mention effects */
320- msg_print(L"You are about to use the dangerous, unsupported, borg commands!");
321- msg_print(L"Your machine may crash, and your savefile may become corrupted!");
320+ msg_print(__T("You are about to use the dangerous, unsupported, borg commands!"));
321+ msg_print(__T("Your machine may crash, and your savefile may become corrupted!"));
322322 message_flush();
323323
324324 /* Verify request */
325- if (!get_check(L"Are you sure you want to use the borg commands? "))
325+ if (!get_check(__T("Are you sure you want to use the borg commands? ")))
326326 return;
327327
328328 /* Mark savefile */
@@ -335,7 +335,6 @@
335335
336336 #endif /* ALLOW_BORG */
337337
338-
339338 /*
340339 * Quit the game.
341340 */
@@ -348,7 +347,6 @@
348347 p_ptr->leaving = TRUE;
349348 }
350349
351-
352350 /*
353351 * Handle a mouseclick, using the horrible hack that is '\xff'.
354352 */
@@ -384,12 +382,11 @@
384382 else if (p_ptr->command_cmd_ex.mousebutton == 2)
385383 {
386384 target_set_location(y, x);
387- msg_print(L"Target set.");
385+ msg_print(__T("Target set.");
388386 }
389387 */
390388 }
391389
392-
393390 /*
394391 * Port-specific options
395392 *
@@ -400,7 +397,6 @@
400397 (void)Term_user(0);
401398 }
402399
403-
404400 /*
405401 * Display the options and redraw afterward.
406402 */
@@ -410,7 +406,6 @@
410406 do_cmd_redraw();
411407 }
412408
413-
414409 /*
415410 * Display the main-screen monster list.
416411 */
@@ -427,7 +422,6 @@
427422 screen_load();
428423 }
429424
430-
431425 /*
432426 * Display the main-screen item list.
433427 */
@@ -444,13 +438,12 @@
444438 screen_load();
445439 }
446440
447-
448441 /*
449442 * Invoked when the command isn't recognised.
450443 */
451444 static void do_cmd_unknown(void)
452445 {
453- prt(L"Type '?' for help.", 0, 0);
446+ prt(__T("Type '?' for help."), 0, 0);
454447 }
455448
456449 /* List indexed by char */
@@ -518,7 +511,7 @@
518511
519512 /* Set up the menu */
520513 WIPE(&menu, menu);
521- menu.cmd_keys = L"\x8B\x8C\n\r";
514+ menu.cmd_keys = __T("\x8B\x8C\n\r");
522515 menu.count = list->len;
523516 menu.menu_data = list->list;
524517 menu_init(&menu, MN_SKIN_SCROLL, &commands_menu, &area);
@@ -583,7 +576,7 @@
583576
584577 /* Set up the menu */
585578 WIPE(&menu, menu);
586- menu.cmd_keys = L"\x8B\x8C\n\r";
579+ menu.cmd_keys = __T("\x8B\x8C\n\r");
587580 menu.count = N_ELEMENTS(cmds_all) - 1;
588581 menu.menu_data = &chosen_command;
589582 menu_init(&menu, MN_SKIN_SCROLL, &commands_menu, &area);
@@ -609,7 +602,6 @@
609602 }
610603 }
611604
612-
613605 /*** Exported functions ***/
614606
615607 /*
@@ -661,7 +653,6 @@
661653 }
662654 }
663655
664-
665656 /*
666657 * Parse and execute the current command
667658 * Give "Warning" on illegal commands.
--- trunk/JBand/src/cmd2.cpp (revision 114)
+++ trunk/JBand/src/cmd2.cpp (revision 115)
@@ -1,4 +1,8 @@
11 /* テスト */
2+/*
3+ * Debug Status: Not checked.
4+ * - Fixed __T on this page.
5+ */
26 /*
37 * File: cmd2.c
48 * Purpose: Chest and door opening/closing, disarming, running, resting, &c.
@@ -20,7 +24,6 @@
2024 {
2125 #include "angband.h"
2226 #include "object/tvalsval.h"
23-
2427 #include "cmds.h"
2528 #include "game-cmd.h"
2629 }
@@ -38,13 +41,13 @@
3841 /* Verify stairs */
3942 if (cave_feat[p_ptr->py][p_ptr->px] != FEAT_LESS)
4043 {
41- msg_print(L"I see no up staircase here.");
44+ msg_print(__T("I see no up staircase here."));
4245 return;
4346 }
4447 /* Ironman */
4548 if (OPT(adult_ironman))
4649 {
47- msg_print(L"Nothing happens!");
50+ msg_print(__T("Nothing happens!"));
4851 return;
4952 }
5053 /* Hack -- take a turn */
@@ -69,7 +72,7 @@
6972 /* Verify stairs */
7073 if (cave_feat[p_ptr->py][p_ptr->px] != FEAT_MORE)
7174 {
72- msg_print(L"I see no down staircase here.");
75+ msg_print(__T("I see no down staircase here."));
7376 return;
7477 }
7578
@@ -77,7 +80,7 @@
7780 p_ptr->energy_use = 100;
7881
7982 /* Success */
80- message(MSG_STAIRS_DOWN, 0, L"You enter a maze of down staircases.");
83+ message(MSG_STAIRS_DOWN, 0, __T("You enter a maze of down staircases."));
8184
8285 /* Create a way back */
8386 p_ptr->create_up_stair = TRUE;
@@ -178,7 +181,6 @@
178181 object_type *i_ptr;
179182 object_type object_type_body;
180183
181-
182184 /* Get the chest */
183185 o_ptr = &o_list[o_idx];
184186
@@ -252,7 +254,7 @@
252254 /* Lose strength */
253255 if (trap & (CHEST_LOSE_STR))
254256 {
255- msg_print(L"A small needle has pricked you!");
257+ msg_print(__T("A small needle has pricked you!"));
256258 take_hit(damroll(1, 4), L"a poison needle");
257259 (void)do_dec_stat(A_STR, FALSE);
258260 }
@@ -259,7 +261,7 @@
259261 /* Lose constitution */
260262 if (trap & (CHEST_LOSE_CON))
261263 {
262- msg_print(L"A small needle has pricked you!");
264+ msg_print(__T("A small needle has pricked you!"));
263265 take_hit(damroll(1, 4), L"a poison needle");
264266 (void)do_dec_stat(A_CON, FALSE);
265267 }
@@ -266,7 +268,7 @@
266268 /* Poison */
267269 if (trap & (CHEST_POISON))
268270 {
269- msg_print(L"A puff of green gas surrounds you!");
271+ msg_print(__T("A puff of green gas surrounds you!"));
270272 if (!(p_ptr->state.resist_pois || p_ptr->timed[TMD_OPP_POIS]))
271273 (void)inc_timed(TMD_POISONED, 10 + randint1(20), TRUE);
272274 else if (p_ptr->state.resist_pois)
@@ -275,7 +277,7 @@
275277 /* Paralyze */
276278 if (trap & (CHEST_PARALYZE))
277279 {
278- msg_print(L"A puff of yellow gas surrounds you!");
280+ msg_print(__T("A puff of yellow gas surrounds you!"));
279281 if (!p_ptr->state.free_act)
280282 (void)inc_timed(TMD_PARALYZED, 10 + randint1(20), TRUE);
281283 else
@@ -285,7 +287,7 @@
285287 if (trap & (CHEST_SUMMON))
286288 {
287289 int num = 2 + randint1(3);
288- msg_print(L"You are enveloped in a cloud of smoke!");
290+ msg_print(__T("You are enveloped in a cloud of smoke!"));
289291 sound(MSG_SUM_MONSTER);
290292 for (i = 0; i < num; i++)
291293 {
@@ -295,8 +297,8 @@
295297 /* Explode */
296298 if (trap & (CHEST_EXPLODE))
297299 {
298- msg_print(L"There is a sudden explosion!");
299- msg_print(L"Everything inside the chest is destroyed!");
300+ msg_print(__T("There is a sudden explosion!"));
301+ msg_print(__T("Everything inside the chest is destroyed!"));
300302 o_ptr->pval = 0;
301303 take_hit(damroll(5, 8), L"an exploding chest");
302304 }
@@ -404,17 +406,17 @@
404406 /* Must find the trap first. */
405407 if (!object_known_p(o_ptr))
406408 {
407- msg_print(L"I don't see any traps.");
409+ msg_print(__T("I don't see any traps."));
408410 }
409411 /* Already disarmed/unlocked */
410412 else if (o_ptr->pval <= 0)
411413 {
412- msg_print(L"The chest is not trapped.");
414+ msg_print(__T("The chest is not trapped."));
413415 }
414416 /* No traps to find. */
415417 else if (!chest_traps[o_ptr->pval])
416418 {
417- msg_print(L"The chest is not trapped.");
419+ msg_print(__T("The chest is not trapped."));
418420 }
419421 /* Success (get a lot of experience) */
420422 else if (randint0(100) < j)
@@ -429,11 +431,11 @@
429431 /* We may keep trying */
430432 more = TRUE;
431433 if (OPT(flush_failure)) flush();
432- msg_print(L"You failed to disarm the chest.");
434+ msg_print(__T("You failed to disarm the chest."));
433435 }
434436 else /* Failure -- Set off the trap */
435437 {
436- msg_print(L"You set off a trap!");
438+ msg_print(__T("You set off a trap!"));
437439 chest_trap(y, x, o_idx);
438440 }
439441 /* Result */
@@ -440,7 +442,6 @@
440442 return (more);
441443 }
442444
443-
444445 /*
445446 * Return TRUE if the given feature is an open door
446447 */
@@ -557,7 +558,6 @@
557558 return count;
558559 }
559560
560-
561561 /*
562562 * Extract a "direction" which will move one step from the player location
563563 * towards the given "target" location (or "5" if no motion necessary).
@@ -576,7 +576,7 @@
576576 if (!(cave_info[y][x] & (CAVE_MARK)))
577577 {
578578 /* Message */
579- msg_print(L"You see nothing there.");
579+ msg_print(__T("You see nothing there."));
580580
581581 /* Nope */
582582 return (FALSE);
@@ -596,7 +596,6 @@
596596 return (TRUE);
597597 }
598598
599-
600599 /*
601600 * Perform the basic "open" command on doors
602601 *
@@ -617,7 +616,7 @@
617616 if (cave_feat[y][x] >= FEAT_DOOR_HEAD + 0x08)
618617 {
619618 /* Stuck */
620- msg_print(L"The door appears to be stuck.");
619+ msg_print(__T("The door appears to be stuck."));
621620 }
622621 /* Locked door */
623622 else if (cave_feat[y][x] >= FEAT_DOOR_HEAD + 0x01)
@@ -725,7 +724,7 @@
725724 if (cave_m_idx[y][x] > 0)
726725 {
727726 /* Message */
728- msg_print(L"There is a monster in the way!");
727+ msg_print(__T("There is a monster in the way!"));
729728
730729 /* Attack */
731730 py_attack(y, x);
@@ -778,7 +777,7 @@
778777 if (!(cave_info[y][x] & (CAVE_MARK)))
779778 {
780779 /* Message */
781- msg_print(L"You see nothing there.");
780+ msg_print(__T("You see nothing there."));
782781
783782 /* Nope */
784783 return (FALSE);
@@ -788,7 +787,7 @@
788787 (cave_feat[y][x] != FEAT_BROKEN))
789788 {
790789 /* Message */
791- msg_print(L"You see nothing there to close.");
790+ msg_print(__T("You see nothing there to close."));
792791
793792 /* Nope */
794793 return (FALSE);
@@ -797,7 +796,6 @@
797796 return (TRUE);
798797 }
799798
800-
801799 /*
802800 * Perform the basic "close" command
803801 *
@@ -817,7 +815,7 @@
817815 if (cave_feat[y][x] == FEAT_BROKEN)
818816 {
819817 /* Message */
820- msg_print(L"The door appears to be broken.");
818+ msg_print(__T("The door appears to be broken."));
821819 }
822820 else /* Open door */
823821 {
@@ -866,7 +864,7 @@
866864 if (cave_m_idx[y][x] > 0)
867865 {
868866 /* Message */
869- msg_print(L"There is a monster in the way!");
867+ msg_print(__T("There is a monster in the way!"));
870868
871869 /* Attack */
872870 py_attack(y, x);
@@ -906,7 +904,7 @@
906904 if (!(cave_info[y][x] & (CAVE_MARK)))
907905 {
908906 /* Message */
909- msg_print(L"You see nothing there.");
907+ msg_print(__T("You see nothing there."));
910908
911909 /* Nope */
912910 return (FALSE);
@@ -915,7 +913,7 @@
915913 if (cave_floor_bold(y, x))
916914 {
917915 /* Message */
918- msg_print(L"You see nothing there to tunnel.");
916+ msg_print(__T("You see nothing there to tunnel."));
919917
920918 /* Nope */
921919 return (FALSE);
@@ -981,7 +979,7 @@
981979 /* Titanium */
982980 if (cave_feat[y][x] >= FEAT_PERM_EXTRA)
983981 {
984- msg_print(L"This seems to be permanent rock.");
982+ msg_print(__T("This seems to be permanent rock."));
985983 }
986984 /* Granite */
987985 else if (cave_feat[y][x] >= FEAT_WALL_EXTRA)
@@ -989,12 +987,12 @@
989987 /* Tunnel */
990988 if ((p_ptr->state.skills[SKILL_DIGGING] > 40 + randint0(1600)) && twall(y, x))
991989 {
992- msg_print(L"You have finished the tunnel.");
990+ msg_print(__T("You have finished the tunnel."));
993991 }
994992 else /* Keep trying */
995993 {
996994 /* We may continue tunelling */
997- msg_print(L"You tunnel into the granite wall.");
995+ msg_print(__T("You tunnel into the granite wall."));
998996 more = TRUE;
999997 }
1000998 }
@@ -1034,12 +1032,12 @@
10341032 place_gold(y, x, p_ptr->depth);
10351033
10361034 /* Message */
1037- msg_print(L"You have found something!");
1035+ msg_print(__T("You have found something!"));
10381036 }
10391037 else /* Found nothing */
10401038 {
10411039 /* Message */
1042- msg_print(L"You have finished the tunnel.");
1040+ msg_print(__T("You have finished the tunnel."));
10431041 }
10441042 }
10451043 /* Failure (quartz) */
@@ -1046,7 +1044,7 @@
10461044 else if (hard)
10471045 {
10481046 /* Message, continue digging */
1049- msg_print(L"You tunnel into the quartz vein.");
1047+ msg_print(__T("You tunnel into the quartz vein."));
10501048 more = TRUE;
10511049 }
10521050
@@ -1054,7 +1052,7 @@
10541052 else
10551053 {
10561054 /* Message, continue digging */
1057- msg_print(L"You tunnel into the magma vein.");
1055+ msg_print(__T("You tunnel into the magma vein."));
10581056 more = TRUE;
10591057 }
10601058 }
@@ -1065,7 +1063,7 @@
10651063 if ((p_ptr->state.skills[SKILL_DIGGING] > randint0(200)) && twall(y, x))
10661064 {
10671065 /* Message */
1068- msg_print(L"You have removed the rubble.");
1066+ msg_print(__T("You have removed the rubble."));
10691067
10701068 /* Hack -- place an object */
10711069 if (randint0(100) < 10)
@@ -1077,7 +1075,7 @@
10771075 if (!squelch_hide_item(&o_list[cave_o_idx[y][x]]) &&
10781076 player_can_see_bold(y, x))
10791077 {
1080- msg_print(L"You have found something!");
1078+ msg_print(__T("You have found something!"));
10811079 }
10821080 }
10831081 }
@@ -1084,7 +1082,7 @@
10841082 else
10851083 {
10861084 /* Message, keep digging */
1087- msg_print(L"You dig in the rubble.");
1085+ msg_print(__T("You dig in the rubble."));
10881086 more = TRUE;
10891087 }
10901088 }
@@ -1094,12 +1092,12 @@
10941092 /* Tunnel */
10951093 if ((p_ptr->state.skills[SKILL_DIGGING] > 30 + randint0(1200)) && twall(y, x))
10961094 {
1097- msg_print(L"You have finished the tunnel.");
1095+ msg_print(__T("You have finished the tunnel."));
10981096 }
10991097 else /* Keep trying */
11001098 {
11011099 /* We may continue tunelling */
1102- msg_print(L"You tunnel into the granite wall.");
1100+ msg_print(__T("You tunnel into the granite wall."));
11031101 more = TRUE;
11041102
11051103 /* Occasional Search XXX XXX */
@@ -1111,12 +1109,12 @@
11111109 /* Tunnel */
11121110 if ((p_ptr->state.skills[SKILL_DIGGING] > 30 + randint0(1200)) && twall(y, x))
11131111 {
1114- msg_print(L"You have finished the tunnel.");
1112+ msg_print(__T("You have finished the tunnel."));
11151113 }
11161114 else /* Keep trying */
11171115 {
11181116 /* We may continue tunelling */
1119- msg_print(L"You tunnel into the door.");
1117+ msg_print(__T("You tunnel into the door."));
11201118 more = TRUE;
11211119 }
11221120 }
@@ -1159,7 +1157,7 @@
11591157 if (cave_m_idx[y][x] > 0)
11601158 {
11611159 /* Message */
1162- msg_print(L"There is a monster in the way!");
1160+ msg_print(__T("There is a monster in the way!"));
11631161
11641162 /* Attack */
11651163 py_attack(y, x);
@@ -1187,7 +1185,7 @@
11871185 if (!(cave_info[y][x] & (CAVE_MARK)))
11881186 {
11891187 /* Message */
1190- msg_print(L"You see nothing there.");
1188+ msg_print(__T("You see nothing there."));
11911189
11921190 /* Nope */
11931191 return (FALSE);
@@ -1197,7 +1195,7 @@
11971195 (cave_feat[y][x] <= FEAT_TRAP_TAIL)))
11981196 {
11991197 /* Message */
1200- msg_print(L"You see nothing there to disarm.");
1198+ msg_print(__T("You see nothing there to disarm."));
12011199
12021200 /* Nope */
12031201 return (FALSE);
@@ -1224,7 +1222,6 @@
12241222 /* Verify legality */
12251223 if (!do_cmd_disarm_test(y, x)) return (FALSE);
12261224
1227-
12281225 /* Get the trap name */
12291226 name = (f_name + f_info[cave_feat[y][x]].name);
12301227
@@ -1286,7 +1283,6 @@
12861283 return (more);
12871284 }
12881285
1289-
12901286 /*
12911287 * Disarms a trap, or a chest
12921288 */
@@ -1326,7 +1322,7 @@
13261322 if (cave_m_idx[y][x] > 0)
13271323 {
13281324 /* Message */
1329- msg_print(L"There is a monster in the way!");
1325+ msg_print(__T("There is a monster in the way!"));
13301326
13311327 /* Attack */
13321328 py_attack(y, x);
@@ -1383,7 +1379,7 @@
13831379 if (!(cave_info[y][x] & (CAVE_MARK)))
13841380 {
13851381 /* Message */
1386- msg_print(L"You see nothing there.");
1382+ msg_print(__T("You see nothing there."));
13871383
13881384 /* Nope */
13891385 return (FALSE);
@@ -1393,7 +1389,7 @@
13931389 (cave_feat[y][x] <= FEAT_DOOR_TAIL)))
13941390 {
13951391 /* Message */
1396- msg_print(L"You see nothing there to bash.");
1392+ msg_print(__T("You see nothing there to bash."));
13971393
13981394 /* Nope */
13991395 return (FALSE);
@@ -1402,7 +1398,6 @@
14021398 return (TRUE);
14031399 }
14041400
1405-
14061401 /*
14071402 * Perform the basic "bash" command
14081403 *
@@ -1420,7 +1415,7 @@
14201415 return (FALSE);
14211416
14221417 /* Message */
1423- msg_print(L"You smash into the door!");
1418+ msg_print(__T("You smash into the door!"));
14241419
14251420 /* Hack -- Bash power based on strength */
14261421 /* (Ranges from 3 to 20 to 100 to 200) */
@@ -1459,7 +1454,7 @@
14591454 p_ptr->lev)
14601455 {
14611456 /* Message */
1462- msg_print(L"The door holds firm.");
1457+ msg_print(__T("The door holds firm."));
14631458
14641459 /* Allow repeated bashing */
14651460 more = TRUE;
@@ -1467,7 +1462,7 @@
14671462 else /* High dexterity yields coolness */
14681463 {
14691464 /* Message */
1470- msg_print(L"You are off-balance.");
1465+ msg_print(__T("You are off-balance."));
14711466
14721467 /* Hack -- Lose balance ala paralysis */
14731468 (void)inc_timed(TMD_PARALYZED, 2 + randint0(2), TRUE);
@@ -1519,7 +1514,7 @@
15191514 if (cave_m_idx[y][x] > 0)
15201515 {
15211516 /* Message */
1522- msg_print(L"There is a monster in the way!");
1517+ msg_print(__T("There is a monster in the way!"));
15231518
15241519 /* Attack */
15251520 py_attack(y, x);
@@ -1623,7 +1618,7 @@
16231618 else /* Oops */
16241619 {
16251620 /* Oops */
1626- msg_print(L"You spin around.");
1621+ msg_print(__T("You spin around."));
16271622 }
16281623 /* Cancel repetition unless we can continue */
16291624 if (!more)
@@ -1672,7 +1667,6 @@
16721667 return (FALSE);
16731668 }
16741669
1675-
16761670 /*
16771671 * Determine if a given grid may be "spiked"
16781672 */
@@ -1682,7 +1676,7 @@
16821676 if (!(cave_info[y][x] & (CAVE_MARK)))
16831677 {
16841678 /* Message */
1685- msg_print(L"You see nothing there.");
1679+ msg_print(__T("You see nothing there."));
16861680
16871681 /* Nope */
16881682 return (FALSE);
@@ -1692,7 +1686,7 @@
16921686 (cave_feat[y][x] <= FEAT_DOOR_TAIL)))
16931687 {
16941688 /* Message */
1695- msg_print(L"You see nothing there to spike.");
1689+ msg_print(__T("You see nothing there to spike."));
16961690
16971691 /* Nope */
16981692 return (FALSE);
@@ -1716,7 +1710,7 @@
17161710 if (!get_spike(&item))
17171711 {
17181712 /* Message */
1719- msg_print(L"You have no spikes!");
1713+ msg_print(__T("You have no spikes!"));
17201714
17211715 /* Done */
17221716 return;
@@ -1725,11 +1719,9 @@
17251719 y = p_ptr->py + ddy[dir];
17261720 x = p_ptr->px + ddx[dir];
17271721
1728-
17291722 /* Verify legality */
17301723 if (!do_cmd_spike_test(y, x)) return;
17311724
1732-
17331725 /* Take a turn */
17341726 p_ptr->energy_use = 100;
17351727
@@ -1744,7 +1736,7 @@
17441736 if (cave_m_idx[y][x] > 0)
17451737 {
17461738 /* Message */
1747- msg_print(L"There is a monster in the way!");
1739+ msg_print(__T("There is a monster in the way!"));
17481740
17491741 /* Attack */
17501742 py_attack(y, x);
@@ -1755,7 +1747,7 @@
17551747 if (!do_cmd_spike_test(y, x)) return;
17561748
17571749 /* Successful jamming */
1758- msg_print(L"You jam the door with a spike.");
1750+ msg_print(__T("You jam the door with a spike."));
17591751
17601752 /* Convert "locked" to "stuck" XXX XXX XXX */
17611753 if (cave_feat[y][x] < FEAT_DOOR_HEAD + 0x08)
@@ -1922,7 +1914,7 @@
19221914 /* Hack XXX XXX XXX */
19231915 if (p_ptr->timed[TMD_CONFUSED])
19241916 {
1925- msg_print(L"You are too confused!");
1917+ msg_print(__T("You are too confused!"));
19261918 return;
19271919 }
19281920
@@ -1952,7 +1944,7 @@
19521944 /* Hack XXX XXX XXX */
19531945 if (p_ptr->timed[TMD_CONFUSED])
19541946 {
1955- msg_print(L"You are too confused!");
1947+ msg_print(__T("You are too confused!"));
19561948 return;
19571949 }
19581950
@@ -1966,8 +1958,6 @@
19661958 }
19671959 }
19681960
1969-
1970-
19711961 /*
19721962 * Stay still. Search. Enter stores.
19731963 * Pick up treasure if "pickup" is true.
@@ -2113,7 +2103,6 @@
21132103 }
21142104 }
21152105
2116-
21172106 /*
21182107 * Hack -- commit suicide
21192108 */
@@ -2132,7 +2121,6 @@
21322121 _tcscpy_s(p_ptr->died_from, _countof(p_ptr->died_from), __T("Quitting"));
21332122 }
21342123
2135-
21362124 void textui_cmd_suicide(void)
21372125 {
21382126 /* Flush input */
--- trunk/JBand/src/trap.cpp (revision 114)
+++ trunk/JBand/src/trap.cpp (revision 115)
@@ -135,10 +135,10 @@
135135 {
136136 case FEAT_TRAP_HEAD + 0x00:
137137 {
138- msg_print(L"You fall through a trap door!");
138+ msg_print(__T("You fall through a trap door!"));
139139 if (p_ptr->state.ffall)
140140 {
141- msg_print(L"You float gently down to the next level.");
141+ msg_print(__T("You float gently down to the next level."));
142142 object_notice_flag(2, TR2_FEATHER);
143143 }
144144 else
@@ -155,10 +155,10 @@
155155
156156 case FEAT_TRAP_HEAD + 0x01:
157157 {
158- msg_print(L"You fall into a pit!");
158+ msg_print(__T("You fall into a pit!"));
159159 if (p_ptr->state.ffall)
160160 {
161- msg_print(L"You float gently to the bottom of the pit.");
161+ msg_print(__T("You float gently to the bottom of the pit."));
162162 object_notice_flag(2, TR2_FEATHER);
163163 }
164164 else
@@ -171,12 +171,12 @@
171171
172172 case FEAT_TRAP_HEAD + 0x02:
173173 {
174- msg_print(L"You fall into a spiked pit!");
174+ msg_print(__T("You fall into a spiked pit!"));
175175
176176 if (p_ptr->state.ffall)
177177 {
178- msg_print(L"You float gently to the floor of the pit.");
179- msg_print(L"You carefully avoid touching the spikes.");
178+ msg_print(__T("You float gently to the floor of the pit."));
179+ msg_print(__T("You carefully avoid touching the spikes."));
180180 object_notice_flag(2, TR2_FEATHER);
181181 }
182182 else
@@ -187,7 +187,7 @@
187187 /* Extra spike damage */
188188 if (one_in_(2))
189189 {
190- msg_print(L"You are impaled!");
190+ msg_print(__T("You are impaled!"));
191191
192192 dam = dam * 2;
193193 (void)inc_timed(TMD_CUT, randint1(dam), TRUE);
@@ -201,12 +201,12 @@
201201
202202 case FEAT_TRAP_HEAD + 0x03:
203203 {
204- msg_print(L"You fall into a spiked pit!");
204+ msg_print(__T("You fall into a spiked pit!"));
205205
206206 if (p_ptr->state.ffall)
207207 {
208- msg_print(L"You float gently to the floor of the pit.");
209- msg_print(L"You carefully avoid touching the spikes.");
208+ msg_print(__T("You float gently to the floor of the pit."));
209+ msg_print(__T("You carefully avoid touching the spikes."));
210210 object_notice_flag(2, TR2_FEATHER);
211211 }
212212 else
@@ -217,7 +217,7 @@
217217 /* Extra spike damage */
218218 if (one_in_(2))
219219 {
220- msg_print(L"You are impaled on poisonous spikes!");
220+ msg_print(__T("You are impaled on poisonous spikes!"));
221221
222222 dam = dam * 2;
223223 (void)inc_timed(TMD_CUT, randint1(dam), TRUE);
@@ -224,7 +224,7 @@
224224
225225 if (p_ptr->state.resist_pois || p_ptr->timed[TMD_OPP_POIS])
226226 {
227- msg_print(L"The poison does not affect you!");
227+ msg_print(__T("The poison does not affect you!"));
228228 }
229229 else
230230 {
@@ -246,7 +246,7 @@
246246 case FEAT_TRAP_HEAD + 0x04:
247247 {
248248 sound(MSG_SUM_MONSTER);
249- msg_print(L"You are enveloped in a cloud of smoke!");
249+ msg_print(__T("You are enveloped in a cloud of smoke!"));
250250 cave_info[y][x] &= ~(CAVE_MARK);
251251 cave_set_feat(y, x, FEAT_FLOOR);
252252 num = 2 + randint1(3);
@@ -259,7 +259,7 @@
259259
260260 case FEAT_TRAP_HEAD + 0x05:
261261 {
262- msg_print(L"You hit a teleport trap!");
262+ msg_print(__T("You hit a teleport trap!"));
263263 teleport_player(100);
264264 break;
265265 }
@@ -266,7 +266,7 @@
266266
267267 case FEAT_TRAP_HEAD + 0x06:
268268 {
269- msg_print(L"You are enveloped in flames!");
269+ msg_print(__T("You are enveloped in flames!"));
270270 dam = damroll(4, 6);
271271 fire_dam(dam, L"a fire trap");
272272 break;
@@ -274,7 +274,7 @@
274274
275275 case FEAT_TRAP_HEAD + 0x07:
276276 {
277- msg_print(L"You are splashed with acid!");
277+ msg_print(__T("You are splashed with acid!"));
278278 dam = damroll(4, 6);
279279 acid_dam(dam, L"an acid trap");
280280 break;
@@ -284,7 +284,7 @@
284284 {
285285 if (trap_check_hit(125))
286286 {
287- msg_print(L"A small dart hits you!");
287+ msg_print(__T("A small dart hits you!"));
288288 dam = damroll(1, 4);
289289 take_hit(dam, name);
290290 (void)inc_timed(TMD_SLOW, randint0(20) + 20, TRUE);
@@ -291,7 +291,7 @@
291291 }
292292 else
293293 {
294- msg_print(L"A small dart barely misses you.");
294+ msg_print(__T("A small dart barely misses you."));
295295 }
296296 break;
297297 }
@@ -300,7 +300,7 @@
300300 {
301301 if (trap_check_hit(125))
302302 {
303- msg_print(L"A small dart hits you!");
303+ msg_print(__T("A small dart hits you!"));
304304 dam = damroll(1, 4);
305305 take_hit(dam, name);
306306 (void)do_dec_stat(A_STR, FALSE);
@@ -307,7 +307,7 @@
307307 }
308308 else
309309 {
310- msg_print(L"A small dart barely misses you.");
310+ msg_print(__T("A small dart barely misses you."));
311311 }
312312 break;
313313 }
@@ -316,7 +316,7 @@
316316 {
317317 if (trap_check_hit(125))
318318 {
319- msg_print(L"A small dart hits you!");
319+ msg_print(__T("A small dart hits you!"));
320320 dam = damroll(1, 4);
321321 take_hit(dam, name);
322322 (void)do_dec_stat(A_DEX, FALSE);
@@ -323,7 +323,7 @@
323323 }
324324 else
325325 {
326- msg_print(L"A small dart barely misses you.");
326+ msg_print(__T("A small dart barely misses you."));
327327 }
328328 break;
329329 }
@@ -332,7 +332,7 @@
332332 {
333333 if (trap_check_hit(125))
334334 {
335- msg_print(L"A small dart hits you!");
335+ msg_print(__T("A small dart hits you!"));
336336 dam = damroll(1, 4);
337337 take_hit(dam, name);
338338 (void)do_dec_stat(A_CON, FALSE);
@@ -339,7 +339,7 @@
339339 }
340340 else
341341 {
342- msg_print(L"A small dart barely misses you.");
342+ msg_print(__T("A small dart barely misses you."));
343343 }
344344 break;
345345 }
@@ -346,7 +346,7 @@
346346
347347 case FEAT_TRAP_HEAD + 0x0C:
348348 {
349- msg_print(L"You are surrounded by a black gas!");
349+ msg_print(__T("You are surrounded by a black gas!"));
350350 if (!p_ptr->state.resist_blind)
351351 (void)inc_timed(TMD_BLIND, randint0(50) + 25, TRUE);
352352 else
@@ -357,7 +357,7 @@
357357
358358 case FEAT_TRAP_HEAD + 0x0D:
359359 {
360- msg_print(L"You are surrounded by a gas of scintillating colors!");
360+ msg_print(__T("You are surrounded by a gas of scintillating colors!"));
361361 if (!p_ptr->state.resist_confu)
362362 (void)inc_timed(TMD_CONFUSED, randint0(20) + 10, TRUE);
363363 else
@@ -368,7 +368,7 @@
368368
369369 case FEAT_TRAP_HEAD + 0x0E:
370370 {
371- msg_print(L"You are surrounded by a pungent green gas!");
371+ msg_print(__T("You are surrounded by a pungent green gas!"));
372372 if (!p_ptr->state.resist_pois && !p_ptr->timed[TMD_OPP_POIS])
373373 (void)inc_timed(TMD_POISONED, randint0(20) + 10, TRUE);
374374 else if (p_ptr->state.resist_pois)
@@ -379,7 +379,7 @@
379379
380380 case FEAT_TRAP_HEAD + 0x0F:
381381 {
382- msg_print(L"You are surrounded by a strange white mist!");
382+ msg_print(__T("You are surrounded by a strange white mist!"));
383383 if (!p_ptr->state.free_act)
384384 (void)inc_timed(TMD_PARALYZED, randint0(10) + 5, TRUE);
385385 else
--- trunk/JBand/src/player/timed.cpp (revision 114)
+++ trunk/JBand/src/player/timed.cpp (revision 115)
@@ -706,7 +706,7 @@
706706 /* Weak */
707707 case 1:
708708 {
709- msg_print(L"You are still weak.");
709+ msg_print(__T("You are still weak."));
710710 break;
711711 }
712712
@@ -713,7 +713,7 @@
713713 /* Hungry */
714714 case 2:
715715 {
716- msg_print(L"You are still hungry.");
716+ msg_print(__T("You are still hungry."));
717717 break;
718718 }
719719
@@ -720,7 +720,7 @@
720720 /* Normal */
721721 case 3:
722722 {
723- msg_print(L"You are no longer hungry.");
723+ msg_print(__T("You are no longer hungry."));
724724 break;
725725 }
726726
@@ -727,7 +727,7 @@
727727 /* Full */
728728 case 4:
729729 {
730- msg_print(L"You are full!");
730+ msg_print(__T("You are full!"));
731731 break;
732732 }
733733
@@ -734,7 +734,7 @@
734734 /* Bloated */
735735 case 5:
736736 {
737- msg_print(L"You have gorged yourself!");
737+ msg_print(__T("You have gorged yourself!"));
738738 break;
739739 }
740740 }
@@ -753,7 +753,7 @@
753753 case 0:
754754 {
755755 sound(MSG_NOTICE);
756- msg_print(L"You are getting faint from hunger!");
756+ msg_print(__T("You are getting faint from hunger!"));
757757 break;
758758 }
759759
@@ -761,7 +761,7 @@
761761 case 1:
762762 {
763763 sound(MSG_NOTICE);
764- msg_print(L"You are getting weak from hunger!");
764+ msg_print(__T("You are getting weak from hunger!"));
765765 break;
766766 }
767767
@@ -769,7 +769,7 @@
769769 case 2:
770770 {
771771 sound(MSG_HUNGRY);
772- msg_print(L"You are getting hungry.");
772+ msg_print(__T("You are getting hungry."));
773773 break;
774774 }
775775
@@ -777,7 +777,7 @@
777777 case 3:
778778 {
779779 sound(MSG_NOTICE);
780- msg_print(L"You are no longer full.");
780+ msg_print(__T("You are no longer full."));
781781 break;
782782 }
783783
@@ -785,7 +785,7 @@
785785 case 4:
786786 {
787787 sound(MSG_NOTICE);
788- msg_print(L"You are no longer gorged.");
788+ msg_print(__T("You are no longer gorged."));
789789 break;
790790 }
791791 }
--- trunk/JBand/src/spells1.cpp (revision 114)
+++ trunk/JBand/src/spells1.cpp (revision 115)
@@ -285,7 +285,7 @@
285285 {
286286 if (OPT(adult_ironman))
287287 {
288- msg_print(L"Nothing happens.");
288+ msg_print(__T("Nothing happens."));
289289 return;
290290 }
291291
@@ -1307,7 +1307,7 @@
13071307 {
13081308 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
13091309 {
1310- msg_print(L"You resist the effects!");
1310+ msg_print(__T("You resist the effects!"));
13111311 break;
13121312 }
13131313
@@ -1320,11 +1320,11 @@
13201320 {
13211321 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
13221322 {
1323- msg_print(L"You resist the effects!");
1323+ msg_print(__T("You resist the effects!"));
13241324 break;
13251325 }
13261326
1327- msg_print(L"Your body starts to scramble...");
1327+ msg_print(__T("Your body starts to scramble..."));
13281328
13291329 /* Pick a pair of stats */
13301330 ii = randint0(A_MAX);
@@ -1426,7 +1426,7 @@
14261426 /* Check line of sight */
14271427 if (player_has_los_bold(y, x))
14281428 {
1429- msg_print(L"There is a bright flash of light!");
1429+ msg_print(__T("There is a bright flash of light!"));
14301430 obvious = TRUE;
14311431 }
14321432
@@ -1447,7 +1447,7 @@
14471447 /* Check line of sound */
14481448 if (player_has_los_bold(y, x))
14491449 {
1450- msg_print(L"Click!");
1450+ msg_print(__T("Click!"));
14511451 obvious = TRUE;
14521452 }
14531453 }
@@ -1471,7 +1471,7 @@
14711471 if (player_has_los_bold(y, x))
14721472 {
14731473 /* Message */
1474- msg_print(L"There is a bright flash of light!");
1474+ msg_print(__T("There is a bright flash of light!"));
14751475 obvious = TRUE;
14761476
14771477 /* Visibility change */
@@ -1508,7 +1508,7 @@
15081508 /* Message */
15091509 if (cave_info[y][x] & (CAVE_MARK))
15101510 {
1511- msg_print(L"The wall turns into mud!");
1511+ msg_print(__T("The wall turns into mud!"));
15121512 obvious = TRUE;
15131513 }
15141514
@@ -1525,8 +1525,8 @@
15251525 /* Message */
15261526 if (cave_info[y][x] & (CAVE_MARK))
15271527 {
1528- msg_print(L"The vein turns into mud!");
1529- msg_print(L"You have found something!");
1528+ msg_print(__T("The vein turns into mud!"));
1529+ msg_print(__T("You have found something!"));
15301530 obvious = TRUE;
15311531 }
15321532
@@ -1546,7 +1546,7 @@
15461546 /* Message */
15471547 if (cave_info[y][x] & (CAVE_MARK))
15481548 {
1549- msg_print(L"The vein turns into mud!");
1549+ msg_print(__T("The vein turns into mud!"));
15501550 obvious = TRUE;
15511551 }
15521552
@@ -1563,7 +1563,7 @@
15631563 /* Message */
15641564 if (cave_info[y][x] & (CAVE_MARK))
15651565 {
1566- msg_print(L"The rubble turns into mud!");
1566+ msg_print(__T("The rubble turns into mud!"));
15671567 obvious = TRUE;
15681568 }
15691569
@@ -1579,7 +1579,7 @@
15791579 /* Found something */
15801580 if (player_can_see_bold(y, x))
15811581 {
1582- msg_print(L"There was something buried in the rubble!");
1582+ msg_print(__T("There was something buried in the rubble!"));
15831583 obvious = TRUE;
15841584 }
15851585
@@ -1594,7 +1594,7 @@
15941594 /* Hack -- special message */
15951595 if (cave_info[y][x] & (CAVE_MARK))
15961596 {
1597- msg_print(L"The door turns into mud!");
1597+ msg_print(__T("The door turns into mud!"));
15981598 obvious = TRUE;
15991599 }
16001600
@@ -1903,7 +1903,7 @@
19031903 /* Notice */
19041904 if (o_ptr->marked && !squelch_hide_item(o_ptr))
19051905 {
1906- msg_print(L"Click!");
1906+ msg_print(__T("Click!"));
19071907 obvious = TRUE;
19081908 }
19091909 }
@@ -3221,7 +3221,7 @@
32213221 /* Standard damage -- hurts inventory too */
32223222 case GF_ACID:
32233223 {
3224- if (blind) msg_print(L"You are hit by acid!");
3224+ if (blind) msg_print(__T("You are hit by acid!"));
32253225 acid_dam(dam, killer);
32263226 break;
32273227 }
@@ -3229,7 +3229,7 @@
32293229 /* Standard damage -- hurts inventory too */
32303230 case GF_FIRE:
32313231 {
3232- if (blind) msg_print(L"You are hit by fire!");
3232+ if (blind) msg_print(__T("You are hit by fire!"));
32333233 fire_dam(dam, killer);
32343234 break;
32353235 }
@@ -3237,7 +3237,7 @@
32373237 /* Standard damage -- hurts inventory too */
32383238 case GF_COLD:
32393239 {
3240- if (blind) msg_print(L"You are hit by cold!");
3240+ if (blind) msg_print(__T("You are hit by cold!"));
32413241 cold_dam(dam, killer);
32423242 break;
32433243 }
@@ -3245,7 +3245,7 @@
32453245 /* Standard damage -- hurts inventory too */
32463246 case GF_ELEC:
32473247 {
3248- if (blind) msg_print(L"You are hit by lightning!");
3248+ if (blind) msg_print(__T("You are hit by lightning!"));
32493249 elec_dam(dam, killer);
32503250 break;
32513251 }
@@ -3253,7 +3253,7 @@
32533253 /* Standard damage -- also poisons player */
32543254 case GF_POIS:
32553255 {
3256- if (blind) msg_print(L"You are hit by poison!");
3256+ if (blind) msg_print(__T("You are hit by poison!"));
32573257 if (p_ptr->state.resist_pois)
32583258 {
32593259 dam = RES_POIS_ADJ(dam, NOT_USED);
@@ -3274,7 +3274,7 @@
32743274 /* Standard damage */
32753275 case GF_MISSILE:
32763276 {
3277- if (blind) msg_print(L"You are hit by something!");
3277+ if (blind) msg_print(__T("You are hit by something!"));
32783278 take_hit(dam, killer);
32793279 break;
32803280 }
@@ -3282,7 +3282,7 @@
32823282 /* Holy Orb -- Player only takes partial damage */
32833283 case GF_HOLY_ORB:
32843284 {
3285- if (blind) msg_print(L"You are hit by something!");
3285+ if (blind) msg_print(__T("You are hit by something!"));
32863286 dam /= 2;
32873287 take_hit(dam, killer);
32883288 break;
@@ -3291,7 +3291,7 @@
32913291 /* Arrow -- no dodging XXX */
32923292 case GF_ARROW:
32933293 {
3294- if (blind) msg_print(L"You are hit by something sharp!");
3294+ if (blind) msg_print(__T("You are hit by something sharp!"));
32953295 take_hit(dam, killer);
32963296 break;
32973297 }
@@ -3299,7 +3299,7 @@
32993299 /* Plasma -- No resist XXX */
33003300 case GF_PLASMA:
33013301 {
3302- if (blind) msg_print(L"You are hit by something!");
3302+ if (blind) msg_print(__T("You are hit by something!"));
33033303 take_hit(dam, killer);
33043304 if (!p_ptr->state.resist_sound)
33053305 {
@@ -3316,7 +3316,7 @@
33163316 /* Nether -- drain experience */
33173317 case GF_NETHER:
33183318 {
3319- if (blind) msg_print(L"You are hit by something strange!");
3319+ if (blind) msg_print(__T("You are hit by something strange!"));
33203320 if (p_ptr->state.resist_nethr)
33213321 {
33223322 dam = RES_NETH_ADJ(dam, RANDOMISE);
@@ -3326,7 +3326,7 @@
33263326 {
33273327 if (p_ptr->state.hold_life && (randint0(100) < 75))
33283328 {
3329- msg_print(L"You keep hold of your life force!");
3329+ msg_print(__T("You keep hold of your life force!"));
33303330 object_notice_flag(2, TR2_HOLD_LIFE);
33313331 }
33323332 else
@@ -3335,13 +3335,13 @@
33353335
33363336 if (p_ptr->state.hold_life)
33373337 {
3338- msg_print(L"You feel your life slipping away!");
3338+ msg_print(__T("You feel your life slipping away!"));
33393339 lose_exp(d / 10);
33403340 object_notice_flag(2, TR2_HOLD_LIFE);
33413341 }
33423342 else
33433343 {
3344- msg_print(L"You feel your life draining away!");
3344+ msg_print(__T("You feel your life draining away!"));
33453345 lose_exp(d);
33463346 }
33473347 }
@@ -3353,7 +3353,7 @@
33533353 /* Water -- stun/confuse */
33543354 case GF_WATER:
33553355 {
3356- if (blind) msg_print(L"You are hit by something!");
3356+ if (blind) msg_print(__T("You are hit by something!"));
33573357 if (!p_ptr->state.resist_sound)
33583358 (void)inc_timed(TMD_STUN, randint1(40), TRUE);
33593359 else
@@ -3371,7 +3371,7 @@
33713371 /* Chaos -- many effects */
33723372 case GF_CHAOS:
33733373 {
3374- if (blind) msg_print(L"You are hit by something strange!");
3374+ if (blind) msg_print(__T("You are hit by something strange!"));
33753375 if (p_ptr->state.resist_chaos)
33763376 {
33773377 dam = RES_CHAO_ADJ(dam, RANDOMISE);
@@ -3391,7 +3391,7 @@
33913391 {
33923392 if (p_ptr->state.hold_life && (randint0(100) < 75))
33933393 {
3394- msg_print(L"You keep hold of your life force!");
3394+ msg_print(__T("You keep hold of your life force!"));
33953395 object_notice_flag(2, TR2_HOLD_LIFE);
33963396 }
33973397 else
@@ -3400,13 +3400,13 @@
34003400
34013401 if (p_ptr->state.hold_life)
34023402 {
3403- msg_print(L"You feel your life slipping away!");
3403+ msg_print(__T("You feel your life slipping away!"));
34043404 lose_exp(d / 10);
34053405 object_notice_flag(2, TR2_HOLD_LIFE);
34063406 }
34073407 else
34083408 {
3409- msg_print(L"You feel your life draining away!");
3409+ msg_print(__T("You feel your life draining away!"));
34103410 lose_exp(d);
34113411 }
34123412 }
@@ -3424,7 +3424,7 @@
34243424 /* Shards -- mostly cutting */
34253425 case GF_SHARD:
34263426 {
3427- if (blind) msg_print(L"You are hit by something sharp!");
3427+ if (blind) msg_print(__T("You are hit by something sharp!"));
34283428 if (p_ptr->state.resist_shard)
34293429 {
34303430 dam = RES_SHAR_ADJ(dam, RANDOMISE);
@@ -3441,7 +3441,7 @@
34413441 /* Sound -- mostly stunning */
34423442 case GF_SOUND:
34433443 {
3444- if (blind) msg_print(L"You are hit by something!");
3444+ if (blind) msg_print(__T("You are hit by something!"));
34453445 if (p_ptr->state.resist_sound)
34463446 {
34473447 dam = RES_SOUN_ADJ(dam, RANDOMISE);
@@ -3459,7 +3459,7 @@
34593459 /* Pure confusion */
34603460 case GF_CONFUSION:
34613461 {
3462- if (blind) msg_print(L"You are hit by something!");
3462+ if (blind) msg_print(__T("You are hit by something!"));
34633463 if (p_ptr->state.resist_confu)
34643464 {
34653465 dam = RES_CONF_ADJ(dam, RANDOMISE);
@@ -3476,7 +3476,7 @@
34763476 /* Disenchantment -- see above */
34773477 case GF_DISENCHANT:
34783478 {
3479- if (blind) msg_print(L"You are hit by something strange!");
3479+ if (blind) msg_print(__T("You are hit by something strange!"));
34803480 if (p_ptr->state.resist_disen)
34813481 {
34823482 dam = RES_DISE_ADJ(dam, RANDOMISE);
@@ -3493,7 +3493,7 @@
34933493 /* Nexus -- see above */
34943494 case GF_NEXUS:
34953495 {
3496- if (blind) msg_print(L"You are hit by something strange!");
3496+ if (blind) msg_print(__T("You are hit by something strange!"));
34973497 if (p_ptr->state.resist_nexus)
34983498 {
34993499 dam = RES_NEXU_ADJ(dam, RANDOMISE);
@@ -3510,7 +3510,7 @@
35103510 /* Force -- mostly stun */
35113511 case GF_FORCE:
35123512 {
3513- if (blind) msg_print(L"You are hit by something!");
3513+ if (blind) msg_print(__T("You are hit by something!"));
35143514 if (!p_ptr->state.resist_sound)
35153515 (void)inc_timed(TMD_STUN, randint1(20), TRUE);
35163516 else
@@ -3523,7 +3523,7 @@
35233523 /* Inertia -- slowness */
35243524 case GF_INERTIA:
35253525 {
3526- if (blind) msg_print(L"You are hit by something strange!");
3526+ if (blind) msg_print(__T("You are hit by something strange!"));
35273527 (void)inc_timed(TMD_SLOW, randint0(4) + 4, TRUE);
35283528 take_hit(dam, killer);
35293529 break;
@@ -3532,7 +3532,7 @@
35323532 /* Lite -- blinding */
35333533 case GF_LITE:
35343534 {
3535- if (blind) msg_print(L"You are hit by something!");
3535+ if (blind) msg_print(__T("You are hit by something!"));
35363536 if (p_ptr->state.resist_lite)
35373537 {
35383538 dam = RES_LITE_ADJ(dam, RANDOMISE);
@@ -3553,7 +3553,7 @@
35533553 /* Dark -- blinding */
35543554 case GF_DARK:
35553555 {
3556- if (blind) msg_print(L"You are hit by something!");
3556+ if (blind) msg_print(__T("You are hit by something!"));
35573557 if (p_ptr->state.resist_dark)
35583558 {
35593559 dam = RES_DARK_ADJ(dam, RANDOMISE);
@@ -3574,13 +3574,13 @@
35743574 /* Time -- bolt fewer effects XXX */
35753575 case GF_TIME:
35763576 {
3577- if (blind) msg_print(L"You are hit by something strange!");
3577+ if (blind) msg_print(__T("You are hit by something strange!"));
35783578
35793579 switch (randint1(10))
35803580 {
35813581 case 1: case 2: case 3: case 4: case 5:
35823582 {
3583- msg_print(L"You feel life has clocked back.");
3583+ msg_print(__T("You feel life has clocked back."));
35843584 lose_exp(100 + (p_ptr->exp / 100) * MON_DRAIN_LIFE);
35853585 break;
35863586 }
@@ -3607,7 +3607,7 @@
36073607
36083608 case 10:
36093609 {
3610- msg_print(L"You're not as powerful as you used to be...");
3610+ msg_print(__T("You're not as powerful as you used to be..."));
36113611
36123612 for (k = 0; k < A_MAX; k++)
36133613 {
@@ -3624,8 +3624,8 @@
36243624 /* Gravity -- stun plus slowness plus teleport */
36253625 case GF_GRAVITY:
36263626 {
3627- if (blind) msg_print(L"You are hit by something strange!");
3628- msg_print(L"Gravity warps around you.");
3627+ if (blind) msg_print(__T("You are hit by something strange!"));
3628+ msg_print(__T("Gravity warps around you."));
36293629
36303630 /* Higher level players can resist the teleportation better */
36313631 if (randint1(127) > p_ptr->lev)
@@ -3647,7 +3647,7 @@
36473647 /* Pure damage */
36483648 case GF_MANA:
36493649 {
3650- if (blind) msg_print(L"You are hit by something!");
3650+ if (blind) msg_print(__T("You are hit by something!"));
36513651 take_hit(dam, killer);
36523652 break;
36533653 }
@@ -3654,7 +3654,7 @@
36543654 /* Pure damage */
36553655 case GF_METEOR:
36563656 {
3657- if (blind) msg_print(L"You are hit by something!");
3657+ if (blind) msg_print(__T("You are hit by something!"));
36583658 take_hit(dam, killer);
36593659 break;
36603660 }
@@ -3661,7 +3661,7 @@
36613661 /* Ice -- cold plus stun plus cuts */
36623662 case GF_ICE:
36633663 {
3664- if (blind) msg_print(L"You are hit by something sharp!");
3664+ if (blind) msg_print(__T("You are hit by something sharp!"));
36653665 cold_dam(dam, killer);
36663666
36673667 if (!p_ptr->state.resist_shard)
--- trunk/JBand/src/generate.cpp (revision 114)
+++ trunk/JBand/src/generate.cpp (revision 115)
@@ -785,7 +785,7 @@
785785
786786
787787 /* Note destroyed levels */
788- if (OPT(cheat_room)) msg_print(L"Destroyed Level");
788+ if (OPT(cheat_room)) msg_print(__T("Destroyed Level"));
789789
790790 /* Drop a few epi-centers (usually about two) */
791791 for (n = 0; n < randint1(5); n++)
--- trunk/JBand/src/monster/melee1.cpp (revision 114)
+++ trunk/JBand/src/monster/melee1.cpp (revision 115)
@@ -558,7 +558,7 @@
558558 {
559559 int heal = rlev * drained;
560560
561- msg_print(L"Energy drains from your pack!");
561+ msg_print(__T("Energy drains from your pack!"));
562562
563563 obvious = TRUE;
564564
@@ -600,7 +600,7 @@
600600 p_ptr->lev)))
601601 {
602602 /* Saving throw message */
603- msg_print(L"You quickly protect your money pouch!");
603+ msg_print(__T("You quickly protect your money pouch!"));
604604
605605 /* Occasional blink anyway */
606606 if (randint0(3)) blinked = TRUE;
@@ -616,17 +616,17 @@
616616 p_ptr->au -= gold;
617617 if (gold <= 0)
618618 {
619- msg_print(L"Nothing was stolen.");
619+ msg_print(__T("Nothing was stolen."));
620620 }
621621 else if (p_ptr->au)
622622 {
623- msg_print(L"Your purse feels lighter.");
623+ msg_print(__T("Your purse feels lighter."));
624624 msg_format(L"%ld coins were stolen!", (long)gold);
625625 }
626626 else
627627 {
628- msg_print(L"Your purse feels lighter.");
629- msg_print(L"All of your coins were stolen!");
628+ msg_print(__T("Your purse feels lighter."));
629+ msg_print(__T("All of your coins were stolen!"));
630630 }
631631
632632 /* Redraw gold */
@@ -650,7 +650,7 @@
650650 p_ptr->lev)))
651651 {
652652 /* Saving throw message */
653- msg_print(L"You grab hold of your backpack!");
653+ msg_print(__T("You grab hold of your backpack!"));
654654
655655 /* Occasional "blink" anyway */
656656 blinked = TRUE;
@@ -786,7 +786,7 @@
786786 /* Notice */
787787 if (!p_ptr->timed[TMD_BLIND])
788788 {
789- msg_print(L"Your light dims.");
789+ msg_print(__T("Your light dims."));
790790 obvious = TRUE;
791791 }
792792
@@ -803,7 +803,7 @@
803803 obvious = TRUE;
804804
805805 /* Message */
806- msg_print(L"You are covered in acid!");
806+ msg_print(__T("You are covered in acid!"));
807807
808808 /* Special damage */
809809 acid_dam(damage, ddesc);
@@ -820,7 +820,7 @@
820820 obvious = TRUE;
821821
822822 /* Message */
823- msg_print(L"You are struck by electricity!");
823+ msg_print(__T("You are struck by electricity!"));
824824
825825 /* Take damage (special) */
826826 elec_dam(damage, ddesc);
@@ -837,7 +837,7 @@
837837 obvious = TRUE;
838838
839839 /* Message */
840- msg_print(L"You are enveloped in flames!");
840+ msg_print(__T("You are enveloped in flames!"));
841841
842842 /* Take damage (special) */
843843 fire_dam(damage, ddesc);
@@ -854,7 +854,7 @@
854854 obvious = TRUE;
855855
856856 /* Message */
857- msg_print(L"You are covered with frost!");
857+ msg_print(__T("You are covered with frost!"));
858858
859859 /* Take damage (special) */
860860 cold_dam(damage, ddesc);
@@ -921,13 +921,13 @@
921921 /* Increase "afraid" */
922922 if (p_ptr->state.resist_fear)
923923 {
924- msg_print(L"You stand your ground!");
924+ msg_print(__T("You stand your ground!"));
925925 object_notice_flag(1, TR1_RES_FEAR);
926926 obvious = TRUE;
927927 }
928928 else if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
929929 {
930- msg_print(L"You stand your ground!");
930+ msg_print(__T("You stand your ground!"));
931931 obvious = TRUE;
932932 }
933933 else
@@ -953,13 +953,13 @@
953953 /* Increase "paralyzed" */
954954 if (p_ptr->state.free_act)
955955 {
956- msg_print(L"You are unaffected!");
956+ msg_print(__T("You are unaffected!"));
957957 object_notice_flag(2, TR2_FREE_ACT);
958958 obvious = TRUE;
959959 }
960960 else if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
961961 {
962- msg_print(L"You resist the effects!");
962+ msg_print(__T("You resist the effects!"));
963963 obvious = TRUE;
964964 }
965965 else
@@ -1093,7 +1093,7 @@
10931093
10941094 if (p_ptr->state.hold_life && (randint0(100) < 95))
10951095 {
1096- msg_print(L"You keep hold of your life force!");
1096+ msg_print(__T("You keep hold of your life force!"));
10971097 object_notice_flag(2, TR2_HOLD_LIFE);
10981098 }
10991099 else
@@ -1101,13 +1101,13 @@
11011101 s32b d = damroll(10, 6) + (p_ptr->exp/100) * MON_DRAIN_LIFE;
11021102 if (p_ptr->state.hold_life)
11031103 {
1104- msg_print(L"You feel your life slipping away!");
1104+ msg_print(__T("You feel your life slipping away!"));
11051105 lose_exp(d/10);
11061106 object_notice_flag(2, TR2_HOLD_LIFE);
11071107 }
11081108 else
11091109 {
1110- msg_print(L"You feel your life draining away!");
1110+ msg_print(__T("You feel your life draining away!"));
11111111 lose_exp(d);
11121112 }
11131113 }
@@ -1124,7 +1124,7 @@
11241124
11251125 if (p_ptr->state.hold_life && (randint0(100) < 90))
11261126 {
1127- msg_print(L"You keep hold of your life force!");
1127+ msg_print(__T("You keep hold of your life force!"));
11281128 object_notice_flag(2, TR2_HOLD_LIFE);
11291129 }
11301130 else
@@ -1133,13 +1133,13 @@
11331133
11341134 if (p_ptr->state.hold_life)
11351135 {
1136- msg_print(L"You feel your life slipping away!");
1136+ msg_print(__T("You feel your life slipping away!"));
11371137 lose_exp(d / 10);
11381138 object_notice_flag(2, TR2_HOLD_LIFE);
11391139 }
11401140 else
11411141 {
1142- msg_print(L"You feel your life draining away!");
1142+ msg_print(__T("You feel your life draining away!"));
11431143 lose_exp(d);
11441144 }
11451145 }
@@ -1156,7 +1156,7 @@
11561156
11571157 if (p_ptr->state.hold_life && (randint0(100) < 75))
11581158 {
1159- msg_print(L"You keep hold of your life force!");
1159+ msg_print(__T("You keep hold of your life force!"));
11601160 object_notice_flag(2, TR2_HOLD_LIFE);
11611161 }
11621162 else
@@ -1165,13 +1165,13 @@
11651165
11661166 if (p_ptr->state.hold_life)
11671167 {
1168- msg_print(L"You feel your life slipping away!");
1168+ msg_print(__T("You feel your life slipping away!"));
11691169 lose_exp(d / 10);
11701170 object_notice_flag(2, TR2_HOLD_LIFE);
11711171 }
11721172 else
11731173 {
1174- msg_print(L"You feel your life draining away!");
1174+ msg_print(__T("You feel your life draining away!"));
11751175 lose_exp(d);
11761176 }
11771177 }
@@ -1188,7 +1188,7 @@
11881188
11891189 if (p_ptr->state.hold_life && (randint0(100) < 50))
11901190 {
1191- msg_print(L"You keep hold of your life force!");
1191+ msg_print(__T("You keep hold of your life force!"));
11921192 object_notice_flag(2, TR2_HOLD_LIFE);
11931193 }
11941194 else
@@ -1197,13 +1197,13 @@
11971197
11981198 if (p_ptr->state.hold_life)
11991199 {
1200- msg_print(L"You feel your life slipping away!");
1200+ msg_print(__T("You feel your life slipping away!"));
12011201 lose_exp(d / 10);
12021202 object_notice_flag(2, TR2_HOLD_LIFE);
12031203 }
12041204 else
12051205 {
1206- msg_print(L"You feel your life draining away!");
1206+ msg_print(__T("You feel your life draining away!"));
12071207 lose_exp(d);
12081208 }
12091209 }
@@ -1358,7 +1358,7 @@
13581358 /* Blink away */
13591359 if (blinked)
13601360 {
1361- msg_print(L"There is a puff of smoke!");
1361+ msg_print(__T("There is a puff of smoke!"));
13621362 teleport_away(m_idx, MAX_SIGHT * 2 + 5);
13631363 }
13641364
--- trunk/JBand/src/monster/melee2.cpp (revision 114)
+++ trunk/JBand/src/monster/melee2.cpp (revision 115)
@@ -1210,7 +1210,7 @@
12101210 disturb(1, 0);
12111211 if (blind) msg_format(L"%^s mumbles.", m_name);
12121212 else msg_format(L"%^s gestures fluidly.", m_name);
1213- msg_print(L"You are engulfed in a whirlpool.");
1213+ msg_print(__T("You are engulfed in a whirlpool."));
12141214 breath(m_idx, GF_WATER,
12151215 BA_WATE_DMG(rlev, RANDOMISE));
12161216 break;
@@ -1297,7 +1297,7 @@
12971297 disturb(1, 0);
12981298 if (!seen)
12991299 {
1300- msg_print(L"You feel something focusing on your mind.");
1300+ msg_print(__T("You feel something focusing on your mind."));
13011301 }
13021302 else
13031303 {
@@ -1306,11 +1306,11 @@
13061306
13071307 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
13081308 {
1309- msg_print(L"You resist the effects!");
1309+ msg_print(__T("You resist the effects!"));
13101310 }
13111311 else
13121312 {
1313- msg_print(L"Your mind is blasted by psionic energy.");
1313+ msg_print(__T("Your mind is blasted by psionic energy."));
13141314 if (!p_ptr->state.resist_confu)
13151315 (void)inc_timed(TMD_CONFUSED, randint0(4) + 4, TRUE);
13161316 else
@@ -1326,17 +1326,17 @@
13261326 if (!direct) break;
13271327 disturb(1, 0);
13281328 if (!seen)
1329- msg_print(L"You feel something focusing on your mind.");
1329+ msg_print(__T("You feel something focusing on your mind."));
13301330 else
1331- msg_format(L"%^s looks deep into your eyes.", m_name);
1331+ msg_format(__T("%^s looks deep into your eyes."), m_name);
13321332
13331333 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
13341334 {
1335- msg_print(L"You resist the effects!");
1335+ msg_print(__T("You resist the effects!"));
13361336 }
13371337 else
13381338 {
1339- msg_print(L"Your mind is blasted by psionic energy.");
1339+ msg_print(__T("Your mind is blasted by psionic energy."));
13401340 take_hit(BRAIN_SMASH_DMG(rlev, RANDOMISE), ddesc);
13411341 if (!p_ptr->state.resist_blind)
13421342 (void)inc_timed(TMD_BLIND, 8 + randint0(8), TRUE);
@@ -1366,7 +1366,7 @@
13661366 else msg_format(L"%^s points at you and curses.", m_name);
13671367 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
13681368 {
1369- msg_print(L"You resist the effects!");
1369+ msg_print(__T("You resist the effects!"));
13701370 }
13711371 else
13721372 {
@@ -1383,7 +1383,7 @@
13831383 else msg_format(L"%^s points at you and curses horribly.", m_name);
13841384 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
13851385 {
1386- msg_print(L"You resist the effects!");
1386+ msg_print(__T("You resist the effects!"));
13871387 }
13881388 else
13891389 {
@@ -1400,7 +1400,7 @@
14001400 else msg_format(L"%^s points at you, incanting terribly!", m_name);
14011401 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
14021402 {
1403- msg_print(L"You resist the effects!");
1403+ msg_print(__T("You resist the effects!"));
14041404 }
14051405 else
14061406 {
@@ -1417,7 +1417,7 @@
14171417 else msg_format(L"%^s points at you, screaming the word DIE!", m_name);
14181418 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
14191419 {
1420- msg_print(L"You resist the effects!");
1420+ msg_print(__T("You resist the effects!"));
14211421 }
14221422 else
14231423 {
@@ -1547,12 +1547,12 @@
15471547 else msg_format(L"%^s casts a fearful illusion.", m_name);
15481548 if (p_ptr->state.resist_fear)
15491549 {
1550- msg_print(L"You refuse to be frightened.");
1550+ msg_print(__T("You refuse to be frightened."));
15511551 object_notice_flag(1, TR1_RES_FEAR);
15521552 }
15531553 else if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
15541554 {
1555- msg_print(L"You refuse to be frightened.");
1555+ msg_print(__T("You refuse to be frightened."));
15561556 }
15571557 else
15581558 {
@@ -1570,12 +1570,12 @@
15701570 else msg_format(L"%^s casts a spell, burning your eyes!", m_name);
15711571 if (p_ptr->state.resist_blind)
15721572 {
1573- msg_print(L"You are unaffected!");
1573+ msg_print(__T("You are unaffected!"));
15741574 object_notice_flag(1, TR1_RES_BLIND);
15751575 }
15761576 else if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
15771577 {
1578- msg_print(L"You resist the effects!");
1578+ msg_print(__T("You resist the effects!"));
15791579 }
15801580 else
15811581 {
@@ -1593,12 +1593,12 @@
15931593 else msg_format(L"%^s creates a mesmerising illusion.", m_name);
15941594 if (p_ptr->state.resist_confu)
15951595 {
1596- msg_print(L"You disbelieve the feeble spell.");
1596+ msg_print(__T("You disbelieve the feeble spell."));
15971597 object_notice_flag(1, TR1_RES_CONFU);
15981598 }
15991599 else if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
16001600 {
1601- msg_print(L"You disbelieve the feeble spell.");
1601+ msg_print(__T("You disbelieve the feeble spell."));
16021602 }
16031603 else
16041604 {
@@ -1615,12 +1615,12 @@
16151615 msg_format(L"%^s drains power from your muscles!", m_name);
16161616 if (p_ptr->state.free_act)
16171617 {
1618- msg_print(L"You are unaffected!");
1618+ msg_print(__T("You are unaffected!"));
16191619 object_notice_flag(2, TR2_FREE_ACT);
16201620 }
16211621 else if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
16221622 {
1623- msg_print(L"You resist the effects!");
1623+ msg_print(__T("You resist the effects!"));
16241624 }
16251625 else
16261626 {
@@ -1638,12 +1638,12 @@
16381638 else msg_format(L"%^s stares deep into your eyes!", m_name);
16391639 if (p_ptr->state.free_act)
16401640 {
1641- msg_print(L"You are unaffected!");
1641+ msg_print(__T("You are unaffected!"));
16421642 object_notice_flag(2, TR2_FREE_ACT);
16431643 }
16441644 else if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
16451645 {
1646- msg_format(L"You resist the effects!");
1646+ msg_format(__T("You resist the effects!"));
16471647 }
16481648 else
16491649 {
@@ -1809,12 +1809,12 @@
18091809 else msg_format(L"%^s gestures at your feet.", m_name);
18101810 if (p_ptr->state.resist_nexus)
18111811 {
1812- msg_print(L"You are unaffected!");
1812+ msg_print(__T("You are unaffected!"));
18131813 object_notice_flag(1, TR1_RES_NEXUS);
18141814 }
18151815 else if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
18161816 {
1817- msg_print(L"You resist the effects!");
1817+ msg_print(__T("You resist the effects!"));
18181818 }
18191819 else
18201820 {
@@ -1857,7 +1857,7 @@
18571857 msg_format(L"%^s tries to blank your mind.", m_name);
18581858
18591859 if (randint0(100) < p_ptr->state.skills[SKILL_SAVE])
1860- msg_print(L"You resist the effects!");
1860+ msg_print(__T("You resist the effects!"));
18611861 else
18621862 inc_timed(TMD_AMNESIA, 3, TRUE);
18631863
@@ -1886,7 +1886,7 @@
18861886 }
18871887 if (blind && count)
18881888 {
1889- msg_print(L"You hear many things appear nearby.");
1889+ msg_print(__T("You hear many things appear nearby."));
18901890 }
18911891 break;
18921892 }
@@ -1903,7 +1903,7 @@
19031903 }
19041904 if (blind && count)
19051905 {
1906- msg_print(L"You hear many evil things appear nearby.");
1906+ msg_print(__T("You hear many evil things appear nearby."));
19071907 }
19081908 break;
19091909 }
@@ -1920,7 +1920,7 @@
19201920 }
19211921 if (blind && count)
19221922 {
1923- msg_print(L"You hear something appear nearby.");
1923+ msg_print(__T("You hear something appear nearby."));
19241924 }
19251925 break;
19261926 }
@@ -1937,7 +1937,7 @@
19371937 }
19381938 if (blind && count)
19391939 {
1940- msg_print(L"You hear many things appear nearby.");
1940+ msg_print(__T("You hear many things appear nearby."));
19411941 }
19421942 break;
19431943 }
@@ -1954,7 +1954,7 @@
19541954 }
19551955 if (blind && count)
19561956 {
1957- msg_print(L"You hear many things appear nearby.");
1957+ msg_print(__T("You hear many things appear nearby."));
19581958 }
19591959 break;
19601960 }
@@ -1971,7 +1971,7 @@
19711971 }
19721972 if (blind && count)
19731973 {
1974- msg_print(L"You hear many things appear nearby.");
1974+ msg_print(__T("You hear many things appear nearby."));
19751975 }
19761976 break;
19771977 }
@@ -1988,7 +1988,7 @@
19881988 }
19891989 if (blind && count)
19901990 {
1991- msg_print(L"You hear many things appear nearby.");
1991+ msg_print(__T("You hear many things appear nearby."));
19921992 }
19931993 break;
19941994 }
@@ -2005,7 +2005,7 @@
20052005 }
20062006 if (blind && count)
20072007 {
2008- msg_print(L"You hear many things appear nearby.");
2008+ msg_print(__T("You hear many things appear nearby."));
20092009 }
20102010 break;
20112011 }
@@ -2022,7 +2022,7 @@
20222022 }
20232023 if (blind && count)
20242024 {
2025- msg_print(L"You hear something appear nearby.");
2025+ msg_print(__T("You hear something appear nearby."));
20262026 }
20272027 break;
20282028 }
@@ -2039,7 +2039,7 @@
20392039 }
20402040 if (blind && count)
20412041 {
2042- msg_print(L"You hear something appear nearby.");
2042+ msg_print(__T("You hear something appear nearby."));
20432043 }
20442044 break;
20452045 }
@@ -2056,7 +2056,7 @@
20562056 }
20572057 if (blind && count)
20582058 {
2059- msg_print(L"You hear something appear nearby.");
2059+ msg_print(__T("You hear something appear nearby."));
20602060 }
20612061 break;
20622062 }
@@ -2073,7 +2073,7 @@
20732073 }
20742074 if (blind && count)
20752075 {
2076- msg_print(L"You hear something appear nearby.");
2076+ msg_print(__T("You hear something appear nearby."));
20772077 }
20782078 break;
20792079 }
@@ -2090,7 +2090,7 @@
20902090 }
20912091 if (blind && count)
20922092 {
2093- msg_print(L"You hear many creepy things appear nearby.");
2093+ msg_print(__T("You hear many creepy things appear nearby."));
20942094 }
20952095 break;
20962096 }
@@ -2107,7 +2107,7 @@
21072107 }
21082108 if (blind && count)
21092109 {
2110- msg_print(L"You hear many powerful things appear nearby.");
2110+ msg_print(__T("You hear many powerful things appear nearby."));
21112111 }
21122112 break;
21132113 }
@@ -2128,7 +2128,7 @@
21282128 }
21292129 if (blind && count)
21302130 {
2131- msg_print(L"You hear many creepy things appear nearby.");
2131+ msg_print(__T("You hear many creepy things appear nearby."));
21322132 }
21332133 break;
21342134 }
@@ -2149,7 +2149,7 @@
21492149 }
21502150 if (blind && count)
21512151 {
2152- msg_print(L"You hear many powerful things appear nearby.");
2152+ msg_print(__T("You hear many powerful things appear nearby."));
21532153 }
21542154 break;
21552155 }
@@ -3549,7 +3549,7 @@
35493549 if (randint0(m_ptr->hp / 10) > k)
35503550 {
35513551 /* Message */
3552- msg_print(L"You hear a door burst open!");
3552+ msg_print(__T("You hear a door burst open!"));
35533553
35543554 /* Disturb (sometimes) */
35553555 disturb(0, 0);
@@ -3594,7 +3594,7 @@
35943594 /* Describe observable breakage */
35953595 if (cave_info[ny][nx] & (CAVE_MARK))
35963596 {
3597- msg_print(L"The rune of protection is broken!");
3597+ msg_print(__T("The rune of protection is broken!"));
35983598 }
35993599
36003600 /* Forget the rune */
--- trunk/JBand/src/effects.cpp (revision 114)
+++ trunk/JBand/src/effects.cpp (revision 115)
@@ -102,7 +102,7 @@
102102 if (die > 100)
103103 {
104104 /* above 100 the effect is always visible */
105- msg_print(L"You feel a surge of power!");
105+ msg_print(__T("You feel a surge of power!"));
106106 visible = TRUE;
107107 }
108108
@@ -159,7 +159,7 @@
159159
160160 if (effect < 1 || effect > EF_MAX)
161161 {
162- msg_print(L"Bad effect passed to do_effect(). Please report this bug.");
162+ msg_print(__T("Bad effect passed to do_effect(). Please report this bug."));
163163 return FALSE;
164164 }
165165
@@ -402,7 +402,7 @@
402402 {
403403 if (p_ptr->exp < PY_MAX_EXP)
404404 {
405- msg_print(L"You feel more experienced.");
405+ msg_print(__T("You feel more experienced."));
406406 gain_exp(100000L);
407407 *ident = TRUE;
408408 }
@@ -413,7 +413,7 @@
413413 {
414414 if (!p_ptr->state.hold_life && (p_ptr->exp > 0))
415415 {
416- msg_print(L"You feel your memories fade.");
416+ msg_print(__T("You feel your memories fade."));
417417 lose_exp(p_ptr->exp / 4);
418418 *ident = TRUE;
419419 }
@@ -436,7 +436,7 @@
436436 {
437437 p_ptr->csp = p_ptr->msp;
438438 p_ptr->csp_frac = 0;
439- msg_print(L"Your feel your head clear.");
439+ msg_print(__T("Your feel your head clear."));
440440 p_ptr->redraw |= (PR_MANA);
441441 *ident = TRUE;
442442 }
@@ -569,7 +569,7 @@
569569
570570 case EF_CURE_NONORLYBIG:
571571 {
572- msg_print(L"You feel life flow through your body!");
572+ msg_print(__T("You feel life flow through your body!"));
573573 restore_level();
574574 (void)clear_timed(TMD_POISONED, TRUE);
575575 (void)clear_timed(TMD_BLIND, TRUE);
@@ -634,7 +634,7 @@
634634
635635 case EF_ENLIGHTENMENT:
636636 {
637- msg_print(L"An image of your surroundings forms in your mind...");
637+ msg_print(__T("An image of your surroundings forms in your mind..."));
638638 wiz_lite();
639639 *ident = TRUE;
640640 return TRUE;
@@ -642,7 +642,7 @@
642642
643643 case EF_ENLIGHTENMENT2:
644644 {
645- msg_print(L"You begin to feel more enlightened...");
645+ msg_print(__T("You begin to feel more enlightened..."));
646646 message_flush();
647647 wiz_lite();
648648 (void)do_inc_stat(A_INT);
@@ -658,7 +658,7 @@
658658
659659 case EF_SELF_KNOW:
660660 {
661- msg_print(L"You begin to know yourself a little better...");
661+ msg_print(__T("You begin to know yourself a little better..."));
662662 message_flush();
663663 self_knowledge(TRUE);
664664 *ident = TRUE;
@@ -809,9 +809,9 @@
809809 if (remove_curse())
810810 {
811811 if (!p_ptr->timed[TMD_BLIND])
812- msg_print(L"The air around your body glows blue for a moment...");
812+ msg_print(__T("The air around your body glows blue for a moment..."));
813813 else
814- msg_print(L"You feel as if someone is watching over you.");
814+ msg_print(__T("You feel as if someone is watching over you."));
815815
816816 *ident = TRUE;
817817 }
@@ -882,7 +882,7 @@
882882 {
883883 if (p_ptr->confusing == 0)
884884 {
885- msg_print(L"Your hands begin to glow.");
885+ msg_print(__T("Your hands begin to glow."));
886886 p_ptr->confusing = TRUE;
887887 *ident = TRUE;
888888 }
@@ -919,7 +919,7 @@
919919
920920 case EF_ANNOY_MON:
921921 {
922- msg_print(L"There is a high pitched humming noise.");
922+ msg_print(__T("There is a high pitched humming noise."));
923923 aggravate_monsters(0);
924924 *ident = TRUE;
925925 return TRUE;
@@ -932,7 +932,7 @@
932932 return TRUE;
933933
934934 trap_creation();
935- msg_print(L"You hear a low-pitched whistling sound.");
935+ msg_print(__T("You hear a low-pitched whistling sound."));
936936 *ident = TRUE;
937937 return TRUE;
938938 }
@@ -1038,11 +1038,11 @@
10381038 if (p_ptr->depth == 0)
10391039 {
10401040 set_recall();
1041- msg_print(L"The lower reaches of the dungeon beckon.");
1041+ msg_print(__T("The lower reaches of the dungeon beckon."));
10421042 }
10431043 else
10441044 {
1045- message(MSG_TPLEVEL, 0, L"You sink through the floor...");
1045+ message(MSG_TPLEVEL, 0, __T("You sink through the floor..."));
10461046 dungeon_change_level(p_ptr->max_depth);
10471047 }
10481048
@@ -1449,7 +1449,7 @@
14491449 }
14501450 case EF_LIGHT_LINE:
14511451 {
1452- msg_print(L"A line of shimmering blue light appears.");
1452+ msg_print(__T("A line of shimmering blue light appears."));
14531453 lite_line(dir);
14541454 *ident = TRUE;
14551455 return TRUE;
@@ -1478,7 +1478,7 @@
14781478 {
14791479 int i;
14801480 if (!p_ptr->timed[TMD_BLIND])
1481- msg_print(L"Light shoots in all directions!");
1481+ msg_print(__T("Light shoots in all directions!"));
14821482 for (i = 0; i < 8; i++) lite_line(ddd[i]);
14831483 *ident = TRUE;
14841484 return TRUE;
@@ -1524,7 +1524,7 @@
15241524 p_ptr->csp = p_ptr->msp;
15251525 p_ptr->csp_frac = 0;
15261526 *ident = TRUE;
1527- msg_print(L"Your feel your head clear.");
1527+ msg_print(__T("Your feel your head clear."));
15281528 p_ptr->redraw |= (PR_MANA);
15291529 }
15301530 return TRUE;
@@ -1555,20 +1555,20 @@
15551555 }
15561556 case EF_DRINK_GOOD:
15571557 {
1558- msg_print(L"You feel less thirsty.");
1558+ msg_print(__T("You feel less thirsty."));
15591559 *ident = TRUE;
15601560 return TRUE;
15611561 }
15621562 case EF_DRINK_DEATH:
15631563 {
1564- msg_print(L"A feeling of Death flows through your body.");
1565- take_hit(5000, L"a potion of Death");
1564+ msg_print(__T("A feeling of Death flows through your body."));
1565+ take_hit(5000, __T("a potion of Death"));
15661566 *ident = TRUE;
15671567 return TRUE;
15681568 }
15691569 case EF_DRINK_RUIN:
15701570 {
1571- msg_print(L"Your nerves and muscles feel weak and lifeless!");
1571+ msg_print(__T("Your nerves and muscles feel weak and lifeless!"));
15721572 take_hit(damroll(10, 10), L"a potion of Ruination");
15731573 (void)dec_stat(A_DEX, TRUE);
15741574 (void)dec_stat(A_WIS, TRUE);
@@ -1581,7 +1581,7 @@
15811581 }
15821582 case EF_DRINK_DETONATE:
15831583 {
1584- msg_print(L"Massive explosions rupture your body!");
1584+ msg_print(__T("Massive explosions rupture your body!"));
15851585 take_hit(damroll(50, 20), L"a potion of Detonation");
15861586 (void)inc_timed(TMD_STUN, 75, TRUE);
15871587 (void)inc_timed(TMD_CUT, 5000, TRUE);
@@ -1590,7 +1590,7 @@
15901590 }
15911591 case EF_DRINK_SALT:
15921592 {
1593- msg_print(L"The potion makes you vomit!");
1593+ msg_print(__T("The potion makes you vomit!"));
15941594 (void)set_food(PY_FOOD_STARVE - 1);
15951595 (void)clear_timed(TMD_POISONED, TRUE);
15961596 (void)inc_timed(TMD_PARALYZED, 4, TRUE);
@@ -1599,13 +1599,13 @@
15991599 }
16001600 case EF_FOOD_GOOD:
16011601 {
1602- msg_print(L"That tastes good.");
1602+ msg_print(__T("That tastes good."));
16031603 *ident = TRUE;
16041604 return TRUE;
16051605 }
16061606 case EF_FOOD_WAYBREAD:
16071607 {
1608- msg_print(L"That tastes good.");
1608+ msg_print(__T("That tastes good."));
16091609 (void)clear_timed(TMD_POISONED, TRUE);
16101610 (void)hp_player(damroll(4, 8));
16111611 *ident = TRUE;
@@ -1640,7 +1640,7 @@
16401640 {
16411641 p_ptr->csp = p_ptr->msp;
16421642 p_ptr->csp_frac = 0;
1643- msg_print(L"Your feel your head clear.");
1643+ msg_print(__T("Your feel your head clear."));
16441644 p_ptr->redraw |= (PR_MANA);
16451645 *ident = TRUE;
16461646 }
@@ -1693,7 +1693,7 @@
16931693 case EF_DRAGON_BLUE:
16941694 {
16951695 sound(MSG_BR_ELEC);
1696- msg_print(L"You breathe lightning.");
1696+ msg_print(__T("You breathe lightning."));
16971697 fire_ball(GF_ELEC, dir, 100, 2);
16981698 return TRUE;
16991699 }
@@ -1700,7 +1700,7 @@
17001700 case EF_DRAGON_GREEN:
17011701 {
17021702 sound(MSG_BR_GAS);
1703- msg_print(L"You breathe poison gas.");
1703+ msg_print(__T("You breathe poison gas."));
17041704 fire_ball(GF_POIS, dir, 150, 2);
17051705 return TRUE;
17061706 }
@@ -1707,7 +1707,7 @@
17071707 case EF_DRAGON_RED:
17081708 {
17091709 sound(MSG_BR_FIRE);
1710- msg_print(L"You breathe fire.");
1710+ msg_print(__T("You breathe fire."));
17111711 fire_ball(GF_FIRE, dir, 200, 2);
17121712 return TRUE;
17131713 }
@@ -1736,7 +1736,7 @@
17361736 case EF_DRAGON_BRONZE:
17371737 {
17381738 sound(MSG_BR_CONF);
1739- msg_print(L"You breathe confusion.");
1739+ msg_print(__T("You breathe confusion."));
17401740 fire_ball(GF_CONFUSION, dir, 120, 2);
17411741 return TRUE;
17421742 }
@@ -1743,7 +1743,7 @@
17431743 case EF_DRAGON_GOLD:
17441744 {
17451745 sound(MSG_BR_SOUND);
1746- msg_print(L"You breathe sound.");
1746+ msg_print(__T("You breathe sound."));
17471747 fire_ball(GF_SOUND, dir, 130, 2);
17481748 return TRUE;
17491749 }
@@ -1792,7 +1792,7 @@
17921792 case EF_DRAGON_POWER:
17931793 {
17941794 sound(MSG_BR_ELEMENTS);
1795- msg_print(L"You breathe the elements.");
1795+ msg_print(__T("You breathe the elements."));
17961796 fire_ball(GF_MISSILE, dir, 300, 2);
17971797 return TRUE;
17981798 }
@@ -1820,6 +1820,6 @@
18201820 break;
18211821 }
18221822 /* Not used */
1823- msg_print(L"Effect not handled.");
1823+ msg_print(__T("Effect not handled."));
18241824 return FALSE;
18251825 }
--- trunk/JBand/src/wiz-spoil.cpp (revision 114)
+++ trunk/JBand/src/wiz-spoil.cpp (revision 115)
@@ -248,7 +248,7 @@
248248 /* Oops */
249249 if (!fh)
250250 {
251- msg_print(L"Cannot create spoiler file.");
251+ msg_print(__T("Cannot create spoiler file."));
252252 return;
253253 }
254254
@@ -335,12 +335,12 @@
335335 /* Check for errors */
336336 if (!file_close(fh))
337337 {
338- msg_print(L"Cannot close spoiler file.");
338+ msg_print(__T("Cannot close spoiler file."));
339339 return;
340340 }
341341
342342 /* Message */
343- msg_print(L"Successfully created a spoiler file.");
343+ msg_print(__T("Successfully created a spoiler file."));
344344 }
345345
346346 /*
@@ -439,7 +439,7 @@
439439 /* Oops */
440440 if (!fh)
441441 {
442- msg_print(L"Cannot create spoiler file.");
442+ msg_print(__T("Cannot create spoiler file."));
443443 return;
444444 }
445445
@@ -506,12 +506,12 @@
506506 /* Check for errors */
507507 if (!file_close(fh))
508508 {
509- msg_print(L"Cannot close spoiler file.");
509+ msg_print(__T("Cannot close spoiler file."));
510510 return;
511511 }
512512
513513 /* Message */
514- msg_print(L"Successfully created a spoiler file.");
514+ msg_print(__T("Successfully created a spoiler file."));
515515 }
516516
517517 /*
@@ -541,7 +541,7 @@
541541 /* Oops */
542542 if (!fh)
543543 {
544- msg_print(L"Cannot create spoiler file.");
544+ msg_print(__T("Cannot create spoiler file."));
545545 return;
546546 }
547547
@@ -634,12 +634,12 @@
634634 /* Check for errors */
635635 if (!file_close(fh))
636636 {
637- msg_print(L"Cannot close spoiler file.");
637+ msg_print(__T("Cannot close spoiler file."));
638638 return;
639639 }
640640
641641 /* Worked */
642- msg_print(L"Successfully created a spoiler file.");
642+ msg_print(__T("Successfully created a spoiler file."));
643643 }
644644
645645 /*
@@ -664,7 +664,7 @@
664664 /* Oops */
665665 if (!fh)
666666 {
667- msg_print(L"Cannot create spoiler file.");
667+ msg_print(__T("Cannot create spoiler file."));
668668 return;
669669 }
670670
@@ -768,10 +768,10 @@
768768 /* Check for errors */
769769 if (!file_close(fh))
770770 {
771- msg_print(L"Cannot close spoiler file.");
771+ msg_print(__T("Cannot close spoiler file."));
772772 return;
773773 }
774- msg_print(L"Successfully created a spoiler file.");
774+ msg_print(__T("Successfully created a spoiler file."));
775775 }
776776
777777 /*
@@ -791,16 +791,16 @@
791791 Term_clear();
792792
793793 /* Info */
794- prt(L"Create a spoiler file.", 2, 0);
794+ prt(__T("Create a spoiler file."), 2, 0);
795795
796796 /* Prompt for a file */
797- prt(L"(1) Brief Object Info (obj-desc.spo)", 5, 5);
798- prt(L"(2) Brief Artifact Info (artifact.spo)", 6, 5);
799- prt(L"(3) Brief Monster Info (mon-desc.spo)", 7, 5);
800- prt(L"(4) Full Monster Info (mon-info.spo)", 8, 5);
797+ prt(__T("(1) Brief Object Info (obj-desc.spo)"), 5, 5);
798+ prt(__T("(2) Brief Artifact Info (artifact.spo)"), 6, 5);
799+ prt(__T("(3) Brief Monster Info (mon-desc.spo)"), 7, 5);
800+ prt(__T("(4) Full Monster Info (mon-info.spo)"), 8, 5);
801801
802802 /* Prompt */
803- prt(L"Command: ", 12, 0);
803+ prt(__T("Command: "), 12, 0);
804804
805805 /* Get a choice */
806806 ch = inkey();
Show on old repository browser