diff --git a/main.lua b/main.lua index 88b25791..bcaf15d5 100644 --- a/main.lua +++ b/main.lua @@ -124,6 +124,7 @@ IMG.init{ batteryImage="mess/power.png", title="mess/title.png", title_color="mess/title_colored.png", + lock="mess/lock.png", dialCircle="mess/dialCircle.png", dialNeedle="mess/dialNeedle.png", lifeIcon="mess/life.png", diff --git a/media/image/mess/lock.png b/media/image/mess/lock.png new file mode 100644 index 00000000..29a1fb8d Binary files /dev/null and b/media/image/mess/lock.png differ diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index fded0fa1..60ac279d 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -108,7 +108,7 @@ function scene.keyDown(k) PATH.socket..PATH.play_room.. "?email="..urlEncode(USER.email).. "&access_token="..urlEncode(USER.access_token).. - "&room_id="..urlEncode(rooms[selected].room_id) + "&id="..urlEncode(rooms[selected].id) -- "&password="..urlEncode(password), ) end @@ -122,6 +122,8 @@ function scene.update() end function scene.draw() + gc.setColor(1,1,1,.26) + gc.arc("fill","pie",440,620,60,-1.5708,-1.5708+1.2566*(TIME()-lastfreshTime)) if rooms then gc.setColor(1,1,1) if #rooms>0 then @@ -132,6 +134,10 @@ function scene.draw() setFont(35) for i=1,min(10,#rooms-scrollPos)do local R=rooms[scrollPos+i] + if R.private then + gc.setColor(1,1,1) + gc.draw(IMG.lock,64,75+40*i) + end gc.setColor(.9,.9,1) gc.print(scrollPos+i,100,66+40*i) gc.setColor(1,1,.7) @@ -148,8 +154,8 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="fresh", x=440,y=620,w=140,h=140,font=40,code=fresh,hide=function()return TIME()-lastfreshTime<1 end}, - WIDGET.newKey{name="join", x=640,y=620,w=140,h=140,font=40,code=pressKey"enter",hide=function()return not rooms end}, + WIDGET.newKey{name="fresh", x=440,y=620,w=140,h=140,font=40,code=fresh,hide=function()return TIME()-lastfreshTime<1.26 end}, + WIDGET.newKey{name="join", x=640,y=620,w=140,h=140,font=40,code=pressKey"return",hide=function()return not rooms end}, WIDGET.newKey{name="up", x=840,y=585,w=140,h=70,font=40,code=pressKey"up",hide=function()return not rooms end}, WIDGET.newKey{name="down", x=840,y=655,w=140,h=70,font=40,code=pressKey"down",hide=function()return not rooms end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},