[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/deliantra

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.29 by root, Mon Mar 24 00:24:47 2008 UTC vs.
Revision 1.65 by root, Sat Aug 30 06:49:05 2008 UTC

…		…
49	}	49	}
50	}	50	}
51		51
52	if ($^O eq "MSWin32") {	52	if ($^O eq "MSWin32") {
53	# pango is relocatable on win32	53	# pango is relocatable on win32
54	} else {	54	} elsif (-e "$root/pangoversion") {
55	open my $fh, "<:perlio", "$root/pangoversion"	55	open my $fh, "<:perlio", "$root/pangoversion"
56	or die "pangoversion: $!";	56	or die "pangoversion: $!";
57	my $PANGO = <$fh>;	57	my $PANGO = <$fh>;
58	# unix, need to patch pango rc file	58	# unix, need to patch pango rc file
59	open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"	59	open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
…		…
69		69
70	$ENV{PANGO_RC_FILE} = "$root/pango.rc";	70	$ENV{PANGO_RC_FILE} = "$root/pango.rc";
71	open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}	71	open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72	or die "$ENV{PANGO_RC_FILE}: $!";	72	or die "$ENV{PANGO_RC_FILE}: $!";
73	print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";	73	print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
		74	} else {
		75	# OS X
		76	$ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
		77	$ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
		78	$ENV{PANGO_RC_FILE} = "$root/pango.rc";
		79	$ENV{DYLD_LIBRARY_PATH} = $root;
		80	chdir $root; # for pango modules, maybe other things
74	}	81	}
75		82
76	unshift @INC, $root;	83	unshift @INC, $root;
77	}	84	}
78	}	85	}
…		…
97	use List::Util qw(max min);	104	use List::Util qw(max min);
98		105
99	use Deliantra;	106	use Deliantra;
100	use Deliantra::Protocol::Constants;	107	use Deliantra::Protocol::Constants;
101		108
		109	use AnyEvent::DNS;
		110	use AnyEvent::Socket ();
		111
102	use Compress::LZF;	112	use Compress::LZF;
103		113
104	use DC;	114	use DC;
		115	BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
105	use DC::OpenGL ();	116	use DC::OpenGL ();
106	use DC::Protocol;	117	use DC::Protocol;
107	use DC::DB;	118	use DC::DB;
108	use DC::UI;	119	use DC::UI;
109	use DC::UI::Canvas;	120	use DC::UI::Canvas;
110	use DC::UI::Inventory;	121	use DC::UI::Inventory;
111	use DC::UI::SpellList;	122	use DC::UI::SpellList;
112	use DC::UI::Dockable;	123	use DC::UI::Dockable;
113	use DC::UI::Dockbar;	124	use DC::UI::Dockbar;
114	use DC::UI::MessageWindow;
115	use DC::UI::ChatView;	125	use DC::UI::ChatView;
116	use DC::MessageDistributor;	126	use DC::MessageDistributor;
117	use DC::Pod;	127	use DC::Pod;
118	use DC::MapWidget;	128	use DC::MapWidget;
119	use DC::Macro;	129	use DC::Macro;
…		…
137	our $PROFILE; # current profile	147	our $PROFILE; # current profile
138	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	148	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139		149
140	our $WANT_REFRESH;	150	our $WANT_REFRESH;
141		151
		152	our $MODE_SLIDER;
		153	our $CAVEAT_LABEL;
		154
142	our @SDL_MODES;	155	our @SDL_MODES;
		156	our $SDL_REINIT = 1;
143	our $WIDTH;	157	our $WIDTH;
144	our $HEIGHT;	158	our $HEIGHT;
145	our $FULLSCREEN;	159	our $FULLSCREEN;
146	our $FONTSIZE;	160	our $FONTSIZE;
147		161
…		…
232		246
233	$markup .= $mod & DC::KMOD_NUM	247	$markup .= $mod & DC::KMOD_NUM
234	? "[NUM]"	248	? "[NUM]"
235	: "[<span foreground='#888'>num</span>]";	249	: "[<span foreground='#888'>num</span>]";
236		250
		251	# <tt> around next statement works around some bug that keeps the
		252	# "font =>" from being used on windows
237	$MODBOX->set_markup ($markup);	253	$MODBOX->set_markup ("<tt>$markup</tt>");
238	}	254	}
239		255
240	#############################################################################	256	#############################################################################
241	#TODO: maybe move into own audio module...	257	#TODO: maybe move into own audio module...
242		258
…		…
662	# right: accept	678	# right: accept
663	$table->add_at (4, 0, new DC::UI::Button	679	$table->add_at (4, 0, new DC::UI::Button
664	text => "Accept",	680	text => "Accept",
665	on_activate => sub {	681	on_activate => sub {
666	$conn->send ("reply n");	682	$conn->send ("reply n");
667	$STATS_PAGE->hide;
668	destroy_query_dialog $conn;	683	destroy_query_dialog $conn;
669	0	684	0
670	},	685	},
671	);	686	);
672		687
…		…
724		739
725	$vbox->add (@dialog);	740	$vbox->add (@dialog);
726	$dialog->show;	741	$dialog->show;
727	}	742	}
728		743
729	sub start_game {	744	sub dc_connect {
730	status "logging in...";	745	my ($host, $port) = @_;
731
732	$LOGIN_BUTTON->set_text ("Logout");
733	$SETUP_DIALOG->hide;
734		746
735	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	747	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
736		748
737	my ($host, $port) = split /:/, $PROFILE->{host};
738
739	$MAP = new DC::Map;
740
741	$CONN = eval {	749	$CONN =
742	new DC::Protocol	750	new DC::Protocol
743	host => $host,	751	host => $host,
744	port => $port \|\| 13327,	752	port => $port,
745	user => $PROFILE->{user},	753	user => $PROFILE->{user},
746	pass => $PROFILE->{password},	754	pass => $PROFILE->{password},
747	mapw => $mapsize,	755	mapw => $mapsize,
748	maph => $mapsize,	756	maph => $mapsize,
749		757
…		…
756	query => \&server_query,	764	query => \&server_query,
757		765
758	setup_req => {	766	setup_req => {
759	smoothing => $CFG->{map_smoothing}*1,	767	smoothing => $CFG->{map_smoothing}*1,
760	},	768	},
761	};
762		769
763	if ($CONN) {	770	on_connect => sub {
		771	if ($_[0]) {
764	DC::lowdelay fileno $CONN->{fh};	772	DC::lowdelay fileno $CONN->{fh};
765		773
766	status "login successful";	774	status "login successful";
		775	} else {
		776	undef $CONN;
		777	status "unable to connect: $!";
		778	stop_game();
		779	}
		780	},
		781	;
		782	}
		783
		784	sub start_game {
		785	status "logging in...";
		786
		787	$LOGIN_BUTTON->set_text ("Logout");
		788	$SETUP_DIALOG->hide;
		789
		790	my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
		791
		792	$MAP = new DC::Map;
		793
		794	# hack to make SURE we find the IP address all right
		795	# can be removed once AnyEvent::DNS is proven stable.
		796	if ($host eq "gameserver.deliantra.net") {
		797	AnyEvent::DNS::a "dnstest.deliantra.net", sub {
		798	if ($_[0] ne "80.101.114.108") { # Perl
		799	status "dns failure, using hardcoded address";
		800	$host = "129.13.162.95";
		801	}
		802
		803	dc_connect $host, $port;
		804	};
767	} else {	805	} else {
768	status "unable to connect";	806	dc_connect $host, $port;
769	stop_game();
770	}	807	}
771	}	808	}
772		809
773	sub stop_game {	810	sub stop_game {
774	$LOGIN_BUTTON->set_text ("Login / Register");	811	$LOGIN_BUTTON->set_text ("Login / Register");
…		…
798		835
799	my $row = 0;	836	my $row = 0;
800		837
801	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");	838	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
802	$table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,	839	$table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
803	can_events => 1,	840	can_events => 1,
804	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");	841	tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
		842
		843	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
		844	$table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
		845	can_events => 1,
		846	tooltip => "This field shows any known issues with your config or driver, such as "
		847	. "a non-accelerated display format. You can try to work around these issues "
		848	. "by selecting a different video mode, changing the settings below or "
		849	. "by installing the right driver for your graphics card.");
805		850
806	my $vidmode_tooltip =	851	my $vidmode_tooltip =
807	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "	852	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
808	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";	853	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
809		854
810	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");	855	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
811	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);	856	$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
812		857
813	$hbox->add (my $mode_slider = new DC::UI::Slider	858	$hbox->add ($MODE_SLIDER = new DC::UI::Slider
814	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],	859	force_w => $WIDTH * 0.1, expand => 1,
		860	range => [ ($CFG->{sdl_mode}) x 3 ],
815	tooltip => $vidmode_tooltip);	861	tooltip => $vidmode_tooltip);
816	$hbox->add (my $mode_label = new DC::UI::Label	862	$hbox->add (my $mode_label = new DC::UI::Label
817	height => 0.8, template => "9999x9999@9+9",	863	height => 0.8, template => "9999x9999@9+9",
818	can_events => 1, tooltip => $vidmode_tooltip);	864	can_events => 1, tooltip => $vidmode_tooltip);
819		865
820	$mode_slider->connect (changed => sub {	866	$MODE_SLIDER->connect (changed => sub {
821	my ($self, $value) = @_;	867	my ($self, $value) = @_;
822		868
823	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	869	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
824	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});	870	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
825	});	871	});
826	$mode_slider->emit (changed => $mode_slider->{range}[0]);	872	$MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
827		873
828	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");	874	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
829	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox	875	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
830	state => $CFG->{fullscreen},	876	state => $CFG->{fullscreen},
831	tooltip => "Bring the client into fullscreen mode.",	877	tooltip => "Bring the client into fullscreen mode.",
…		…
837	state => $CFG->{force_opengl11},	883	state => $CFG->{force_opengl11},
838	tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "	884	tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
839	. "higher memory usage and slower performance. It will, however, help tremendously on "	885	. "higher memory usage and slower performance. It will, however, help tremendously on "
840	. "cards that claim to support a feature but fall back to software rendering. "	886	. "cards that claim to support a feature but fall back to software rendering. "
841	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "	887	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
842	. "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "	888	. "but cards and drivers from other vendors (ATI) are often just as bad. "
843	. "experience extremely low framerates and your card should do better, try this option.</b>",	889	. "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
844	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }	890	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
		891	);
		892
		893	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
		894	$table->add_at (1, $row++, new DC::UI::CheckBox
		895	state => $CFG->{disable_alpha},
		896	tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
		897	. "by disabling a number of textures and transparency effects. Normally, these "
		898	. "effects do not cost a lot of resources, but some graphics cards might fall "
		899	. "back to etxremely slow rendering if this is enabled. If disabling this option "
		900	. "noticably improves the framerate of the client please report this! "
		901	. "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
		902	on_changed => sub {
		903	my ($self, $value) = @_;
		904	$CFG->{disable_alpha} = $value;
		905	$SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
		906	0
		907	}
845	);	908	);
846		909
847	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");	910	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
848	$table->add_at (1, $row++, new DC::UI::CheckBox	911	$table->add_at (1, $row++, new DC::UI::CheckBox
849	state => $CFG->{texture_compression},	912	state => $CFG->{texture_compression},
850	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "	913	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
851	. "will save a lot of memory and increase performance. The compression algorithm "	914	. "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
852	. "can differ form card to card, so your mileage may vary. This setting is ignored in "	915	. "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
853	. "forced OpenGL 1.1 mode.",	916	. "forced OpenGL 1.1 mode and when using the Apple renderer.",
854	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }	917	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
855	);	918	);
856		919
857	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");	920	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
858	$table->add_at (1, $row++, new DC::UI::CheckBox	921	$table->add_at (1, $row++, new DC::UI::CheckBox
…		…
874	on_activate => sub {	937	on_activate => sub {
875	video_shutdown ();	938	video_shutdown ();
876	video_init ();	939	video_init ();
877	0	940	0
878	}	941	}
		942	);
		943
		944	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
		945	$table->add_at (1, $row++, new DC::UI::CheckBox
		946	state => $CFG->{smooth_movement},
		947	tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
		948	. "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
		949	. "then disable this option. Changes take effect immdiately.",
		950	on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
879	);	951	);
880		952
881	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");	953	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
882	$table->add_at (1, $row++, new DC::UI::Slider	954	$table->add_at (1, $row++, new DC::UI::Slider
883	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	955	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
…		…
1523	1	1595	1
1524	},	1596	},
1525	);	1597	);
1526		1598
1527	$vbox->add (new DC::UI::FancyFrame	1599	$vbox->add (new DC::UI::FancyFrame
1528	label => "Registering",	1600	label => "How to Play",
1529	min_h => 200,	1601	min_h => 240,
1530	child => (new DC::UI::Label valign => 0, ellipsise => 0,	1602	child => (new DC::UI::Label valign => 0, ellipsise => 0,
1531	markup =>	1603	markup =>
		1604	"First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
		1605	. "Then register a new account (or use an existing one if you have one). "
1532	"To register a new account, choose a username that hasn't been taken yet and "	1606	. "To register an account, choose a username that hasn't been taken yet (just guess) and "
1533	. "try to log-in. Follow the instructions in the Log tab in the message window.",	1607	. "try to log-in. Follow the instructions in the Log tab in the message window.",
1534	),	1608	),
1535	);	1609	);
1536		1610
1537	$vbox	1611	$vbox
…		…
1618	$CFG->{show_tips} = $value;	1692	$CFG->{show_tips} = $value;
1619	0	1693	0
1620	}	1694	}
1621	);	1695	);
1622		1696
1623	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size");	1697	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1624	$table->add_at (1, $row++, my $saycmd = new DC::UI::Entry	1698	$table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1625	text => $CFG->{logview_max_par},	1699	text => $CFG->{logview_max_par},
1626	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "	1700	tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1627	. "sends more messages than this number, older messages get removed to save memory and "	1701	. "sends more messages than this number, older messages get removed to save memory and "
1628	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",	1702	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1629	on_changed => sub {	1703	on_changed => sub {
1630	my ($self, $value) = @_;	1704	my ($self, $value) = @_;
1631	$MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);	1705	$MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
…		…
1683	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1757	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1684	["Ignore cursed" => PICKUP_NOT_CURSED],	1758	["Ignore cursed" => PICKUP_NOT_CURSED],
1685	["Jewelery" => PICKUP_JEWELS],	1759	["Jewelery" => PICKUP_JEWELS],
1686	["Flesh" => PICKUP_FLESH],	1760	["Flesh" => PICKUP_FLESH],
1687	],	1761	],
1688	["Weight/Value ratio", 2, 17]	1762	["Value/Weight ratio", 2, 17]
1689	)	1763	)
1690	{	1764	{
1691	my ($title, $x, $y, @bits) = @$_;	1765	my ($title, $x, $y, @bits) = @$_;
1692	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1766	$table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1693		1767
…		…
1718	}	1792	}
1719		1793
1720	$table->add_at (2, 18, new DC::UI::ValSlider	1794	$table->add_at (2, 18, new DC::UI::ValSlider
1721	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1795	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1722	template => ">= 99",	1796	template => ">= 99",
		1797	tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1723	to_value => sub { ">= " . 5 * $_[0] },	1798	to_value => sub { ">= " . 5 * $_[0] },
1724	on_changed => sub {	1799	on_changed => sub {
1725	my ($slider, $value) = @_;	1800	my ($slider, $value) = @_;
1726		1801
1727	$::CFG->{pickup} &= ~0xF;	1802	$::CFG->{pickup} &= ~0xF;
…		…
1740		1815
1741	$r	1816	$r
1742	}	1817	}
1743		1818
1744	my %SORT_ORDER = (	1819	my %SORT_ORDER = (
1745	type => undef,	1820	type => sub {
		1821	sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
		1822	},
1746	mtime => sub {	1823	mtime => sub {
1747	my $NOW = time;	1824	my $NOW = time;
1748	sort {	1825	sort {
1749	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;	1826	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1750	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;	1827	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
…		…
1781	$::CFG->{inv_sort} = $_[1];	1858	$::CFG->{inv_sort} = $_[1];
1782	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1859	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1783	},	1860	},
1784	);	1861	);
1785	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);	1862	$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1786	#TODO# update to weigh/maxweight	1863	#TODO# update to weight/maxweight
1787	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);	1864	$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1788		1865
1789	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);	1866	$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1790	$sw1->add ($INV = new DC::UI::Inventory);	1867	$sw1->add ($INV = new DC::UI::Inventory);
1791	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});	1868	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
…		…
1972	my @path = DC::Pod::full_path_of $node;	2049	my @path = DC::Pod::full_path_of $node;
1973	pop @path; # drop current node	2050	pop @path; # drop current node
1974		2051
1975	for my $node (@path) {	2052	for my $node (@path) {
1976	$buttons->add (new DC::UI::Button	2053	$buttons->add (new DC::UI::Button
1977	text => $node->{kw}[0],	2054	text => $node->[DC::Pod::N_KW][0],
1978	tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",	2055	tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1979	on_activate => sub {	2056	on_activate => sub {
1980	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();	2057	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1981	$load_node->($node);	2058	$load_node->($node);
1982	},	2059	},
1983	);	2060	);
1984	$buttons->add (new DC::UI::Label text => "/");	2061	$buttons->add (new DC::UI::Label text => "/");
1985	}	2062	}
1986		2063
1987	$buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);	2064	$buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1988		2065
1989	$curnode = $node;	2066	$curnode = $node;
1990		2067
1991	$viewer->clear;	2068	$viewer->clear;
1992	$viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);	2069	$viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
…		…
2118	$dialog->show;	2195	$dialog->show;
2119	};	2196	};
2120	}	2197	}
2121		2198
2122	sub sdl_init {	2199	sub sdl_init {
2123	DC::SDL_Init	2200	DC::SDL_Init DC::SDL_INIT_AUDIO #\| DC::SDL_NOPARACHUTE
2124	and die "SDL::Init failed!\n";	2201	and die "SDL::Init failed!\n";
2125	}	2202	}
2126		2203
2127	sub video_init {	2204	sub video_init {
		2205	DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
		2206	$SDL_REINIT = 0;
		2207
		2208	@SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
		2209	@SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
		2210	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
		2211	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2212
		2213	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
		2214
2128	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	2215	if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
		2216	$CFG->{sdl_mode} = 0; # lowest resolution by default
		2217
		2218	# now choose biggets mode <= 1024x768
		2219	for (0 .. $#SDL_MODES) {
		2220	if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
		2221	$CFG->{sdl_mode} = $_;
		2222	}
		2223	}
		2224	}
2129		2225
2130	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	2226	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2131		2227
2132	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2228	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2133	$FULLSCREEN = $CFG->{fullscreen};	2229	$FULLSCREEN = $CFG->{fullscreen};
2134	$FAST = $CFG->{fast};	2230	$FAST = $CFG->{fast};
2135		2231
		2232	# due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2136	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN	2233	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
		2234	or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2137	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";	2235	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2138		2236
2139	$SDL_ACTIVE = 1;	2237	$SDL_ACTIVE = 1;
2140	$LAST_REFRESH = time - 0.01;	2238	$LAST_REFRESH = time - 0.01;
2141		2239
…		…
2178	can_events => 1,	2276	can_events => 1,
2179	can_hover => 1,	2277	can_hover => 1,
2180	markup => "",	2278	markup => "",
2181	align => 0,	2279	align => 0,
2182	font => $FONT_FIXED,	2280	font => $FONT_FIXED,
2183	tooltip => "#modifier_box";	2281	tooltip => "#modifier_box",
		2282	tooltip_width => 0.67,
		2283	;
2184		2284
2185	update_modbox;	2285	update_modbox;
2186		2286
2187	(new DC::UI::Frame	2287	(new DC::UI::Frame
2188	bg => [0, 0, 0, 0.4],	2288	bg => [0, 0, 0, 0.4],
…		…
2237	force_h => $::HEIGHT * 0.6,	2337	force_h => $::HEIGHT * 0.6,
2238	has_close_button => 1,	2338	has_close_button => 1,
2239	;	2339	;
2240		2340
2241	$METASERVER = metaserver_dialog;	2341	$METASERVER = metaserver_dialog;
2242	$MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages');	2342	# the name is changed to not conflict with the older name as users could have hidden it
		2343	$MESSAGE_WINDOW = new DC::UI::Dockbar
		2344	name => "message_window2",
		2345	title => 'Messages',
		2346	force_w => $::WIDTH * 0.6,
		2347	force_h => $::HEIGHT * 0.25,
		2348	;
		2349
2243	$MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;	2350	$MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2244		2351
2245	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1,	2352	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2246	filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);	2353	filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2247		2354
2248	$SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,	2355	$SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2249	"Configure the server to play on, your username and password.");	2356	"Configure the server to play on, your username and password.");
2250	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,	2357	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
…		…
2268	$BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	2375	$BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2269		2376
2270	$BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	2377	$BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2271	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	2378	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2272		2379
2273	$BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,	2380	# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2274	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	2381	# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2275		2382
2276	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	2383	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2277		2384
2278	$BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,	2385	$BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2279	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	2386	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
…		…
2281	$BUTTONBAR->add (new DC::UI::Button	2388	$BUTTONBAR->add (new DC::UI::Button
2282	text => "Save Config",	2389	text => "Save Config",
2283	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	2390	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2284	on_activate => sub {	2391	on_activate => sub {
2285	$::CFG->{layout} = DC::UI::get_layout;	2392	$::CFG->{layout} = DC::UI::get_layout;
2286	DC::write_cfg "$Deliantra::VARDIR/client.cf";	2393	DC::write_cfg;
2287	status "Configuration Saved";	2394	status "Configuration Saved";
2288	0	2395	0
2289	},	2396	},
2290	);	2397	);
2291		2398
2292	$BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	2399	$BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2293	tooltip => "View Documentation");	2400	tooltip => "View Documentation");
2294
2295		2401
2296	$BUTTONBAR->add (new DC::UI::Button	2402	$BUTTONBAR->add (new DC::UI::Button
2297	text => "Quit",	2403	text => "Quit",
2298	tooltip => "Terminates the program",	2404	tooltip => "Terminates the program",
2299	on_activate => sub {	2405	on_activate => sub {
…		…
2309	$BUTTONBAR->show;	2415	$BUTTONBAR->show;
2310	$SETUP_DIALOG->show;	2416	$SETUP_DIALOG->show;
2311	$MESSAGE_WINDOW->show;	2417	$MESSAGE_WINDOW->show;
2312	}	2418	}
2313		2419
		2420	$MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
		2421	$MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
		2422
		2423	$CAVEAT_LABEL->set_text ("None :)");
		2424	$CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
		2425	unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
		2426
2314	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2427	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2315	}	2428	}
2316		2429
2317	sub video_shutdown {	2430	sub video_shutdown {
2318	DC::OpenGL::shutdown;	2431	DC::OpenGL::shutdown;
		2432	DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2319		2433
2320	undef $SDL_ACTIVE;	2434	undef $SDL_ACTIVE;
2321	}	2435	}
2322		2436
2323	my %animate_object;	2437	my %animate_object;
…		…
2384	# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;	2498	# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2385	},	2499	},
2386	DC::SDL_KEYDOWN => sub {	2500	DC::SDL_KEYDOWN => sub {
2387	if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {	2501	if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2388	# alt-enter	2502	# alt-enter
		2503	video_shutdown;
2389	$FULLSCREEN_ENABLE->toggle;	2504	$FULLSCREEN_ENABLE->toggle;
2390	video_shutdown;
2391	video_init;	2505	video_init;
2392	} else {	2506	} else {
2393	&DC::UI::feed_sdl_key_down_event;	2507	&DC::UI::feed_sdl_key_down_event;
2394	}	2508	}
2395	update_modbox;	2509	update_modbox;
…		…
2415	$SIG{INT} = $SIG{TERM} = sub {	2529	$SIG{INT} = $SIG{TERM} = sub {
2416	EV::unloop;	2530	EV::unloop;
2417	#d# TODO calling exit here hangs the process in some futex	2531	#d# TODO calling exit here hangs the process in some futex
2418	};	2532	};
2419		2533
2420	{	2534	# due to mac os x + sdl combined briandamage, we need this contortion
		2535	sub main {
		2536	{
		2537	DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
		2538
2421	if (-e "$Deliantra::VARDIR/client.cf") {	2539	if (-e "$Deliantra::VARDIR/client.cf") {
2422	DC::read_cfg "$Deliantra::VARDIR/client.cf";	2540	DC::read_cfg "$Deliantra::VARDIR/client.cf";
2423	} else {	2541	} else {
2424	#TODO: compatibility cruft	2542	#TODO: compatibility cruft
2425	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";	2543	DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2426	print STDERR "INFO: used old configuration file\n";	2544	print STDERR "INFO: used old configuration file\n";
2427	}	2545	}
2428		2546
2429	DC::DB::Server::run;	2547	DC::DB::Server::run;
2430		2548
		2549	if ($CFG->{db_schema} < 1) {
		2550	warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
		2551	DC::DB::nuke_db;
		2552	$CFG->{db_schema} = 1;
		2553	DC::write_cfg;
		2554	}
		2555
		2556	DC::DB::open_db;
		2557
2431	DC::UI::set_layout ($::CFG->{layout});	2558	DC::UI::set_layout ($::CFG->{layout});
2432		2559
2433	my %DEF_CFG = (	2560	my %DEF_CFG = (
2434	sdl_mode => 0,	2561	sdl_mode => undef,
2435	fullscreen => 1,	2562	fullscreen => 1,
2436	fast => 0,	2563	fast => 0,
2437	force_opengl11 => undef,	2564	force_opengl11 => undef,
		2565	disable_alpha => 0,
		2566	smooth_movement => 1,
2438	texture_compression => 1,	2567	texture_compression => 1,
2439	map_scale => 1,	2568	map_scale => 1,
2440	fow_enable => 1,	2569	fow_enable => 1,
2441	fow_intensity => 0,	2570	fow_intensity => 0,
2442	map_smoothing => 1,	2571	map_smoothing => 1,
2443	gui_fontsize => 1,	2572	gui_fontsize => 1,
2444	log_fontsize => 0.7,	2573	log_fontsize => 0.7,
2445	gauge_fontsize => 1,	2574	gauge_fontsize => 1,
2446	gauge_size => 0.35,	2575	gauge_size => 0.35,
2447	stat_fontsize => 0.7,	2576	stat_fontsize => 0.7,
2448	mapsize => 100,	2577	mapsize => 100,
2449	audio_enable => 1,	2578	audio_enable => 1,
2450	audio_hw_channels => 0,	2579	audio_hw_channels => 0,
2451	audio_hw_frequency => 0,	2580	audio_hw_frequency => 0,
2452	audio_hw_chunksize => 0,	2581	audio_hw_chunksize => 0,
2453	audio_mix_channels => 8,	2582	audio_mix_channels => 8,
2454	effects_enable => 1,	2583	effects_enable => 1,
2455	effects_volume => 1,	2584	effects_volume => 1,
2456	bgm_enable => 1,	2585	bgm_enable => 1,
2457	bgm_volume => 0.5,	2586	bgm_volume => 0.5,
2458	output_rate => "",	2587	output_rate => "",
2459	pickup => 0,	2588	pickup => 0,
2460	inv_sort => "mtime",	2589	inv_sort => "mtime",
2461	default => "profile", # default profile	2590	default => "profile", # default profile
2462	show_tips => 1,	2591	show_tips => 1,
2463	logview_max_par => 1000,	2592	logview_max_par => 1000,
		2593	shift_fire_stop => 0,
2464	);	2594	);
2465		2595
2466	while (my ($k, $v) = each %DEF_CFG) {	2596	while (my ($k, $v) = each %DEF_CFG) {
2467	$CFG->{$k} = $v unless exists $CFG->{$k};	2597	$CFG->{$k} = $v unless exists $CFG->{$k};
2468	}	2598	}
2469		2599
2470	$CFG->{profile}{default}{host} \|\|= "gameserver.deliantra.net";	2600	$CFG->{profile}{default}{host} \|\|= "gameserver.deliantra.net";
2471	$PROFILE = $CFG->{profile}{default};	2601	$PROFILE = $CFG->{profile}{default};
2472		2602
2473	# convert old bindings (only default profile matters)	2603	# convert old bindings (only default profile matters)
2474	if (my $bindings = delete $PROFILE->{bindings}) {	2604	if (my $bindings = delete $PROFILE->{bindings}) {
2475	while (my ($mod, $syms) = each %$bindings) {	2605	while (my ($mod, $syms) = each %$bindings) {
2476	while (my ($sym, $cmds) = each %$syms) {	2606	while (my ($sym, $cmds) = each %$syms) {
2477	push @{ $PROFILE->{macro} }, {	2607	push @{ $PROFILE->{macro} }, {
2478	accelkey => [$mod1, $sym1],	2608	accelkey => [$mod1, $sym1],
2479	action => $cmds,	2609	action => $cmds,
		2610	};
2480	};	2611	}
2481	}	2612	}
2482	}	2613	}
2483	}
2484		2614
2485	sdl_init;	2615	sdl_init;
2486		2616
2487	@SDL_MODES = DC::SDL_ListModes 8, 8;	2617	{
2488	@SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2489	@SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2490
2491	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2492
2493	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2494
2495	{
2496	my @fonts = map DC::find_rcfile "fonts/$_", qw(	2618	my @fonts = map DC::find_rcfile "fonts/$_", qw(
2497	DejaVuSans.ttf	2619	DejaVuSans.ttf
2498	DejaVuSansMono.ttf	2620	DejaVuSansMono.ttf
2499	DejaVuSans-Bold.ttf	2621	DejaVuSans-Bold.ttf
2500	DejaVuSansMono-Bold.ttf	2622	DejaVuSansMono-Bold.ttf
2501	DejaVuSans-Oblique.ttf	2623	DejaVuSans-Oblique.ttf
2502	DejaVuSansMono-Oblique.ttf	2624	DejaVuSansMono-Oblique.ttf
2503	DejaVuSans-BoldOblique.ttf	2625	DejaVuSans-BoldOblique.ttf
2504	DejaVuSansMono-BoldOblique.ttf	2626	DejaVuSansMono-BoldOblique.ttf
2505	);	2627	);
2506		2628
2507	DC::add_font $_ for @fonts;	2629	DC::add_font $_ for @fonts;
2508		2630
2509	DC::pango_init;
2510
2511	$FONT_PROP = new_from_file DC::Font $fonts[0];	2631	$FONT_PROP = new_from_file DC::Font $fonts[0];
2512	$FONT_FIXED = new_from_file DC::Font $fonts[1];	2632	$FONT_FIXED = new_from_file DC::Font $fonts[1];
2513		2633
2514	$FONT_PROP->make_default;	2634	$FONT_PROP->make_default;
2515	}	2635
		2636	DC::pango_init;
		2637	}
2516		2638
2517	# compare mono (ft) vs. rgba (cairo)	2639	# compare mono (ft) vs. rgba (cairo)
2518	# ft - 1.8s, cairo 3s, even in alpha-only mode	2640	# ft - 1.8s, cairo 3s, even in alpha-only mode
2519	# for my $rgba (0..1) {	2641	# for my $rgba (0..1) {
2520	# my $t1 = Time::HiRes::time;	2642	# my $t1 = Time::HiRes::time;
…		…
2525	# }	2647	# }
2526	# my $t2 = Time::HiRes::time;	2648	# my $t2 = Time::HiRes::time;
2527	# warn $t2-$t1;	2649	# warn $t2-$t1;
2528	# }	2650	# }
2529		2651
2530	video_init;	2652	video_init;
2531	audio_init;	2653	audio_init;
2532	}	2654	}
2533		2655
2534	show_tip_of_the_day if $CFG->{show_tips};	2656	show_tip_of_the_day if $CFG->{show_tips};
2535		2657
2536	our $STARTUP_CANCEL = EV::idle sub {	2658	our $STARTUP_CANCEL = EV::idle sub {
2537	undef $::STARTUP_CANCEL;	2659	undef $::STARTUP_CANCEL;
2538	$startup_done->();	2660	$startup_done->();
2539	};	2661	};
2540		2662
		2663	delete $SIG{__DIE__};
2541	EV::loop;	2664	EV::loop;
2542		2665
2543	#video_shutdown;	2666	#video_shutdown;
2544	#audio_shutdown;	2667	#audio_shutdown;
2545	DC::OpenGL::quit;	2668	DC::OpenGL::quit;
2546	DC::SDL_Quit;	2669	DC::SDL_Quit;
2547	DC::DB::Server::stop;	2670	DC::DB::Server::stop;
		2671	}
		2672
		2673	DC::SDL_braino; # see sub above
2548		2674
2549	=head1 NAME	2675	=head1 NAME
2550		2676
2551	deliantra - A Deliantra MORPG game client	2677	deliantra - A Deliantra MORPG game client
2552		2678
…		…
2569	4 show fps	2695	4 show fps
2570	8 suppress tooltips	2696	8 suppress tooltips
2571		2697
2572	=head1 AUTHOR	2698	=head1 AUTHOR
2573		2699
2574	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	2700	Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2575		2701
2576		2702
2577		2703

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.29 by root, Mon Mar 24 00:24:47 2008 UTC vs. Revision 1.65 by root, Sat Aug 30 06:49:05 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.29 by root, Mon Mar 24 00:24:47 2008 UTC vs.
Revision 1.65 by root, Sat Aug 30 06:49:05 2008 UTC