From fa763ba1bc7285247a5b1438d59633383a80cf6c Mon Sep 17 00:00:00 2001 From: zelgadis Date: Sat, 15 Sep 2007 23:33:50 +0000 Subject: Split off portions of externs.h and enum.h into other files. The crawl_environment, player and monsters classes have been left in externs.h, which necessitates that all of the enums references by those classes stay in enums.h, since you can't forward declare an enum. However, it's a start. Also, portions of misc.{cc,h} have been split off into traps.{cc,h}, place.{cc,h} and terrain.{cc,h} git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2095 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/message.h | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'crawl-ref/source/message.h') diff --git a/crawl-ref/source/message.h b/crawl-ref/source/message.h index 92ad895d21..3eb6d9dd2f 100644 --- a/crawl-ref/source/message.h +++ b/crawl-ref/source/message.h @@ -18,7 +18,8 @@ #include #include -#include "externs.h" +#include "enum.h" +#include "mpr.h" struct message_item { msg_channel_type channel; // message channel @@ -45,18 +46,6 @@ void mesclr( bool force = false ); void more(void); -// last updated 12may2000 {dlb} -/* *********************************************************************** - * called from: ability - acr - bang - beam - chardump - command - debug - - * decks - direct - effects - fight - files - food - it_use2 - - * it_use3 - item_use - items - macro - misc - monplace - - * monstuff - mstuff2 - mutation - ouch - overmap - player - - * religion - shopping - skills - spell - spl-book - spells - - * spells1 - spells2 - spells3 - spells4 - stuff - transfor - - * view - * *********************************************************************** */ -void mpr(const char *inf, msg_channel_type channel = MSGCH_PLAIN, int param=0); - class formatted_string; void formatted_mpr(const formatted_string& fs, @@ -74,11 +63,6 @@ void mpr_comma_separated_list(const std::string prefix, const msg_channel_type channel = MSGCH_PLAIN, const int param = 0); -// 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, ... ); - class no_messages { public: -- cgit v1.2.3-54-g00ecf