Chance function(void) to function()

75 files changed, 196 insertions, 196 deletions

diff --git a/crawl-ref/source/ability.h b/crawl-ref/source/ability.h
index a07ba12f4e..2780bc25f1 100644
--- a/crawl-ref/source/ability.h
+++ b/crawl-ref/source/ability.h
@@ -91,9 +91,9 @@ bool check_ability_possible(const ability_type ability, bool hungerCheck = true,
 bool activate_talent(const talent& tal);
 vector<talent> your_talents(bool check_confused, bool include_unusable = false);
 bool string_matches_ability_name(const string& key);
-string print_abilities(void);
+string print_abilities();
 
-void set_god_ability_slots(void);
+void set_god_ability_slots();
 vector<ability_type> get_god_abilities(bool include_unusable = false,
                                        bool ignore_piety = false);
 
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index f7ae34c70b..b425cc2ae5 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -71,8 +71,8 @@ static sample_queue abyss_sample_queue;
 static vector<dungeon_feature_type> abyssal_features;
 static list<monster*> displaced_monsters;
 
-static void abyss_area_shift(void);
-static void _push_items(void);
+static void abyss_area_shift();
+static void _push_items();
 static void _push_displaced_monster(monster* mon);
 
 // If not_seen is true, don't place the feature where it can be seen from
@@ -1356,7 +1356,7 @@ void set_abyss_state(coord_def coord, uint32_t depth)
     _abyss_apply_terrain(abyss_genlevel_mask, true, true);
 }
 
-static void abyss_area_shift(void)
+static void abyss_area_shift()
 {
     dprf(DIAG_ABYSS, "area_shift() - player at pos (%d, %d)",
          you.pos().x, you.pos().y);
diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc
index b18f3bacd8..8602769b2d 100644
--- a/crawl-ref/source/chardump.cc
+++ b/crawl-ref/source/chardump.cc
@@ -1360,7 +1360,7 @@ static const char* thirst_names[] =
     "almost alive",
 };
 
-const char *hunger_level(void)
+const char *hunger_level()
 {
     COMPILE_CHECK(ARRAYSZ(hunger_names) == HS_ENGORGED + 1);
     COMPILE_CHECK(ARRAYSZ(thirst_names) == HS_ENGORGED + 1);
diff --git a/crawl-ref/source/chardump.h b/crawl-ref/source/chardump.h
index c6840436dc..ca8ad4f669 100644
--- a/crawl-ref/source/chardump.h
+++ b/crawl-ref/source/chardump.h
@@ -31,7 +31,7 @@ void dump_map(const char* fname, bool debug = false, bool dist = false);
 void dump_map(FILE *fp, bool debug = false, bool dist = false);
 void display_notes();
 string munge_description(string inStr);
-const char *hunger_level(void);
+const char *hunger_level();
 
 #ifdef DGL_WHEREIS
 void whereis_record(const char *status = "active");
diff --git a/crawl-ref/source/cloud.h b/crawl-ref/source/cloud.h
index 2a4b27ea1d..be764e268f 100644
--- a/crawl-ref/source/cloud.h
+++ b/crawl-ref/source/cloud.h
@@ -28,7 +28,7 @@ void place_cloud(cloud_type cl_type, const coord_def& ctarget,
                  int spread_rate = -1, int colour = -1, string name = "",
                  string tile = "", int excl_rad = -1);
 
-void manage_clouds(void);
+void manage_clouds();
 
 bool is_opaque_cloud(int cloud_idx);
 
diff --git a/crawl-ref/source/colour.cc b/crawl-ref/source/colour.cc
index aff28287df..5f1d45993f 100644
--- a/crawl-ref/source/colour.cc
+++ b/crawl-ref/source/colour.cc
@@ -66,7 +66,7 @@ int random_element_colour_calc::get(const coord_def& loc, bool non_random)
     return (*real_calc)(rand(non_random), loc, rand_vals);
 }
 
-colour_t random_colour(void)
+colour_t random_colour()
 {
     return 1 + random2(15);
 }
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 330f85f0d6..0dc58f95d5 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -58,9 +58,9 @@
 #include "view.h"
 #include "viewchar.h"
 
-static void _adjust_item(void);
-static void _adjust_spell(void);
-static void _adjust_ability(void);
+static void _adjust_item();
+static void _adjust_spell();
+static void _adjust_ability();
 
 static const char *features[] =
 {
@@ -101,12 +101,12 @@ static const char *features[] =
 #endif
 };
 
-static string _get_version_information(void)
+static string _get_version_information()
 {
     return string("This is <w>" CRAWL " ") + Version::Long + "</w>\n";
 }
 
-static string _get_version_features(void)
+static string _get_version_features()
 {
     string result  = "<w>Features</w>\n";
            result += "--------\n";
@@ -125,7 +125,7 @@ static void _add_file_to_scroller(FILE* fp, formatted_scroller& m,
                                   int first_hotkey  = 0,
                                   bool auto_hotkeys = false);
 
-static string _get_version_changes(void)
+static string _get_version_changes()
 {
     // Attempts to print "Highlights" of the latest version.
     FILE* fp = fopen_u(datafile_path("changelog.txt", false).c_str(), "r");
@@ -200,7 +200,7 @@ static string _get_version_changes(void)
 }
 
 //#define DEBUG_FILES
-static void _print_version(void)
+static void _print_version()
 {
     formatted_scroller cmd_version;
 
@@ -217,7 +217,7 @@ static void _print_version(void)
     cmd_version.show();
 }
 
-void adjust(void)
+void adjust()
 {
     mprf(MSGCH_PROMPT, "Adjust (i)tems, (s)pells, or (a)bilities? ");
 
@@ -279,7 +279,7 @@ void swap_inv_slots(int from_slot, int to_slot, bool verbose)
     you.last_pickup.erase(from_slot);
 }
 
-static void _adjust_item(void)
+static void _adjust_item()
 {
     int from_slot, to_slot;
 
@@ -311,7 +311,7 @@ static void _adjust_item(void)
     you.redraw_quiver = true;
 }
 
-static void _adjust_spell(void)
+static void _adjust_spell()
 {
     if (!you.spell_no)
     {
@@ -377,7 +377,7 @@ static void _adjust_spell(void)
         mprf_nocap("%c - %s", input_1, spell_title(spell));
 }
 
-static void _adjust_ability(void)
+static void _adjust_ability()
 {
     const vector<talent> talents = your_talents(false);
 
@@ -492,7 +492,7 @@ void list_armour()
     }
 }
 
-void list_jewellery(void)
+void list_jewellery()
 {
     string jstr;
     int cols = get_number_of_cols() - 1;
diff --git a/crawl-ref/source/ctest.cc b/crawl-ref/source/ctest.cc
index 1bb18a34fc..cdb8314926 100644
--- a/crawl-ref/source/ctest.cc
+++ b/crawl-ref/source/ctest.cc
@@ -143,7 +143,7 @@ static bool _has_test(const string& test)
     return crawl_state.tests_selected[0].find(test) != string::npos;
 }
 
-static void _run_test(const string &name, void (*func)(void))
+static void _run_test(const string &name, void (*func)())
 {
     if (crawl_state.test_list)
         return (void)printf("%s\n", name.c_str());
diff --git a/crawl-ref/source/database.h b/crawl-ref/source/database.h
index 62fbb899b9..96cad735d9 100644
--- a/crawl-ref/source/database.h
+++ b/crawl-ref/source/database.h
@@ -48,7 +48,7 @@ string getHelpString(const string &topic);
 string getMiscString(const string &misc, const string &suffix = "");
 string getHintString(const string &key);
 
-vector<string> getAllFAQKeys(void);
+vector<string> getAllFAQKeys();
 string getFAQ_Question(const string &key);
 string getFAQ_Answer(const string &question);
 #endif
diff --git a/crawl-ref/source/dbg-scan.cc b/crawl-ref/source/dbg-scan.cc
index 0120decb4d..e8e029e8d1 100644
--- a/crawl-ref/source/dbg-scan.cc
+++ b/crawl-ref/source/dbg-scan.cc
@@ -69,7 +69,7 @@ static void _dump_item(const char *name, int num, const item_def &item,
 // debug_item_scan
 //
 //---------------------------------------------------------------
-void debug_item_scan(void)
+void debug_item_scan()
 {
     int   i;
     char  name[256];
diff --git a/crawl-ref/source/dbg-util.cc b/crawl-ref/source/dbg-util.cc
index 0d33e04d65..73801015b0 100644
--- a/crawl-ref/source/dbg-util.cc
+++ b/crawl-ref/source/dbg-util.cc
@@ -24,7 +24,7 @@
 #include "state.h"
 #include "stuff.h"
 
-monster_type debug_prompt_for_monster(void)
+monster_type debug_prompt_for_monster()
 {
     char specs[1024];
 
diff --git a/crawl-ref/source/dbg-util.h b/crawl-ref/source/dbg-util.h
index fff973fd65..8891c401e1 100644
--- a/crawl-ref/source/dbg-util.h
+++ b/crawl-ref/source/dbg-util.h
@@ -6,7 +6,7 @@
 #ifndef DBGUTIL_H
 #define DBGUTIL_H
 
-monster_type debug_prompt_for_monster(void);
+monster_type debug_prompt_for_monster();
 skill_type debug_prompt_for_skill(const char *prompt);
 skill_type skill_from_name(const char *name);
 
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index fdc7fdadfb..584e3ffd95 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -441,12 +441,12 @@ void handle_interrupted_swap()
     you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
 }
 
-bool you_are_delayed(void)
+bool you_are_delayed()
 {
     return !you.delay_queue.empty();
 }
 
-delay_type current_delay_action(void)
+delay_type current_delay_action()
 {
     return you_are_delayed() ? you.delay_queue.front().type
                              : DELAY_NOT_DELAYED;
diff --git a/crawl-ref/source/dgn-layouts.cc b/crawl-ref/source/dgn-layouts.cc
index b422cec007..f5bfe00924 100644
--- a/crawl-ref/source/dgn-layouts.cc
+++ b/crawl-ref/source/dgn-layouts.cc
@@ -24,7 +24,7 @@ static void _make_trail(int xs, int xr, int ys, int yr, int corrlength,
 static void _builder_extras(int level_number);
 static bool _octa_room(dgn_region& region, int oblique_max,
                        dungeon_feature_type type_floor);
-static dungeon_feature_type _random_wall(void);
+static dungeon_feature_type _random_wall();
 static void _chequerboard(dgn_region& region, dungeon_feature_type target,
                           dungeon_feature_type floor1,
                           dungeon_feature_type floor2);
@@ -127,7 +127,7 @@ void dgn_build_basic_level()
     _builder_extras(level_number);
 }
 
-void dgn_build_bigger_room_level(void)
+void dgn_build_bigger_room_level()
 {
     env.level_build_method += " bigger_room";
     env.level_layout_types.insert("open");
diff --git a/crawl-ref/source/dgn-layouts.h b/crawl-ref/source/dgn-layouts.h
index 40294bcb50..4c29b9fb43 100644
--- a/crawl-ref/source/dgn-layouts.h
+++ b/crawl-ref/source/dgn-layouts.h
@@ -4,7 +4,7 @@
 #include "enum.h"
 
 void dgn_build_basic_level();
-void dgn_build_bigger_room_level(void);
+void dgn_build_bigger_room_level();
 void dgn_build_chaotic_city_level(dungeon_feature_type force_wall);
 
 #endif
diff --git a/crawl-ref/source/directn.h b/crawl-ref/source/directn.h
index d61edb8331..2e182af7d5 100644
--- a/crawl-ref/source/directn.h
+++ b/crawl-ref/source/directn.h
@@ -307,7 +307,7 @@ string feature_description(dungeon_feature_type grid,
 
 vector<dungeon_feature_type> features_by_desc(const base_pattern &pattern);
 
-void full_describe_view(void);
+void full_describe_view();
 void do_look_around(const coord_def &whence = coord_def(0, 0));
 
 extern const struct coord_def Compass[9];
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index eb0510bd4d..0f8b02be57 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -108,7 +108,7 @@ static bool _place_specific_trap(const coord_def& where, trap_spec* spec,
 static void _place_branch_entrances(bool use_vaults);
 static void _place_extra_vaults();
 static void _place_chance_vaults();
-static void _place_minivaults(void);
+static void _place_minivaults();
 static int _place_uniques();
 static void _place_gozag_shop(dungeon_feature_type stair);
 static void _place_traps();
@@ -3244,7 +3244,7 @@ static void _place_chance_vaults()
     }
 }
 
-static void _place_minivaults(void)
+static void _place_minivaults()
 {
     // Always try to place PLACE:X minivaults.
     const map_def *vault = NULL;
diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h
index 52b8adc979..c68f88432b 100644
--- a/crawl-ref/source/dungeon.h
+++ b/crawl-ref/source/dungeon.h
@@ -287,5 +287,5 @@ int count_feature_in_box(int x0, int y0, int x1, int y1,
                          dungeon_feature_type feat);
 bool door_vetoed(const coord_def pos);
 
-void fixup_misplaced_items(void);
+void fixup_misplaced_items();
 #endif
diff --git a/crawl-ref/source/evoke.cc b/crawl-ref/source/evoke.cc
index 3fa4d526ab..f1689d7c8c 100644
--- a/crawl-ref/source/evoke.cc
+++ b/crawl-ref/source/evoke.cc
@@ -786,7 +786,7 @@ static bool _sack_of_spiders(item_def &sack)
     return success;
 }
 
-static bool _ball_of_energy(void)
+static bool _ball_of_energy()
 {
     bool ret = false;
 
diff --git a/crawl-ref/source/feature.cc b/crawl-ref/source/feature.cc
index a02a2226da..538fcac071 100644
--- a/crawl-ref/source/feature.cc
+++ b/crawl-ref/source/feature.cc
@@ -550,7 +550,7 @@ static void _init_feat(feature_def &f, dungeon_feature_type feat)
     }
 }
 
-void init_show_table(void)
+void init_show_table()
 {
     show_type obj;
     for (int i = 0; i < NUM_FEATURES; i++)
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index 5d220c9688..5b8be96976 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -111,7 +111,7 @@ static bool _read_char_chunk(package *save);
 
 const short GHOST_SIGNATURE = short(0xDC55);
 
-static void _redraw_all(void)
+static void _redraw_all()
 {
     you.redraw_hit_points   = true;
     you.redraw_magic_points = true;
diff --git a/crawl-ref/source/godcompanions.cc b/crawl-ref/source/godcompanions.cc
index ddcb8cf00f..15b2cb71b2 100644
--- a/crawl-ref/source/godcompanions.cc
+++ b/crawl-ref/source/godcompanions.cc
@@ -26,7 +26,7 @@ companion::companion(const monster& m)
     timestamp = you.elapsed_time;
 }
 
-void init_companions(void)
+void init_companions()
 {
     companion_list.clear();
 }
diff --git a/crawl-ref/source/godcompanions.h b/crawl-ref/source/godcompanions.h
index d39bfe0c00..a085dcae21 100644
--- a/crawl-ref/source/godcompanions.h
+++ b/crawl-ref/source/godcompanions.h
@@ -23,7 +23,7 @@ struct companion
 
 extern map<mid_t, companion> companion_list;
 
-void init_companions(void);
+void init_companions();
 void add_companion(monster* mons);
 void remove_companion(monster* mons);
 void remove_enslaved_soul_companion();
diff --git a/crawl-ref/source/hints.h b/crawl-ref/source/hints.h
index 8d37dc8dab..8d156d951e 100644
--- a/crawl-ref/source/hints.h
+++ b/crawl-ref/source/hints.h
@@ -29,7 +29,7 @@ enum hints_types
 
 void save_hints(writer& outf);
 void load_hints(reader& inf);
-void init_hints_options(void);
+void init_hints_options();
 
 enum hints_event_type
 {
@@ -152,14 +152,14 @@ struct newgame_def;
 void init_hints();
 void tutorial_init_hints();
 void pick_hints(newgame_def* choice);
-void hints_load_game(void);
+void hints_load_game();
 
 formatted_string hints_starting_info2();
-void hints_starting_screen(void);
+void hints_starting_screen();
 void hints_new_turn();
 void print_hint(string key, const string arg1 = "", const string arg2 = "");
-void hints_death_screen(void);
-void hints_finished(void);
+void hints_death_screen();
+void hints_finished();
 
 void hints_dissection_reminder(bool healthy);
 void hints_healing_check();
@@ -170,10 +170,10 @@ void hints_monster_seen(const monster& mon);
 void hints_first_item(const item_def& item);
 void learned_something_new(hints_event_type seen_what,
                            coord_def gc = coord_def());
-formatted_string hints_abilities_info(void);
-string hints_skills_info(void);
+formatted_string hints_abilities_info();
+string hints_skills_info();
 string hints_skill_training_info();
-string hints_skills_description_info(void);
+string hints_skills_description_info();
 
 // Additional information for tutorial players.
 void check_item_hint(const item_def &item, unsigned int num_old_talents);
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index e8796d88d5..93a55ce385 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -3816,7 +3816,7 @@ static string check_string(const char *s)
     return s? s : "";
 }
 
-void get_system_environment(void)
+void get_system_environment()
 {
     // The player's name
     SysEnv.crawl_name = check_string(getenv("CRAWL_NAME"));
diff --git a/crawl-ref/source/initfile.h b/crawl-ref/source/initfile.h
index b104483d00..7f02d70b69 100644
--- a/crawl-ref/source/initfile.h
+++ b/crawl-ref/source/initfile.h
@@ -24,7 +24,7 @@ newgame_def read_startup_prefs();
 void read_options(const string &s, bool runscript = false,
                   bool clear_aliases = false);
 
-void get_system_environment(void);
+void get_system_environment();
 
 class depth_ranges;
 
@@ -70,7 +70,7 @@ bool parse_args(int argc, char **argv, bool rc_only);
 struct newgame_def;
 void write_newgame_options_file(const newgame_def& prefs);
 
-void save_player_name(void);
+void save_player_name();
 
 string channel_to_str(int ch);
 
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index 589c194df2..b9aa3847ea 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -10,7 +10,7 @@
 
 struct bolt;
 
-void init_properties(void);
+void init_properties();
 
 // cursed:
 bool item_known_cursed(const item_def &item) PURE;
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index e706879b8f..ad73454c3c 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -107,7 +107,7 @@ void fix_item_coordinates()
 }
 
 // This function uses the items coordinates to relink all the igrd lists.
-void link_items(void)
+void link_items()
 {
     // First, initialise igrd array.
     igrd.init(NON_ITEM);
@@ -173,7 +173,7 @@ static bool _item_preferred_to_clean(int item)
 
 // Returns index number of first available space, or NON_ITEM for
 // unsuccessful cleanup (should be exceedingly rare!)
-static int _cull_items(void)
+static int _cull_items()
 {
     crawl_state.cancel_cmd_repeat();
 
@@ -3004,7 +3004,7 @@ void autopickup()
     _do_autopickup();
 }
 
-int inv_count(void)
+int inv_count()
 {
     int count = 0;
 
diff --git a/crawl-ref/source/items.h b/crawl-ref/source/items.h
index bb1899ab58..f28414059d 100644
--- a/crawl-ref/source/items.h
+++ b/crawl-ref/source/items.h
@@ -55,9 +55,9 @@ int item_on_floor(const item_def &item, const coord_def& where);
 
 void init_item(int item);
 
-void link_items(void);
+void link_items();
 
-void fix_item_coordinates(void);
+void fix_item_coordinates();
 
 int get_mitm_slot(int reserve = 50);
 
@@ -90,9 +90,9 @@ const item_def* top_item_at(const coord_def& where);
 // Returns whether there is more than one item in a given cell.
 bool multiple_items_at(const coord_def& where);
 
-void drop(void);
+void drop();
 
-int inv_count(void);
+int inv_count();
 int runes_in_pack();
 
 bool pickup_single_item(int link, int qty);
diff --git a/crawl-ref/source/json.cc b/crawl-ref/source/json.cc
index 48b3e33c02..d01a69bbda 100644
--- a/crawl-ref/source/json.cc
+++ b/crawl-ref/source/json.cc
@@ -524,7 +524,7 @@ static JsonNode *mknode(JsonTag tag)
     return ret;
 }
 
-JsonNode *json_mknull(void)
+JsonNode *json_mknull()
 {
     return mknode(JSON_NULL);
 }
@@ -555,12 +555,12 @@ JsonNode *json_mknumber(double n)
     return node;
 }
 
-JsonNode *json_mkarray(void)
+JsonNode *json_mkarray()
 {
     return mknode(JSON_ARRAY);
 }
 
-JsonNode *json_mkobject(void)
+JsonNode *json_mkobject()
 {
     return mknode(JSON_OBJECT);
 }
diff --git a/crawl-ref/source/json.h b/crawl-ref/source/json.h
index c34d7c7d10..7384b3c01b 100644
--- a/crawl-ref/source/json.h
+++ b/crawl-ref/source/json.h
@@ -95,12 +95,12 @@ JsonNode   *json_first_child    (const JsonNode *node);
 
 /*** Construction and manipulation ***/
 
-JsonNode *json_mknull(void);
+JsonNode *json_mknull();
 JsonNode *json_mkbool(bool b);
 JsonNode *json_mkstring(const char *s);
 JsonNode *json_mknumber(double n);
-JsonNode *json_mkarray(void);
-JsonNode *json_mkobject(void);
+JsonNode *json_mkarray();
+JsonNode *json_mkobject();
 
 void json_append_element(JsonNode *array, JsonNode *element);
 void json_prepend_element(JsonNode *array, JsonNode *element);
diff --git a/crawl-ref/source/lev-pand.cc b/crawl-ref/source/lev-pand.cc
index 8ddc68e352..563d32b9fc 100644
--- a/crawl-ref/source/lev-pand.cc
+++ b/crawl-ref/source/lev-pand.cc
@@ -40,7 +40,7 @@ static colour_t _pan_rock_colour()
     return col;
 }
 
-void init_pandemonium(void)
+void init_pandemonium()
 {
     for (int pc = 0; pc < PAN_MONS_ALLOC; ++pc)
     {
diff --git a/crawl-ref/source/lev-pand.h b/crawl-ref/source/lev-pand.h
index 544df5ca10..a53fa17c9c 100644
--- a/crawl-ref/source/lev-pand.h
+++ b/crawl-ref/source/lev-pand.h
@@ -6,6 +6,6 @@
 #ifndef LEVPAND_H
 #define LEVPAND_H
 
-void init_pandemonium(void);
+void init_pandemonium();
 
 #endif
diff --git a/crawl-ref/source/libconsole.h b/crawl-ref/source/libconsole.h
index 5ad692dda5..a6b7a5b243 100644
--- a/crawl-ref/source/libconsole.h
+++ b/crawl-ref/source/libconsole.h
@@ -12,19 +12,19 @@ int get_number_of_lines();
 int get_number_of_cols();
 int num_to_lines(int num);
 
-void clrscr(void);
+void clrscr();
 void clear_to_end_of_line();
 void gotoxy_sys(int x, int y);
 void textcolor(int c);
 void textbackground(int c);
 void cprintf(const char *format, ...);
 
-int wherex(void);
-int wherey(void);
+int wherex();
+int wherey();
 void putwch(ucs_t c);
-int getchk(void);
-int getch_ck(void);
-bool kbhit(void);
+int getchk();
+int getch_ck();
+bool kbhit();
 void delay(unsigned int ms);
 void puttext(int x, int y, const crawl_view_buffer &vbuf);
 void update_screen();
diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc
index 30634ba3cb..1a1648ecb4 100644
--- a/crawl-ref/source/libunix.cc
+++ b/crawl-ref/source/libunix.cc
@@ -134,7 +134,7 @@ static short translate_colour(short col)
     }
 }
 
-static void setup_colour_pairs(void)
+static void setup_colour_pairs()
 {
     short i, j;
 
@@ -326,7 +326,7 @@ static void unix_handle_terminal_resize()
     console_startup();
 }
 
-static void unixcurses_defkeys(void)
+static void unixcurses_defkeys()
 {
 #ifdef NCURSES_VERSION
     // keypad 0-9 (only if the "application mode" was successfully initialised)
@@ -410,7 +410,7 @@ int unixcurses_get_vi_key(int keyin)
 #define KPADAPP "\033[?1051l\033[?1052l\033[?1060l\033[?1061h"
 #define KPADCUR "\033[?1051l\033[?1052l\033[?1060l\033[?1061l"
 
-void console_startup(void)
+void console_startup()
 {
     termio_init();
 
@@ -535,7 +535,7 @@ void puttext(int x1, int y1, const crawl_view_buffer &vbuf)
 // this file.  This is good, since there are some issues with
 // name space collisions between curses macros and the standard
 // C++ string class.  -- bwr
-void update_screen(void)
+void update_screen()
 {
     refresh();
 
@@ -544,7 +544,7 @@ void update_screen(void)
 #endif
 }
 
-void clear_to_end_of_line(void)
+void clear_to_end_of_line()
 {
     textcolor(LIGHTGREY);
     textbackground(BLACK);
@@ -555,12 +555,12 @@ void clear_to_end_of_line(void)
 #endif
 }
 
-int get_number_of_lines(void)
+int get_number_of_lines()
 {
     return LINES;
 }
 
-int get_number_of_cols(void)
+int get_number_of_cols()
 {
     return COLS;
 }
diff --git a/crawl-ref/source/libw32c.cc b/crawl-ref/source/libw32c.cc
index 011e8abdb3..491d8cbe71 100644
--- a/crawl-ref/source/libw32c.cc
+++ b/crawl-ref/source/libw32c.cc
@@ -95,7 +95,7 @@ static bool w32_smart_cursor = true;
 // we can do straight translation of DOS color to win32 console color.
 #define WIN32COLOR(col) (WORD)(col)
 static void writeChar(ucs_t c);
-static void bFlush(void);
+static void bFlush();
 static void _setcursortype_internal(bool curstype);
 
 // [ds] Unused for portability reasons
@@ -191,7 +191,7 @@ bool is_smart_cursor_enabled()
     return w32_smart_cursor;
 }
 
-void bFlush(void)
+void bFlush()
 {
     COORD source;
     SMALL_RECT target;
@@ -494,7 +494,7 @@ void clear_to_end_of_line()
         cprintf("%*s", cols - pos + 1, "");
 }
 
-void clrscr(void)
+void clrscr()
 {
     int x,y;
     COORD source;
@@ -608,12 +608,12 @@ void cprintf(const char *format, ...)
     va_end(argp);
 }
 
-int wherex(void)
+int wherex()
 {
     return cx+1;
 }
 
-int wherey(void)
+int wherey()
 {
     return cy+1;
 }
@@ -769,7 +769,7 @@ static int w32_proc_mouse_event(const MOUSE_EVENT_RECORD &mer)
     return 0;
 }
 
-int getch_ck(void)
+int getch_ck()
 {
     INPUT_RECORD ir;
     DWORD nread;
@@ -839,7 +839,7 @@ int getch_ck(void)
     return key;
 }
 
-int getchk(void)
+int getchk()
 {
     int c = getch_ck();
     return key_to_command(c);
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index 36b32045dc..ad928f2e89 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -166,7 +166,7 @@ static bool userfunc_referenced(int index)
 }
 
 // Expensive function to discard unused function names
-static void userfunc_collectgarbage(void)
+static void userfunc_collectgarbage()
 {
     for (int i = userfunctions.size() - 1; i >= 0; --i)
     {
@@ -883,7 +883,7 @@ static string _macro_type_name(bool keymap, KeymapContext keymc)
                         (keymap ? "keymap" : "macro"));
 }
 
-void macro_add_query(void)
+void macro_add_query()
 {
     int input;
     bool keymap = false;
diff --git a/crawl-ref/source/macro.h b/crawl-ref/source/macro.h
index 6ee0147894..b9a30cb850 100644
--- a/crawl-ref/source/macro.h
+++ b/crawl-ref/source/macro.h
@@ -39,7 +39,7 @@ private:
 int getchm(int (*rgetch)() = NULL);       // keymaps applied (ie for prompts)
 int getchm(KeymapContext context, int (*rgetch)() = NULL);
 
-int getch_with_command_macros(void);  // keymaps and macros (ie for commands)
+int getch_with_command_macros();  // keymaps and macros (ie for commands)
 
 void flush_input_buffer(int reason);
 
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index b68e045c31..8f072638d3 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -200,9 +200,9 @@ const struct coord_def Compass[9] =
 static void _launch_game_loop();
 NORETURN static void _launch_game();
 
-static void _do_berserk_no_combat_penalty(void);
-static void _do_searing_ray(void);
-static void _input(void);
+static void _do_berserk_no_combat_penalty();
+static void _do_searing_ray();
+static void _input();
 static void _move_player(int move_x, int move_y);
 static void _move_player(coord_def move);
 static int  _check_adjacent(dungeon_feature_type feat, coord_def& delta);
@@ -233,7 +233,7 @@ static void _set_removed_types_as_identified();
 static void _compile_time_asserts();
 
 #ifdef WIZARD
-static void _handle_wizard_command(void);
+static void _handle_wizard_command();
 #endif
 
 //
@@ -855,7 +855,7 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
     you.turn_is_over = false;
 }
 
-static void _handle_wizard_command(void)
+static void _handle_wizard_command()
 {
     int wiz_command;
 
@@ -3179,7 +3179,7 @@ static void _close_door(coord_def move)
 // Total penalty (including the standard one during upkeep is:
 //          2  5  9  14  20  27  35  44
 //
-static void _do_berserk_no_combat_penalty(void)
+static void _do_berserk_no_combat_penalty()
 {
     // Butchering/eating a corpse will maintain a blood rage.
     const int delay = current_delay_action();
diff --git a/crawl-ref/source/map_knowledge.h b/crawl-ref/source/map_knowledge.h
index cf613d2513..e1f6fb63eb 100644
--- a/crawl-ref/source/map_knowledge.h
+++ b/crawl-ref/source/map_knowledge.h
@@ -316,7 +316,7 @@ void set_terrain_seen(const coord_def c);
 void set_terrain_visible(const coord_def c);
 void clear_terrain_visibility();
 
-int count_detected_mons(void);
+int count_detected_mons();
 
 void clear_map(bool clear_items = true, bool clear_mons = true);
 
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 0843a1ec8a..2cbc913d5d 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -98,7 +98,7 @@ static int find_weight(string &s, int defweight = TAG_UNFOUND)
     return weight == TAG_UNFOUND ? defweight : weight;
 }
 
-void clear_subvault_stack(void)
+void clear_subvault_stack()
 {
     env.new_subvault_names.clear();
     env.new_subvault_tags.clear();
diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h
index 8108a284c1..38b7e869bf 100644
--- a/crawl-ref/source/mapdef.h
+++ b/crawl-ref/source/mapdef.h
@@ -1305,7 +1305,7 @@ private:
 
 const int CHANCE_ROLL = 10000;
 
-void clear_subvault_stack(void);
+void clear_subvault_stack();
 
 void map_register_flag(const string &flag);
 
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 8dc9e4a185..9275287394 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -1449,7 +1449,7 @@ static void _parse_maps(const string &s)
     time_t mtime = file_modtime(dat);
     _reset_map_parser();
 
-    extern int yyparse(void);
+    extern int yyparse();
     extern FILE *yyin;
     yyin = dat;
 
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index 870d6996e8..82c1d9f75a 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -1641,7 +1641,7 @@ void load_messages(reader& inf)
     mesclr();
 }
 
-void replay_messages(void)
+void replay_messages()
 {
     formatted_scroller hist(MF_START_AT_END | MF_ALWAYS_SHOW_MORE, "");
     hist.set_more();
diff --git a/crawl-ref/source/mon-pathfind.h b/crawl-ref/source/mon-pathfind.h
index 1be95afd67..bd7a214ef3 100644
--- a/crawl-ref/source/mon-pathfind.h
+++ b/crawl-ref/source/mon-pathfind.h
@@ -20,12 +20,12 @@ public:
     bool init_pathfind(coord_def src, coord_def dest,
                        bool diag = true, bool msg = false);
     bool start_pathfind(bool msg = false);
-    vector<coord_def> backtrack(void);
-    vector<coord_def> calc_waypoints(void);
+    vector<coord_def> backtrack();
+    vector<coord_def> calc_waypoints();
 
 protected:
     // protected methods
-    bool calc_path_to_neighbours(void);
+    bool calc_path_to_neighbours();
     bool traversable(const coord_def& p);
     int  travel_cost(coord_def npos);
     bool mons_traversable(const coord_def& p);
@@ -33,7 +33,7 @@ protected:
     int  estimated_cost(coord_def npos);
     void add_new_pos(coord_def pos, int total);
     void update_pos(coord_def pos, int total);
-    bool get_best_position(void);
+    bool get_best_position();
 
     // The monster trying to find a path.
     const monster* mons;
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc
index a16cb49cb5..ed3b9705fd 100644
--- a/crawl-ref/source/mon-stuff.cc
+++ b/crawl-ref/source/mon-stuff.cc
@@ -158,7 +158,7 @@ void monster_drop_things(monster* mons,
     }
 }
 // If you're invis and throw/zap whatever, alerts menv to your position.
-void alert_nearby_monsters(void)
+void alert_nearby_monsters()
 {
     // Judging from the above comment, this function isn't
     // intended to wake up monsters, so we're only going to
diff --git a/crawl-ref/source/mon-stuff.h b/crawl-ref/source/mon-stuff.h
index 580ebb3ea1..0dcc646992 100644
--- a/crawl-ref/source/mon-stuff.h
+++ b/crawl-ref/source/mon-stuff.h
@@ -37,7 +37,7 @@ bool feature_mimic_at(const coord_def &c);
 item_def* item_mimic_at(const coord_def &c);
 bool mimic_at(const coord_def &c);
 
-void alert_nearby_monsters(void);
+void alert_nearby_monsters();
 
 beh_type attitude_creation_behavior(mon_attitude_type att);
 beh_type actual_same_attitude(const monster& base);
diff --git a/crawl-ref/source/ng-input.cc b/crawl-ref/source/ng-input.cc
index bd98a209ac..47f953fb8f 100644
--- a/crawl-ref/source/ng-input.cc
+++ b/crawl-ref/source/ng-input.cc
@@ -15,7 +15,7 @@
 extern string init_file_error; // defined in main.cc
 
 // Eventually, this should be something more grand. {dlb}
-void opening_screen(void)
+void opening_screen()
 {
     string msg =
     "<yellow>Hello, welcome to " CRAWL " " + string(Version::Long) + "!</yellow>\n"
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index 053ad71625..862fce4494 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -36,7 +36,7 @@
 static void _newgame_give_item(object_class_type base, int sub_type,
                                int qty = 1, int plus = 0, int plus2 = 0);
 
-static void _init_player(void)
+static void _init_player()
 {
     you.init();
     dlua.callfn("dgn_clear_data", "");
diff --git a/crawl-ref/source/ng-wanderer.cc b/crawl-ref/source/ng-wanderer.cc
index 7a1b1f6ae5..6cc40a941f 100644
--- a/crawl-ref/source/ng-wanderer.cc
+++ b/crawl-ref/source/ng-wanderer.cc
@@ -859,7 +859,7 @@ static void _wanderer_cover_equip_holes(int & slot)
 
 // New style wanderers are supposed to be decent in terms of skill
 // levels/equipment, but pretty randomised.
-void create_wanderer(void)
+void create_wanderer()
 {
     // Decide what our character roles are.
     stat_type primary_role   = _wanderer_choose_role();
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 62498e71bc..8e839a602f 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -1287,7 +1287,7 @@ static void _redraw_title(const string &your_name, const string &job_name)
     textcolor(LIGHTGREY);
 }
 
-void print_stats(void)
+void print_stats()
 {
 #if TAG_MAJOR_VERSION == 34
     int temp = (you.species == SP_LAVA_ORC) ? 1 : 0;
@@ -1483,7 +1483,7 @@ void print_stats_level()
     clear_to_end_of_line();
 }
 
-void draw_border(void)
+void draw_border()
 {
     textcolor(HUD_CAPTION_COLOUR);
     clrscr();
diff --git a/crawl-ref/source/output.h b/crawl-ref/source/output.h
index 30b97f4022..816369f2ed 100644
--- a/crawl-ref/source/output.h
+++ b/crawl-ref/source/output.h
@@ -32,22 +32,22 @@ enum status_redraw_flag_type
 };
 
 #ifdef DGL_SIMPLE_MESSAGING
-void update_message_status(void);
+void update_message_status();
 #endif
 
-void update_turn_count(void);
+void update_turn_count();
 
-void print_stats(void);
-void print_stats_level(void);
-void draw_border(void);
+void print_stats();
+void print_stats_level();
+void draw_border();
 
 string mpr_monster_list(bool past = false);
-int update_monster_pane(void);
+int update_monster_pane();
 
 const char *equip_slot_to_name(int equip);
 int equip_name_to_slot(const char *s);
 
-void print_overview_screen(void);
+void print_overview_screen();
 
 string dump_overview_screen(bool full_id);
 
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 233f15f5d0..cc825058de 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -476,17 +476,17 @@ bool is_feat_dangerous(dungeon_feature_type grid, bool permanently,
         return false;
 }
 
-bool is_map_persistent(void)
+bool is_map_persistent()
 {
     return !testbits(env.level_flags, LFLAG_NO_MAP);
 }
 
-bool player_in_hell(void)
+bool player_in_hell()
 {
     return is_hell_subbranch(you.where_are_you);
 }
 
-bool player_in_connected_branch(void)
+bool player_in_connected_branch()
 {
     return is_connected_branch(you.where_are_you);
 }
@@ -1450,7 +1450,7 @@ int player_hunger_rate(bool temp)
     return hunger;
 }
 
-int player_spell_levels(void)
+int player_spell_levels()
 {
     int sl = you.experience_level - 1 + you.skill(SK_SPELLCASTING, 2, true);
 
@@ -2323,7 +2323,7 @@ int player_movement_speed(bool ignore_burden)
 // This function differs from the above in that it's used to set the
 // initial time_taken value for the turn.  Everything else (movement,
 // spellcasting, combat) applies a ratio to this value.
-int player_speed(void)
+int player_speed()
 {
     int ps = 10;
 
@@ -2414,7 +2414,7 @@ bool player_effectively_in_light_armour()
 // that lich transformation doesn't change the character's shape
 // (so we end up with Naga-liches, Spiggan-liches, Minotaur-liches)
 // it just makes the character undead (with the benefits that implies). - bwr
-bool player_is_shapechanged(void)
+bool player_is_shapechanged()
 {
     if (you.form == TRAN_NONE
         || you.form == TRAN_BLADE_HANDS
@@ -2628,13 +2628,13 @@ int player_armour_shield_spell_penalty()
     return max(total_penalty, 0) / scale;
 }
 
-int player_wizardry(void)
+int player_wizardry()
 {
     return you.wearing(EQ_RINGS, RING_WIZARDRY)
            + you.wearing(EQ_STAFF, STAFF_WIZARDRY);
 }
 
-int player_shield_class(void)
+int player_shield_class()
 {
     int shield = 0;
     int stat = 0;
@@ -2727,7 +2727,7 @@ int carrying_capacity(burden_state_type bs)
         return cap;
 }
 
-int burden_change(void)
+int burden_change()
 {
     const burden_state_type old_burdenstate = you.burden_state;
 
@@ -3684,7 +3684,7 @@ void adjust_level(int diff, bool just_xp)
 // Here's a question for you: does the ordering of mods make a difference?
 // (yes) -- are these things in the right order of application to stealth?
 // - 12mar2000 {dlb}
-int check_stealth(void)
+int check_stealth()
 {
     ASSERT(!crawl_state.game_is_arena());
     // Extreme stealthiness can be enforced by wizmode stealth setting.
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index 5f199b8f47..dd8c214065 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -24,7 +24,7 @@
 
 class targetter;
 
-int check_stealth(void);
+int check_stealth();
 
 typedef FixedVector<int, NUM_DURATIONS> durations_t;
 class player : public actor
@@ -813,22 +813,22 @@ bool check_moveto_trap(const coord_def& p, const string &move_verb = "step",
 
 void move_player_to_grid(const coord_def& p, bool stepped);
 
-bool is_map_persistent(void);
-bool player_in_mappable_area(void);
-bool player_in_connected_branch(void);
-bool player_in_hell(void);
+bool is_map_persistent();
+bool player_in_mappable_area();
+bool player_in_connected_branch();
+bool player_in_hell();
 
 static inline bool player_in_branch(int branch)
 {
     return you.where_are_you == branch;
 };
 
-bool berserk_check_wielded_weapon(void);
+bool berserk_check_wielded_weapon();
 bool player_equip_unrand(int unrand_index);
 bool player_can_hit_monster(const monster* mon);
 bool player_can_hear(const coord_def& p, int hear_distance = 999);
 
-bool player_is_shapechanged(void);
+bool player_is_shapechanged();
 
 bool is_effectively_light_armour(const item_def *item);
 bool player_effectively_in_light_armour();
@@ -838,11 +838,11 @@ static inline int player_under_penance(god_type god = you.religion)
     return you.penance[god];
 }
 
-int burden_change(void);
+int burden_change();
 
 int carrying_capacity(burden_state_type bs = BS_OVERLOADED);
 
-int player_energy(void);
+int player_energy();
 
 int player_raw_body_armour_evasion_penalty();
 int player_adjusted_shield_evasion_penalty(int scale);
@@ -859,12 +859,12 @@ int player_icemail_armour_class();
 
 bool player_stoneskin();
 
-int player_wizardry(void);
+int player_wizardry();
 
 int player_prot_life(bool calc_unid = true, bool temp = true,
                      bool items = true);
 
-int player_regen(void);
+int player_regen();
 
 int player_res_cold(bool calc_unid = true, bool temp = true,
                     bool items = true);
@@ -896,22 +896,22 @@ int player_res_magic(bool calc_unid = true, bool temp = true);
 
 bool player_control_teleport(bool temp = true);
 
-int player_shield_class(void);
+int player_shield_class();
 
-int player_spec_air(void);
-int player_spec_cold(void);
-int player_spec_conj(void);
-int player_spec_death(void);
-int player_spec_earth(void);
-int player_spec_fire(void);
-int player_spec_hex(void);
-int player_spec_charm(void);
-int player_spec_poison(void);
-int player_spec_summ(void);
+int player_spec_air();
+int player_spec_cold();
+int player_spec_conj();
+int player_spec_death();
+int player_spec_earth();
+int player_spec_fire();
+int player_spec_hex();
+int player_spec_charm();
+int player_spec_poison();
+int player_spec_summ();
 
-int player_speed(void);
+int player_speed();
 
-int player_spell_levels(void);
+int player_spell_levels();
 
 bool player_sust_abil(bool calc_unid = true);
 
@@ -926,7 +926,7 @@ bool will_gain_life(int lev);
 
 int get_expiration_threshold(duration_type dur);
 bool dur_expiring(duration_type dur);
-void display_char_status(void);
+void display_char_status();
 
 void forget_map(bool rot = false);
 
diff --git a/crawl-ref/source/quiver.h b/crawl-ref/source/quiver.h
index aadc1ed5e4..2c1d1ce2a1 100644
--- a/crawl-ref/source/quiver.h
+++ b/crawl-ref/source/quiver.h
@@ -79,6 +79,6 @@ public:
 };
 
 void quiver_item(int slot);
-void choose_item_for_quiver(void);
+void choose_item_for_quiver();
 
 #endif
diff --git a/crawl-ref/source/random.cc b/crawl-ref/source/random.cc
index 3d0ed1a6f0..7fb382fc61 100644
--- a/crawl-ref/source/random.cc
+++ b/crawl-ref/source/random.cc
@@ -152,7 +152,7 @@ int ui_random(int max)
 }
 
 // [0, 1]
-bool coinflip(void)
+bool coinflip()
 {
     return static_cast<bool>(random2(2));
 }
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc
index 6c70c5b3ff..1bac5dc95f 100644
--- a/crawl-ref/source/skills2.cc
+++ b/crawl-ref/source/skills2.cc
@@ -454,7 +454,7 @@ skill_type best_skill(skill_type min_skill, skill_type max_skill,
 // other skills will have to attain the next level higher to be
 // considered a better skill (thus, the first skill to reach level 27
 // becomes the characters final nickname). -- bwr
-void init_skill_order(void)
+void init_skill_order()
 {
     for (int i = SK_FIRST_SKILL; i < NUM_SKILLS; i++)
     {
diff --git a/crawl-ref/source/spl-selfench.cc b/crawl-ref/source/spl-selfench.cc
index a322baf449..2b2a338a09 100644
--- a/crawl-ref/source/spl-selfench.cc
+++ b/crawl-ref/source/spl-selfench.cc
@@ -25,7 +25,7 @@
 #include "transform.h"
 #include "view.h"
 
-int allowed_deaths_door_hp(void)
+int allowed_deaths_door_hp()
 {
     int hp = you.skill(SK_NECROMANCY) / 2;
 
diff --git a/crawl-ref/source/spl-selfench.h b/crawl-ref/source/spl-selfench.h
index f208fdcaef..359057f4de 100644
--- a/crawl-ref/source/spl-selfench.h
+++ b/crawl-ref/source/spl-selfench.h
@@ -3,7 +3,7 @@
 
 #include "spl-cast.h"
 
-int allowed_deaths_door_hp(void);
+int allowed_deaths_door_hp();
 spret_type cast_deaths_door(int pow, bool fail);
 void remove_ice_armour();
 spret_type ice_armour(int pow, bool fail);
diff --git a/crawl-ref/source/spl-transloc.cc b/crawl-ref/source/spl-transloc.cc
index 956df30bec..5f758c1465 100644
--- a/crawl-ref/source/spl-transloc.cc
+++ b/crawl-ref/source/spl-transloc.cc
@@ -347,7 +347,7 @@ spret_type cast_teleport_self(bool fail)
     return SPRET_SUCCESS;
 }
 
-void you_teleport(void)
+void you_teleport()
 {
     // [Cha] here we block teleportation, which will save the player from
     // death from read-id'ing scrolls (in sprint)
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index 6e34f60450..3ff9ffb7fd 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -83,7 +83,7 @@ static const struct spell_desc *_seekspell(spell_type spellid);
 //
 
 // All this does is merely refresh the internal spell list {dlb}:
-void init_spell_descs(void)
+void init_spell_descs()
 {
     for (int i = 0; i < NUM_SPELLS; i++)
         spell_list[i] = -1;
diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h
index d35f47d71a..472ace1a67 100644
--- a/crawl-ref/source/spl-util.h
+++ b/crawl-ref/source/spl-util.h
@@ -47,7 +47,7 @@ enum spell_highlight_colours
 };
 
 bool is_valid_spell(spell_type spell);
-void init_spell_descs(void);
+void init_spell_descs();
 void init_spell_name_cache();
 spell_type spell_by_name(string name, bool partial_match = false);
 
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index bd45c4e58b..56fb962b37 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -305,7 +305,7 @@ NORETURN void game_ended_with_error(const string &message)
         end(1, false, "%s", message.c_str());
 }
 
-void redraw_screen(void)
+void redraw_screen()
 {
     if (!crawl_state.need_save)
     {
diff --git a/crawl-ref/source/throw.h b/crawl-ref/source/throw.h
index 91a4728e4d..53e5325933 100644
--- a/crawl-ref/source/throw.h
+++ b/crawl-ref/source/throw.h
@@ -32,7 +32,7 @@ bool fire_warn_if_impossible(bool silent = false);
 int get_next_fire_item(int current, int offset);
 int get_ammo_to_shoot(int item, dist &target, bool teleport = false);
 void fire_thing(int item = -1);
-void throw_item_no_quiver(void);
+void throw_item_no_quiver();
 
 bool silver_damages_victim(bolt &beam, actor* victim, int &dmg,
                            string &dmg_msg);
diff --git a/crawl-ref/source/tilereg-text.h b/crawl-ref/source/tilereg-text.h
index 107951c7ed..56c5244fd1 100644
--- a/crawl-ref/source/tilereg-text.h
+++ b/crawl-ref/source/tilereg-text.h
@@ -32,13 +32,13 @@ public:
     static void cgotoxy(int x, int y);
     static int wherex();
     static int wherey();
-    //static int get_number_of_lines(void);
+    //static int get_number_of_lines();
     static void _setcursortype(int curstype);
     static void textbackground(int bg);
     static void textcolor(int col);
 
     // Object's method
-    void clear_to_end_of_line(void);
+    void clear_to_end_of_line();
     void putwch(ucs_t chr);
 
     ucs_t   *cbuf; //text backup
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 752bb616c2..d518845522 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -143,7 +143,7 @@ static void _init_consoles()
 static void _shutdown_console()
 {
 #ifdef TARGET_OS_WINDOWS
-    typedef BOOL (WINAPI *fc_func)(void);
+    typedef BOOL (WINAPI *fc_func)();
     fc_func free_console = (fc_func)GetProcAddress(
         GetModuleHandle(TEXT("kernel32.dll")), "FreeConsole");
     if (free_console)
diff --git a/crawl-ref/source/traps.h b/crawl-ref/source/traps.h
index ce044954ed..12db752927 100644
--- a/crawl-ref/source/traps.h
+++ b/crawl-ref/source/traps.h
@@ -14,7 +14,7 @@ class monster;
 struct trap_def;
 
 void disarm_trap(const coord_def& where);
-void free_self_from_net(void);
+void free_self_from_net();
 void free_stationary_net(int item_index);
 
 void handle_traps(trap_type trt, int i, bool trap_known);
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index d7dfabdcff..24131b4a76 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -601,7 +601,7 @@ static inline void _check_interesting_square(const coord_def pos,
     ed.found_feature(pos, grd(pos));
 }
 
-static void _userdef_run_stoprunning_hook(void)
+static void _userdef_run_stoprunning_hook()
 {
 #ifdef CLUA_BINDINGS
     if (you.running)
@@ -611,7 +611,7 @@ static void _userdef_run_stoprunning_hook(void)
 #endif
 }
 
-static void _userdef_run_startrunning_hook(void)
+static void _userdef_run_startrunning_hook()
 {
 #ifdef CLUA_BINDINGS
     if (you.running)
diff --git a/crawl-ref/source/travel.h b/crawl-ref/source/travel.h
index b75abf48e7..8d19c58e2a 100644
--- a/crawl-ref/source/travel.h
+++ b/crawl-ref/source/travel.h
@@ -54,13 +54,13 @@ enum run_mode_type
 /* ***********************************************************************
  * Initialises the travel subsystem.
  */
-void stop_running(void);
+void stop_running();
 void travel_init_load_level();
 void travel_init_new_level();
 
 uint8_t is_waypoint(const coord_def &p);
 command_type direction_to_command(int x, int y);
-bool is_resting(void);
+bool is_resting();
 void explore_pickup_event(int did_pickup, int tried_pickup);
 bool feat_is_traversable_now(dungeon_feature_type feat, bool try_fallback = false);
 bool feat_is_traversable(dungeon_feature_type feat, bool try_fallback = false);
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index 813b1721cf..6dd45a7ca1 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -452,7 +452,7 @@ static void _tweak_randart(item_def &item)
     }
 }
 
-void wizard_tweak_object(void)
+void wizard_tweak_object()
 {
     char specs[50];
     int keyin;
@@ -1579,7 +1579,7 @@ static void _debug_rap_stats(FILE *ostat)
     mpr("Results written into 'items.stat'.");
 }
 
-void debug_item_statistics(void)
+void debug_item_statistics()
 {
     FILE *ostat = fopen("items.stat", "a");
 
diff --git a/crawl-ref/source/wiz-item.h b/crawl-ref/source/wiz-item.h
index 9479a03eb7..4029a24073 100644
--- a/crawl-ref/source/wiz-item.h
+++ b/crawl-ref/source/wiz-item.h
@@ -6,10 +6,10 @@
 #ifndef WIZITEM_H
 #define WIZITEM_H
 
-void wizard_create_spec_object(void);
+void wizard_create_spec_object();
 void wizard_create_spec_object_by_name();
-void wizard_tweak_object(void);
-void wizard_make_object_randart(void);
+void wizard_tweak_object();
+void wizard_make_object_randart();
 void wizard_value_artefact();
 void wizard_uncurse_item();
 void wizard_create_all_artefacts();
@@ -19,6 +19,6 @@ void wizard_draw_card();
 void wizard_list_items();
 void wizard_identify_all_items();
 void wizard_unidentify_all_items();
-void debug_item_statistics(void);
+void debug_item_statistics();
 
 #endif
diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc
index 5d6021fcf4..34a26bddf7 100644
--- a/crawl-ref/source/wiz-mon.cc
+++ b/crawl-ref/source/wiz-mon.cc
@@ -50,7 +50,7 @@
 
 #ifdef WIZARD
 // Creates a specific monster by mon type number.
-void wizard_create_spec_monster(void)
+void wizard_create_spec_monster()
 {
     int mon = prompt_for_int("Which monster by number? ", true);
 
diff --git a/crawl-ref/source/wiz-mon.h b/crawl-ref/source/wiz-mon.h
index c42535cd50..1e9c68cea4 100644
--- a/crawl-ref/source/wiz-mon.h
+++ b/crawl-ref/source/wiz-mon.h
@@ -8,8 +8,8 @@
 
 #ifdef WIZARD
 
-void wizard_create_spec_monster(void);
-void wizard_create_spec_monster_name(void);
+void wizard_create_spec_monster();
+void wizard_create_spec_monster_name();
 void wizard_spawn_control();
 void wizard_detect_creatures();
 void wizard_dismiss_all_monsters(bool force_all = false);
diff --git a/crawl-ref/source/wiz-you.cc b/crawl-ref/source/wiz-you.cc
index 628940800f..86f089a8ed 100644
--- a/crawl-ref/source/wiz-you.cc
+++ b/crawl-ref/source/wiz-you.cc
@@ -43,7 +43,7 @@ static void _swap_equip(equipment_type a, equipment_type b)
     you.melded.set(b, tmp);
 }
 
-void wizard_change_species(void)
+void wizard_change_species()
 {
     char specs[80];
 
@@ -228,7 +228,7 @@ void wizard_change_species(void)
 
 #ifdef WIZARD
 // Casts a specific spell by number or name.
-void wizard_cast_spec_spell(void)
+void wizard_cast_spec_spell()
 {
     char specs[80], *end;
     int spell;
@@ -258,7 +258,7 @@ void wizard_cast_spec_spell(void)
         crawl_state.cancel_cmd_repeat();
 }
 
-void wizard_memorise_spec_spell(void)
+void wizard_memorise_spec_spell()
 {
     char specs[80], *end;
     int spell;
@@ -436,7 +436,7 @@ void wizard_set_piety()
 //
 //---------------------------------------------------------------
 #ifdef WIZARD
-void wizard_exercise_skill(void)
+void wizard_exercise_skill()
 {
     skill_type skill = debug_prompt_for_skill("Which skill (by name)? ");
 
@@ -493,7 +493,7 @@ void wizard_set_skill_level(skill_type skill)
 #endif
 
 #ifdef WIZARD
-void wizard_set_all_skills(void)
+void wizard_set_all_skills()
 {
     double amount = prompt_for_float("Set all skills to what level? ");
 
@@ -885,7 +885,7 @@ static const char* dur_names[] =
     "corrosion"
 };
 
-void wizard_edit_durations(void)
+void wizard_edit_durations()
 {
     COMPILE_CHECK(ARRAYSZ(dur_names) == NUM_DURATIONS);
     vector<int> durs;
@@ -1068,7 +1068,7 @@ void set_xl(const int newxl, const bool train)
         debug_uptick_xl(newxl, train);
 }
 
-void wizard_get_god_gift(void)
+void wizard_get_god_gift()
 {
     if (you_worship(GOD_NO_GOD))
     {
diff --git a/crawl-ref/source/wiz-you.h b/crawl-ref/source/wiz-you.h
index ad1e64ebc8..c14bff2b0b 100644
--- a/crawl-ref/source/wiz-you.h
+++ b/crawl-ref/source/wiz-you.h
@@ -8,21 +8,21 @@
 
 #include "enum.h"
 
-void wizard_cast_spec_spell(void);
-void wizard_memorise_spec_spell(void);
+void wizard_cast_spec_spell();
+void wizard_memorise_spec_spell();
 void wizard_heal(bool super_heal);
 void wizard_set_hunger_state();
 void wizard_set_piety();
-void wizard_exercise_skill(void);
-void wizard_set_abyss(void);
+void wizard_exercise_skill();
+void wizard_set_abyss();
 void wizard_set_skill_level(skill_type skill = SK_NONE);
-void wizard_set_all_skills(void);
-void wizard_change_species(void);
+void wizard_set_all_skills();
+void wizard_change_species();
 void wizard_set_xl();
 void set_xl(const int newxl, const bool train);
 bool wizard_add_mutation();
-void wizard_set_stats(void);
-void wizard_edit_durations(void);
+void wizard_set_stats();
+void wizard_edit_durations();
 void wizard_list_props();
 void wizard_get_god_gift();
 void wizard_toggle_xray_vision();