diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 22:31:01 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 22:31:01 +0000 |
commit | cc279c7aa6e04db390bed9bc28f3d2f48f2ea6d7 (patch) | |
tree | 1cfe922ec090a5eef886ca592616dab1e8190997 | |
parent | 54aec4d505c1ae364d89c2b464b24204c24e1f96 (diff) | |
download | crawl-ref-cc279c7aa6e04db390bed9bc28f3d2f48f2ea6d7.tar.gz crawl-ref-cc279c7aa6e04db390bed9bc28f3d2f48f2ea6d7.zip |
Kill hard tabs, and add whitespace fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6158 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/format.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/guic-x11.cc | 16 | ||||
-rw-r--r-- | crawl-ref/source/guic.h | 10 | ||||
-rw-r--r-- | crawl-ref/source/initfile.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/libgui.h | 6 | ||||
-rw-r--r-- | crawl-ref/source/libx11.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/store.cc | 20 |
7 files changed, 33 insertions, 33 deletions
diff --git a/crawl-ref/source/format.cc b/crawl-ref/source/format.cc index d5d34fd768..e4280e5038 100644 --- a/crawl-ref/source/format.cc +++ b/crawl-ref/source/format.cc @@ -232,11 +232,11 @@ void formatted_string::parse_string1( } else { - colour_stack.push_back(get_colour(tagtext)); + colour_stack.push_back(get_colour(tagtext)); } // fs.cprintf("%d%d", colour_stack.size(), colour_stack.back()); - fs.textcolor(colour_stack.back()); + fs.textcolor(colour_stack.back()); tag += tagtext.length() + 1; } diff --git a/crawl-ref/source/guic-x11.cc b/crawl-ref/source/guic-x11.cc index 9093600d59..315cfb37b3 100644 --- a/crawl-ref/source/guic-x11.cc +++ b/crawl-ref/source/guic-x11.cc @@ -163,7 +163,7 @@ void MapRegionClass::resize_backbuf() } void TextRegionClass::draw_string(int x, int y, unsigned char *buf, - int len, int col) + int len, int col) { XFillRectangle(display, win->win, term_gc[col>>4], x*dx+ox, y*dy+oy, dx * len, dy); @@ -1040,9 +1040,9 @@ XImage *read_png (const char *fname) (info_ptr->sig_bit.red != info_ptr->sig_bit.green || info_ptr->sig_bit.red != info_ptr->sig_bit.blue) ) { - pm_message ("different bit depths for color channels not " + pm_message ("different bit depths for color channels not " "supported"); - pm_message ("writing file with %d bit resolution", + pm_message ("writing file with %d bit resolution", info_ptr->bit_depth); } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE @@ -1050,16 +1050,16 @@ XImage *read_png (const char *fname) { for (i = 0 ; i < info_ptr->num_palette ; i++) { - info_ptr->palette[i].red >>= (8 - info_ptr->sig_bit.red); - info_ptr->palette[i].green >>= (8 - info_ptr->sig_bit.green); - info_ptr->palette[i].blue >>= (8 - info_ptr->sig_bit.blue); - } + info_ptr->palette[i].red >>= (8 - info_ptr->sig_bit.red); + info_ptr->palette[i].green >>= (8 - info_ptr->sig_bit.green); + info_ptr->palette[i].blue >>= (8 - info_ptr->sig_bit.blue); + } } else if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) && info_ptr->sig_bit.gray < info_ptr->bit_depth) { - png_set_shift (png_ptr, &(info_ptr->sig_bit)); + png_set_shift (png_ptr, &(info_ptr->sig_bit)); } } diff --git a/crawl-ref/source/guic.h b/crawl-ref/source/guic.h index 68b5190972..8aff4756ed 100644 --- a/crawl-ref/source/guic.h +++ b/crawl-ref/source/guic.h @@ -135,15 +135,15 @@ class WinClass void move(); // place Regions inside it - void placeRegion(class RegionClass *r, int layer, - class RegionClass *neighbor, + void placeRegion(class RegionClass *r, int layer, + class RegionClass *neighbor, int pflag, - int margin_top = 0, int margin_left = 0, + int margin_top = 0, int margin_left = 0, int margin_bottom = 0, int margin_right = 0); - void placeRegion(class RegionClass *r, int layer, + void placeRegion(class RegionClass *r, int layer, int x, int y, - int margin_top = 0, int margin_left = 0, + int margin_top = 0, int margin_left = 0, int margin_bottom = 0, int margin_right = 0); void removeRegion(class RegionClass *r); diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index d759d130d2..bbf41a480c 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -2574,8 +2574,8 @@ void game_options::read_option_line(const std::string &str, bool runscript) else BOOL_OPTION(explore_greedy); else BOOL_OPTION(explore_improved); - BOOL_OPTION(trap_prompt); - else if (key == "stash_tracking") + BOOL_OPTION(trap_prompt); + else if (key == "stash_tracking") { stash_tracking = field == "dropped" ? STM_DROPPED : diff --git a/crawl-ref/source/libgui.h b/crawl-ref/source/libgui.h index 49cf753940..30bbafdf3f 100644 --- a/crawl-ref/source/libgui.h +++ b/crawl-ref/source/libgui.h @@ -56,13 +56,13 @@ class mouse_control public: mouse_control(int mode) { - oldmode = mouse_get_mode(); - mouse_set_mode(mode); + oldmode = mouse_get_mode(); + mouse_set_mode(mode); } ~mouse_control() { - mouse_set_mode(oldmode); + mouse_set_mode(oldmode); } private: int oldmode; diff --git a/crawl-ref/source/libx11.cc b/crawl-ref/source/libx11.cc index 43ac0ed644..aec3c53221 100644 --- a/crawl-ref/source/libx11.cc +++ b/crawl-ref/source/libx11.cc @@ -250,9 +250,9 @@ int x11_keypress(XKeyEvent *xev) const unsigned int ck_table[9] = { - CK_END, CK_DOWN, CK_PGDN, - CK_LEFT, CK_INSERT, CK_RIGHT, - CK_HOME, CK_UP, CK_PGUP + CK_END, CK_DOWN, CK_PGDN, + CK_LEFT, CK_INSERT, CK_RIGHT, + CK_HOME, CK_UP, CK_PGUP }; int dir, base; diff --git a/crawl-ref/source/store.cc b/crawl-ref/source/store.cc index eadfc1a5d9..c64345c9c6 100644 --- a/crawl-ref/source/store.cc +++ b/crawl-ref/source/store.cc @@ -772,16 +772,16 @@ const CrawlStoreValue &CrawlStoreValue::operator ///////////////////// // Typecast operators #if _MSC_VER -CrawlStoreValue::operator bool&() { return get_bool(); } -CrawlStoreValue::operator char&() { return get_byte(); } -CrawlStoreValue::operator short&() { return get_short(); } -CrawlStoreValue::operator float&() { return get_float(); } -CrawlStoreValue::operator long&() { return get_long(); } -CrawlStoreValue::operator std::string&() { return get_string(); } -CrawlStoreValue::operator coord_def&() { return get_coord(); } -CrawlStoreValue::operator CrawlHashTable&() { return get_table(); } -CrawlStoreValue::operator CrawlVector&() { return get_vector(); } -CrawlStoreValue::operator item_def&() { return get_item(); } +CrawlStoreValue::operator bool&() { return get_bool(); } +CrawlStoreValue::operator char&() { return get_byte(); } +CrawlStoreValue::operator short&() { return get_short(); } +CrawlStoreValue::operator float&() { return get_float(); } +CrawlStoreValue::operator long&() { return get_long(); } +CrawlStoreValue::operator std::string&() { return get_string(); } +CrawlStoreValue::operator coord_def&() { return get_coord(); } +CrawlStoreValue::operator CrawlHashTable&() { return get_table(); } +CrawlStoreValue::operator CrawlVector&() { return get_vector(); } +CrawlStoreValue::operator item_def&() { return get_item(); } #else &CrawlStoreValue::operator bool() { |