From 251663830ec66c93ba1b3bc46216a8c33bce0b5a Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 1 Oct 2009 21:18:29 -0500 Subject: Replace extraneous tabs with spaces. --- crawl-ref/source/AppHdr.h | 4 ++-- crawl-ref/source/initfile.cc | 28 ++++++++++++++-------------- crawl-ref/source/libutil.cc | 12 +++++++----- crawl-ref/source/religion.cc | 2 +- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index 385d4827a6..991b5587ba 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -339,10 +339,10 @@ #ifdef USE_TILE - #ifdef __cplusplus + #ifdef __cplusplus #include "libgui.h" #include "tilesdl.h" - #endif + #endif #endif // ========================================================================= diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 5618e04642..5ea6dc449c 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -3446,15 +3446,15 @@ bool arg_seen[num_cmd_ops]; std::string find_executable_path() { - char tempPath[2048]; + char tempPath[2048]; - // A lot of OSes give ways to find the location of the running app's - // binary executable. This is useful, because argv[0] can be relative - // when we really need an absolute path in order to locate the game's - // resources. + // A lot of OSes give ways to find the location of the running app's + // binary executable. This is useful, because argv[0] can be relative + // when we really need an absolute path in order to locate the game's + // resources. - // Faster than a memset, and counts as a null-terminated string! - tempPath[0] = 0; + // Faster than a memset, and counts as a null-terminated string! + tempPath[0] = 0; #if defined ( _MSC_VER ) GetModuleFileName ( NULL, tempPath, sizeof(tempPath) ); @@ -3463,21 +3463,21 @@ std::string find_executable_path() #elif defined ( __MACH__ ) strncpy ( tempPath, NXArgv[0], sizeof(tempPath) ); #else - // We don't know how to find the executable's path on this OS. + // We don't know how to find the executable's path on this OS. #endif - return std::string(tempPath); + return std::string(tempPath); } bool parse_args( int argc, char **argv, bool rc_only ) { COMPILE_CHECK(ARRAYSZ(cmd_ops) == CLO_NOPS, c1); - std::string exe_path = find_executable_path(); + std::string exe_path = find_executable_path(); - if (!exe_path.empty()) - set_crawl_base_dir(exe_path.c_str()); - else - set_crawl_base_dir(argv[0]); + if (!exe_path.empty()) + set_crawl_base_dir(exe_path.c_str()); + else + set_crawl_base_dir(argv[0]); SysEnv.rcdirs.clear(); diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index d6064e7bbc..d02fe3e0b1 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -171,16 +171,18 @@ std::string &escape_path_spaces(std::string &s) s.find("\"") == std::string::npos) { result = "\"" + s + "\""; - } else { + } + else + { return s; } #else - // Not implemented for this platform. Assume that - // escaping isn't necessary. - return s; + // Not implemented for this platform. Assume that escaping isn't + // necessary. + return s; #endif s = result; - return s; + return s; } std::string &uppercase(std::string &s) diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 61f0b54376..db9aae8b1a 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -7081,7 +7081,7 @@ static bool _altar_prayer() } // Return early so we don't offer our Necronomicon to Kiku. - return (did_bless); + return (did_bless); } offer_items(); -- cgit v1.2.3-54-g00ecf