diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-04-26 08:47:05 -0500 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-04-26 08:47:05 -0500 |
| commit | 809ea63fb87708fcb763492e2da99188679ed0f4 (patch) | |
| tree | de25799e8538d30d4eb5dcfa37a7bc328ea491c3 /crawl-ref/source/format.h | |
| parent | 77b621a0ace27951fc2f24ab357f69430bcbfd67 (diff) | |
| parent | 96f00b85b9271dade59c577353651eca1e88e0cd (diff) | |
| download | crawl-ref-809ea63fb87708fcb763492e2da99188679ed0f4.tar.gz crawl-ref-809ea63fb87708fcb763492e2da99188679ed0f4.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/actor.cc
crawl-ref/source/delay.cc
crawl-ref/source/directn.cc
crawl-ref/source/directn.h
crawl-ref/source/fight.cc
crawl-ref/source/files.cc
crawl-ref/source/mon-act.cc
crawl-ref/source/monster.cc
crawl-ref/source/mpr.h
crawl-ref/source/player.cc
crawl-ref/source/shopping.cc
Diffstat (limited to 'crawl-ref/source/format.h')
| -rw-r--r-- | crawl-ref/source/format.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/crawl-ref/source/format.h b/crawl-ref/source/format.h index 771c190e9a..02e70c3137 100644 --- a/crawl-ref/source/format.h +++ b/crawl-ref/source/format.h @@ -1,8 +1,3 @@ -/* - * File: format.h - * Created by: haranp on Sat Feb 17 13:35:54 2007 UTC - */ - #ifndef __FORMAT_H__ #define __FORMAT_H__ @@ -34,7 +29,8 @@ public: void cprintf(const std::string &s); void add_glyph(glyph g); void textcolor(int color); - formatted_string substr(size_t index, size_t length=std::string::npos) const; + formatted_string chop(int length) const; + void del_char(); void all_caps(); void capitalize(); @@ -43,7 +39,7 @@ public: void swap(formatted_string& other); - std::string::size_type length() const; + int width() const; std::string html_dump() const; bool operator < (const formatted_string &other) const; @@ -104,8 +100,6 @@ public: int count_linebreaks(const formatted_string& fs); int tagged_string_tag_length(const std::string& s); -int tagged_string_printable_length(const std::string& s); -std::string tagged_string_substr(const std::string& s, int start, int end); void display_tagged_block(const std::string& s); #endif |