diff options
author | Adam Borowski <kilobyte@angband.pl> | 2012-07-05 12:14:09 +0200 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2012-07-05 12:14:09 +0200 |
commit | c41419c4f47bbf0737d3fedf58128c835d2c4e3b (patch) | |
tree | 764ae18c107df39fd90af718922036bd245561ca /crawl-ref/source/l_crawl.cc | |
parent | b80adef8882143cad34f3c8bcc9a8ccbd4440223 (diff) | |
download | crawl-ref-c41419c4f47bbf0737d3fedf58128c835d2c4e3b.tar.gz crawl-ref-c41419c4f47bbf0737d3fedf58128c835d2c4e3b.zip |
Drop parentheses around scalar values in "return".
Diffstat (limited to 'crawl-ref/source/l_crawl.cc')
-rw-r--r-- | crawl-ref/source/l_crawl.cc | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/crawl-ref/source/l_crawl.cc b/crawl-ref/source/l_crawl.cc index 8c502b443e..1a276997f0 100644 --- a/crawl-ref/source/l_crawl.cc +++ b/crawl-ref/source/l_crawl.cc @@ -54,11 +54,11 @@ function mpr(message, channel) */ static int crawl_mpr(lua_State *ls) { if (!crawl_state.io_inited) - return (0); + return 0; const char *message = luaL_checkstring(ls, 1); if (!message) - return (0); + return 0; int ch = MSGCH_PLAIN; if (lua_isnumber(ls, 2)) @@ -74,7 +74,7 @@ static int crawl_mpr(lua_State *ls) ch = MSGCH_PLAIN; mpr(message, static_cast<msg_channel_type>(ch)); - return (0); + return 0; } /* @@ -83,11 +83,11 @@ function formatted_mpr(message, channel) */ static int crawl_formatted_mpr(lua_State *ls) { if (!crawl_state.io_inited) - return (0); + return 0; const char *message = luaL_checkstring(ls, 1); if (!message) - return (0); + return 0; int ch = MSGCH_PLAIN; if (lua_isnumber(ls, 2)) @@ -104,7 +104,7 @@ static int crawl_formatted_mpr(lua_State *ls) formatted_mpr(formatted_string::parse_string(message), static_cast<msg_channel_type>(ch)); - return (0); + return 0; } /* @@ -114,7 +114,7 @@ LUAFN(crawl_stderr) { const char *text = luaL_checkstring(ls, 1); fprintf(stderr, "%s\n", text); - return (0); + return 0; } /* @@ -127,7 +127,7 @@ LUAFN(crawl_dpr) if (crawl_state.io_inited) dprf("%s", text); #endif - return (0); + return 0; } /* @@ -159,11 +159,11 @@ static int crawl_set_more_autoclear(lua_State *ls) if (lua_isnone(ls, 1)) { luaL_argerror(ls, 1, "needs a boolean argument"); - return (0); + return 0; } set_more_autoclear(lua_toboolean(ls, 1)); - return (0); + return 0; } /* @@ -174,11 +174,11 @@ static int crawl_enable_more(lua_State *ls) if (lua_isnone(ls, 1)) { luaL_argerror(ls, 1, "needs a boolean argument"); - return (0); + return 0; } crawl_state.show_more_prompt = lua_toboolean(ls, 1); - return (0); + return 0; } /* @@ -196,7 +196,7 @@ static int crawl_c_input_line(lua_State *ls) lua_pushstring(ls, linebuf); else lua_pushnil(ls); - return (1); + return 1; } /* @@ -243,7 +243,7 @@ static int crawl_yesno(lua_State *ls) lua_pushboolean(ls, yesno(prompt, safe, safeanswer, clear_after, interrupt_delays, noprompt)); - return (1); + return 1; } /* @@ -266,7 +266,7 @@ static int crawl_yesnoquit(lua_State *ls) lua_pushnumber(ls, yesnoquit(prompt, safe, safeanswer, allow_all, clear_after)); - return (1); + return 1; } static void crawl_sendkeys_proc(lua_State *ls, int argi) @@ -308,7 +308,7 @@ static int crawl_sendkeys(lua_State *ls) int top = lua_gettop(ls); for (int i = 1; i <= top; ++i) crawl_sendkeys_proc(ls, i); - return (0); + return 0; } /* @@ -330,7 +330,7 @@ static int crawl_process_command(lua_State *ls) } lua_pushboolean(ls, will_process); - return (1); + return 1; } /* @@ -343,13 +343,13 @@ static int crawl_process_keys(lua_State *ls) { luaL_error(ls, "Cannot currently process new keys (%s delay active)", delay_name(current_delay)); - return (0); + return 0; } if (you.turn_is_over) { luaL_error(ls, "Cannot currently process new keys (turn is over)"); - return (0); + return 0; } const char* keys = luaL_checkstring(ls, 1); @@ -357,7 +357,7 @@ static int crawl_process_keys(lua_State *ls) if (strlen(keys) == 0) { luaL_argerror(ls, 1, "Must have at least one key to process."); - return (0); + return 0; } command_type cmd = key_to_command(keys[0], KMC_DEFAULT); @@ -365,7 +365,7 @@ static int crawl_process_keys(lua_State *ls) if (cmd == CMD_NO_CMD) { luaL_argerror(ls, 1, "First key is invalid command"); - return (0); + return 0; } flush_input_buffer(FLUSH_BEFORE_COMMAND); @@ -374,7 +374,7 @@ static int crawl_process_keys(lua_State *ls) process_command(cmd); - return (0); + return 0; } /* @@ -385,9 +385,9 @@ static int crawl_playsound(lua_State *ls) { const char *sf = luaL_checkstring(ls, 1); if (!sf) - return (0); + return 0; play_sound(sf); - return (0); + return 0; } /* @@ -398,9 +398,9 @@ static int crawl_runmacro(lua_State *ls) { const char *macroname = luaL_checkstring(ls, 1); if (!macroname) - return (0); + return 0; run_macro(macroname); - return (0); + return 0; } /* @@ -410,7 +410,7 @@ function setopt(s) */ static int crawl_setopt(lua_State *ls) { if (!lua_isstring(ls, 1)) - return (0); + return 0; const char *s = lua_tostring(ls, 1); if (s) @@ -419,7 +419,7 @@ static int crawl_setopt(lua_State *ls) read_options(s, true); } - return (0); + return 0; } /* @@ -429,11 +429,11 @@ function read_options(filename) */ static int crawl_read_options(lua_State *ls) { if (!lua_isstring(ls, 1)) - return (0); + return 0; const char* filename = lua_tostring(ls, 1); Options.include(filename, true, true); - return (0); + return 0; } static int crawl_bindkey(lua_State *ls) @@ -443,7 +443,7 @@ static int crawl_bindkey(lua_State *ls) s = lua_tostring(ls, 1); if (!s || !lua_isfunction(ls, 2) || lua_gettop(ls) != 2) - return (0); + return 0; lua_pushvalue(ls, 2); std::string name = clua.setuniqregistry(); @@ -453,20 +453,20 @@ static int crawl_bindkey(lua_State *ls) lua_settop(ls, 2); } macro_userfn(s, name.c_str()); - return (0); + return 0; } static int crawl_msgch_num(lua_State *ls) { const char *s = luaL_checkstring(ls, 1); if (!s) - return (0); + return 0; int ch = str_to_channel(s); if (ch == -1) - return (0); + return 0; lua_pushnumber(ls, ch); - return (1); + return 1; } static int crawl_msgch_name(lua_State *ls) @@ -474,21 +474,21 @@ static int crawl_msgch_name(lua_State *ls) int num = luaL_checkint(ls, 1); std::string name = channel_to_str(num); lua_pushstring(ls, name.c_str()); - return (1); + return 1; } static int crawl_take_note(lua_State *ls) { const char* msg = luaL_checkstring(ls, 1); take_note(Note(NOTE_MESSAGE, 0, 0, msg)); - return (0); + return 0; } static int crawl_messages(lua_State *ls) { const int count = luaL_checkint(ls, 1); lua_pushstring(ls, get_last_messages(count).c_str()); - return (1); + return 1; } #define REGEX_METATABLE "crawl.regex" @@ -498,7 +498,7 @@ static int crawl_regex(lua_State *ls) { const char *s = luaL_checkstring(ls, 1); if (!s) - return (0); + return 0; text_pattern **tpudata = @@ -506,9 +506,9 @@ static int crawl_regex(lua_State *ls) if (tpudata) { *tpudata = new text_pattern(s); - return (1); + return 1; } - return (0); + return 0; } static int crawl_regex_find(lua_State *ls) @@ -516,14 +516,14 @@ static int crawl_regex_find(lua_State *ls) text_pattern **pattern = clua_get_userdata< text_pattern* >(ls, REGEX_METATABLE); if (!pattern) - return (0); + return 0; const char *text = luaL_checkstring(ls, -1); if (!text) - return (0); + return 0; lua_pushboolean(ls, (*pattern)->matches(text)); - return (1); + return 1; } static const luaL_reg crawl_regex_ops[] = @@ -536,7 +536,7 @@ static int crawl_message_filter(lua_State *ls) { const char *pattern = luaL_checkstring(ls, 1); if (!pattern) - return (0); + return 0; int num = lua_isnumber(ls, 2)? luaL_checkint(ls, 2) : -1; message_filter **mf = @@ -544,9 +544,9 @@ static int crawl_message_filter(lua_State *ls) if (mf) { *mf = new message_filter(num, pattern); - return (1); + return 1; } - return (0); + return 0; } static int crawl_messf_matches(lua_State *ls) @@ -554,7 +554,7 @@ static int crawl_messf_matches(lua_State *ls) message_filter **mf = clua_get_userdata< message_filter* >(ls, MESSF_METATABLE); if (!mf) - return (0); + return 0; const char *pattern = luaL_checkstring(ls, 2); int ch = luaL_checkint(ls, 3); @@ -562,9 +562,9 @@ static int crawl_messf_matches(lua_State *ls) { bool filt = (*mf)->is_filtered(ch, pattern); lua_pushboolean(ls, filt); - return (1); + return 1; } - return (0); + return 0; } static const luaL_reg crawl_messf_ops[] = @@ -577,11 +577,11 @@ static int crawl_trim(lua_State *ls) { const char *s = luaL_checkstring(ls, 1); if (!s) - return (0); + return 0; std::string text = s; trim_string(text); lua_pushstring(ls, text.c_str()); - return (1); + return 1; } static int crawl_split(lua_State *ls) @@ -589,7 +589,7 @@ static int crawl_split(lua_State *ls) const char *s = luaL_checkstring(ls, 1), *token = luaL_checkstring(ls, 2); if (!s || !token) - return (0); + return 0; std::vector<std::string> segs = split_string(token, s); lua_newtable(ls); @@ -598,7 +598,7 @@ static int crawl_split(lua_State *ls) lua_pushstring(ls, segs[i].c_str()); lua_rawseti(ls, -2, i + 1); } - return (1); + return 1; } static int _crawl_grammar(lua_State *ls) @@ -621,7 +621,7 @@ static int crawl_article_a(lua_State *ls) lua_pushstring(ls, article_a(s, lowercase).c_str()); - return (1); + return 1; } LUARET1(crawl_game_started, boolean, crawl_state.need_save) @@ -647,7 +647,7 @@ static int crawl_is_tiles(lua_State *ls) { lua_pushboolean(ls, is_tiles()); - return (1); + return 1; } static int crawl_is_webtiles(lua_State *ls) @@ -658,7 +658,7 @@ static int crawl_is_webtiles(lua_State *ls) lua_pushboolean(ls, false); #endif - return (1); + return 1; } static int crawl_get_command(lua_State *ls) @@ -666,7 +666,7 @@ static int crawl_get_command(lua_State *ls) if (lua_gettop(ls) == 0) { lua_pushnil(ls); - return (1); + return 1; } const command_type cmd = name_to_command(luaL_checkstring(ls, 1)); @@ -676,7 +676,7 @@ static int crawl_get_command(lua_State *ls) cmd_name = "<<"; lua_pushstring(ls, cmd_name.c_str()); - return (1); + return 1; } LUAWRAP(crawl_endgame, screen_end_game(luaL_checkstring(ls, 1))) @@ -786,7 +786,7 @@ static int crawl_call_dlua(lua_State *ls) const char* code = luaL_checkstring(ls, 1); if (!code) - return (0); + return 0; luaL_loadbuffer(dlua, code, strlen(code), "call_dlua"); int status = lua_pcall(dlua, 0, LUA_MULTRET, 0); @@ -916,13 +916,13 @@ LUAFN(_crawl_milestone) mark_milestone(luaL_checkstring(ls, 1), luaL_checkstring(ls, 2), lua_toboolean(ls, 3)); - return (0); + return 0; } LUAFN(_crawl_redraw_view) { viewwindow(); - return (0); + return 0; } LUAFN(_crawl_redraw_stats) @@ -939,7 +939,7 @@ LUAFN(_crawl_redraw_stats) you.redraw_status_flags = 0xFFFFFFFF; print_stats(); - return (0); + return 0; } @@ -954,7 +954,7 @@ LUAFN(_crawl_millis) strerror(error)).c_str()); lua_pushnumber(ls, tv.tv_sec * 1000 + tv.tv_usec / 1000); - return (1); + return 1; } #endif @@ -984,7 +984,7 @@ LUARET1(crawl_make_name, string, _crawl_make_name(ls).c_str()) static int _crawl_god_speaks(lua_State *ls) { if (!crawl_state.io_inited) - return (0); + return 0; const char *god_name = luaL_checkstring(ls, 1); if (!god_name) @@ -1002,10 +1002,10 @@ static int _crawl_god_speaks(lua_State *ls) const char *message = luaL_checkstring(ls, 2); if (!message) - return (0); + return 0; god_speaks(god, message); - return (0); + return 0; } LUAFN(_crawl_set_max_runes) @@ -1015,7 +1015,7 @@ LUAFN(_crawl_set_max_runes) luaL_error(ls, make_stringf("Bad number of max runes: %d", max_runes).c_str()); else you.obtainable_runes = max_runes; - return (0); + return 0; } LUAWRAP(_crawl_mark_game_won, crawl_state.mark_last_game_won()) |