Killed a lot of libunix.cc which is no longer necessary with the new

command dispatch mechanism.
Cleaned up all remaining variable shadowing warnings.
Added -Wshadow and -pedantic to CFLAGS.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@135 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 7 deletions

diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index ece94608ba..5a594fcaa8 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -752,10 +752,10 @@ void start_running(void)
  */
 command_type travel()
 {
-    char x,y;
-    char *move_x = &x;
-    char *move_y = &y;
-    x = y = 0;
+    char holdx, holdy;
+    char *move_x = &holdx;
+    char *move_y = &holdy;
+    holdx = holdy = 0;
     
     command_type result = CMD_NO_CMD;
 
@@ -1486,14 +1486,14 @@ static std::vector<unsigned char> get_known_branches()
         BRANCH_HALL_OF_ZOT
     };
 
-    std::vector<unsigned char> branches;
+    std::vector<unsigned char> result;
     for (unsigned i = 0; i < sizeof list_order / sizeof(*list_order); ++i)
     {
         if (is_known_branch(list_order[i]))
-            branches.push_back(list_order[i]);
+            result.push_back(list_order[i]);
     }
 
-    return branches;
+    return result;
 }
 
 static int prompt_travel_branch()