diff --git a/Zframework/widget.lua b/Zframework/widget.lua index 26c9df19..f7db59cc 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -845,10 +845,10 @@ function textBox:update() end function textBox:push(t) ins(self.texts,t) - if self.scrollPos==#self.texts-1 and not(self.hide==true or self.hide and self.hide())then + if self.scrollPos==#self.texts-1 then self.scrollPos=#self.texts else - SFX.play("spin_0",.8) + SFX.play("spin_0",.6) self.new=true end end diff --git a/parts/net.lua b/parts/net.lua index 36b1d856..53d8f61f 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -56,7 +56,7 @@ local function _parse(res) )or "[NO Message]" ), - "warning") + "warn") end end end diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index e6261800..0a3b916d 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -145,9 +145,6 @@ function scene.socketRead(cmd,d) COLOR.dY,"#"..d.uid.." ", COLOR.Y,text.leaveRoom, } - if not playing then - initPlayerPosition(true) - end elseif cmd=="Talk"then textBox:push{ COLOR.W,d.username,