Merge branch 'wdoor-stable'

[shogi-server/shogi-server.git] / shogi_server / league.rb

diff --git a/shogi_server/league.rb b/shogi_server/league.rb
index 5936e79..b3e9c46 100644 (file)
--- a/shogi_server/league.rb
+++ b/shogi_server/league.rb
@@ -1,7 +1,7 @@
 ## $Id$
 
 ## Copyright (C) 2004 NABEYA Kenichi (aka nanami@2ch)
-## Copyright (C) 2007-2008 Daigo Moriwaki (daigo at debian dot org)
+## Copyright (C) 2007-2012 Daigo Moriwaki (daigo at debian dot org)
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -105,17 +105,17 @@ class League
   #   2. a rival player instance found
   #   3. nil if rival not found 
   #
-  def find_rival(player, my_sente_string, game_name)
-    case my_sente_string
-    when "*" # no preference
+  def find_rival(player, game_name)
+    case player.sente
+    when nil # no preference
       if Login.handicapped_game_name?(game_name)
         player.write_safe("##[ERROR] Random turn preference is not allowed for handicapped games\n")
         return :continue
       end
       return get_player("game_waiting", game_name, nil, player)
-    when "+" # rival must be gote
+    when true # rival must be gote
       return get_player("game_waiting", game_name, false, player) 
-    when "-" # rival must be sente 
+    when false # rival must be sente 
       return get_player("game_waiting", game_name, true, player) 
     else
       write_safe("##[ERROR] bad game option: %s\n" % [my_sente_string])