From: <ke...@us...> - 2008-01-30 23:33:21
|
Revision: 732 http://planeshift.svn.sourceforge.net/planeshift/?rev=732&view=rev Author: kemedes Date: 2008-01-30 15:33:25 -0800 (Wed, 30 Jan 2008) Log Message: ----------- - Fix for some compiler warnings in GM GUI by ThomPhoenix. - Reverted chat.xml (again...). Modified Paths: -------------- trunk/data/gui/chat.xml trunk/src/client/gui/pawsgmgui.cpp Modified: trunk/data/gui/chat.xml =================================================================== --- trunk/data/gui/chat.xml 2008-01-30 23:02:14 UTC (rev 731) +++ trunk/data/gui/chat.xml 2008-01-30 23:33:25 UTC (rev 732) @@ -1,10 +1,9 @@ <widget_description> - <widget name="ChatWindow" factory="pawsChatWindow" visible="yes" savepositions="yes" movable="yes" resizable="yes" keepaspect="yes" configurable="yes"> + <widget name="ChatWindow" factory="pawsChatWindow" visible="yes" savepositions="yes" movable="yes" resizable="yes" keepaspect="no" configurable="yes"> <!-- ContextMenu="data/gui/chatmenu.xml" disabled until its finished --> <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" /> <frame x="360" y="300" width="330" height="122" border="no" /> <minframe width="475" height="190" /> - <maxframe width="660" height="240" /> <bgimage resource="Chat Background" alpha="128" /> <title resource="Nanaki Title Bar" text="Communication" align="left" close_button="yes"/> <childborders> Modified: trunk/src/client/gui/pawsgmgui.cpp =================================================================== --- trunk/src/client/gui/pawsgmgui.cpp 2008-01-30 23:02:14 UTC (rev 731) +++ trunk/src/client/gui/pawsgmgui.cpp 2008-01-30 23:33:25 UTC (rev 732) @@ -159,13 +159,13 @@ { int gmSets = message.gmSettings; isVisible = gmSets & 1; - isInvincible = gmSets & (1 << 1); - isViewAllObjects = gmSets & (1 << 2); - isNeverTired = gmSets & (1 << 3); - isQuestTester = gmSets & (1 << 4); - isInfiniteMana = gmSets & (1 << 5); - isFiniteInv = gmSets & (1 << 6); - isSafeFall = gmSets & (1 << 7); + isInvincible = ( gmSets & (1 << 1) ? true : false); + isViewAllObjects = ( gmSets & (1 << 2) ? true : false); + isNeverTired = ( gmSets & (1 << 3) ? true : false); + isQuestTester = ( gmSets & (1 << 4) ? true : false); + isInfiniteMana = ( gmSets & (1 << 5) ? true : false); + isFiniteInv = ( gmSets & (1 << 6) ? true : false); + isSafeFall = ( gmSets & (1 << 7) ? true : false); } } break; @@ -972,3 +972,4 @@ } } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |