| … | |
… | |
| 113 | { |
113 | { |
| 114 | if (operate_altar (altar, &money)) |
114 | if (operate_altar (altar, &money)) |
| 115 | { |
115 | { |
| 116 | identify (marked); |
116 | identify (marked); |
| 117 | |
117 | |
| 118 | buf.printf ("You have %s.", long_desc (marked, pl)); |
118 | buf.printf ("You have %s.\n\n", long_desc (marked, pl)); |
| 119 | if (marked->msg) |
119 | if (marked->msg) |
| 120 | buf << "The item has a story:\n" << marked->msg; |
120 | buf << "The item has a story:\n\n" << marked->msg << "\n\n"; |
| 121 | |
121 | |
| 122 | return !money; |
122 | return !money; |
| 123 | } |
123 | } |
| 124 | } |
124 | } |
| 125 | |
125 | |
| … | |
… | |
| 129 | { |
129 | { |
| 130 | if (operate_altar (altar, &money)) |
130 | if (operate_altar (altar, &money)) |
| 131 | { |
131 | { |
| 132 | identify (id); |
132 | identify (id); |
| 133 | |
133 | |
| 134 | buf.printf ("You have %s.", long_desc (id, pl)); |
134 | buf.printf ("You have %s.\n\n", long_desc (id, pl)); |
| 135 | if (id->msg) |
135 | if (id->msg) |
| 136 | buf << "The item has a story:\n" << id->msg; |
136 | buf << "The item has a story:\n\n" << id->msg << "\n\n"; |
| 137 | |
137 | |
| 138 | /* If no more money, might as well quit now */ |
138 | /* If no more money, might as well quit now */ |
| 139 | if (!money || !check_altar_sacrifice (altar, money)) |
139 | if (!money || !check_altar_sacrifice (altar, money)) |
| 140 | break; |
140 | break; |
| 141 | } |
141 | } |
| … | |
… | |
| 146 | } |
146 | } |
| 147 | } |
147 | } |
| 148 | } |
148 | } |
| 149 | |
149 | |
| 150 | if (buf.empty ()) |
150 | if (buf.empty ()) |
| 151 | buf << ("You have nothing that needs identifying"); |
151 | pl->failmsg ("You have nothing that needs identifying"); |
| 152 | |
152 | else |
| 153 | pl->contr->infobox ("Identify", buf); |
153 | pl->contr->infobox (MSG_CHANNEL ("identify"), buf); |
| 154 | |
154 | |
| 155 | return !money; |
155 | return !money; |
| 156 | } |
156 | } |
| 157 | |
157 | |
| 158 | /** |
158 | /** |
| … | |
… | |
| 2278 | |
2278 | |
| 2279 | #if 0 //TODO |
2279 | #if 0 //TODO |
| 2280 | if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) |
2280 | if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) |
| 2281 | return 0; /* This is a reset town portal */ |
2281 | return 0; /* This is a reset town portal */ |
| 2282 | #endif |
2282 | #endif |
|
|
2283 | |
|
|
2284 | LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ()); |
| 2283 | |
2285 | |
| 2284 | maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); |
2286 | maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); |
| 2285 | |
2287 | |
| 2286 | if (exitmap) |
2288 | if (exitmap) |
| 2287 | { |
2289 | { |
