[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/MapWidget.pm

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.154 by root, Fri Dec 4 15:04:56 2009 UTC

…		…
1	package CFClient::MapWidget;	1	package DC::MapWidget;
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
		8	use DC;
8	use CFClient::OpenGL;	9	use DC::OpenGL;
		10	use DC::UI;
		11	use DC::Macro;
9		12
10	our @ISA = CFClient::UI::Base::;	13	our @ISA = DC::UI::Base::;
		14
		15	my $magicmap_tex =
		16	new_from_resource DC::Texture "magicmap.png",
		17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11		18
12	sub new {	19	sub new {
13	my $class = shift;	20	my $class = shift;
14		21
15	$class->SUPER::new (	22	my $self = $class->SUPER::new (
16	z => -1,	23	z => -1,
17	can_focus => 1,	24	can_focus => 1,
18	list => glGenList,	25	tilesize => 32,
19	@_	26	@_
20	)	27	);
21	}
22		28
23	sub DESTROY {	29	$self
		30	}
		31
		32	sub add_command {
		33	my ($self, $command, $tooltip, $widget, $cb) = @_;
		34
		35	(my $data = $command) =~ s/\\//g;
		36
		37	$tooltip =~ s/^\s+//;
		38	$tooltip = "<big>$data</big>\n\n$tooltip";
		39	$tooltip =~ s/\s+$//;
		40
		41	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		42	}
		43
		44	sub clr_commands {
24	my $self = shift;	45	my ($self) = @_;
25		46
26	glDeleteList $self->{list};	47	%{$::COMPLETER->{command}} = ();
27		48
28	$self->SUPER::DESTROY;	49	$::COMPLETER->hide
		50	if $::COMPLETER;
29	}	51	}
30		52
		53	sub server_login {
		54	my ($server) = @_;
		55
		56	::stop_game ();
		57	local $::PROFILE->{host} = $server;
		58	::start_game ();
		59	}
		60
		61	sub editor_invoke {
		62	my $editsup = $::CONN && $::CONN->{editor_support}
		63	or return;
		64
		65	DC::background {
		66	print "preparing editor startup...\n";
		67
		68	my $server = $editsup->{gameserver} \|\| "default";
		69	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		70
		71	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
		72	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
		73
		74	print "map directory is $mapdir\n";
		75	print "lib directory is $libdir\n";
		76
		77	my $ua = DC::lwp_useragent;
		78
		79	for my $file (qw(archetypes crossfire.0)) {
		80	my $url = "$editsup->{lib_root}$file";
		81	print "mirroring $url...\n";
		82	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
		83	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		84	}
		85
		86	if (1) { # upload a map
		87	my $mapname = $::CONN->{map_info}[0];
		88
		89	my $mappath = "$mapdir/$mapname";
		90
		91	-e $mappath and die "$mappath already exists\n";
		92
		93	print "getting map revision for $mapname...\n";
		94
		95	# try to get the most recent head revision, what a hack,
		96	# this should have been returned while downloading sigh
		97	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		98
		99	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		100	my $rev = $1;
		101
		102	print "downloading revision $rev...\n";
		103
		104	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		105
		106	my $meta = {
		107	%$editsup,
		108	path => $mapname,
		109	revision => $rev,
		110	cf_login => $::PROFILE->{user},
		111	};
		112
		113	require File::Basename;
		114	require File::Path;
		115
		116	File::Path::mkpath (File::Basename::dirname ($mappath));
		117	open my $fh, ">:raw:perlio", "$mappath.meta"
		118	or die "$mappath.meta: $!\n";
		119	print $fh DC::encode_json $meta;
		120	close $fh;
		121	open my $fh, ">:raw:perlio:utf8", $mappath
		122	or die "$mappath: $!\n";
		123	print $fh $map;
		124	close $fh;
		125
		126	print "saved as $mappath\n";
		127
		128	print "invoking editor...\n";
		129	exec "/root/s2/gce $mappath";#d#
		130
		131	# now upload it
		132	# require HTTP::Request::Common;
		133	#
		134	# my $res = $ua->post (
		135	# $ENV{CFPLUS_UPLOAD},
		136	# Content_Type => 'multipart/form-data',
		137	# Content => [
		138	# path => $mapname,
		139	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		140	# map => $map,
		141	# revision => $rev,
		142	# cf_login => $ENV{CFPLUS_LOGIN},
		143	# cf_password => $ENV{CFPLUS_PASSWORD},
		144	# comment => "",
		145	# ]
		146	# );
		147	#
		148	# if ($res->is_error) {
		149	# # fatal condition
		150	# warn $res->status_line;
		151	# } else {
		152	# # script replies are marked as {{..}}
		153	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		154	# warn map "$_\n", @msgs;
		155	# }
		156	} else {
		157	die "viewvc parse error, unable to detect revision\n";
		158	}
		159	}
		160	}
		161	}
		162
31	sub button_down {	163	sub invoke_button_down {
32	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
33		165
34	$self->focus_in;
35
36	if ($ev->{button} == 2) {	166	if ($ev->{button} == 1) {
		167	$self->grab_focus;
		168	return unless $::CONN && $self->{ctilesize};
		169
		170	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
		171	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
		172
		173	$x -= DC::floor $::MAP->w * 0.5;
		174	$y -= DC::floor $::MAP->h * 0.5;
		175
		176	if ($::CONN) {
		177	$::CONN->lookat ($x, $y)
		178	}
		179
		180	} elsif ($ev->{button} == 2) {
		181	$self->grab_focus;
		182	return unless $::CONN;
		183
37	my ($ox, $oy) = ($ev->{x}, $ev->{y});	184	my ($ox, $oy) = ($ev->{x}, $ev->{y});
38	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	185	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
39		186
40	$self->{motion} = sub {	187	$self->{motion} = sub {
41	my ($ev, $x, $y) = @_;	188	my ($ev, $x, $y) = @_;
45	$::CFG->{map_shift_x} = $bw + $x - $ox;	192	$::CFG->{map_shift_x} = $bw + $x - $ox;
46	$::CFG->{map_shift_y} = $bh + $y - $oy;	193	$::CFG->{map_shift_y} = $bh + $y - $oy;
47		194
48	$self->update;	195	$self->update;
49	};	196	};
		197	} elsif ($ev->{button} == 3) {
		198	my @items = (
		199	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
		200	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
		201	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		202	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
		203	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
		204	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
		205	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
		206	);
		207
		208	if ($::CONN && $::CONN->{editor_support}) {
		209	# push @items, [
		210	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
		211	# \&editor_invoke,
		212	# ];
		213
		214	for my $type (qw(test name)) {
		215	$::CONN->{editor_support}{type} ne $type
		216	or next;
		217	my $server = $::CONN->{editor_support}{"${type}server"}
		218	or next;
		219
		220	push @items, [
		221	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
		222	sub { server_login $server },
		223	];
		224	}
		225	}
		226
		227	push @items,
		228	["Quit",
		229	sub {
		230	if ($::CONN) {
		231	&::open_quit_dialog;
		232	} else {
		233	exit;
		234	}
		235	}
		236	],
		237	;
		238
		239	(new DC::UI::Menu
		240	items => \@items,
		241	)->popup ($ev);
		242	}
		243
50	}	244	1
51	}	245	}
52		246
53	sub button_up {	247	sub invoke_button_up {
54	my ($self, $ev, $x, $y) = @_;	248	my ($self, $ev, $x, $y) = @_;
55		249
56	delete $self->{motion};	250	delete $self->{motion};
57	}
58		251
		252	1
		253	}
		254
59	sub mouse_motion {	255	sub invoke_mouse_motion {
60	my ($self, $ev, $x, $y) = @_;	256	my ($self, $ev, $x, $y) = @_;
61		257
		258	if ($self->{motion}) {
62	$self->{motion}->($ev, $x, $y) if $self->{motion};	259	$self->{motion}->($ev, $x, $y);
		260	} else {
		261	return 0;
		262	}
		263
		264	1
63	}	265	}
64		266
65	sub size_request {	267	sub size_request {
		268	my ($self) = @_;
		269
66	(	270	(
67	1 + 32 * int $::WIDTH / 32,	271	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
68	1 + 32 * int $::HEIGHT / 32,	272	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
69	)	273	)
70	}	274	}
71		275
72	sub update {	276	sub update {
73	my ($self) = @_;	277	my ($self) = @_;
74		278
75	$self->{need_update} = 1;	279	$self->{need_update} = 1;
76	$self->SUPER::update;	280	$self->SUPER::update;
77	}	281	}
78		282
79	sub draw {	283	my %DIR = (
		284	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
		285	( "," . DC::SDLK_KP8 ), [1, "north"],
		286	( "," . DC::SDLK_KP9 ), [2, "northeast"],
		287	( "," . DC::SDLK_KP6 ), [3, "east"],
		288	( "," . DC::SDLK_KP3 ), [4, "southeast"],
		289	( "," . DC::SDLK_KP2 ), [5, "south"],
		290	( "," . DC::SDLK_KP1 ), [6, "southwest"],
		291	( "," . DC::SDLK_KP4 ), [7, "west"],
		292	( "," . DC::SDLK_KP7 ), [8, "northwest"],
		293
		294	( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
		295	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
		296	( "," . DC::SDLK_END ), [6, "southwest"],
		297	( "," . DC::SDLK_HOME ), [8, "northwest"],
		298
		299	( "," . DC::SDLK_UP ), [1, "north"],
		300	("1," . DC::SDLK_UP ), [2, "northeast"],
		301	( "," . DC::SDLK_RIGHT ), [3, "east"],
		302	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
		303	( "," . DC::SDLK_DOWN ), [5, "south"],
		304	("1," . DC::SDLK_DOWN ), [6, "southwest"],
		305	( "," . DC::SDLK_LEFT ), [7, "west"],
		306	("1," . DC::SDLK_LEFT ), [8, "northwest"],
		307	);
		308
		309	sub invoke_key_down {
80	my ($self) = @_;	310	my ($self, $ev) = @_;
81		311
		312	my $mod = $ev->{mod};
		313	my $sym = $ev->{sym};
		314	my $uni = $ev->{unicode};
		315
		316	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
		317
		318	# ignore repeated keypresses
		319	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
		320	$self->{last_mod} = $mod;
		321	$self->{last_sym} = $sym;
		322
		323	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		324
		325	if ($::CONN && $dir) {
		326	if ($mod & DC::KMOD_SHIFT) {
		327	$self->{shft}++;
		328	if ($dir->[0] != $self->{fire_dir}) {
		329	$::CONN->user_send ("fire $dir->[0]");
		330	}
		331	$self->{fire_dir} = $dir->[0];
		332	} elsif ($mod & DC::KMOD_CTRL) {
		333	$self->{ctrl}++;
		334	$::CONN->user_send ("run $dir->[0]");
		335	} else {
		336	$::CONN->user_send ("$dir->[1]");
		337	}
		338
		339	return 1;
		340	}
		341
		342	0
		343	}
		344
		345	sub invoke_key_up {
		346	my ($self, $ev) = @_;
		347
		348	my $res = 0;
		349	my $mod = $ev->{mod};
		350	my $sym = $ev->{sym};
		351
		352	delete $self->{last_mod};
		353	delete $self->{last_sym};
		354
		355	if ($::CFG->{shift_fire_stop}) {
		356	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
		357	$::CONN->user_send ("fire_stop");
		358	delete $self->{fire_dir};
		359	$res = 1;
		360	}
		361	} else {
		362	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		363
		364	if ($dir && delete $self->{shft}) {
		365	$::CONN->user_send ("fire_stop");
		366	delete $self->{fire_dir};
		367	$res = 1;
		368	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		369	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
		370	$::CONN->user_send ("fire_stop");
		371	delete $self->{fire_dir};
		372	$res = 1;
		373	}
		374	}
		375
		376	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
		377	$::CONN->user_send ("run_stop");
		378	$res = 1;
		379	}
		380
		381	$res
		382	}
		383
		384	sub invoke_visibility_change {
		385	my ($self) = @_;
		386
		387	$self->refresh_hook;
		388
		389	0
		390	}
		391
		392	sub set_tilesize {
		393	my ($self, $tilesize) = @_;
		394
		395	$self->{tilesize} = $tilesize;
		396	}
		397
		398	sub scroll {
		399	my ($self, $dx, $dy) = @_;
		400
		401	$::MAP->scroll ($dx, $dy);
		402
		403	$self->{last_fow_texture} = $self->{fow_texture};
		404	$self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
		405	$self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
		406
		407	$self->movement_update;
		408
		409	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		410	$self->{sdy} += $dy * $self->{tilesize};
		411	}
		412
		413	sub set_magicmap {
		414	my ($self, $w, $h, $x, $y, $data) = @_;
		415
		416	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		417	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		418
		419	$self->{magicmap} = [$x, $y, $w, $h, $data];
		420
		421	$self->update;
		422	}
		423
		424	sub movement_update {
		425	my ($self) = @_;
		426
		427	if ($::CFG->{smooth_movement}) {
		428	if ($self->{sdx} \|\| $self->{sdy}) {
		429	my $diff = EV::time - ($self->{last_update} \|\| $::LAST_REFRESH);
		430	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
		431
		432	# the minimum time for a single tile movement
		433	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK \|\| 1);
		434
		435	$spd *= $self->{tilesize};
		436
		437	# jump if "impossibly high" speed
		438	if (
		439	(max abs $self->{sdx}, abs $self->{sdy})
		440	> $spd * $mintime * 2.1
		441	) {
		442	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
		443	$self->{sdx} = $self->{sdy} = 0;
		444	} else {
		445	$spd = $diff 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
		446
		447	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
		448	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
		449
		450	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
		451	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
		452	}
		453
		454	$self->update;
		455	}
		456	} else {
		457	$self->{sdx} = $self->{sdy} = 0;
		458	}
		459
		460	$self->{last_update} = EV::time;
		461	}
		462
		463	sub refresh_hook {
		464	my ($self) = @_;
		465
		466	if ($::MAP && $::CONN) {
82	if (delete $self->{need_update}) {	467	if (delete $self->{need_update}) {
83	glNewList $self->{list};	468	$self->movement_update;
84		469
85	if ($::MAP) {	470	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
86	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
87	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
88		471
89	glPushMatrix;	472	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
90	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	473	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
91		474
92	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	475	# width/height of map, in tiles
93	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	476	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
		477	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
94		478
95	glTranslate $sx0 - 32, $sy0 - 32, 0;	479	# the map displacement, in tiles
		480	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
		481	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
96		482
97	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	483	# the upper left "visible" corner, in pixels
		484	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		485	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		486
		487	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		488	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
98		489
99	if ($::CFG->{fow_enable}) {	490	if ($::CFG->{fow_enable}) {
100	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	491	my ($sdx_t, $sdy_t);#d# do not anchor at player
101	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	492
102	glConvolutionFilter2D (	493	my ($w, $h, $data) = $::MAP->fow_texture (
103	GL_CONVOLUTION_2D,	494	$dx + (min 0, $sdx_t),
104	GL_ALPHA,	495	$dy + (min 0, $sdy_t),
105	3, 3,	496	$sw + abs $sdx_t,
106	GL_ALPHA, GL_FLOAT,	497	$sh + abs $sdy_t
107	pack "f*",
108	0.05, 0.13, 0.05,
109	0.13, 0.30, 0.13,
110	0.05, 0.13, 0.05,
111	);	498	);
112	glEnable GL_CONVOLUTION_2D;
113	}
114		499
115	$self->{fow_texture} = new CFClient::Texture	500	$self->{fow_texture} = new DC::Texture
116	w => $w,	501	w => $w,
117	h => $h,	502	h => $h,
118	data => $data,	503	data => $data,
119	internalformat => GL_ALPHA,	504	internalformat => GL_ALPHA,
120	format => GL_ALPHA;	505	format => GL_ALPHA;
		506	} else {
		507	delete $self->{fow_texture};
		508	}
121		509
122	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	510	glNewList ($self->{list} \|\|= glGenList);
123		511
		512	glPushMatrix;
		513	glTranslate $sx0, $sy0;
		514	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		515	glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
		516
		517	$::MAP->draw ($dx, $dy, $sw, $sh,
		518	$self->{tilesize},
		519	$::CONN->{player}{tag},
		520	-$self->{sdx}, -$self->{sdy});
		521
		522	#d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
		523	glScale $self->{tilesize}, $self->{tilesize};
		524
		525	if (my $tex = $self->{fow_texture}) {
		526	glEnable GL_TEXTURE_2D;
124	glEnable GL_BLEND;	527	glEnable GL_BLEND;
125	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
126	glEnable GL_TEXTURE_2D;
127	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	528	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		529	glBlendFunc GL_ONE, GL_ZERO;
128		530
		531	my $a1 = 0.9;
		532
		533	if (0 && $self->{last_fow_texture}) {
		534	my $d1 = ($self->{sdx} 2 + $self->{sdy} 2) ** 0.5;
		535	my $d2 = ($self->{ldx} 2 + $self->{ldy} 2) ** 0.5;
		536
		537	if ($d1 * $d2) {
		538	my $a2 = $d1 / $d2;
		539
		540	$a1 = 1 - $a2;
		541
		542	#$a1 *= 0.9;
		543	#$a2 *= 0.9;
		544
		545	printf "%4g %4g %4g %4g\n", $d1, $d2, $a1, $a2;#d#
		546
		547	#$a1 = 1 - (1-$a1) * 0.707;
		548	#$a2 = 1 - (1-$a2) * 0.707;
		549
		550	glColor 1,0,0,1;
		551	glBegin GL_QUADS;
		552	glVertex 10 + $sdx_t, 10;
		553	glVertex 11 + $sdx_t, 10;
		554	glVertex 11 + $sdx_t, 11;
		555	glVertex 10 + $sdx_t, 11;
		556	glEnd;
		557
		558	glColor +($::CFG->{fow_intensity}) x 3, $a2;
		559	glPushMatrix;
		560	glTranslate $sdx_t, $sdy_t; # anchor at player
		561	glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
		562	glScale 1/3, 1/3;
		563	$self->{last_fow_texture}->draw_quad_alpha (0, 0);
		564	glPopMatrix;
		565	} else {
		566	delete $self->{last_fow_texture};
		567	}
		568	}
		569
129	glColor +($::CFG->{fow_intensity}) x 3, 0.8;	570	glColor +($::CFG->{fow_intensity}) x 3, $a1;
		571	glPushMatrix;
		572	#d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
		573	glScale 1/3, 1/3;
130	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	574	$self->{fow_texture}->draw_quad_alpha (0, 0);
		575	glPopMatrix;
131		576
132	glDisable GL_TEXTURE_2D;	577	glDisable GL_TEXTURE_2D;
133	glDisable GL_BLEND;	578	glDisable GL_BLEND;
134	}	579	}
135		580
136	# HACK BEGIN	581	if ($self->{magicmap}) {
137	{	582	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
138	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
139		583
140	glTranslate 0, 30;	584	$x += $::MAP->ox + $self->{dx};
141	my ($w, $h) = (250, 250);	585	$y += $::MAP->oy + $self->{dy};
142		586
143	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	587	glTranslate - $x - 1, - $y - 1;
144		588	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
145	glEnable GL_BLEND;	589	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
146	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
147	glEnable GL_TEXTURE_2D;
148	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
149
150	glPopMatrix;
151
152	$self->{mapmap_texture} =
153	new CFClient::Texture
154	w => $w,
155	h => $h,
156	data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
157	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
158
159	$self->{mapmap_texture}->draw_quad (0, 0);
160
161	glDisable GL_TEXTURE_2D;
162
163	glTranslate 0.375, 0.375;
164
165	glColor 1, 1, 0, 1;
166	glBegin GL_LINE_LOOP;
167	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
168	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
169	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
170	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
171	glEnd;
172
173	glDisable GL_BLEND;
174	}	590	}
175	# HACK END
176	}
177		591
		592	glPopMatrix;
178	glEndList;	593	glEndList;
		594	}
		595	} else {
		596	glDeleteList delete $self->{list}
		597	if $self->{list};
179	}	598	}
		599	}
180		600
181	glPushMatrix;	601	sub draw {
		602	my ($self) = @_;
		603
		604	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		605
		606	return unless $self->{list};
		607
		608	my $focused = $DC::UI::FOCUS == $self
		609	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
		610
		611	return
		612	unless $focused \|\| !$::FAST;
		613
182	glCallList $self->{list};	614	glCallList $self->{list};
183	glPopMatrix;
184		615
185	if ($CFClient::UI::FOCUS != $self) {	616	# TNT2 emulates logops in software (or worse :)
186	glColor 64/255, 64/255, 64/255;	617	unless ($focused) {
187	glLogicOp GL_AND;	618	glColor_premultiply 0, 0, 1, 0.25;
188	glEnable GL_COLOR_LOGIC_OP;	619	glEnable GL_BLEND;
		620	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
189	glBegin GL_QUADS;	621	glBegin GL_QUADS;
190	glVertex 0, 0;	622	glVertex 0, 0;
191	glVertex 0, $::HEIGHT;	623	glVertex 0, $::HEIGHT;
192	glVertex $::WIDTH, $::HEIGHT;	624	glVertex $::WIDTH, $::HEIGHT;
193	glVertex $::WIDTH, 0;	625	glVertex $::WIDTH, 0;
194	glEnd;	626	glEnd;
195	glDisable GL_COLOR_LOGIC_OP;	627	glDisable GL_BLEND;
196	}	628	}
197	}	629	}
198		630
199	my %DIR = (	631	sub DESTROY {
200	CFClient::SDLK_KP8, [1, "north"],	632	my $self = shift;
201	CFClient::SDLK_KP9, [2, "northeast"],
202	CFClient::SDLK_KP6, [3, "east"],
203	CFClient::SDLK_KP3, [4, "southeast"],
204	CFClient::SDLK_KP2, [5, "south"],
205	CFClient::SDLK_KP1, [6, "southwest"],
206	CFClient::SDLK_KP4, [7, "west"],
207	CFClient::SDLK_KP7, [8, "northwest"],
208		633
209	CFClient::SDLK_UP, [1, "north"],	634	glDeleteList $self->{list};
210	CFClient::SDLK_RIGHT, [3, "east"],
211	CFClient::SDLK_DOWN, [5, "south"],
212	CFClient::SDLK_LEFT, [7, "west"],
213	);
214		635
215	sub key_down {	636	$self->SUPER::DESTROY;
216	my ($self, $ev) = @_;
217
218	my $mod = $ev->{mod};
219	my $sym = $ev->{sym};
220
221	if ($sym == CFClient::SDLK_KP5) {
222	$::CONN->user_send ("stay fire");
223	} elsif ($sym == ord ",") {
224	$::CONN->user_send ("take");
225	} elsif ($sym == ord "a") {
226	$::CONN->user_send ("apply");
227	} elsif ($sym == ord "'") {
228	$self->emit ('activate_console');
229	} elsif ($sym == ord "/") {
230	$self->emit (activate_console => '/');
231	} elsif (exists $DIR{$sym}) {
232	if ($mod & CFClient::KMOD_SHIFT) {
233	$self->{shft}++;
234	$::CONN->user_send ("fire $DIR{$sym}[0]");
235	} elsif ($mod & CFClient::KMOD_CTRL) {
236	$self->{ctrl}++;
237	$::CONN->user_send ("run $DIR{$sym}[0]");
238	} else {
239	$::CONN->user_send ("$DIR{$sym}[1]");
240	}
241	} elsif ($ev->{unicode}) {
242	$self->{command_widget} \|\|=
243	new CFClient::MapWidget::Command::
244	command => $self->{command},
245	can_focus => 1,
246	connect_execute => sub {
247	# todo: support callback instead of user_send
248	$::CONN->user_send ($_[1][1]);
249	},
250	connect_close => sub {
251	(delete $self->{command_widget})->hide;
252	$self->focus_in;
253	},
254	;
255	$self->{command_widget}->key_down ($ev);
256	return unless $self->{command_widget};
257	$self->{command_widget}->show;
258	$self->{command_widget}->focus_in;
259	}
260	}	637	}
261		638
262	sub key_up {	639	package DC::MapWidget::MapMap;
263	my ($self, $ev) = @_;
264
265	my $mod = $ev->{mod};
266	my $sym = $ev->{sym};
267
268	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269	$::CONN->user_send ("fire_stop");
270	}
271	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272	$::CONN->user_send ("run_stop");
273	}
274	}
275
276	sub add_command {
277	my ($self, $command, $tooltip, $widget, $cb) = @_;
278
279	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
280
281	push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
282	}
283
284	package CFClient::MapWidget::Command;
285		640
286	use strict;	641	use strict;
		642	use utf8;
287		643
		644	our @ISA = DC::UI::Base::;
		645
		646	use Time::HiRes qw(time);
288	use CFClient::OpenGL;	647	use DC::OpenGL;
289		648
290	our @ISA = CFClient::UI::VBox::;	649	sub size_request {
		650	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		651	}
		652
		653	sub refresh_hook {
		654	my ($self) = @_;
		655
		656	if ($::MAP && $self->{texture_atime} < time) {
		657	my ($w, $h) = @$self{qw(w h)};
		658
		659	return unless $w && $h;
		660
		661	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		662	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		663
		664	my $ox = 0.5 * ($w - $sw);
		665	my $oy = 0.5 * ($h - $sh);
		666
		667	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		668	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		669
		670	#TODO: map scale is completely borked
		671
		672	my $x0 = int $ox - $sx + 0.5;
		673	my $y0 = int $oy - $sy + 0.5;
		674
		675	$self->{sw} = $sw;
		676	$self->{sh} = $sh;
		677
		678	$self->{x0} = $x0;
		679	$self->{y0} = $y0;
		680
		681	$self->{texture_atime} = time + 1/3;
		682
		683	$self->{texture} =
		684	new DC::Texture
		685	w => $w,
		686	h => $h,
		687	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		688	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		689	}
		690	}
		691
		692	sub invoke_visibility_change {
		693	my ($self) = @_;
		694
		695	$self->refresh_hook;
		696
		697	0
		698	}
		699
		700	sub invoke_size_allocate {
		701	my ($self, $w, $h) = @_;
		702
		703	$self->update;
		704
		705	1
		706	}
		707
		708	sub update {
		709	my ($self) = @_;
		710
		711	delete $self->{texture_atime};
		712	$self->SUPER::update;
		713	}
		714
		715	sub _draw {
		716	my ($self) = @_;
		717
		718	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		719
		720	$self->{texture} or return;
		721
		722	glEnable GL_BLEND;
		723	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		724	glEnable GL_TEXTURE_2D;
		725	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		726
		727	$self->{texture}->draw_quad (0, 0);
		728
		729	glDisable GL_TEXTURE_2D;
		730
		731	glTranslate 0.375, 0.375;
		732
		733	glColor 1, 1, 0, 1;
		734	glBegin GL_LINE_LOOP;
		735	glVertex $self->{x0} , $self->{y0} ;
		736	glVertex $self->{x0} , $self->{y0} + $self->{sh};
		737	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
		738	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
		739	glEnd;
		740
		741	glDisable GL_BLEND;
		742	}
		743
		744	package DC::MapWidget::Command;
		745
		746	use strict;
		747
		748	use DC::OpenGL;
		749
		750	our @ISA = DC::UI::Frame::;
291		751
292	sub new {	752	sub new {
293	my $class = shift;	753	my $class = shift;
294		754
295	my $self = $class->SUPER::new (	755	my $self = $class->SUPER::new (
		756	bg => [0, 0, 0, 0.8],
296	@_,	757	@_,
297	children => [map
298	CFClient::UI::Label->new (
299	can_hover => 1,
300	can_events => 1,
301	fontsize => $_,
302	), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
303	],
304	);	758	);
305		759
		760	$self->add ($self->{vbox} = new DC::UI::VBox);
		761
		762	$self->{label} = [
		763	map
		764	DC::UI::Label->new (
		765	align => 0,
		766	can_hover => 1,
		767	can_events => 1,
		768	tooltip_width => 0.33,
		769	fontsize => $_,
		770	), (0.8) x 16
		771	];
		772
		773	$self->{entry} = new DC::UI::Entry
		774	on_changed => sub {
		775	$self->update_labels;
		776	0
		777	},
		778	on_button_down => sub {
		779	my ($entry, $ev, $x, $y) = @_;
		780
		781	if ($ev->{button} == 3) {
		782	(new DC::UI::Menu
		783	items => [
		784	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
		785	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
		786	],
		787	)->popup ($ev);
		788	return 1;
		789	}
		790	0
		791	},
		792	on_key_down => sub {
		793	my ($entry, $ev) = @_;
		794
		795	my $self = $entry->{parent}{parent};
		796
		797	if ($ev->{sym} == 13) {
		798	if (exists $self->{select}) {
		799	$self->{last_command} = $self->{select};
		800	$::CONN->user_send ($self->{select});
		801
		802	unshift @{$self->{history}}, $self->{entry}->get_text;
		803	$self->{hist_ptr} = 0;
		804
		805	$self->hide;
		806	}
		807	} elsif ($ev->{sym} == 27) {
		808	$self->{hist_ptr} = 0;
		809	$self->hide;
		810	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
		811	if ($self->{hist_ptr} > 1) {
		812	$self->{hist_ptr}--;
		813	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		814	} elsif ($self->{hist_ptr} > 0) {
		815	$self->{hist_ptr}--;
		816	$self->{entry}->set_text ($self->{hist_saveback});
		817	} else {
		818	++$self->{select_offset}
		819	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		820	}
		821	$self->update_labels;
		822	} elsif ($ev->{sym} == DC::SDLK_UP) {
		823	if ($self->{select_offset}) {
		824	--$self->{select_offset}
		825	} else {
		826	unless ($self->{hist_ptr}) {
		827	$self->{hist_saveback} = $self->{entry}->get_text;
		828	}
		829	if ($self->{hist_ptr} <= $#{$self->{history}}) {
		830	$self->{hist_ptr}++;
		831	}
		832	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		833	if exists $self->{history}->[$self->{hist_ptr} - 1];
		834	}
		835	$self->update_labels;
		836	} else {
		837	return 0;
		838	}
		839
		840	1
		841	}
		842	;
		843
		844	$self->{vbox}->add (
		845	$self->{entry},
		846	@{$self->{label}},
		847	);
		848
306	$self	849	$self
307	}	850	}
308		851
		852	sub set_prefix {
		853	my ($self, $prefix) = @_;
		854
		855	$self->{entry}->set_text ($prefix);
		856	$self->show;
		857	}
		858
309	sub size_allocate {	859	sub invoke_size_allocate {
310	my ($self, $w, $h) = @_;	860	my ($self, $w, $h) = @_;
311		861
312	$self->SUPER::size_allocate ($w, $h);
313	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	862	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		863
		864	$self->SUPER::invoke_size_allocate ($w, $h)
		865	}
		866
		867	sub show {
		868	my ($self) = @_;
		869
		870	$self->SUPER::show;
		871	$self->{entry}->grab_focus;
		872	}
		873
		874	sub hide {
		875	my ($self) = @_;
		876
		877	$self->{hist_ptr} = 0;
		878
		879	$self->SUPER::hide;
		880	$self->{entry}->set_text ("");
		881	}
		882
		883	sub inject_key_down {
		884	my ($self, $ev) = @_;
		885
		886	$self->{entry}->grab_focus;
		887	$self->{entry}->emit (key_down => $ev);
314	}	888	}
315		889
316	sub update_labels {	890	sub update_labels {
317	my ($self) = @_;	891	my ($self) = @_;
318		892
319	my $command = $self->{command};	893	my $text = $self->{entry}->get_text;
320	my $search_abbrev = qr/^\Q$self->{search}/;
321	my $search_full = qr/\Q$self->{search}/;
322		894
323	my @found;	895	length $text
		896	or return $self->hide;
324		897
325	for (@$command) {	898	if ($text ne $self->{last_search}) {
326	if ($_->[0] =~ $search_abbrev) {	899	my @match;
327	push @found, [$_->[0], $_];	900
328	} elsif ($_->[1] =~ $search_full) {	901	if ($text =~ /^(.*?)\s+$/) {
329	push @found, [$_->[1], $_];	902	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		903	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
		904	} else {
		905	# @match is [command, penalty, command with arguments] until sort
		906
		907	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		908
		909	my $regexp_abbrev = do {
		910	my ($beg, @chr) = split //, lc $cmd;
		911
		912	# the following regex is used to match our "completion entry"
		913	# to an actual command - the parentheses match kind of "overhead"
		914	# - the more characters the parentheses match, the less attractive
		915	# is the match.
		916	my $regexp = "^\Q$beg\E"
		917	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		918	qr<$regexp>
		919	};
		920
		921	my $regexp_partial = do {
		922	my $regexp = "^\Q$text\E(.*)";
		923	qr<$regexp>
		924	};
		925
		926	for (keys %{$self->{command}}) {
		927	my @scores;
		928
		929	# 1. Complete command [with args]
		930	# command is a prefix of the text
		931	# score is length of complete command matched
		932	# e.g. "invoke summon pet monster bat"
		933	# "invoke" "summon pet monster bat" = 6
		934	# "invoke summon pet monster" "bat" = 25
		935	if ($text =~ /^\Q$_\E(.*)/) {
		936	push @scores, [$_, length $_, $text];
		937	}
		938
		939	# 2. Partial command
		940	# text is a prefix of the full command
		941	# score is the length of the input text
		942	# e.g. "invoke s"
		943	# "invoke small fireball" = 8
		944	# "invoke summon pet monster" = 8
		945
		946	if ($_ =~ $regexp_partial) {
		947	push @scores, [$_, length $text, $_];
		948	}
		949
		950	# 3. Abbreviation match
		951	# attempts to use first word of text as an abbreviated command
		952	# score is length of word + 1 - 3 per non-word-initial character
		953
		954	if (my @penalty = $_ =~ $regexp_abbrev) {
		955	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		956	}
		957
		958	# Pick the best option for this command
		959	push @match, (sort {
		960	$b->[1] <=> $a->[1]
		961	} @scores)[0];
330	}	962	}
331	}
332		963
333	@found = sort { $a->[0] cmp $b->[0] } @found;	964	# @match is now [command object, command with arguments]
		965	@match = map [$self->{command}{$_->[0]}, $_->[2]],
		966	sort {
		967	$b->[1] <=> $a->[1]
		968	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		969	or (length $b->[0]) <=> (length $a->[0])
		970	} @match;
		971	}
334		972
335	$self->{children}[0]->set_text ("$self->{search}_");	973	$self->{last_search} = $text;
		974	$self->{last_match} = \@match;
336		975
337	for (0..5) {	976	$self->{select_offset} = 0;
338	$self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
339	$self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
340	}	977	}
341		978
		979	my @labels = @{ $self->{label} };
		980	my @matches = @{ $self->{last_match} \|\| [] };
		981
		982	if ($self->{select_offset}) {
		983	splice @matches, 0, $self->{select_offset}, ();
		984
		985	my $label = shift @labels;
		986	$label->set_text ("...");
		987	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		988	}
		989
		990	for my $label (@labels) {
		991	$label->{fg} = [1, 1, 1, 1];
		992	$label->{bg} = [0, 0, 0, 0];
		993	}
		994
		995	if (@matches) {
342	$self->{select} = $found[0][1]	996	$self->{select} = "$matches[0][1]";
343	if @found;
344		997
345	if (@found > 6) {	998	$labels[0]->{fg} = [0, 0, 0, 1];
346	$self->{children}[6]->set_text ("...");	999	$labels[0]->{bg} = [1, 1, 1, 0.8];
		1000	} else {
		1001	$self->{select} = "$text";
347	}	1002	}
348		1003
349	$self->check_size;	1004	for my $match (@matches) {
350	}	1005	my $label = shift @labels;
351		1006
352	sub key_down {	1007	if (@labels) {
		1008	$label->set_text ("$match->[1]");
		1009	$label->set_tooltip ("$match->[0][1]");
		1010	} else {
		1011	$label->set_text ("...");
		1012	$label->set_tooltip ("Use Cursor-Down to view more matches");
		1013	last;
		1014	}
		1015	}
		1016
		1017	for my $label (@labels) {
		1018	$label->set_text ("");
		1019	$label->set_tooltip ("");
		1020	}
		1021
		1022	$self->update;
		1023	}
		1024
		1025	sub _draw {
353	my ($self, $ev) = @_;	1026	my ($self) = @_;
354		1027
355	if ($ev->{sym} == 8) {	1028	# hack
356	substr $self->{search}, -1, 1, "";	1029	local $DC::UI::FOCUS = $self->{entry};
357	$self->update_labels;
358	} elsif ($ev->{sym} == 13) {
359	if (exists $self->{select}) {
360	$self->emit (execute => $self->{select});
361	$self->emit ("close");
362	}
363	} elsif ($ev->{sym} == 27) {
364	$self->emit ("close");
365	return;
366	} elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
367	$self->{search} .= chr $ev->{unicode};
368	$self->update_labels;
369	}
370		1030
371	length $self->{search}	1031	$self->SUPER::_draw;
372	or $self->emit ("close");
373	}	1032	}
374		1033
375	1	1034	1
		1035

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs. Revision 1.154 by root, Fri Dec 4 15:04:56 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.154 by root, Fri Dec 4 15:04:56 2009 UTC