ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/player.h
(Generate patch)

Comparing deliantra/server/include/player.h (file contents):
Revision 1.68 by root, Thu Aug 16 06:36:56 2007 UTC vs.
Revision 1.71 by root, Sat Aug 25 22:19:26 2007 UTC

170 /* MAP_CLIENT_.., the upper left is used */ 170 /* MAP_CLIENT_.., the upper left is used */
171 171
172 shstr ACC (RW, invis_race); /* What race invisible to? */ 172 shstr ACC (RW, invis_race); /* What race invisible to? */
173 173
174 MTH static player *create (); 174 MTH static player *create ();
175 static player *find (const char *name);
175 176
176 static player *load_pl (object_thawer &thawer); 177 static player *load_pl (object_thawer &thawer);
177 MTH static player *load_pl (const char *path); 178 MTH static player *load_pl (const char *path);
178 179
179 bool save_pl (object_freezer &freezer); 180 bool save_pl (object_freezer &freezer);
209 } 210 }
210 211
211 // a prominent box that can easily be escaped away or so 212 // a prominent box that can easily be escaped away or so
212 // should be used for informative output such as who, maps etc. 213 // should be used for informative output such as who, maps etc.
213 // will stay on-screen 214 // will stay on-screen
214 void infobox (const char *msg, int color = NDI_BLACK) 215 void infobox (const char *title, const char *msg, int color = NDI_BLACK)
215 { 216 {
216 send_msg (NDI_REPLY, LOG_CHANNEL, msg); 217 send_msg (NDI_REPLY, LOG_CHANNEL, msg);
217 } 218 }
218 219
219 // a prominent msg that signifies some important event, 220 // a prominent msg that signifies some important event,
224 send_msg (NDI_REPLY | color, INFO_CHANNEL, msg); 225 send_msg (NDI_REPLY | color, INFO_CHANNEL, msg);
225 } 226 }
226 227
227 // a prominent box that signifies some error such as a failed 228 // a prominent box that signifies some error such as a failed
228 // improvement potion. should not be long. 229 // improvement potion. should not be long.
229 void errormsg (const char *msg, int color = NDI_RED) 230 void failmsg (const char *msg, int color = NDI_RED)
230 { 231 {
231 play_sound (sound_find ("errormsg")); 232 play_sound (sound_find ("generic_failure"));
232 statusmsg (msg, color); 233 statusmsg (msg, color);
233 } 234 }
234 235
235 ~player (); 236 ~player ();
236 237
252{ 253{
253 if (expect_true (contr)) contr->statusmsg (msg, color); 254 if (expect_true (contr)) contr->statusmsg (msg, color);
254} 255}
255 256
256inline void 257inline void
257object::errormsg (const char *msg, int color) 258object::failmsg (const char *msg, int color)
258{ 259{
259 if (expect_true (contr)) contr->errormsg (msg, color); 260 if (expect_true (contr)) contr->failmsg (msg, color);
260} 261}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines