From: <cl...@us...> - 2007-07-13 14:09:59
|
Revision: 51 http://fortress.svn.sourceforge.net/fortress/?rev=51&view=rev Author: clrg Date: 2007-07-13 07:07:44 -0700 (Fri, 13 Jul 2007) Log Message: ----------- Properly restore minimap Modified Paths: -------------- trunk/client/src/net/sourceforge/fortress/game.t trunk/client/src/net/sourceforge/fortress/isogrid.t trunk/client/src/net/sourceforge/fortress/minimap.t trunk/client/src/net/sourceforge/fortress/minimaptile.t trunk/client/src/net/sourceforge/fortress/panel.t Modified: trunk/client/src/net/sourceforge/fortress/game.t =================================================================== --- trunk/client/src/net/sourceforge/fortress/game.t 2007-07-13 12:53:45 UTC (rev 50) +++ trunk/client/src/net/sourceforge/fortress/game.t 2007-07-13 14:07:44 UTC (rev 51) @@ -11,14 +11,17 @@ <shadowtext text="Map Size 100 x 100" shrink="true" /> </panel> <ui:box> - <panel id="left" hshrink="true"> - <ui:box width="10" /> + <panel id="left" hshrink="true" orient="vertical" padding="0 10"> + <layout:border border="#ffcc00" depth="1" shrink="true"> + <minimap id="minimap" /> + </layout:border> <ui:box orient="vertical" vshrink="true"> - <layout:border border="#ffcc00" depth="1" shrink="true"> - <minimap id="minimap" /> - </layout:border> + <ui:box height="10" /> + <widget:check id="gridon" cursor="hand" focusable="false" selected="true"> + <shadowtext text="Toggle Grid" /> + </widget:check> </ui:box> - <ui:box width="10" /> + <ui:box /> </panel> <layout:border border="#ffcc00" depth="1"> <isogrid id="map" /> @@ -29,6 +32,12 @@ vexi.ui.frame = thisbox; + //// Map / Sidebar Interaction //////////////////////////////// + + $gridon.selected ++= function(v) { cascade = v; $map.gridon = v; } + + //// Panel Layout ///////////////////////////////////////////// + $top.height ++= function(v) { cascade = v; @@ -40,12 +49,14 @@ { cascade = v; $bottom.bgy = -((v + $top.height)%256); + surface.setMapBox(vexi.math.floor($map.width / 48), vexi.math.floor(v / 24)); } $map.width ++= function(v) { cascade = v; $right.bgx = -((v + $left.width)%256); + surface.setMapBox(vexi.math.floor(v / 48), vexi.math.floor($map.height / 24)); } </ui:box> Modified: trunk/client/src/net/sourceforge/fortress/isogrid.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/minimap.t =================================================================== --- trunk/client/src/net/sourceforge/fortress/minimap.t 2007-07-13 12:53:45 UTC (rev 50) +++ trunk/client/src/net/sourceforge/fortress/minimap.t 2007-07-13 14:07:44 UTC (rev 51) @@ -6,7 +6,7 @@ $minimap.width ++= function(v) { cascade = v; width = v; } $minimap.height ++= function(v) { cascade = v; height = v; } <ui:box id="minimap" shrink="true" /> - <ui:box id="viewbox" display="false" orient="vertical" align="topleft"> + <ui:box id="viewbox" orient="vertical"> <ui:box fill="white" height="1" vshrink="true" /> <ui:box> <ui:box fill="white" width="1" hshrink="true" /> @@ -34,7 +34,6 @@ var moveMapFunc = function(v) { - vexi.log.info(v); // assumes minimap tiles are 1px by 1px surface.moveMapTo(mouse.x, mouse.y); cascade = v; @@ -42,6 +41,7 @@ var releaseFunc = function(v) { + cascade = v; Move --= moveMapFunc; surface.Focused --= releaseFunc; surface._Release1 --= releaseFunc; @@ -49,6 +49,7 @@ var pressFunc = function(v) { + cascade = v; Move ++= moveMapFunc; surface.Focused ++= releaseFunc; surface._Release1 ++= releaseFunc; Modified: trunk/client/src/net/sourceforge/fortress/minimaptile.t =================================================================== --- trunk/client/src/net/sourceforge/fortress/minimaptile.t 2007-07-13 12:53:45 UTC (rev 50) +++ trunk/client/src/net/sourceforge/fortress/minimaptile.t 2007-07-13 14:07:44 UTC (rev 51) @@ -7,16 +7,16 @@ { switch (s) { - case 0: return "70"; - case 1: return "78"; - case 2: return "80"; - case 3: return "88"; - case 4: return "90"; - case 5: return "98"; - case 6: return "A0"; - case 7: return "A8"; - case 8: return "B0"; - case 9: return "B8"; + case 0: return "50"; + case 1: return "58"; + case 2: return "60"; + case 3: return "68"; + case 4: return "70"; + case 5: return "78"; + case 6: return "80"; + case 7: return "88"; + case 8: return "90"; + case 9: return "98"; } return "FF"; } Modified: trunk/client/src/net/sourceforge/fortress/panel.t =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |