--- a/gameServer/Actions.hs Sun Nov 14 21:36:47 2010 +0300
+++ b/gameServer/Actions.hs Sun Nov 14 20:06:47 2010 +0100
@@ -6,9 +6,9 @@
import qualified Data.IntSet as IntSet
import qualified Data.Sequence as Seq
import System.Log.Logger
-import Monad
+import Control.Monad
import Data.Time
-import Maybe
+import Data.Maybe
-----------------------------
import CoreTypes
import Utils
--- a/gameServer/HWProtoCore.hs Sun Nov 14 21:36:47 2010 +0300
+++ b/gameServer/HWProtoCore.hs Sun Nov 14 20:06:47 2010 +0100
@@ -2,7 +2,7 @@
import qualified Data.IntMap as IntMap
import Data.Foldable
-import Maybe
+import Data.Maybe
--------------------------------------
import CoreTypes
import Actions
--- a/gameServer/HWProtoInRoomState.hs Sun Nov 14 21:36:47 2010 +0300
+++ b/gameServer/HWProtoInRoomState.hs Sun Nov 14 20:06:47 2010 +0100
@@ -5,7 +5,7 @@
import qualified Data.Map as Map
import Data.Sequence(Seq, (|>), (><), fromList, empty)
import Data.List
-import Maybe
+import Data.Maybe
--------------------------------------
import CoreTypes
import Actions
--- a/gameServer/HWProtoLobbyState.hs Sun Nov 14 21:36:47 2010 +0300
+++ b/gameServer/HWProtoLobbyState.hs Sun Nov 14 20:06:47 2010 +0100
@@ -4,7 +4,7 @@
import qualified Data.IntMap as IntMap
import qualified Data.IntSet as IntSet
import qualified Data.Foldable as Foldable
-import Maybe
+import Data.Maybe
import Data.List
import Data.Word
--------------------------------------
--- a/gameServer/HWProtoNEState.hs Sun Nov 14 21:36:47 2010 +0300
+++ b/gameServer/HWProtoNEState.hs Sun Nov 14 20:06:47 2010 +0100
@@ -1,7 +1,7 @@
module HWProtoNEState where
import qualified Data.IntMap as IntMap
-import Maybe
+import Data.Maybe
import Data.List
import Data.Word
--------------------------------------
--- a/gameServer/OfficialServer/DBInteraction.hs Sun Nov 14 21:36:47 2010 +0300
+++ b/gameServer/OfficialServer/DBInteraction.hs Sun Nov 14 20:06:47 2010 +0100
@@ -11,8 +11,7 @@
import qualified Control.Exception as Exception
import Control.Monad
import qualified Data.Map as Map
-import Monad
-import Maybe
+import Data.Maybe
import System.Log.Logger
import Data.Time
------------------------
--- a/gameServer/Opts.hs Sun Nov 14 21:36:47 2010 +0300
+++ b/gameServer/Opts.hs Sun Nov 14 20:06:47 2010 +0100
@@ -3,7 +3,7 @@
getOpts,
) where
-import System
+import System.Environment ( getArgs )
import System.Console.GetOpt
import Network
import Data.Maybe ( fromMaybe )
--- a/gameServer/Utils.hs Sun Nov 14 21:36:47 2010 +0300
+++ b/gameServer/Utils.hs Sun Nov 14 20:06:47 2010 +0100
@@ -13,7 +13,7 @@
import System.IO
import qualified Data.List as List
import Control.Monad
-import Maybe
+import Data.Maybe
-------------------------------------------------
import qualified Codec.Binary.Base64 as Base64
import qualified Data.ByteString.UTF8 as BUTF8