Merge branch 'wdoor-stable'

[shogi-server/shogi-server.git] / shogi-server

diff --git a/shogi-server b/shogi-server
index 8073889..b5e1ecf 100755 (executable)
--- a/shogi-server
+++ b/shogi-server
@@ -278,10 +278,10 @@ def check_command_line
     $options["floodgate-history"] = nil
   end
 
-  $options["max-moves"] ||= 256
+  $options["max-moves"] ||= ShogiServer::Default_Max_Moves
   $options["max-moves"] = $options["max-moves"].to_i
 
-  $options["least-time-per-move"] ||= 0
+  $options["least-time-per-move"] ||= ShogiServer::Default_Least_Time_Per_Move
   $options["least-time-per-move"] = $options["least-time-per-move"].to_i
 end
 
@@ -356,8 +356,9 @@ def login_loop(client)
           # can override the current player.
           if (current_player.password == player.password &&
               (current_player.status != "game" ||
-               Time.now - current_player.modifiled_at > ONE_DAY))
-            log_message("user %s login forcely (previously modified at %s)" % [player.name, player.modified_at])
+               Time.now - current_player.last_command_at > ONE_DAY))
+            log_message("player %s login forcibly, nudging the former player" % [player.name])
+            log_message("  the former player was in %s and received the last command at %s" % [current_player.status, current_player.last_command_at])
             current_player.kill
           else
             login.incorrect_duplicated_player(str)