diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-10-25 15:38:46 -0500 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-10-25 15:38:46 -0500 |
| commit | ce5cd1e9df7f220ee7d07b285b76473ec9fb928f (patch) | |
| tree | 9f56ef300bc15746c2cde58dcbd09c2df1bdac95 /crawl-ref/source/mpr.h | |
| parent | 71b738e8b44d6dad14c29bc898eff2ac700e9e1e (diff) | |
| parent | 5efc2ebb172e0046e26e8b4a5114359f2e217628 (diff) | |
| download | crawl-ref-ce5cd1e9df7f220ee7d07b285b76473ec9fb928f.tar.gz crawl-ref-ce5cd1e9df7f220ee7d07b285b76473ec9fb928f.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/Makefile.obj
crawl-ref/source/dbg-scan.cc
crawl-ref/source/decks.cc
crawl-ref/source/describe.cc
crawl-ref/source/directn.cc
crawl-ref/source/evoke.cc
crawl-ref/source/fight.cc
crawl-ref/source/fight.h
crawl-ref/source/ghost.cc
crawl-ref/source/ghost.h
crawl-ref/source/item_use.cc
crawl-ref/source/items.cc
crawl-ref/source/map_knowledge.cc
crawl-ref/source/melee_attack.h
crawl-ref/source/mon-abil.cc
crawl-ref/source/mon-act.cc
crawl-ref/source/mon-stuff.cc
crawl-ref/source/monster.cc
crawl-ref/source/monster.h
crawl-ref/source/player.cc
crawl-ref/source/player.h
crawl-ref/source/shopping.cc
crawl-ref/source/spl-damage.cc
crawl-ref/source/spl-summoning.cc
crawl-ref/source/spl-transloc.cc
crawl-ref/source/stairs.cc
crawl-ref/source/stuff.cc
crawl-ref/source/tags.cc
crawl-ref/source/traps.cc
crawl-ref/source/xom.cc
Diffstat (limited to 'crawl-ref/source/mpr.h')
| -rw-r--r-- | crawl-ref/source/mpr.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/mpr.h b/crawl-ref/source/mpr.h index 2566f82489..d978079a90 100644 --- a/crawl-ref/source/mpr.h +++ b/crawl-ref/source/mpr.h @@ -85,9 +85,9 @@ inline void mprnojoin(std::string text, msg_channel_type channel=MSGCH_PLAIN, } // 4.1-style mpr, currently named mprf for minimal disruption. -void mprf(msg_channel_type channel, int param, const char *format, ...); -void mprf(msg_channel_type channel, const char *format, ...); -void mprf(const char *format, ...); +void mprf(msg_channel_type channel, int param, PRINTF(2, )); +void mprf(msg_channel_type channel, PRINTF(1, )); +void mprf(PRINTF(0, )); void mprf_nocap(msg_channel_type channel, int param, const char *format, ...); void mprf_nocap(msg_channel_type channel, const char *format, ...); @@ -95,7 +95,7 @@ void mprf_nocap(const char *format, ...); // Yay for C89 and lack of variadic #defines... #ifdef DEBUG_DIAGNOSTICS -void dprf(const char *format, ...); +void dprf(PRINTF(0, )); #else # define dprf(...) ((void)0) #endif |