crossfire-cvs — List for CVS update messages only.

[Crossfire-cvs] SF.net SVN: crossfire:[12236] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12236
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12236&view=rev
Author:   akirschbaum
Date:     2009-10-29 20:01:47 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
Omit objects below the floor from the ground view.

Modified Paths:
--------------
    server/trunk/ChangeLog
    server/trunk/socket/item.c

Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog	2009-10-29 17:31:37 UTC (rev 12235)
+++ server/trunk/ChangeLog	2009-10-29 20:01:47 UTC (rev 12236)
@@ -14,6 +14,9 @@
 else.  With this, include the file(s) that you changed.
 ------------------------------------------------------------------------------
 
+Omit objects below the floor from the ground view.
+Andreas Kirschbaum 2009-10-29
+
 Fix exit location for the goto command in server/c_wiz.c (was broken when exit
 coordinates recently changed so that (-1,-1) meant default coordinates).
 Arvid Norlander 2009-10-29

Modified: server/trunk/socket/item.c
===================================================================
--- server/trunk/socket/item.c	2009-10-29 17:31:37 UTC (rev 12235)
+++ server/trunk/socket/item.c	2009-10-29 20:01:47 UTC (rev 12236)
@@ -251,6 +251,10 @@
     FOR_OB_AND_BELOW_PREPARE(tmp) {
         object *head;
 
+        if (tmp == last) {
+            break;
+        }
+
         if (QUERY_FLAG(tmp, FLAG_IS_FLOOR) && !last) {
             last = tmp->below;  /* assumes double floor mode */
             if (last && QUERY_FLAG(last, FLAG_IS_FLOOR))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12235] maps/trunk/quests/peterm/FireTemple/Fire2

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12235
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12235&view=rev
Author:   anmaster
Date:     2009-10-29 17:31:37 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
Remove some double floor in /quests/peterm/FireTemple/Fire2, move one magic mouth below the floor.

Modified Paths:
--------------
    maps/trunk/quests/peterm/FireTemple/Fire2

Modified: maps/trunk/quests/peterm/FireTemple/Fire2
===================================================================
--- maps/trunk/quests/peterm/FireTemple/Fire2	2009-10-29 16:55:08 UTC (rev 12234)
+++ maps/trunk/quests/peterm/FireTemple/Fire2	2009-10-29 17:31:37 UTC (rev 12235)
@@ -9,7 +9,7 @@
 enter_y 30
 msg
 Created:  1997-06-07 PeterM (pe...@so...)
-Modified: 2008-12-21 Rick Tanner
+Modified: 2009-10-29 Arvid Norlander
 endmsg
 end
 arch pstone_1
@@ -450,10 +450,6 @@
 x 2
 y 7
 end
-arch pstone_1
-x 2
-y 7
-end
 arch fire_elemental
 hp 32766
 x 2
@@ -653,10 +649,6 @@
 x 3
 y 7
 end
-arch pstone_1
-x 3
-y 7
-end
 arch fire_elemental
 hp 32766
 x 3
@@ -872,10 +864,6 @@
 x 4
 y 6
 end
-arch pstone_1
-x 4
-y 6
-end
 arch dun8
 x 4
 y 6
@@ -884,10 +872,6 @@
 x 4
 y 7
 end
-arch pstone_1
-x 4
-y 7
-end
 arch dun3
 x 4
 y 7
@@ -896,10 +880,6 @@
 x 4
 y 8
 end
-arch pstone_1
-x 4
-y 8
-end
 arch dun4
 x 4
 y 8
@@ -1094,10 +1074,6 @@
 x 5
 y 6
 end
-arch pstone_1
-x 5
-y 6
-end
 arch door_look_1
 x 5
 y 6
@@ -1106,10 +1082,6 @@
 x 5
 y 7
 end
-arch pstone_1
-x 5
-y 7
-end
 arch random_weapon
 x 5
 y 7
@@ -1118,10 +1090,6 @@
 x 5
 y 8
 end
-arch pstone_1
-x 5
-y 8
-end
 arch dun2
 x 5
 y 8
@@ -1328,10 +1296,6 @@
 x 6
 y 6
 end
-arch pstone_1
-x 6
-y 6
-end
 arch dun6
 x 6
 y 6
@@ -1340,10 +1304,6 @@
 x 6
 y 7
 end
-arch pstone_1
-x 6
-y 7
-end
 arch random_weapon
 x 6
 y 7
@@ -1352,10 +1312,6 @@
 x 6
 y 8
 end
-arch pstone_1
-x 6
-y 8
-end
 arch dun2
 x 6
 y 8
@@ -1571,10 +1527,6 @@
 x 7
 y 6
 end
-arch pstone_1
-x 7
-y 6
-end
 arch dun2
 x 7
 y 6
@@ -1583,10 +1535,6 @@
 x 7
 y 7
 end
-arch pstone_1
-x 7
-y 7
-end
 arch random_weapon
 x 7
 y 7
@@ -1595,10 +1543,6 @@
 x 7
 y 8
 end
-arch pstone_1
-x 7
-y 8
-end
 arch dun2
 x 7
 y 8
@@ -1661,10 +1605,6 @@
 speed 0.500000
 connected 6
 end
-arch pstone_1
-x 7
-y 16
-end
 arch magic_ear
 msg
 @match water of diamond
@@ -1674,6 +1614,10 @@
 y 16
 connected 6
 end
+arch pstone_1
+x 7
+y 16
+end
 arch block_door_closed
 x 7
 y 16
@@ -1826,10 +1770,6 @@
 x 8
 y 6
 end
-arch pstone_1
-x 8
-y 6
-end
 arch dun2
 x 8
 y 6
@@ -1838,10 +1778,6 @@
 x 8
 y 7
 end
-arch pstone_1
-x 8
-y 7
-end
 arch random_weapon
 x 8
 y 7
@@ -1850,10 +1786,6 @@
 x 8
 y 8
 end
-arch pstone_1
-x 8
-y 8
-end
 arch dun2
 x 8
 y 8
@@ -2054,10 +1986,6 @@
 x 9
 y 6
 end
-arch pstone_1
-x 9
-y 6
-end
 arch dun9
 x 9
 y 6
@@ -2066,10 +1994,6 @@
 x 9
 y 7
 end
-arch pstone_1
-x 9
-y 7
-end
 arch dun11
 x 9
 y 7
@@ -2078,10 +2002,6 @@
 x 9
 y 8
 end
-arch pstone_1
-x 9
-y 8
-end
 arch dun7
 x 9
 y 8
@@ -2138,10 +2058,6 @@
 x 9
 y 15
 end
-arch pstone_1
-x 9
-y 15
-end
 arch dragonman
 name lesser dragonman
 Con 5
@@ -2165,10 +2081,6 @@
 end
 arch pstone_1
 x 9
-y 16
-end
-arch pstone_1
-x 9
 y 17
 end
 arch pstone_1
@@ -2297,10 +2209,6 @@
 x 10
 y 6
 end
-arch pstone_1
-x 10
-y 6
-end
 arch fire_elemental
 x 10
 y 6
@@ -2314,10 +2222,6 @@
 x 10
 y 7
 end
-arch pstone_1
-x 10
-y 7
-end
 arch dun2
 x 10
 y 7
@@ -2326,10 +2230,6 @@
 x 10
 y 8
 end
-arch pstone_1
-x 10
-y 8
-end
 arch fire_elemental
 x 10
 y 8
@@ -2536,10 +2436,6 @@
 x 11
 y 6
 end
-arch pstone_1
-x 11
-y 6
-end
 arch dun10
 x 11
 y 6
@@ -2548,10 +2444,6 @@
 x 11
 y 7
 end
-arch pstone_1
-x 11
-y 7
-end
 arch dun14
 x 11
 y 7
@@ -2560,10 +2452,6 @@
 x 11
 y 8
 end
-arch pstone_1
-x 11
-y 8
-end
 arch dun4
 x 11
 y 8
@@ -2771,10 +2659,6 @@
 x 12
 y 6
 end
-arch pstone_1
-x 12
-y 6
-end
 arch dun2
 x 12
 y 6
@@ -2783,10 +2667,6 @@
 x 12
 y 7
 end
-arch pstone_1
-x 12
-y 7
-end
 arch random_treasure
 x 12
 y 7
@@ -2795,10 +2675,6 @@
 x 12
 y 8
 end
-arch pstone_1
-x 12
-y 8
-end
 arch dun2
 x 12
 y 8
@@ -3016,10 +2892,6 @@
 x 13
 y 6
 end
-arch pstone_1
-x 13
-y 6
-end
 arch dun2
 x 13
 y 6
@@ -3028,10 +2900,6 @@
 x 13
 y 7
 end
-arch pstone_1
-x 13
-y 7
-end
 arch random_treasure
 x 13
 y 7
@@ -3040,10 +2908,6 @@
 x 13
 y 8
 end
-arch pstone_1
-x 13
-y 8
-end
 arch dun2
 x 13
 y 8
@@ -3274,10 +3138,6 @@
 x 14
 y 6
 end
-arch pstone_1
-x 14
-y 6
-end
 arch dun12
 x 14
 y 6
@@ -3286,10 +3146,6 @@
 x 14
 y 7
 end
-arch pstone_1
-x 14
-y 7
-end
 arch random_treasure
 x 14
 y 7
@@ -3298,10 +3154,6 @@
 x 14
 y 8
 end
-arch pstone_1
-x 14
-y 8
-end
 arch dun2
 x 14
 y 8
@@ -3515,10 +3367,6 @@
 x 15
 y 6
 end
-arch pstone_1
-x 15
-y 6
-end
 arch door_2
 x 15
 y 6
@@ -3527,10 +3375,6 @@
 x 15
 y 7
 end
-arch pstone_1
-x 15
-y 7
-end
 arch random_treasure
 x 15
 y 7
@@ -3539,10 +3383,6 @@
 x 15
 y 8
 end
-arch pstone_1
-x 15
-y 8
-end
 arch dun2
 x 15
 y 8
@@ -3749,10 +3589,6 @@
 x 16
 y 6
 end
-arch pstone_1
-x 16
-y 6
-end
 arch dun6
 x 16
 y 6
@@ -3761,10 +3597,6 @@
 x 16
 y 7
 end
-arch pstone_1
-x 16
-y 7
-end
 arch random_treasure
 x 16
 y 7
@@ -3773,10 +3605,6 @@
 x 16
 y 8
 end
-arch pstone_1
-x 16
-y 8
-end
 arch dun2
 x 16
 y 8
@@ -3959,10 +3787,6 @@
 x 17
 y 6
 end
-arch pstone_1
-x 17
-y 6
-end
 arch dun2
 x 17
 y 6
@@ -3971,10 +3795,6 @@
 x 17
 y 7
 end
-arch pstone_1
-x 17
-y 7
-end
 arch random_treasure
 x 17
 y 7
@@ -3983,10 +3803,6 @@
 x 17
 y 8
 end
-arch pstone_1
-x 17
-y 8
-end
 arch dun2
 x 17
 y 8
@@ -4199,10 +4015,6 @@
 x 18
 y 6
 end
-arch pstone_1
-x 18
-y 6
-end
 arch dun2
 x 18
 y 6
@@ -4211,10 +4023,6 @@
 x 18
 y 7
 end
-arch pstone_1
-x 18
-y 7
-end
 arch random_treasure
 x 18
 y 7
@@ -4223,10 +4031,6 @@
 x 18
 y 8
 end
-arch pstone_1
-x 18
-y 8
-end
 arch dun2
 x 18
 y 8
@@ -4283,10 +4087,6 @@
 x 18
 y 15
 end
-arch pstone_1
-x 18
-y 15
-end
 arch dragonman
 name lesser dragonman
 Con 5
@@ -4310,10 +4110,6 @@
 end
 arch pstone_1
 x 18
-y 16
-end
-arch pstone_1
-x 18
 y 17
 end
 arch pstone_1
@@ -4465,10 +4261,6 @@
 x 19
 y 6
 end
-arch pstone_1
-x 19
-y 6
-end
 arch dun9
 x 19
 y 6
@@ -4477,10 +4269,6 @@
 x 19
 y 7
 end
-arch pstone_1
-x 19
-y 7
-end
 arch dun11
 x 19
 y 7
@@ -4489,10 +4277,6 @@
 x 19
 y 8
 end
-arch pstone_1
-x 19
-y 8
-end
 arch dun7
 x 19
 y 8
@@ -4693,10 +4477,6 @@
 x 20
 y 6
 end
-arch pstone_1
-x 20
-y 6
-end
 arch fire_elemental
 x 20
 y 6
@@ -4710,10 +4490,6 @@
 x 20
 y 7
 end
-arch pstone_1
-x 20
-y 7
-end
 arch dun2
 x 20
 y 7
@@ -4722,10 +4498,6 @@
 x 20
 y 8
 end
-arch pstone_1
-x 20
-y 8
-end
 arch fire_elemental
 x 20
 y 8
@@ -4946,10 +4718,6 @@
 x 21
 y 6
 end
-arch pstone_1
-x 21
-y 6
-end
 arch dun10
 x 21
 y 6
@@ -4958,10 +4726,6 @@
 x 21
 y 7
 end
-arch pstone_1
-x 21
-y 7
-end
 arch dun14
 x 21
 y 7
@@ -4970,10 +4734,6 @@
 x 21
 y 8
 end
-arch pstone_1
-x 21
-y 8
-end
 arch dun4
 x 21
 y 8
@@ -5210,10 +4970,6 @@
 x 22
 y 6
 end
-arch pstone_1
-x 22
-y 6
-end
 arch dun2
 x 22
 y 6
@@ -5222,10 +4978,6 @@
 x 22
 y 7
 end
-arch pstone_1
-x 22
-y 7
-end
 arch random_treasure
 x 22
 y 7
@@ -5234,10 +4986,6 @@
 x 22
 y 8
 end
-arch pstone_1
-x 22
-y 8
-end
 arch dun2
 x 22
 y 8
@@ -5256,10 +5004,6 @@
 x 22
 y 10
 end
-arch pstone_1
-x 22
-y 10
-end
 arch grate_closed_2
 x 22
 y 10
@@ -5270,10 +5014,6 @@
 x 22
 y 11
 end
-arch pstone_1
-x 22
-y 11
-end
 arch grate_closed_2
 x 22
 y 11
@@ -5496,10 +5236,6 @@
 x 23
 y 6
 end
-arch pstone_1
-x 23
-y 6
-end
 arch dun2
 x 23
 y 6
@@ -5508,10 +5244,6 @@
 x 23
 y 7
 end
-arch pstone_1
-x 23
-y 7
-end
 arch random_treasure
 x 23
 y 7
@@ -5520,10 +5252,6 @@
 x 23
 y 8
 end
-arch pstone_1
-x 23
-y 8
-end
 arch dun2
 x 23
 y 8
@@ -5721,10 +5449,6 @@
 x 24
 y 6
 end
-arch pstone_1
-x 24
-y 6
-end
 arch dun12
 x 24
 y 6
@@ -5733,10 +5457,6 @@
 x 24
 y 7
 end
-arch pstone_1
-x 24
-y 7
-end
 arch random_treasure
 x 24
 y 7
@@ -5745,10 +5465,6 @@
 x 24
 y 8
 end
-arch pstone_1
-x 24
-y 8
-end
 arch dun2
 x 24
 y 8
@@ -5951,10 +5667,6 @@
 x 25
 y 6
 end
-arch pstone_1
-x 25
-y 6
-end
 arch false_wall
 x 25
 y 6
@@ -5963,10 +5675,6 @@
 x 25
 y 7
 end
-arch pstone_1
-x 25
-y 7
-end
 arch random_treasure
 x 25
 y 7
@@ -5975,10 +5683,6 @@
 x 25
 y 8
 end
-arch pstone_1
-x 25
-y 8
-end
 arch dun2
 x 25
 y 8
@@ -6035,10 +5739,6 @@
 x 25
 y 15
 end
-arch pstone_1
-x 25
-y 15
-end
 arch dragonman
 name lesser dragonman
 Con 5
@@ -6062,10 +5762,6 @@
 end
 arch pstone_1
 x 25
-y 16
-end
-arch pstone_1
-x 25
 y 17
 end
 arch pstone_1
@@ -6186,10 +5882,6 @@
 x 26
 y 6
 end
-arch pstone_1
-x 26
-y 6
-end
 arch dun6
 x 26
 y 6
@@ -6198,10 +5890,6 @@
 x 26
 y 7
 end
-arch pstone_1
-x 26
-y 7
-end
 arch random_treasure
 x 26
 y 7
@@ -6210,10 +5898,6 @@
 x 26
 y 8
 end
-arch pstone_1
-x 26
-y 8
-end
 arch dun2
 x 26
 y 8
@@ -6431,10 +6115,6 @@
 x 27
 y 6
 end
-arch pstone_1
-x 27
-y 6
-end
 arch dun2
 x 27
 y 6
@@ -6443,10 +6123,6 @@
 x 27
 y 7
 end
-arch pstone_1
-x 27
-y 7
-end
 arch random_treasure
 x 27
 y 7
@@ -6455,10 +6131,6 @@
 x 27
 y 8
 end
-arch pstone_1
-x 27
-y 8
-end
 arch dun2
 x 27
 y 8
@@ -6507,10 +6179,6 @@
 x 27
 y 14
 end
-arch goldfloor
-x 27
-y 14
-end
 arch dun7
 x 27
 y 14
@@ -6694,10 +6362,6 @@
 x 28
 y 6
 end
-arch pstone_1
-x 28
-y 6
-end
 arch dun2
 x 28
 y 6
@@ -6717,10 +6381,6 @@
 x 28
 y 8
 end
-arch pstone_1
-x 28
-y 8
-end
 arch dun2
 x 28
 y 8
@@ -6913,10 +6573,6 @@
 x 29
 y 6
 end
-arch pstone_1
-x 29
-y 6
-end
 arch dun9
 x 29
 y 6
@@ -6925,10 +6581,6 @@
 x 29
 y 7
 end
-arch pstone_1
-x 29
-y 7
-end
 arch dun11
 x 29
 y 7
@@ -6937,10 +6589,6 @@
 x 29
 y 8
 end
-arch pstone_1
-x 29
-y 8
-end
 arch dun7
 x 29
 y 8
@@ -7183,10 +6831,6 @@
 x 30
 y 7
 end
-arch pstone_1
-x 30
-y 7
-end
 arch dun2
 x 30
 y 7
@@ -7443,7 +7087,7 @@
 x 31
 y 7
 end
-arch dun3
+arch dun14
 x 31
 y 7
 end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12234] maps/trunk/quests/peterm/FireTemple

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12234
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12234&view=rev
Author:   anmaster
Date:     2009-10-29 16:55:08 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
Remove some double floor and bogus non-reachable exits in /quests/peterm/FireTemple/LavaChamber and /quests/peterm/FireTemple/Passageway.

Modified Paths:
--------------
    maps/trunk/quests/peterm/FireTemple/LavaChamber
    maps/trunk/quests/peterm/FireTemple/Passageway

Modified: maps/trunk/quests/peterm/FireTemple/LavaChamber
===================================================================
--- maps/trunk/quests/peterm/FireTemple/LavaChamber	2009-10-29 10:39:09 UTC (rev 12233)
+++ maps/trunk/quests/peterm/FireTemple/LavaChamber	2009-10-29 16:55:08 UTC (rev 12234)
@@ -8,7 +8,7 @@
 enter_y 30
 msg
 Created:  1996-10-08 Peter Mardahl (pe...@so...)
-Modified: 2008-12-21 Rick Tanner
+Modified: 2009-10-29 Arvid Norlander
 endmsg
 end
 arch cave_15
@@ -6228,24 +6228,10 @@
 x 30
 y 13
 end
-arch invis_exit
-slaying LavaChamber
-hp 29
-sp 14
-x 30
-y 14
-end
 arch pstone_1
 x 30
 y 14
 end
-arch invis_exit
-slaying LavaChamber
-hp 29
-sp 15
-x 30
-y 15
-end
 arch pstone_1
 x 30
 y 15

Modified: maps/trunk/quests/peterm/FireTemple/Passageway
===================================================================
--- maps/trunk/quests/peterm/FireTemple/Passageway	2009-10-29 10:39:09 UTC (rev 12233)
+++ maps/trunk/quests/peterm/FireTemple/Passageway	2009-10-29 16:55:08 UTC (rev 12234)
@@ -9,12 +9,9 @@
 enter_y 5
 msg
 Created:  1997-05-24 Peter Mardahl (pe...@so...)
-Modified: 2008-12-21 Rick Tanner
+Modified: 2009-10-29 Arvid Norlander
 endmsg
 end
-arch pedestal_trigger
-connected 14
-end
 arch pstone_2
 end
 arch pstone_2
@@ -38,10 +35,6 @@
 arch pstone_2
 y 6
 end
-arch pedestal_trigger
-y 7
-connected 13
-end
 arch pstone_2
 y 7
 end
@@ -90,11 +83,6 @@
 x 1
 y 6
 end
-arch pedestal_trigger
-x 1
-y 7
-connected 13
-end
 arch pstone_2
 x 1
 y 7
@@ -141,11 +129,6 @@
 x 2
 y 6
 end
-arch pedestal_trigger
-x 2
-y 7
-connected 13
-end
 arch pstone_2
 x 2
 y 7
@@ -181,38 +164,14 @@
 x 3
 y 3
 end
-arch magic_mouth
-msg
-A hot wind is blowing in from the
-passageway here.
-endmsg
-x 3
-y 4
-end
 arch pstone_2
 x 3
 y 4
 end
-arch magic_mouth
-msg
-A hot wind is blowing in from the
-passage way here
-endmsg
-x 3
-y 5
-end
 arch pstone_2
 x 3
 y 5
 end
-arch magic_mouth
-msg
-A hot wind is blowing in from the
-passageway here.
-endmsg
-x 3
-y 6
-end
 arch pstone_2
 x 3
 y 6
@@ -311,36 +270,14 @@
 x 5
 y 4
 end
-arch invis_exit
-slaying Passageway
-hp 6
-sp 5
-x 5
-y 5
-end
 arch pstone_2
 x 5
 y 5
 end
 arch pstone_2
 x 5
-y 5
-end
-arch invis_exit
-slaying Passageway
-hp 6
-sp 6
-x 5
 y 6
 end
-arch pstone_2
-x 5
-y 6
-end
-arch pstone_2
-x 5
-y 6
-end
 arch pstone_1
 x 5
 y 7


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12233] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12233
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12233&view=rev
Author:   anmaster
Date:     2009-10-29 10:39:09 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
Fix exit location for the goto command in server/c_wiz.c (was broken when exit coordinates recently changed so that (-1,-1) meant default coordinates).

Modified Paths:
--------------
    server/trunk/ChangeLog
    server/trunk/server/c_wiz.c

Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog	2009-10-26 20:21:04 UTC (rev 12232)
+++ server/trunk/ChangeLog	2009-10-29 10:39:09 UTC (rev 12233)
@@ -14,6 +14,10 @@
 else.  With this, include the file(s) that you changed.
 ------------------------------------------------------------------------------
 
+Fix exit location for the goto command in server/c_wiz.c (was broken when exit
+coordinates recently changed so that (-1,-1) meant default coordinates).
+Arvid Norlander 2009-10-29
+
 Disable [Debug] messages by default. Use the -d command-line option to
 enable debug messages.
 Andreas Kirschbaum 2009-10-25

Modified: server/trunk/server/c_wiz.c
===================================================================
--- server/trunk/server/c_wiz.c	2009-10-26 20:21:04 UTC (rev 12232)
+++ server/trunk/server/c_wiz.c	2009-10-29 10:39:09 UTC (rev 12233)
@@ -546,6 +546,8 @@
     dummy = object_new();
     dummy->map = op->map;
     EXIT_PATH(dummy) = add_string(name);
+    EXIT_X(dummy) = -1;
+    EXIT_Y(dummy) = -1;
     dummy->name = add_string(name);
 
     enter_exit(op, dummy);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12232] jxclient/trunk/src/jxclient/com/realtime/ crossfire/jxclient/server/ClientSocket.java

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12232
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12232&view=rev
Author:   akirschbaum
Date:     2009-10-26 20:21:04 +0000 (Mon, 26 Oct 2009)

Log Message:
-----------
Do not display 'null' disconnect reason.

Modified Paths:
--------------
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocket.java

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocket.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocket.java	2009-10-24 22:51:43 UTC (rev 12231)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocket.java	2009-10-26 20:21:04 UTC (rev 12232)
@@ -365,11 +365,13 @@
             }
             catch (final IOException ex)
             {
+                final String tmp = ex.getMessage();
+                final String message = tmp == null ? "I/O error" : tmp; 
                 if (debugProtocol != null)
                 {
-                    debugProtocol.debugProtocolWrite("socket:exception "+ex.getMessage(), ex);
+                    debugProtocol.debugProtocolWrite("socket:exception "+message, ex);
                 }
-                processDisconnect(ex.getMessage());
+                processDisconnect(message);
             }
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12231] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12231
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12231&view=rev
Author:   akirschbaum
Date:     2009-10-24 22:51:43 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Disable [Debug] messages by default. Use the -d command-line option to enable debug messages.

Modified Paths:
--------------
    server/trunk/ChangeLog
    server/trunk/common/init.c

Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog	2009-10-24 22:47:59 UTC (rev 12230)
+++ server/trunk/ChangeLog	2009-10-24 22:51:43 UTC (rev 12231)
@@ -14,6 +14,10 @@
 else.  With this, include the file(s) that you changed.
 ------------------------------------------------------------------------------
 
+Disable [Debug] messages by default. Use the -d command-line option to
+enable debug messages.
+Andreas Kirschbaum 2009-10-25
+
 Fix incorrect error message for throwing skill when no throwable object
 was found.
 Andreas Kirschbaum 2009-10-25

Modified: server/trunk/common/init.c
===================================================================
--- server/trunk/common/init.c	2009-10-24 22:47:59 UTC (rev 12230)
+++ server/trunk/common/init.c	2009-10-24 22:51:43 UTC (rev 12231)
@@ -49,12 +49,7 @@
     LOGFILE,   /* Logfile */
     CSPORT,    /* Client/server port */
 
-    /* Debug level */
-#ifdef DEBUG
-    llevDebug,
-#else
-    llevInfo,
-#endif
+    llevInfo,  /* Debug level */
     0, NULL, 0,    /* dumpvalues, dumparg, daemonmode */
     0, /* argc */
     NULL, /* argv */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12230] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12230
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12230&view=rev
Author:   akirschbaum
Date:     2009-10-24 22:47:59 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Fix incorrect error message for throwing skill when no throwable object was found.

Modified Paths:
--------------
    server/trunk/ChangeLog
    server/trunk/server/skills.c

Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog	2009-10-24 22:20:13 UTC (rev 12229)
+++ server/trunk/ChangeLog	2009-10-24 22:47:59 UTC (rev 12230)
@@ -14,6 +14,10 @@
 else.  With this, include the file(s) that you changed.
 ------------------------------------------------------------------------------
 
+Fix incorrect error message for throwing skill when no throwable object
+was found.
+Andreas Kirschbaum 2009-10-25
+
 Fix checks for incorrect/missing parameters of 'abil' command.
 Andreas Kirschbaum 2009-10-25
 

Modified: server/trunk/server/skills.c
===================================================================
--- server/trunk/server/skills.c	2009-10-24 22:20:13 UTC (rev 12229)
+++ server/trunk/server/skills.c	2009-10-24 22:47:59 UTC (rev 12230)
@@ -1805,15 +1805,16 @@
     /* look through the inventory */
     if (tmp == NULL) {
         FOR_INV_PREPARE(op, tmp2) {
-            tmp = tmp2;
             /* can't toss invisible or inv-locked items */
-            if (tmp->invisible || QUERY_FLAG(tmp, FLAG_INV_LOCKED))
+            if (tmp2->invisible || QUERY_FLAG(tmp2, FLAG_INV_LOCKED))
                 continue;
-            query_name(tmp, name, MAX_BUF);
+            query_name(tmp2, name, MAX_BUF);
             if (!request
                 || !strcmp(name, request)
-                || !strcmp(tmp->name, request))
+                || !strcmp(tmp2->name, request)) {
+                tmp = tmp2;
                 break;
+            }
         } FOR_INV_FINISH();
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12229] server/trunk/plugins/cfpython/cfpython.c

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12229
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12229&view=rev
Author:   akirschbaum
Date:     2009-10-24 22:20:13 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Fix incorrect checks for empty script messages/options.

Modified Paths:
--------------
    server/trunk/plugins/cfpython/cfpython.c

Modified: server/trunk/plugins/cfpython/cfpython.c
===================================================================
--- server/trunk/plugins/cfpython/cfpython.c	2009-10-24 22:15:17 UTC (rev 12228)
+++ server/trunk/plugins/cfpython/cfpython.c	2009-10-24 22:20:13 UTC (rev 12229)
@@ -368,7 +368,7 @@
 }
 
 static PyObject *getWhatIsMessage(PyObject *self, PyObject *args) {
-    if (current_context->message == NULL)
+    if (*current_context->message == '\0')
         return Py_BuildValue("");
     else
         return Py_BuildValue("s", current_context->message);
@@ -379,7 +379,7 @@
 }
 
 static PyObject *getScriptParameters(PyObject *self, PyObject *args) {
-    if (!current_context->options) {
+    if (!*current_context->options) {
         Py_INCREF(Py_None);
         return Py_None;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12228] server/trunk/server/player.c

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12228
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12228&view=rev
Author:   akirschbaum
Date:     2009-10-24 22:15:17 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Remove debugging code.

Modified Paths:
--------------
    server/trunk/server/player.c

Modified: server/trunk/server/player.c
===================================================================
--- server/trunk/server/player.c	2009-10-24 22:13:50 UTC (rev 12227)
+++ server/trunk/server/player.c	2009-10-24 22:15:17 UTC (rev 12228)
@@ -1517,30 +1517,22 @@
             if (op->contr->mode&PU_FOOD)
                 if (tmp->type == FOOD) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "FOOD\n");
                     continue;
                 }
             if (op->contr->mode&PU_DRINK)
                 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG(tmp, FLAG_KNOWN_CURSED))) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "DRINK\n");
                     continue;
                 }
             /* we don't forget dragon food */
             if (op->contr->mode&PU_FLESH)
                 if (tmp->type == FLESH) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "FLESH\n");
                     continue;
                 }
             if (op->contr->mode&PU_POTION)
                 if (tmp->type == POTION) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "POTION\n");
                     continue;
                 }
 
@@ -1548,22 +1540,16 @@
             if (op->contr->mode&PU_SPELLBOOK)
                 if (tmp->type == SPELLBOOK) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "SPELLBOOK\n");
                     continue;
                 }
             if (op->contr->mode&PU_SKILLSCROLL)
                 if (tmp->type == SKILLSCROLL) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "SKILLSCROLL\n");
                     continue;
                 }
             if (op->contr->mode&PU_READABLES)
                 if (tmp->type == BOOK || tmp->type == SCROLL) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "READABLES\n");
                     continue;
                 }
 
@@ -1571,8 +1557,6 @@
             if (op->contr->mode&PU_MAGIC_DEVICE)
                 if (tmp->type == WAND || tmp->type == ROD) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "MAGIC_DEVICE\n");
                     continue;
                 }
 
@@ -1580,16 +1564,12 @@
             if (op->contr->mode&PU_MAGICAL)
                 if (QUERY_FLAG(tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG(tmp, FLAG_KNOWN_CURSED)) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "MAGICAL\n");
                     continue;
                 }
 
             if (op->contr->mode&PU_VALUABLES) {
                 if (tmp->type == MONEY || tmp->type == GEM) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "MONEY/GEM\n");
                     continue;
                 }
             }
@@ -1598,8 +1578,6 @@
             if (op->contr->mode&PU_JEWELS)
                 if (tmp->type == RING || tmp->type == AMULET) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "JEWELS\n");
                     continue;
                 }
 
@@ -1607,15 +1585,11 @@
             if (op->contr->mode&PU_BOW)
                 if (tmp->type == BOW) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "BOW\n");
                     continue;
                 }
             if (op->contr->mode&PU_ARROW)
                 if (tmp->type == ARROW) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "ARROW\n");
                     continue;
                 }
 
@@ -1623,43 +1597,31 @@
             if (op->contr->mode&PU_ARMOUR)
                 if (tmp->type == ARMOUR) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "ARMOUR\n");
                     continue;
                 }
             if (op->contr->mode&PU_HELMET)
                 if (tmp->type == HELMET) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "HELMET\n");
                     continue;
                 }
             if (op->contr->mode&PU_SHIELD)
                 if (tmp->type == SHIELD) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "SHIELD\n");
                     continue;
                 }
             if (op->contr->mode&PU_BOOTS)
                 if (tmp->type == BOOTS) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "BOOTS\n");
                     continue;
                 }
             if (op->contr->mode&PU_GLOVES)
                 if (tmp->type == GLOVES) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "GLOVES\n");
                     continue;
                 }
             if (op->contr->mode&PU_CLOAK)
                 if (tmp->type == CLOAK) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "GLOVES\n");
                     continue;
                 }
 
@@ -1667,8 +1629,6 @@
             if (op->contr->mode&PU_MISSILEWEAPON)
                 if (tmp->type == WEAPON && QUERY_FLAG(tmp, FLAG_IS_THROWN)) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "MISSILEWEAPON\n");
                     continue;
                 }
 
@@ -1680,8 +1640,6 @@
                     && strstr(tmp->name, "chair")
                     && strstr(tmp->arch->name, "chair") == NULL) {
                         pick_up(op, tmp);
-                        if (0)
-                            fprintf(stderr, "WEAPON\n");
                         continue;
                     }
                 }
@@ -1689,8 +1647,6 @@
                     if (strstr(tmp->arch->name, "table") == NULL
                     && strstr(tmp->arch->name, "chair") == NULL) {
                         pick_up(op, tmp);
-                        if (0)
-                            fprintf(stderr, "WEAPON\n");
                         continue;
                     }
                 }
@@ -1700,8 +1656,6 @@
             if (op->contr->mode&PU_KEY)
                 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) {
                     pick_up(op, tmp);
-                    if (0)
-                        fprintf(stderr, "KEY\n");
                     continue;
                 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12227] server/trunk/server/player.c

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12227
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12227&view=rev
Author:   akirschbaum
Date:     2009-10-24 22:13:50 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Fix check for 'PU_NOTHING' pickup option.

Modified Paths:
--------------
    server/trunk/server/player.c

Modified: server/trunk/server/player.c
===================================================================
--- server/trunk/server/player.c	2009-10-24 22:11:35 UTC (rev 12226)
+++ server/trunk/server/player.c	2009-10-24 22:13:50 UTC (rev 12227)
@@ -1488,7 +1488,7 @@
 
             /* if mode is set to pick nothing up, return */
 
-            if (op->contr->mode&PU_NOTHING)
+            if (op->contr->mode == PU_NOTHING)
                 return 1;
 
             /* if mode is set to stop when encountering objects, return.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12226] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12226
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12226&view=rev
Author:   akirschbaum
Date:     2009-10-24 22:11:35 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Fix checks for incorrect/missing parameters of 'abil' command.

Modified Paths:
--------------
    server/trunk/ChangeLog
    server/trunk/server/c_wiz.c

Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog	2009-10-24 22:07:07 UTC (rev 12225)
+++ server/trunk/ChangeLog	2009-10-24 22:11:35 UTC (rev 12226)
@@ -14,6 +14,9 @@
 else.  With this, include the file(s) that you changed.
 ------------------------------------------------------------------------------
 
+Fix checks for incorrect/missing parameters of 'abil' command.
+Andreas Kirschbaum 2009-10-25
+
 Adapt regression test to changed spell parameters (r12127).
 Andreas Kirschbaum 2009-10-24
 

Modified: server/trunk/server/c_wiz.c
===================================================================
--- server/trunk/server/c_wiz.c	2009-10-24 22:07:07 UTC (rev 12225)
+++ server/trunk/server/c_wiz.c	2009-10-24 22:11:35 UTC (rev 12226)
@@ -1602,14 +1602,14 @@
     thing[0] = '\0';
     thing2[0] = '\0';
     if (params == NULL
-    || !sscanf(params, "%s %s %d", thing, thing2, &iii)
-    || thing == NULL) {
+    || sscanf(params, "%s %s %d", thing, thing2, &iii) != 3
+    || thing[0] == '\0') {
         draw_ext_info(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_ERROR,
                       "Who?", NULL);
         return 1;
     }
 
-    if (thing2 == NULL) {
+    if (thing2[0] == '\0') {
         draw_ext_info(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_ERROR,
                       "You can't change that.", NULL);
         return 1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12225] server/trunk/random_maps/reader.l

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12225
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12225&view=rev
Author:   akirschbaum
Date:     2009-10-24 22:07:07 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Do not discard 'const' qualifier in variable initialization.

Modified Paths:
--------------
    server/trunk/random_maps/reader.l

Modified: server/trunk/random_maps/reader.l
===================================================================
--- server/trunk/random_maps/reader.l	2009-10-24 22:03:23 UTC (rev 12224)
+++ server/trunk/random_maps/reader.l	2009-10-24 22:07:07 UTC (rev 12225)
@@ -121,7 +121,7 @@
  * is found.
  */
 static char *rmap_yval(void) {
-    static char *em = "";
+    static char em[] = "";
     char *cp;
 
     cp = strchr(yytext, ' ');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12224] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12224
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12224&view=rev
Author:   akirschbaum
Date:     2009-10-24 22:03:23 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Remove unreachable code.

Modified Paths:
--------------
    server/trunk/random_maps/random_map.c
    server/trunk/server/c_chat.c
    server/trunk/server/server.c

Modified: server/trunk/random_maps/random_map.c
===================================================================
--- server/trunk/random_maps/random_map.c	2009-10-24 21:53:45 UTC (rev 12223)
+++ server/trunk/random_maps/random_map.c	2009-10-24 22:03:23 UTC (rev 12224)
@@ -581,7 +581,6 @@
         }
         return length;
     }
-    return -1;
 }
 
 /**

Modified: server/trunk/server/c_chat.c
===================================================================
--- server/trunk/server/c_chat.c	2009-10-24 21:53:45 UTC (rev 12223)
+++ server/trunk/server/c_chat.c	2009-10-24 22:03:23 UTC (rev 12224)
@@ -1020,8 +1020,6 @@
                              params);
         return(1);
     } /*else*/
-
-    return(0);
 }
 
 /*

Modified: server/trunk/server/server.c
===================================================================
--- server/trunk/server/server.c	2009-10-24 21:53:45 UTC (rev 12223)
+++ server/trunk/server/server.c	2009-10-24 22:03:23 UTC (rev 12224)
@@ -1422,7 +1422,9 @@
 
         sleep_delta();       /* Sleep proper amount of time before next tick */
     }
+#if 0 /* unreachable */
     emergency_save(0);
     cleanup();
     return 0;
+#endif
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12223] server/trunk/common/loader.l

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12223
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12223&view=rev
Author:   akirschbaum
Date:     2009-10-24 21:53:45 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Prevent possible writes to string constant.

Modified Paths:
--------------
    server/trunk/common/loader.l

Modified: server/trunk/common/loader.l
===================================================================
--- server/trunk/common/loader.l	2009-10-24 21:50:51 UTC (rev 12222)
+++ server/trunk/common/loader.l	2009-10-24 21:53:45 UTC (rev 12223)
@@ -1134,7 +1134,7 @@
  */
 static char *yval(void)
 {
-    static char *em = "";
+    static char em[] = "";
     char *cp, *end;
 
     /* First skip over start of line, like animation or name */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12222] server/trunk/common/loader.l

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12222
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12222&view=rev
Author:   akirschbaum
Date:     2009-10-24 21:50:51 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Remove old-style function definitions.

Modified Paths:
--------------
    server/trunk/common/loader.l

Modified: server/trunk/common/loader.l
===================================================================
--- server/trunk/common/loader.l	2009-10-24 21:49:18 UTC (rev 12221)
+++ server/trunk/common/loader.l	2009-10-24 21:50:51 UTC (rev 12222)
@@ -1132,7 +1132,7 @@
  * is found.  Modified 4/26/2000 to also strip spaces at end of
  * line
  */
-static char *yval()
+static char *yval(void)
 {
     static char *em = "";
     char *cp, *end;
@@ -1317,13 +1317,13 @@
  * @todo
  * remove as it is empty.
  */
-void init_vars() {
+void init_vars(void) {
 }
 
 /**
  * Frees all memory allocated by the loader.
  */
-void free_loader() {
+void free_loader(void) {
     yy_delete_buffer(YY_CURRENT_BUFFER);
 
     /* Comment out this yylex_destroy(), as it results in link errors


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12221] server/trunk/common/loader.l

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12221
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12221&view=rev
Author:   akirschbaum
Date:     2009-10-24 21:49:18 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Fix incorrect error check.

Modified Paths:
--------------
    server/trunk/common/loader.l

Modified: server/trunk/common/loader.l
===================================================================
--- server/trunk/common/loader.l	2009-10-24 21:42:20 UTC (rev 12220)
+++ server/trunk/common/loader.l	2009-10-24 21:49:18 UTC (rev 12221)
@@ -734,7 +734,7 @@
                                 if (tmp->arch && (arch_init == 0)) {
                                     object_insert_in_ob(tmp, op);
                                 } else {
-                                    if (init_archetypes == 0)
+                                    if (arch_init == 0)
                                         LOG(llevDebug, "Discarding object without arch: %s\n", tmp->name ? tmp->name : "(null)");
                                     object_free(tmp);
                                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12220] server/trunk/common/time.c

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12220
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12220&view=rev
Author:   akirschbaum
Date:     2009-10-24 21:42:20 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Rewrite code to prevent integer overflows.

Modified Paths:
--------------
    server/trunk/common/time.c

Modified: server/trunk/common/time.c
===================================================================
--- server/trunk/common/time.c	2009-10-24 21:28:41 UTC (rev 12219)
+++ server/trunk/common/time.c	2009-10-24 21:42:20 UTC (rev 12220)
@@ -240,8 +240,7 @@
      * Don't do too much catching up:
      * (Things can still get jerky on a slow/loaded computer)
      */
-    if (last_time.tv_sec*1000000+last_time.tv_usec <
-            new_time.tv_sec*1000000+new_time.tv_usec) {
+    if ((last_time.tv_sec-new_time.tv_sec)*1000000+(last_time.tv_usec-new_time.tv_usec) < 0) {
         last_time.tv_sec = new_time.tv_sec;
         last_time.tv_usec = new_time.tv_usec;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12219] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12219
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12219&view=rev
Author:   akirschbaum
Date:     2009-10-24 21:28:41 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Remove unneeded type casts.

Modified Paths:
--------------
    server/trunk/common/living.c
    server/trunk/server/alchemy.c

Modified: server/trunk/common/living.c
===================================================================
--- server/trunk/common/living.c	2009-10-24 21:23:30 UTC (rev 12218)
+++ server/trunk/common/living.c	2009-10-24 21:28:41 UTC (rev 12219)
@@ -1455,9 +1455,9 @@
 
                 /* Got some extra bonus at first level */
                 if (i < 2) {
-                    stmp = op->contr->levsp[i]+((2.0*(float)get_sp_bonus(op->stats.Pow)+(float)get_sp_bonus(op->stats.Int))/6.0);
+                    stmp = op->contr->levsp[i]+(2.0*get_sp_bonus(op->stats.Pow)+get_sp_bonus(op->stats.Int))/6.0;
                 } else {
-                    stmp = (float)op->contr->levsp[i]+(2.0*(float)get_sp_bonus(op->stats.Pow)+(float)get_sp_bonus(op->stats.Int))/12.0;
+                    stmp = op->contr->levsp[i]+(2.0*get_sp_bonus(op->stats.Pow)+get_sp_bonus(op->stats.Int))/12.0;
                 }
                 if (stmp < 1.0)
                     stmp = 1.0;
@@ -1491,9 +1491,9 @@
 
                 /* Got some extra bonus at first level */
                 if (i < 2) {
-                    grace_tmp = op->contr->levgrace[i]+(((float)get_grace_bonus(op->stats.Pow)+2.0*(float)get_grace_bonus(op->stats.Wis))/6.0);
+                    grace_tmp = op->contr->levgrace[i]+(get_grace_bonus(op->stats.Pow)+2.0*get_grace_bonus(op->stats.Wis))/6.0;
                 } else {
-                    grace_tmp = (float)op->contr->levgrace[i]+((float)get_grace_bonus(op->stats.Pow)+2.0*(float)get_grace_bonus(op->stats.Wis))/12.0;
+                    grace_tmp = op->contr->levgrace[i]+(get_grace_bonus(op->stats.Pow)+2.0*get_grace_bonus(op->stats.Wis))/12.0;
                 }
                 if (grace_tmp < 1.0)
                     grace_tmp = 1.0;

Modified: server/trunk/server/alchemy.c
===================================================================
--- server/trunk/server/alchemy.c	2009-10-24 21:23:30 UTC (rev 12218)
+++ server/trunk/server/alchemy.c	2009-10-24 21:28:41 UTC (rev 12219)
@@ -212,7 +212,7 @@
 #endif
 #endif
                 /* roll the dice */
-                } else if ((float)(random_roll(0, 101, caster, PREFER_LOW)) <= 100.0*success_chance) {
+                } else if (random_roll(0, 101, caster, PREFER_LOW) <= 100.0*success_chance) {
                     change_exp(caster, rp->exp, rp->skill, SK_EXP_NONE);
                     return;
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12218] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12218
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12218&view=rev
Author:   akirschbaum
Date:     2009-10-24 21:23:30 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Remove type casts removing 'const' qualifiers.

Modified Paths:
--------------
    server/trunk/common/object.c
    server/trunk/include/global.h
    server/trunk/include/map.h
    server/trunk/socket/info.c

Modified: server/trunk/common/object.c
===================================================================
--- server/trunk/common/object.c	2009-10-24 20:56:28 UTC (rev 12217)
+++ server/trunk/common/object.c	2009-10-24 21:23:30 UTC (rev 12218)
@@ -3192,7 +3192,7 @@
     /* If radius is not set, default to 1 */
     value = object_get_value(gen, "generator_radius");
     if (value) {
-        radius = (sint8)strtol((char *)value, NULL, 10);
+        radius = (sint8)strtol(value, NULL, 10);
         if (radius < 1) {
             radius = 1;
         }

Modified: server/trunk/include/global.h
===================================================================
--- server/trunk/include/global.h	2009-10-24 20:56:28 UTC (rev 12217)
+++ server/trunk/include/global.h	2009-10-24 21:23:30 UTC (rev 12218)
@@ -285,7 +285,7 @@
  * This is generally done as a safety, and having this macro
  * makes the code a bit cleaner when doing so.
  */
-#define FREE_AND_CLEAR(xyz) { free((void *)xyz); xyz = NULL; }
+#define FREE_AND_CLEAR(xyz) { free(xyz); xyz = NULL; }
 #define FREE_AND_CLEAR_STR(xyz) { free_string(xyz); xyz = NULL; }
 
 /* FREE_AND_COPY is for the shared string - it is handy enough

Modified: server/trunk/include/map.h
===================================================================
--- server/trunk/include/map.h	2009-10-24 20:56:28 UTC (rev 12217)
+++ server/trunk/include/map.h	2009-10-24 21:23:30 UTC (rev 12218)
@@ -294,8 +294,8 @@
  */
 typedef struct regiondef {
     struct regiondef *next;      /**< Pointer to next region, NULL for the last one */
-    const char  *name;           /**< Shortend name of the region as maps refer to it */
-    const char  *parent_name;    /**<
+    char  *name;                 /**< Shortend name of the region as maps refer to it */
+    char  *parent_name;          /**<
                                   * So that parent and child regions can be defined in
                                   * any order, we keep hold of the parent_name during
                                   * initialisation, and the children get assigned to their
@@ -307,9 +307,9 @@
                                   * region, if a value isn't defined in the current region
                                   * we traverse this series of pointers until it is.
                                   */
-    const char  *longname;       /**< Official title of the region, this might be defined
+    char  *longname;             /**< Official title of the region, this might be defined
                                   * to be the same as name*/
-    const char  *msg;            /**< The description of the region */
+    char  *msg;                  /**< The description of the region */
     uint32      counter;         /**< A generic counter for holding temporary data. */
     sint8       fallback;        /**< Whether, in the event of a region not existing,
                                   * this should be the one we fall back on as the default. */

Modified: server/trunk/socket/info.c
===================================================================
--- server/trunk/socket/info.c	2009-10-24 20:56:28 UTC (rev 12217)
+++ server/trunk/socket/info.c	2009-10-24 21:23:30 UTC (rev 12218)
@@ -155,9 +155,11 @@
      */
     if (!CLIENT_SUPPORT_READABLES(&pl->contr->socket, type)) {
         char *buf;
+        const char *buf2;
 
         if (oldmessage) {
-            buf = (char *)oldmessage;
+            buf2 = oldmessage;
+            buf = NULL;
         } else {
             buf = strdup_local(message);
             if (buf == NULL) {
@@ -165,10 +167,10 @@
                 return;
             }
             strip_media_tag(buf);
+            buf2 = buf;
         }
-        print_message(flags&NDI_COLOR_MASK, pl, buf);
-        if (!oldmessage)
-            free(buf);
+        print_message(flags&NDI_COLOR_MASK, pl, buf2);
+        free(buf);
     } else {
         esrv_print_ext_msg(&pl->contr->socket, flags&NDI_COLOR_MASK, type, subtype, message);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12217] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12217
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12217&view=rev
Author:   akirschbaum
Date:     2009-10-24 20:56:28 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Adapt regression test to changed spell parameters (r12127).

Modified Paths:
--------------
    server/trunk/ChangeLog
    server/trunk/test/unit/server/comet_perf.c

Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog	2009-10-24 14:49:39 UTC (rev 12216)
+++ server/trunk/ChangeLog	2009-10-24 20:56:28 UTC (rev 12217)
@@ -14,6 +14,9 @@
 else.  With this, include the file(s) that you changed.
 ------------------------------------------------------------------------------
 
+Adapt regression test to changed spell parameters (r12127).
+Andreas Kirschbaum 2009-10-24
+
 Fix #2879249 (SIGSEGV on transport moving across some edges of tiled maps).
 Andreas Kirschbaum 2009-10-23
 

Modified: server/trunk/test/unit/server/comet_perf.c
===================================================================
--- server/trunk/test/unit/server/comet_perf.c	2009-10-24 14:49:39 UTC (rev 12216)
+++ server/trunk/test/unit/server/comet_perf.c	2009-10-24 20:56:28 UTC (rev 12217)
@@ -189,8 +189,8 @@
 }
 
 START_TEST(cast_one_comet) {
-    int hp_row[TEST_MAP_SIZE] = {25000, 25000, 25000, 25000, 25000, 25000, 25000, 25000, 24895, 24890, 24885, 24880, 24875, 24870, 24865, 24860, 24855, 24850, 24845, 24840, 24827, 24840, 24845, 24850, 24855, 24860, 24865, 24870, 24875, 24880, 24885, 24890, 24895, 25000, 25000, 25000, 25000, 25000, 25000, 25000 },
-        hp_diag[TEST_MAP_SIZE] = {25000, 25000, 25000, 25000, 25000, 25000, 25000, 25000, 24895, 24890, 24885, 24880, 24875, 24870, 24865, 24860, 24855, 24850, 24845, 24840, 24827, 24840, 24845, 24850, 24855, 24860, 24865, 24870, 24875, 24880, 24885, 24890, 24895, 25000, 25000, 25000, 25000, 25000, 25000, 25000 };
+    int hp_row[TEST_MAP_SIZE] = {25000, 25000, 25000, 25000, 25000, 25000, 25000, 25000, 24924, 24920, 24916, 24912, 24908, 24904, 24900, 24896, 24892, 24888, 24884, 24880, 24869, 24880, 24884, 24888, 24892, 24896, 24900, 24904, 24908, 24912, 24916, 24920, 24924, 25000, 25000, 25000, 25000, 25000, 25000, 25000 },
+        hp_diag[TEST_MAP_SIZE] = {25000, 25000, 25000, 25000, 25000, 25000, 25000, 25000, 24924, 24920, 24916, 24912, 24908, 24904, 24900, 24896, 24892, 24888, 24884, 24880, 24869, 24880, 24884, 24888, 24892, 24896, 24900, 24904, 24908, 24912, 24916, 24920, 24924, 25000, 25000, 25000, 25000, 25000, 25000, 25000 };
     object *comet, *rod;
     int tick;
 
@@ -213,8 +213,8 @@
 START_TEST(cast_random_comet) {
     object *comet, *rod;
     int tick, num_cast = 0;
-    int hp_row[TEST_MAP_SIZE] = {23522, 23380, 23217, 23172, 23137, 23007, 22882, 22762, 22655, 22527, 22412, 22407, 22307, 22312, 22217, 22235, 22235, 22217, 22312, 22412, 22412, 22470, 22620, 22770, 22915, 23060, 23200, 23335, 23365, 23400, 23535, 23670, 23800, 23930, 24055, 24180, 24200, 24325, 24445, 24565 },
-        hp_diag[TEST_MAP_SIZE] = {25000, 25000, 25000, 25000, 25000, 25000, 25000, 25000, 23215, 23025, 22830, 22745, 22570, 22510, 22360, 22315, 22280, 22255, 22340, 22425, 22412, 22312, 22317, 22330, 22317, 22417, 22522, 22632, 22647, 22672, 22815, 22945, 23062, 23192, 23327, 23467, 23512, 23675, 23825, 23970 };
+    int hp_row[TEST_MAP_SIZE] = {23756, 23617, 23516, 23428, 23397, 23291, 23203, 23097, 23014, 22875, 22801, 22782, 22706, 22707, 22620, 22645, 22646, 22595, 22705, 22773, 22809, 22835, 22975, 23098, 23239, 23346, 23462, 23597, 23627, 23675, 23786, 23888, 24001, 24119, 24206, 24306, 24336, 24455, 24565, 24649 },
+        hp_diag[TEST_MAP_SIZE] = {25000, 25000, 25000, 25000, 25000, 25000, 25000, 25000, 23515, 23351, 23177, 23097, 22946, 22931, 22763, 22706, 22678, 22658, 22728, 22812, 22809, 22712, 22728, 22741, 22726, 22833, 22862, 22967, 23014, 23009, 23167, 23267, 23367, 23459, 23596, 23713, 23750, 23879, 24026, 24160 };
 
     rod = create_archetype("rod_heavy");
     rod->level = 100;
@@ -246,8 +246,8 @@
 START_TEST(cast_bunch_comet) {
     object *comet, *rod;
     int tick, num_cast = 0;
-    int hp_row[TEST_MAP_SIZE] = {25000, 25000, 25000, 25000, 25000, 25000, 25000, 25000, 21850, 21700, 21550, 21400, 21250, 21100, 20950, 20800, 20650, 20500, 20350, 20200, 19810, 20200, 20350, 20500, 20650, 20800, 20950, 21100, 21250, 21400, 21550, 21700, 21850, 25000, 25000, 25000, 25000, 25000, 25000, 25000 },
-        hp_diag[TEST_MAP_SIZE] = {25000, 25000, 25000, 25000, 25000, 25000, 25000, 25000, 21850, 21700, 21550, 21400, 21250, 21100, 20950, 20800, 20650, 20500, 20350, 20200, 19810, 20200, 20350, 20500, 20650, 20800, 20950, 21100, 21250, 21400, 21550, 21700, 21850, 25000, 25000, 25000, 25000, 25000, 25000, 25000 };
+    int hp_row[TEST_MAP_SIZE] = {25000, 25000, 25000, 25000, 25000, 25000, 25000, 25000, 22355, 22262, 22115, 21966, 21837, 21684, 21554, 21424, 21268, 21137, 21006, 20875, 20534, 20875, 21006, 21137, 21268, 21424, 21554, 21684, 21837, 21966, 22115, 22262, 22355, 25000, 25000, 25000, 25000, 25000, 25000, 25000 },
+        hp_diag[TEST_MAP_SIZE] = {25000, 25000, 25000, 25000, 25000, 25000, 25000, 25000, 22355, 22262, 22115, 21966, 21837, 21684, 21554, 21424, 21268, 21137, 21006, 20875, 20534, 20875, 21006, 21137, 21268, 21424, 21554, 21684, 21837, 21966, 22115, 22262, 22355, 25000, 25000, 25000, 25000, 25000, 25000, 25000 };
 
     rod = create_archetype("rod_heavy");
     rod->level = 100;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12216] jxclient/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12216
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12216&view=rev
Author:   akirschbaum
Date:     2009-10-24 14:49:39 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Stop repaints if the main window is iconified.

Modified Paths:
--------------
    jxclient/trunk/ChangeLog
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindow.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindowRenderer.java

Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog	2009-10-24 14:29:00 UTC (rev 12215)
+++ jxclient/trunk/ChangeLog	2009-10-24 14:49:39 UTC (rev 12216)
@@ -1,3 +1,7 @@
+2009-10-24  Andreas Kirschbaum
+
+	* Stop repaints if the main window is iconified.
+
 2009-08-27  Andreas Kirschbaum
 
 	* Actually fix the crash when updating the ground or inventory

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindow.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindow.java	2009-10-24 14:29:00 UTC (rev 12215)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindow.java	2009-10-24 14:49:39 UTC (rev 12216)
@@ -419,6 +419,20 @@
         {
             quitApplication();
         }
+
+        /** {@inheritDoc} */
+        @Override
+        public void windowIconified(@NotNull final WindowEvent e)
+        {
+            windowRenderer.setInhibitPaintIconified(true);
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void windowDeiconified(@NotNull final WindowEvent e)
+        {
+            windowRenderer.setInhibitPaintIconified(false);
+        }
     };
 
     /**

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindowRenderer.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindowRenderer.java	2009-10-24 14:29:00 UTC (rev 12215)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindowRenderer.java	2009-10-24 14:49:39 UTC (rev 12216)
@@ -118,8 +118,15 @@
     private volatile boolean inhibitPaintMapUpdate = false;
 
     /**
+     * If set, do not repaint anything. It it set while the main widnow is
+     * iconified.
+     */
+    private volatile boolean inhibitPaintIconified = false;
+
+    /**
      * If set, at least one call to {@link #redrawGUI()} has been dropped while
-     * {@link #inhibitPaintMapUpdate} was set.
+     * {@link #inhibitPaintMapUpdate} or {@link #inhibitPaintIconified} was
+     * set.
      */
     private volatile boolean skippedPaint = false;
 
@@ -363,7 +370,7 @@
 
     public void redrawGUI()
     {
-        if (inhibitPaintMapUpdate)
+        if (inhibitPaintMapUpdate || inhibitPaintIconified)
         {
             skippedPaint = true;
             return;
@@ -913,4 +920,13 @@
             throw new UnsupportedOperationException();
         }
     }
+
+    /**
+     * Inhibits or allows painting while the main window is iconified.
+     * @param inhibitPaintIconified whether the main window is iconified
+     */
+    public void setInhibitPaintIconified(final boolean inhibitPaintIconified)
+    {
+        this.inhibitPaintIconified = inhibitPaintIconified;
+    }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12215] jxclient/trunk/src/jxclient/com/realtime/ crossfire/jxclient/window/JXCWindowRenderer.java

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12215
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12215&view=rev
Author:   akirschbaum
Date:     2009-10-24 14:29:00 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Rename field name.

Modified Paths:
--------------
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindowRenderer.java

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindowRenderer.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindowRenderer.java	2009-10-24 14:11:41 UTC (rev 12214)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindowRenderer.java	2009-10-24 14:29:00 UTC (rev 12215)
@@ -115,11 +115,11 @@
      * If set, do not repaint anything. It it set while a map update is in
      * progress.
      */
-    private volatile boolean inhibitPaint = false;
+    private volatile boolean inhibitPaintMapUpdate = false;
 
     /**
      * If set, at least one call to {@link #redrawGUI()} has been dropped while
-     * {@link #inhibitPaint} was set.
+     * {@link #inhibitPaintMapUpdate} was set.
      */
     private volatile boolean skippedPaint = false;
 
@@ -175,7 +175,7 @@
         @Override
         public void mapBegin()
         {
-            inhibitPaint = true;
+            inhibitPaintMapUpdate = true;
             skippedPaint = false;
         }
 
@@ -229,7 +229,7 @@
             {
                 forcePaint = true;
             }
-            inhibitPaint = false;
+            inhibitPaintMapUpdate = false;
         }
 
         /** {@inheritDoc} */
@@ -363,7 +363,7 @@
 
     public void redrawGUI()
     {
-        if (inhibitPaint)
+        if (inhibitPaintMapUpdate)
         {
             skippedPaint = true;
             return;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12214] jxclient/trunk/build.xml

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12214
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12214&view=rev
Author:   akirschbaum
Date:     2009-10-24 14:11:41 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Make project compilable.

Modified Paths:
--------------
    jxclient/trunk/build.xml

Modified: jxclient/trunk/build.xml
===================================================================
--- jxclient/trunk/build.xml	2009-10-24 14:06:26 UTC (rev 12213)
+++ jxclient/trunk/build.xml	2009-10-24 14:11:41 UTC (rev 12214)
@@ -9,6 +9,9 @@
         <delete dir="${build}/jxclient"/>
         <mkdir dir="${build}/jxclient"/>
         <javac srcdir="${src.jxclient}" destdir="${build}/jxclient" source="1.6" debug="yes" fork="yes">
+            <classpath>
+                <pathelement location="lib/annotations.jar"/>
+            </classpath>
             <compilerarg value="-Xlint:unchecked"/>
         </javac>
     </target>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Crossfire-cvs] SF.net SVN: crossfire:[12213] jxclient/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12213
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12213&view=rev
Author:   akirschbaum
Date:     2009-10-24 14:06:26 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Add nullable annotations.

Modified Paths:
--------------
    jxclient/trunk/build.xml
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animation.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animations.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/AbstractCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ClearCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Command.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/DebugColorsCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ExecCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScreenshotCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScriptCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScriptkillCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScriptkillallCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScriptsCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScripttellCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/SetCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/UnbindCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/experience/ExperienceTable.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/AskfaceFaceQueue.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/DefaultFaceQueue.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/Face.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FaceCache.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FaceImages.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FaceImagesUtils.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FaceQueue.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FaceQueueListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FacesManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FacesManagerListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FacesQueue.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FileCache.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FileCacheFaceQueue.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/ImageCache.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/ImageScale2x.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/ImageScale8d.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/MemoryImageCache.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/RawScale2x.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/RawScale8d.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUICheckBox.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUIDialogTitle.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUIMagicMap.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUIMap.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUIMetaElement.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUIPicture.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/button/AbstractButton.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/button/GUIButton.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/button/GUITextButton.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ActivateCommandInputCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ConnectCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/DialogCloseCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/DialogOpenCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/DialogToggleCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/DisconnectCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ExecSelectionCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ExecuteCommandCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ExecuteElementCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/GUICommandFactory.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/HideCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/MetaCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/MoveSelectionCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/QuitCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ScrollCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ScrollListCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ScrollNeverCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ScrollNextCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ScrollResetCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ShowCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/StartCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ToggleCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/ActiveSkillGaugeUpdater.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GUIDupGauge.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GUIDupTextGauge.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GUIGauge.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GUIGaugeListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GUITextGauge.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GaugeState.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GaugeUpdater.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/OrientationParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/SkillGaugeUpdater.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/StatGaugeUpdater.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/ActivatableGUIElement.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GUIElement.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GUIElementChangedListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GUIScrollBar.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/Gui.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GuiAutoCloseListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GuiFactory.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/TooltipManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItem.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemFloor.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemInventory.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemInventoryFactory.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemItem.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemShortcut.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemSpelllist.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/ItemPainter.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/InvalidKeyBindingException.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindingState.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeMap.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/AbstractLabel.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUIHTMLLabel.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUILabel.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUILabelQuery.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUILabelStats.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUIMultiLineLabel.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUIOneLineLabel.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUISpellLabel.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/InternalHTMLRenderer.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/GUIItemInventoryList.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/GUIItemList.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/GUIList.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/GUIMetaElementList.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/ItemInventoryCellRenderer.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/MetaElementCellRenderer.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Buffer.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/BufferListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Fonts.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/GUILabelLog.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/GUILog.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/GUIMessageLog.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Line.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/MessageBufferUpdater.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Parser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/RenderState.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/RenderStateManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Segment.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/scrollable/GUIScrollable2.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/textinput/GUICommandText.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/textinput/GUIQueryText.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/textinput/GUIText.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/textinput/GUITextField.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/textinput/KeyListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/AbstractManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/CfItem.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/CfPlayer.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/CurrentFloorManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/EventScheduler.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/InventoryManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/ItemsManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/LocationListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/LocationsListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/PlayerListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/main/JXClient.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/main/Options.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/AnimationState.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMap.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMapAnimations.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMapPatch.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMapSquare.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMapSquareListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMultiSquare.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/Location.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/CfMapUpdater.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/MapListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/Metaserver.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/MetaserverEntry.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/MetaserverEntryParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/MetaserverModel.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/MetaserverProcessor.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/ServerCache.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/DefaultScriptProcess.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/PacketWatcher.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/ScriptManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/ScriptProcess.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/ScriptProcessListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/StatUtils.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocket.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocketListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CommandQueue.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireDrawextinfoListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireDrawinfoListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireExpTableListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireFaceListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireMagicmapListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireMusicListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireQueryListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireServerConnection.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireServerConnectionListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireSkillInfoListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireSoundListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireSpellListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireStatsListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireUpdateFaceListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireUpdateItemListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireUpdateMapListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/DefaultCrossfireServerConnection.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/DefaultServerConnection.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/MessageTypes.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/Pickup.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/PickupOption.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ReceivedPacketListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ServerConnection.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/UnknownCommandException.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/Codec.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/CommandHistory.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/Filenames.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/Settings.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/options/CommandCheckBoxOption.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/options/Option.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/options/OptionException.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/options/OptionManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/options/SoundCheckBoxOption.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/shortcuts/Shortcut.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/shortcuts/ShortcutCommand.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/shortcuts/ShortcutSpell.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/shortcuts/Shortcuts.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/shortcuts/ShortcutsListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skills/Skill.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skills/SkillSet.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/AbstractJXCSkinSource.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/CheckBoxFactory.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/CommandParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/DefaultJXCSkin.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/DialogFactory.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/Dialogs.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/ExpressionParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/FontParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/GaugeUpdaterParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/GuiElementParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/ImageParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkin.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinCache.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinClassSource.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinDirSource.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinException.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinLoader.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinSource.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/ParseUtils.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/Resolution.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/TextButtonFactory.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/events/ConnectionStateSkinEvent.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/events/CrossfireMagicmapSkinEvent.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/events/MapscrollSkinEvent.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/events/SkillAddedSkinEvent.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/events/SkillRemovedSkinEvent.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/AudioFileLoader.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/ClipCache.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/ClipManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/MusicManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/MusicWatcher.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/SoundManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/SoundWatcher.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/Sounds.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/StatsWatcher.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/CurrentSpellManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/CurrentSpellManagerListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/Spell.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/SpellComparator.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/SpellsManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/SpellsManagerListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/stats/ActiveSkillWatcher.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/stats/PoisonWatcher.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/stats/Stats.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/stats/StatsListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/stats/StatsParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/timeouts/Event.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/timeouts/Timeouts.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/DebugWriter.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/Filenames.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/Formatter.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/HexCodec.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/Images.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/NumberParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/Patterns.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/ResourceUtils.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/StringSplitter.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/StringUtils.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/DialogStateParser.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GUICommandList.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiStateListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCConnection.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindow.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindowRenderer.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/KeyHandler.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/KeybindingsManager.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/MouseTracker.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/RendererGuiStateListener.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/ShortcutsManager.java
    jxclient/trunk/src/test/com/realtime/crossfire/jxclient/gui/gauge/OrientationTest.java
    jxclient/trunk/src/test/com/realtime/crossfire/jxclient/gui/log/ParserTest.java
    jxclient/trunk/src/test/com/realtime/crossfire/jxclient/gui/log/RenderStateTest.java
    jxclient/trunk/src/test/com/realtime/crossfire/jxclient/mapupdater/CfMapUpdaterTest.java
    jxclient/trunk/src/test/com/realtime/crossfire/jxclient/scripts/PacketWatcherTest.java
    jxclient/trunk/src/test/com/realtime/crossfire/jxclient/test/TestCrossfireServerConnection.java
    jxclient/trunk/src/test/com/realtime/crossfire/jxclient/test/TestScriptProcess.java
    jxclient/trunk/src/test/com/realtime/crossfire/jxclient/util/StringSplitterTest.java

Added Paths:
-----------
    jxclient/trunk/lib/annotations.jar
    jxclient/trunk/lib/annotations.jar-LICENSE

Modified: jxclient/trunk/build.xml
===================================================================
--- jxclient/trunk/build.xml	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/build.xml	2009-10-24 14:06:26 UTC (rev 12213)
@@ -18,6 +18,7 @@
         <javac srcdir="${src.test}" destdir="${build}/test" source="1.6" debug="yes" fork="yes">
             <classpath>
                 <pathelement location="jxclient.jar"/>
+                <pathelement location="lib/annotations.jar"/>
                 <pathelement location="lib/junit-4.2.jar"/>
             </classpath>
             <compilerarg value="-Xlint:unchecked"/>
@@ -78,6 +79,7 @@
         <junit fork="yes" haltonerror="yes" haltonfailure="yes">
             <jvmarg value="-ea"/>
             <classpath>
+                <pathelement location="lib/annotations.jar"/>
                 <pathelement location="lib/junit-4.2.jar"/>
                 <pathelement location="${build}/test"/>
                 <pathelement location="jxclient.jar"/>

Added: jxclient/trunk/lib/annotations.jar
===================================================================
(Binary files differ)


Property changes on: jxclient/trunk/lib/annotations.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: jxclient/trunk/lib/annotations.jar-LICENSE
===================================================================
--- jxclient/trunk/lib/annotations.jar-LICENSE	                        (rev 0)
+++ jxclient/trunk/lib/annotations.jar-LICENSE	2009-10-24 14:06:26 UTC (rev 12213)
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.


Property changes on: jxclient/trunk/lib/annotations.jar-LICENSE
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animation.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animation.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animation.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -19,6 +19,8 @@
 //
 package com.realtime.crossfire.jxclient.animations;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * Manages animations frecevied from the server. Animations are uniquely
  * identified by an animation id. Each animation consists of a list of faces.
@@ -35,6 +37,7 @@
     /**
      * The faces list of the animation.
      */
+    @NotNull
     private final int[] faces;
 
     /**
@@ -44,7 +47,7 @@
      *
      * @param faces The faces list of the animation.
      */
-    public Animation(final int flags, final int[] faces)
+    public Animation(final int flags, @NotNull final int[] faces)
     {
         assert faces.length > 0;
 

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animations.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animations.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animations.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -24,6 +24,8 @@
 import com.realtime.crossfire.jxclient.window.JXCWindow;
 import java.util.HashMap;
 import java.util.Map;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Manages animations frecevied from the server. Animations are uniquely
@@ -36,12 +38,14 @@
     /**
      * All defined animations. Maps animation id to animation instance.
      */
+    @NotNull
     private final Map<Integer, Animation> animations = new HashMap<Integer, Animation>();
 
     /**
      * The {@link GuiStateListener} for detecting established or dropped
      * connections.
      */
+    @NotNull
     private final GuiStateListener guiStateListener = new GuiStateListener()
     {
         /** {@inheritDoc} */
@@ -67,7 +71,7 @@
 
         /** {@inheritDoc} */
         @Override
-        public void connecting(final ClientSocketState clientSocketState)
+        public void connecting(@NotNull final ClientSocketState clientSocketState)
         {
             // ignore
         }
@@ -81,7 +85,7 @@
 
         /** {@inheritDoc} */
         @Override
-        public void connectFailed(final String reason)
+        public void connectFailed(@NotNull final String reason)
         {
             // ignore
         }
@@ -91,7 +95,7 @@
      * Creates a new instance.
      * @param window the window to attach to; <code>null</code> to not attach
      */
-    public Animations(final JXCWindow window)
+    public Animations(@Nullable final JXCWindow window)
     {
         if (window != null)
         {
@@ -108,7 +112,7 @@
      *
      * @param faces The faces list of the animation.
      */
-    public void addAnimation(final int animationId, final int flags, final int[] faces)
+    public void addAnimation(final int animationId, final int flags, @NotNull final int[] faces)
     {
         if (faces.length == 1)
         {
@@ -130,6 +134,7 @@
      * @return The animation instance, or <code>null</code> if the animation id
      * does not exist.
      */
+    @Nullable
     public Animation get(final int animationId)
     {
         return animations.get(animationId);

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/AbstractCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/AbstractCommand.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/AbstractCommand.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -21,6 +21,7 @@
 
 import com.realtime.crossfire.jxclient.server.CrossfireDrawinfoListener;
 import com.realtime.crossfire.jxclient.server.CrossfireServerConnection;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Abstract base class for {@link Command} implementations.
@@ -31,13 +32,14 @@
     /**
      * The connection instance.
      */
+    @NotNull
     private final CrossfireServerConnection crossfireServerConnection;
 
     /**
      * Creates a new instance.
      * @param crossfireServerConnection the connection instance
      */
-    protected AbstractCommand(final CrossfireServerConnection crossfireServerConnection)
+    protected AbstractCommand(@NotNull final CrossfireServerConnection crossfireServerConnection)
     {
         this.crossfireServerConnection = crossfireServerConnection;
     }
@@ -46,7 +48,7 @@
      * Displays a regular output message.
      * @param message the message
      */
-    protected void drawInfo(final String message)
+    protected void drawInfo(@NotNull final String message)
     {
         drawInfo(message, CrossfireDrawinfoListener.NDI_BLACK);
     }
@@ -55,7 +57,7 @@
      * Displays an error message.
      * @param message the error message
      */
-    protected void drawInfoError(final String message)
+    protected void drawInfoError(@NotNull final String message)
     {
         drawInfo(message, CrossfireDrawinfoListener.NDI_RED);
     }
@@ -65,7 +67,7 @@
      * @param message the message
      * @param color the color code
      */
-    protected void drawInfo(final String message, final int color)
+    protected void drawInfo(@NotNull final String message, final int color)
     {
         crossfireServerConnection.drawInfo(message, color);
     }

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -25,6 +25,7 @@
 import com.realtime.crossfire.jxclient.window.GUICommandList;
 import com.realtime.crossfire.jxclient.window.GuiManager;
 import com.realtime.crossfire.jxclient.window.JXCWindow;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Implements the "bind" command. It associates a key with a command.
@@ -35,21 +36,25 @@
     /**
      * The windows to execute in.
      */
+    @NotNull
     private final JXCWindow window;
 
     /**
      * The commands instance for executing commands.
      */
+    @NotNull
     private final Commands commands;
 
     /**
      * The {@link GuiManager} to use.
      */
+    @NotNull
     private final GuiManager guiManager;
 
     /**
      * The {@link Macros} instance to use.
      */
+    @NotNull
     private final Macros macros;
 
     /**
@@ -60,7 +65,7 @@
      * @param guiManager the gui manager to use
      * @param macros the macros instance to use
      */
-    public BindCommand(final JXCWindow window, final CrossfireServerConnection crossfireServerConnection, final Commands commands, final GuiManager guiManager, final Macros macros)
+    public BindCommand(@NotNull final JXCWindow window, @NotNull final CrossfireServerConnection crossfireServerConnection, @NotNull final Commands commands, @NotNull final GuiManager guiManager, @NotNull final Macros macros)
     {
         super(crossfireServerConnection);
         this.window = window;
@@ -78,7 +83,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final String args)
+    public void execute(@NotNull final String args)
     {
         final String commandList;
         final boolean perCharacterBinding;

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ClearCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ClearCommand.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ClearCommand.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -22,6 +22,7 @@
 import com.realtime.crossfire.jxclient.gui.log.Buffer;
 import com.realtime.crossfire.jxclient.server.CrossfireServerConnection;
 import com.realtime.crossfire.jxclient.window.JXCWindowRenderer;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Implements the command "clear". It clears the active message window.
@@ -32,6 +33,7 @@
     /**
      * The {@link JXCWindowRenderer} to affect.
      */
+    @NotNull
     private final JXCWindowRenderer windowRenderer;
 
     /**
@@ -39,7 +41,7 @@
      * @param windowRenderer the window renderer to affect
      * @param crossfireServerConnection the connection instance
      */
-    public ClearCommand(final JXCWindowRenderer windowRenderer, final CrossfireServerConnection crossfireServerConnection)
+    public ClearCommand(@NotNull final JXCWindowRenderer windowRenderer, @NotNull final CrossfireServerConnection crossfireServerConnection)
     {
         super(crossfireServerConnection);
         this.windowRenderer = windowRenderer;
@@ -54,7 +56,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final String args)
+    public void execute(@NotNull final String args)
     {
         if (args.length() != 0)
         {

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Command.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Command.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Command.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -19,6 +19,8 @@
 //
 package com.realtime.crossfire.jxclient.commands;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * Implements a client-side command.
  *
@@ -38,5 +40,5 @@
      *
      * @param args The command arguments.
      */
-    void execute(String args);
+    void execute(@NotNull String args);
 }

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -30,6 +30,7 @@
 import com.realtime.crossfire.jxclient.window.JXCWindowRenderer;
 import java.util.HashMap;
 import java.util.Map;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Parses and executes client-side commands.
@@ -41,11 +42,13 @@
     /**
      * The command queue for sending commands.
      */
+    @NotNull
     private final CommandQueue commandQueue;
 
     /**
      * Maps command name to {@link Command} instance.
      */
+    @NotNull
     private final Map<String, Command> commands = new HashMap<String, Command>();
 
     /**
@@ -59,7 +62,7 @@
      * @param guiManager the gui manager to use
      * @param macros the macros instance to use
      */
-    public Commands(final JXCWindow window, final JXCWindowRenderer windowRenderer, final CommandQueue commandQueue, final CrossfireServerConnection crossfireServerConnection, final ScriptManager scriptManager, final OptionManager optionManager, final GuiManager guiManager, final Macros macros)
+    public Commands(@NotNull final JXCWindow window, @NotNull final JXCWindowRenderer windowRenderer, @NotNull final CommandQueue commandQueue, @NotNull final CrossfireServerConnection crossfireServerConnection, @NotNull final ScriptManager scriptManager, @NotNull final OptionManager optionManager, @NotNull final GuiManager guiManager, @NotNull final Macros macros)
     {
         this.commandQueue = commandQueue;
         commands.put("bind", new BindCommand(window, crossfireServerConnection, this, guiManager, macros));
@@ -82,7 +85,7 @@
      *
      * @param commands The commands to execute.
      */
-    public void executeCommand(final CharSequence commands)
+    public void executeCommand(@NotNull final CharSequence commands)
     {
         String cmds = StringUtils.trimLeading(commands);
         while (cmds.length() > 0)
@@ -110,7 +113,7 @@
      *
      * @return <code>true</code> if all remaining commands have been consumed.
      */
-    private boolean execute(final String command, final String commandList)
+    private boolean execute(@NotNull final String command, @NotNull final String commandList)
     {
         if (command.length() <= 0)
         {

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/DebugColorsCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/DebugColorsCommand.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/DebugColorsCommand.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -21,6 +21,7 @@
 
 import com.realtime.crossfire.jxclient.gui.log.MessageBufferUpdater;
 import com.realtime.crossfire.jxclient.server.CrossfireServerConnection;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Implements the "debug_colors" command. It prints text to the log window
@@ -33,7 +34,7 @@
      * Creates a new instance.
      * @param crossfireServerConnection the connection instance
      */
-    public DebugColorsCommand(final CrossfireServerConnection crossfireServerConnection)
+    public DebugColorsCommand(@NotNull final CrossfireServerConnection crossfireServerConnection)
     {
         super(crossfireServerConnection);
     }
@@ -47,7 +48,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final String args)
+    public void execute(@NotNull final String args)
     {
         if (args.length() != 0)
         {

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ExecCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ExecCommand.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ExecCommand.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -23,6 +23,7 @@
 import com.realtime.crossfire.jxclient.skin.JXCSkinException;
 import com.realtime.crossfire.jxclient.window.GUICommandList;
 import com.realtime.crossfire.jxclient.window.GuiManager;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Implements the "exec" command. It runs a skin command.
@@ -33,6 +34,7 @@
     /**
      * The {@link GuiManager} for looking up commands.
      */
+    @NotNull
     private final GuiManager guiManager;
 
     /**
@@ -40,7 +42,7 @@
      * @param guiManager the gui manager for looking up commands
      * @param crossfireServerConnection the connection instance
      */
-    public ExecCommand(final GuiManager guiManager, final CrossfireServerConnection crossfireServerConnection)
+    public ExecCommand(@NotNull final GuiManager guiManager, @NotNull final CrossfireServerConnection crossfireServerConnection)
     {
         super(crossfireServerConnection);
         this.guiManager = guiManager;
@@ -55,7 +57,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final String args)
+    public void execute(@NotNull final String args)
     {
         if (args.length() == 0)
         {

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Manages macro expansion in command strings.
@@ -36,26 +37,30 @@
     /**
      * The "reply_to" macro name.
      */
+    @NotNull
     private static final String REPLY_TO = "reply_to";
 
     /**
      * The {@link Pattern} matching macro names.
      */
+    @NotNull
     private final Pattern macroPattern = Pattern.compile("<<([a-z_]+)>>");
 
     /**
      * The macro expansions. Maps macro name to macro expansion.
      */
+    @NotNull
     private final Map<String, String> expansions = new HashMap<String, String>();
 
     /**
      * The {@link CrossfireDrawextinfoListener} for tracking tells.
      */
+    @NotNull
     private final CrossfireDrawextinfoListener crossfireDrawextinfoListener = new CrossfireDrawextinfoListener()
     {
         /** {@inheritDoc} */
         @Override
-        public void commandDrawextinfoReceived(final int color, final int type, final int subtype, final String message)
+        public void commandDrawextinfoReceived(final int color, final int type, final int subtype, @NotNull final String message)
         {
             switch (type)
             {
@@ -102,7 +107,7 @@
      * @param crossfireServerConnection the crossfire server connection to
      * track
      */
-    public Macros(final CrossfireServerConnection crossfireServerConnection)
+    public Macros(@NotNull final CrossfireServerConnection crossfireServerConnection)
     {
         expansions.put(REPLY_TO, "");
         crossfireServerConnection.addCrossfireDrawextinfoListener(crossfireDrawextinfoListener);
@@ -113,7 +118,8 @@
      * @param string the string to expand
      * @return the expanded string
      */
-    public String expandMacros(final String string)
+    @NotNull
+    public String expandMacros(@NotNull final String string)
     {
         StringBuilder result = null;
         int index = 0;

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScreenshotCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScreenshotCommand.java	2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScreenshotCommand.java	2009-10-24 14:06:26 UTC (rev 12213)
@@ -29,6 +29,7 @@
 import java.io.File;
 import java.io.IOException;
 import javax.imageio.ImageIO;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Implements the "screenshot" command. It write the current window contents
@@ -52,11 +53,13 @@
     /**
      * The window to execute in.
      */
+    @NotNull
     private final JXCWindow window;
 
     /**
      * The renderer to use.
      */
+    @NotNull
     private final JXCWindowRenderer windowRenderer;
 
     /**
@@ -65,7 +68,7 @@
      * @param windowRenderer the renderer to use
      * @param crossfireServerConnection the connection instance
      */
-    public ScreenshotCommand(final JXCWindow window, final JXCWindowRenderer windowRenderer, final CrossfireServerConnection crossfireServerConnection)
+    public ScreenshotCommand(@NotNull final JXCWindow window, @NotNull final JXCWindowRenderer windowRenderer, @NotNull final CrossfireServerConnection crossfireServerConnection)
     {
         super(crossfireServerConnection);
         this.window = window;
@@ -81,7 +84,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final String args)
+    public void execute(@NotNull final String args)
     {
         final File file;
         if (args.length() == 0)

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScriptCommand.java
===================================================================
--- jxclient/trunk/src/...
 
[truncated message content]

[Crossfire-cvs] SF.net SVN: crossfire:[12212] jxclient/trunk/src/jxclient/com/realtime/ crossfire/jxclient/faces/ImageScale2x.java

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12212
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12212&view=rev
Author:   akirschbaum
Date:     2009-10-23 23:45:11 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
Fix Javadoc issues.

Modified Paths:
--------------
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/ImageScale2x.java

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/ImageScale2x.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/ImageScale2x.java	2009-10-23 23:43:28 UTC (rev 12211)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/ImageScale2x.java	2009-10-23 23:45:11 UTC (rev 12212)
@@ -26,24 +26,22 @@
 
 /**
  * A utility to perform the scale2x algorithm on a Java Image.
- *
  * @author Kevin Glass
  */
 public class ImageScale2x
 {
-    /** The src data from the image */
+    /** The src data from the image. */
     private final int[] srcData;
 
-    /** The width of the image */
+    /** The width of the image. */
     private final int width;
 
-    /** The height of the image */
+    /** The height of the image. */
     private final int height;
 
     /**
-     * Create a new scaler that will scale the passed image.
-     *
-     * @param srcImageIcon The image to be scaled.
+     * Creates a new scaler that will scale the passed image.
+     * @param srcImageIcon the image to be scaled
      */
     public ImageScale2x(final Icon srcImageIcon)
     {
@@ -57,10 +55,9 @@
     }
 
     /**
-     * Retrieve the scaled image. Note this is the method that actually does
+     * Retrieves the scaled image. Note this is the method that actually does
      * the work so it may take some time to return.
-     *
-     * @return The scaled image.
+     * @return the scaled image
      */
     public ImageIcon getScaledImage()
     {
@@ -74,10 +71,9 @@
 
     /**
      * An entry point and a bit of test code.
-     *
-     * @param argv The arguments passed in to the test code.
+     * @param args the command-line arguments (ignored)
      */
-    public static void main(final String[] argv)
+    public static void main(final String[] args)
     {
         final String srcFile = "randam_orig.png";
         System.out.println("Reading: "+srcFile);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.