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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.106 by root, Wed Apr 4 02:59:57 2007 UTC

…		…
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
8	use CFPlus;	8	use CFPlus;
9	use CFPlus::OpenGL;	9	use CFPlus::OpenGL;
10	use CFPlus::UI;	10	use CFPlus::UI;
		11	use CFPlus::Macro;
11		12
12	our @ISA = CFPlus::UI::Base::;	13	our @ISA = CFPlus::UI::Base::;
13		14
14	my $magicmap_tex =	15	my $magicmap_tex =
15	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",	16	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
…		…
20		21
21	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
22	z => -1,	23	z => -1,
23	can_focus => 1,	24	can_focus => 1,
24	list => glGenList,	25	list => glGenList,
		26	tilesize => 32,
25		27
26	smooth_matrix => [	28	smooth_matrix => [
27	0.05, 0.13, 0.05,	29	0.05, 0.13, 0.05,
28	0.13, 0.30, 0.13,	30	0.13, 0.30, 0.13,
29	0.05, 0.13, 0.05,	31	0.05, 0.13, 0.05,
…		…
38	;	40	;
39		41
40	$self	42	$self
41	}	43	}
42		44
		45	sub set_tilesize {
		46	my ($self, $tilesize) = @_;
		47
		48	$self->{tilesize} = $tilesize;
		49	}
		50
43	sub add_command {	51	sub add_command {
44	my ($self, $command, $tooltip, $widget, $cb) = @_;	52	my ($self, $command, $tooltip, $widget, $cb) = @_;
45		53
46	(my $data = $command) =~ s/\\//g;	54	(my $data = $command) =~ s/\\//g;
47		55
…		…
59		67
60	$self->{completer}->hide	68	$self->{completer}->hide
61	if $self->{completer};	69	if $self->{completer};
62	}	70	}
63		71
64	sub test_server_login {	72	sub server_login {
65	return unless	73	my ($server) = @_;
66	$::CONN && length $::CONN->{test_server};
67		74
68	my $server = $::CONN->{test_server};
69	::stop_game ();	75	::stop_game ();
70	local $::PROFILE->{host} = $server;	76	local $::PROFILE->{host} = $server;
71	::start_game ();	77	::start_game ();
72	}	78	}
73		79
74	sub editor_invoke {	80	sub editor_invoke {
75	return unless $::CONN;	81	my $editsup = $::CONN && $::CONN->{editor_support}
		82	or return;
76		83
77	# putting the password into the env is somewhat tasteless	84	CFPlus::background {
78	local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};	85	print "preparing editor startup...\n";
79	local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
80	local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
81	local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root};
82		86
83	# CFPlus::set_proxy;	87	my $server = $editsup->{gameserver} \|\| "default";
		88	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84		89
85	# TODO: move into editor	90	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
86	require LWP::Simple;	91	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
		92
		93	print "map directory is $mapdir\n";
		94	print "lib directory is $libdir\n";
		95
		96	my $ua = CFPlus::lwp_useragent;
		97
		98	for my $file (qw(archetypes crossfire.0)) {
		99	my $url = "$editsup->{lib_root}$file";
		100	print "mirroring $url...\n";
		101	CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
		102	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		103	}
		104
		105	if (1) { # upload a map
		106	my $mapname = $::CONN->{map_info}[0];
		107
		108	my $mappath = "$mapdir/$mapname";
		109
		110	-e $mappath and die "$mappath already exists\n";
		111
		112	print "getting map revision for $mapname...\n";
		113
		114	# try to get the most recent head revision, what a hack,
		115	# this should have been returned while downloading sigh
		116	my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		117
		118	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		119	my $rev = $1;
		120
		121	print "downloading revision $rev...\n";
		122
		123	my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		124
		125	my $meta = {
		126	%$editsup,
		127	path => $mapname,
		128	revision => $rev,
		129	cf_login => $::PROFILE->{user},
		130	};
		131
		132	require File::Basename;
		133	require File::Path;
		134
		135	File::Path::mkpath (File::Basename::dirname ($mappath));
		136	open my $fh, ">:raw:perlio", "$mappath.meta"
		137	or die "$mappath.meta: $!\n";
		138	print $fh CFPlus::to_json $meta;
		139	close $fh;
		140	open my $fh, ">:raw:perlio:utf8", $mappath
		141	or die "$mappath: $!\n";
		142	print $fh $map;
		143	close $fh;
		144
		145	print "saved as $mappath\n";
		146
		147	print "invoking editor...\n";
		148	exec "/root/s2/gce $mappath";#d#
		149
		150	# now upload it
		151	# require HTTP::Request::Common;
		152	#
		153	# my $res = $ua->post (
		154	# $ENV{CFPLUS_UPLOAD},
		155	# Content_Type => 'multipart/form-data',
		156	# Content => [
		157	# path => $mapname,
		158	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		159	# map => $map,
		160	# revision => $rev,
		161	# cf_login => $ENV{CFPLUS_LOGIN},
		162	# cf_password => $ENV{CFPLUS_PASSWORD},
		163	# comment => "",
		164	# ]
		165	# );
		166	#
		167	# if ($res->is_error) {
		168	# # fatal condition
		169	# warn $res->status_line;
		170	# } else {
		171	# # script replies are marked as {{..}}
		172	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		173	# warn map "$_\n", @msgs;
		174	# }
		175	} else {
		176	die "viewvc parse error, unable to detect revision\n";
		177	}
		178	}
		179	}
87	}	180	}
88		181
89	sub invoke_button_down {	182	sub invoke_button_down {
90	my ($self, $ev, $x, $y) = @_;	183	my ($self, $ev, $x, $y) = @_;
91		184
92	if ($ev->{button} == 1) {	185	if ($ev->{button} == 1) {
93	$self->grab_focus;	186	$self->grab_focus;
94	return unless $::CONN;	187	return unless $::CONN;
95		188
96	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	189	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
97	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	190	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
98		191
99	$x -= int 0.5 * $self->{sw};	192	$x -= CFPlus::floor $::MAP->w * 0.5;
100	$y -= int 0.5 * $self->{sh};	193	$y -= CFPlus::floor $::MAP->h * 0.5;
101		194
		195	if ($::CONN) {
		196	if ($::IN_BUILD_MODE) {
		197	$::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
		198	} else {
102	$::CONN->lookat ($x, $y)	199	$::CONN->lookat ($x, $y)
103	if $::CONN;	200	}
		201	}
104		202
105	} elsif ($ev->{button} == 2) {	203	} elsif ($ev->{button} == 2) {
106	$self->grab_focus;	204	$self->grab_focus;
107	return unless $::CONN;	205	return unless $::CONN;
108		206
…		…
118	$::CFG->{map_shift_y} = $bh + $y - $oy;	216	$::CFG->{map_shift_y} = $bh + $y - $oy;
119		217
120	$self->update;	218	$self->update;
121	};	219	};
122	} elsif ($ev->{button} == 3) {	220	} elsif ($ev->{button} == 3) {
123	(new CFPlus::UI::Menu	221	my @items = (
124	items => [
125	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	222	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
126	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	223	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
127	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	224	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
128	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	225	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
129	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	226	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
…		…
133	$::PICKUP_ENABLE->{state}	230	$::PICKUP_ENABLE->{state}
134	? "Disable automatic pickup"	231	? "Disable automatic pickup"
135	: "Enable automatic pickup",	232	: "Enable automatic pickup",
136	sub { $::PICKUP_ENABLE->toggle }	233	sub { $::PICKUP_ENABLE->toggle }
137	],	234	],
138	$::CONN && length $::CONN->{cvs_root}	235	);
		236
		237	if ($::CONN && $::CONN->{editor_support}) {
		238	push @items, [
139	? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke]	239	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
140	: (),	240	\&editor_invoke,
141	$::CONN && length $::CONN->{test_server}	241	];
142	? ["Login on Test Server", \&test_server_login]	242
143	: (),	243	for my $type (qw(test name)) {
		244	$::CONN->{editor_support}{type} ne $type
		245	or next;
		246	my $server = $::CONN->{editor_support}{"${type}server"}
		247	or next;
		248
		249	push @items, [
		250	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
		251	sub { server_login $server },
		252	];
		253	}
		254	}
		255
		256	push @items,
144	["Quit",	257	["Quit",
145	sub {	258	sub {
146	if ($::CONN) {	259	if ($::CONN) {
147	&::open_quit_dialog;	260	&::open_quit_dialog;
148	} else {	261	} else {
149	exit;	262	exit;
150	}
151	}	263	}
152	],	264	}
153	],	265	],
		266	;
		267
		268	(new CFPlus::UI::Menu
		269	items => \@items,
154	)->popup ($ev);	270	)->popup ($ev);
155	}	271	}
156		272
157	1	273	1
158	}	274	}
…		…
176		292
177	1	293	1
178	}	294	}
179		295
180	sub size_request {	296	sub size_request {
		297	my ($self) = @_;
		298
181	(	299	(
182	32 * CFPlus::ceil $::WIDTH / 32,	300	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
183	32 * CFPlus::ceil $::HEIGHT / 32,	301	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
184	)	302	)
185	}	303	}
186		304
187	sub update {	305	sub update {
188	my ($self) = @_;	306	my ($self) = @_;
…		…
214	my $sym = $ev->{sym};	332	my $sym = $ev->{sym};
215	my $uni = $ev->{unicode};	333	my $uni = $ev->{unicode};
216		334
217	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	335	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
218		336
219	if ($uni == ord "\t") {	337	if ($sym == 9) {
220	$::PL_WINDOW->toggle_visibility;	338	($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
221	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	339	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
222	$::HELP_WINDOW->toggle_visibility;	340	$::HELP_WINDOW->toggle_visibility;
223	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {	341	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
224	::toggle_player_page ($::STATS_PAGE);	342	::toggle_player_page ($::STATS_PAGE);
225	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {	343	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
…		…
228	::toggle_player_page ($::SPELL_PAGE);	346	::toggle_player_page ($::SPELL_PAGE);
229	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {	347	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
230	::toggle_player_page ($::INVENTORY_PAGE);	348	::toggle_player_page ($::INVENTORY_PAGE);
231	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {	349	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
232	$::SETUP_DIALOG->toggle_visibility;	350	$::SETUP_DIALOG->toggle_visibility;
233	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
234	$::BIND_EDITOR->set_binding (undef, undef, [],
235	sub {
236	my ($mod, $sym, $cmds) = @_;
237	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
238	});
239	$::BIND_EDITOR->start;
240	$::BIND_EDITOR->show;
241	#TODO: elmex, what was this supposed to do? it currently crashes the client.
242	# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
243	# $::BIND_EDITOR->stop;
244	# $::BIND_EDITOR->ask_for_bind_and_commit;
245	# $::BIND_EDITOR->hide;
246	} elsif (!$::CONN) {	351	} elsif (!$::CONN) {
247	return 0; # bindings further down need a valid connection	352	return 0; # bindings further down need a valid connection
248		353
249	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {	354	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
250	$::CONN->user_send ("stay fire");	355	$::CONN->user_send ("stay fire");
…		…
255	} elsif ($uni == 13) {	360	} elsif ($uni == 13) {
256	$::CONN->user_send ("examine");	361	$::CONN->user_send ("examine");
257	} elsif ($uni == ord ".") {	362	} elsif ($uni == ord ".") {
258	$::CONN->user_send ($self->{completer}{last_command})	363	$::CONN->user_send ($self->{completer}{last_command})
259	if exists $self->{completer}{last_command};	364	if exists $self->{completer}{last_command};
260	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {	365	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
261	$::CONN->user_send ($_) for @$bind_cmd;	366	$::CONN->macro_send ($_) for @macros;
262	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {	367	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
263	$::CONN->user_send ("rotateshoottype +");	368	$::CONN->user_send ("rotateshoottype +");
264	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {	369	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
265	$::CONN->user_send ("rotateshoottype -");	370	$::CONN->user_send ("rotateshoottype -");
		371	} elsif ($uni == ord '!') {
		372	$self->{completer}->set_prefix ("shout ");
		373	$self->{completer}->show;
266	} elsif ($uni == ord '"') {	374	} elsif ($uni == ord '"') {
267	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	375	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
268	$self->{completer}->show;	376	$self->{completer}->show;
269	} elsif ($uni == ord "'") {	377	} elsif ($uni == ord "'") {
270	$self->{completer}->set_prefix ("");	378	$self->{completer}->set_prefix ("");
…		…
326	}	434	}
327		435
328	sub set_magicmap {	436	sub set_magicmap {
329	my ($self, $w, $h, $x, $y, $data) = @_;	437	my ($self, $w, $h, $x, $y, $data) = @_;
330		438
331	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	439	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
332	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	440	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
333		441
334	$self->{magicmap} = [$x, $y, $w, $h, $data];	442	$self->{magicmap} = [$x, $y, $w, $h, $data];
335		443
336	$self->update;	444	$self->update;
337	}	445	}
…		…
346		454
347	return	455	return
348	unless $focused \|\| !$::FAST;	456	unless $focused \|\| !$::FAST;
349		457
350	if (delete $self->{need_update}) {	458	if (delete $self->{need_update}) {
351	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	459	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
352		460
		461	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		462	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		463
353	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	464	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
354	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;	465	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
355		466
356	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;	467	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
357	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;	468	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
358		469
359	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	470	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
360	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	471	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
361		472
362	if ($::CFG->{fow_enable}) {	473	if ($::CFG->{fow_enable}) {
363	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);	474	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
364		475
365	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	476	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
366	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	477	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
367	glConvolutionFilter2D (	478	glConvolutionFilter2D (
368	GL_CONVOLUTION_2D,	479	GL_CONVOLUTION_2D,
…		…
390		501
391	glPushMatrix;	502	glPushMatrix;
392	glTranslate $sx0, $sy0;	503	glTranslate $sx0, $sy0;
393	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	504	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
394		505
395	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);	506	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
396		507
397	glScale 32, 32;	508	glScale $self->{tilesize}, $self->{tilesize};
398		509
399	if (my $tex = $self->{fow_texture}) {	510	if (my $tex = $self->{fow_texture}) {
400	glEnable GL_TEXTURE_2D;	511	glEnable GL_TEXTURE_2D;
401	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	512	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
402		513
…		…
407	}	518	}
408		519
409	if ($self->{magicmap}) {	520	if ($self->{magicmap}) {
410	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	521	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
411		522
412	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);	523	$x += $::MAP->ox + $self->{dx};
413	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);	524	$y += $::MAP->oy + $self->{dy};
414		525
415	glTranslate - $x - 1, - $y - 1;	526	glTranslate - $x - 1, - $y - 1;
416	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};	527	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
417	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);	528	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
418	}	529	}
…		…
446	$self->SUPER::DESTROY;	557	$self->SUPER::DESTROY;
447	}	558	}
448		559
449	package CFPlus::MapWidget::MapMap;	560	package CFPlus::MapWidget::MapMap;
450		561
		562	use strict;
		563	use utf8;
		564
451	our @ISA = CFPlus::UI::Base::;	565	our @ISA = CFPlus::UI::Base::;
452		566
453	use Time::HiRes qw(time);	567	use Time::HiRes qw(time);
454	use CFPlus::OpenGL;	568	use CFPlus::OpenGL;
455		569
…		…
477		591
478	$::MAP or return;	592	$::MAP or return;
479		593
480	my ($w, $h) = @$self{qw(w h)};	594	my ($w, $h) = @$self{qw(w h)};
481		595
482	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	596	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
483	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	597	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
484		598
485	my $sx = int $::CFG->{map_shift_x} / 32;	599	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
486	my $sy = int $::CFG->{map_shift_y} / 32;	600	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
487		601
488	my $ox = 0.5 * ($w - $sw);	602	my $ox = 0.5 * ($w - $sw);
489	my $oy = 0.5 * ($h - $sh);	603	my $oy = 0.5 * ($h - $sh);
490		604
491	glEnable GL_BLEND;	605	glEnable GL_BLEND;
…		…
564		678
565	if ($ev->{button} == 3) {	679	if ($ev->{button} == 3) {
566	(new CFPlus::UI::Menu	680	(new CFPlus::UI::Menu
567	items => [	681	items => [
568	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	682	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
569	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	683	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
570	],	684	],
571	)->popup ($ev);	685	)->popup ($ev);
572	return 1;	686	return 1;
573	}	687	}
574	0	688	0
…		…
775		889
776	$self->SUPER::_draw;	890	$self->SUPER::_draw;
777	}	891	}
778		892
779	1	893	1
		894

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs. Revision 1.106 by root, Wed Apr 4 02:59:57 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.106 by root, Wed Apr 4 02:59:57 2007 UTC