Delete cruft, add Reader monad to some internal ai
This commit is contained in:
@@ -70,13 +70,13 @@ resumeSound w = w
|
||||
Consider replacing instances with 'soundOncePos'.
|
||||
-}
|
||||
soundOnce :: Int -> World -> World
|
||||
soundOnce i = over soundQueue ((:) (i,0))
|
||||
soundOnce i = soundQueue %~ ((i,0) : )
|
||||
|
||||
{-| Play a sound with a given position in the world.
|
||||
Uses the angle between the given position and '_cameraViewFrom', taking into account '_cameraRot'.
|
||||
-}
|
||||
soundOncePos :: Int -> Point2 -> World -> World
|
||||
soundOncePos i pos w = over soundQueue ((:) (i,a)) w
|
||||
soundOncePos i pos w = w & soundQueue %~ ((i,a) :)
|
||||
where
|
||||
a = soundAngle pos w
|
||||
|
||||
@@ -88,7 +88,7 @@ soundOnceOrigin
|
||||
-> SoundOrigin -- ^ The \"creator\" of the sound
|
||||
-> Point2 -- ^ The position of the sound in the world
|
||||
-> World -> World
|
||||
soundOnceOrigin sType so p w = over sounds (M.insertWith (flip const) so theSound) w
|
||||
soundOnceOrigin sType so p w = w & sounds %~ M.insertWith (\ _ x -> x) so theSound
|
||||
where
|
||||
theSound = Sound
|
||||
{ _soundChunkID = sType
|
||||
@@ -141,7 +141,7 @@ soundFrom
|
||||
-> Int -- ^ Frames to play
|
||||
-> Int -- ^ Fade out time (ms)
|
||||
-> World -> World
|
||||
soundFrom so sType time fadeTime w = over sounds (M.insertWith f so sound) w
|
||||
soundFrom so sType time fadeTime = sounds %~ M.insertWith f so sound
|
||||
where
|
||||
sound = Sound
|
||||
{ _soundChunkID = sType
|
||||
|
||||
Reference in New Issue
Block a user