… | |
… | |
419 | sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); |
419 | sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); |
420 | else |
420 | else |
421 | sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); |
421 | sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); |
422 | } |
422 | } |
423 | |
423 | |
|
|
424 | // formerly a macro, used only by magic map, so optimised it out |
|
|
425 | static inline faceidx |
|
|
426 | GET_MAP_FACE (maptile *m, int x, int y, int layer) |
|
|
427 | { |
|
|
428 | if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) |
|
|
429 | return op->face; |
|
|
430 | else |
|
|
431 | return 0; |
|
|
432 | } |
|
|
433 | |
424 | /** |
434 | /** |
425 | * Helper for magic map creation. |
435 | * Helper for magic map creation. |
426 | * |
436 | * |
427 | * Takes a player, the map_mark array and an x and y starting position. |
437 | * Takes a player, the map_mark array and an x and y starting position. |
428 | * pl is the player. |
438 | * pl is the player. |