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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.109 by root, Tue Jul 17 17:39:07 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.30, 0.50, 0.30,
28	0.13, 0.30, 0.13,
29	0.05, 0.13, 0.05,	30	0.50, 0.50, 0.50,
		31	0.30, 0.50, 0.30,
30	],	32	],
31		33
32	@_	34	@_
33	);	35	);
34		36
35	$self->{completer} = new CFPlus::MapWidget::Command::	37	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},	38	command => $self->{command},
37	tooltip => "<b>The Command Completer</b>\n\n"	39	tooltip => "#completer_help",
38	. "This is your central interface to send text commands to the server. "
39	. "To enter a verbatim command to send to the server, just type the command, "
40	. "followed by a space, and press return. "
41	. "Typing the initial letters of words (or just any letters) displays guesses "
42	. "for commands you might want to use.\n"
43	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
44	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
45	;	40	;
46		41
47	$self	42	$self
		43	}
		44
		45	sub set_tilesize {
		46	my ($self, $tilesize) = @_;
		47
		48	$self->{tilesize} = $tilesize;
48	}	49	}
49		50
50	sub add_command {	51	sub add_command {
51	my ($self, $command, $tooltip, $widget, $cb) = @_;	52	my ($self, $command, $tooltip, $widget, $cb) = @_;
52		53
…		…
66		67
67	$self->{completer}->hide	68	$self->{completer}->hide
68	if $self->{completer};	69	if $self->{completer};
69	}	70	}
70		71
		72	sub server_login {
		73	my ($server) = @_;
		74
		75	::stop_game ();
		76	local $::PROFILE->{host} = $server;
		77	::start_game ();
		78	}
		79
		80	sub editor_invoke {
		81	my $editsup = $::CONN && $::CONN->{editor_support}
		82	or return;
		83
		84	CFPlus::background {
		85	print "preparing editor startup...\n";
		86
		87	my $server = $editsup->{gameserver} \|\| "default";
		88	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		89
		90	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
		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	}
		180	}
		181
71	sub invoke_button_down {	182	sub invoke_button_down {
72	my ($self, $ev, $x, $y) = @_;	183	my ($self, $ev, $x, $y) = @_;
73		184
74	if ($ev->{button} == 1) {	185	if ($ev->{button} == 1) {
75	$self->grab_focus;	186	$self->grab_focus;
76	return unless $::CONN;	187	return unless $::CONN;
77		188
78	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};
79	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};
80		191
81	$x -= int 0.5 * $self->{sw};	192	$x -= CFPlus::floor $::MAP->w * 0.5;
82	$y -= int 0.5 * $self->{sh};	193	$y -= CFPlus::floor $::MAP->h * 0.5;
83		194
		195	if ($::CONN) {
		196	if ($::IN_BUILD_MODE) {
		197	$::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
		198	} else {
84	$::CONN->lookat ($x, $y)	199	$::CONN->lookat ($x, $y)
85	if $::CONN;	200	}
		201	}
86		202
87	} elsif ($ev->{button} == 2) {	203	} elsif ($ev->{button} == 2) {
88	$self->grab_focus;	204	$self->grab_focus;
89	return unless $::CONN;	205	return unless $::CONN;
90		206
…		…
100	$::CFG->{map_shift_y} = $bh + $y - $oy;	216	$::CFG->{map_shift_y} = $bh + $y - $oy;
101		217
102	$self->update;	218	$self->update;
103	};	219	};
104	} elsif ($ev->{button} == 3) {	220	} elsif ($ev->{button} == 3) {
105	(new CFPlus::UI::Menu	221	my @items = (
106	items => [
107	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	222	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
108	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	223	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
109	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	224	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
110	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	225	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
111	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	226	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
…		…
115	$::PICKUP_ENABLE->{state}	230	$::PICKUP_ENABLE->{state}
116	? "Disable automatic pickup"	231	? "Disable automatic pickup"
117	: "Enable automatic pickup",	232	: "Enable automatic pickup",
118	sub { $::PICKUP_ENABLE->toggle }	233	sub { $::PICKUP_ENABLE->toggle }
119	],	234	],
		235	);
		236
		237	if ($::CONN && $::CONN->{editor_support}) {
		238	push @items, [
		239	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
		240	\&editor_invoke,
		241	];
		242
		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,
120	["Quit",	257	["Quit",
121	sub {	258	sub {
122	if ($::CONN) {	259	if ($::CONN) {
123	&::open_quit_dialog;	260	&::open_quit_dialog;
124	} else {	261	} else {
125	exit;	262	exit;
126	}
127	}	263	}
128	],	264	}
129	],	265	],
		266	;
		267
		268	(new CFPlus::UI::Menu
		269	items => \@items,
130	)->popup ($ev);	270	)->popup ($ev);
131	}	271	}
132		272
133	1	273	1
134	}	274	}
…		…
152		292
153	1	293	1
154	}	294	}
155		295
156	sub size_request {	296	sub size_request {
		297	my ($self) = @_;
		298
157	(	299	(
158	32 * CFPlus::ceil $::WIDTH / 32,	300	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
159	32 * CFPlus::ceil $::HEIGHT / 32,	301	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
160	)	302	)
161	}	303	}
162		304
163	sub update {	305	sub update {
164	my ($self) = @_;	306	my ($self) = @_;
…		…
166	$self->{need_update} = 1;	308	$self->{need_update} = 1;
167	$self->SUPER::update;	309	$self->SUPER::update;
168	}	310	}
169		311
170	my %DIR = (	312	my %DIR = (
		313	CFPlus::SDLK_KP5, [0, "stay fire"],
171	CFPlus::SDLK_KP8, [1, "north"],	314	CFPlus::SDLK_KP8, [1, "north"],
172	CFPlus::SDLK_KP9, [2, "northeast"],	315	CFPlus::SDLK_KP9, [2, "northeast"],
173	CFPlus::SDLK_KP6, [3, "east"],	316	CFPlus::SDLK_KP6, [3, "east"],
174	CFPlus::SDLK_KP3, [4, "southeast"],	317	CFPlus::SDLK_KP3, [4, "southeast"],
175	CFPlus::SDLK_KP2, [5, "south"],	318	CFPlus::SDLK_KP2, [5, "south"],
…		…
190	my $sym = $ev->{sym};	333	my $sym = $ev->{sym};
191	my $uni = $ev->{unicode};	334	my $uni = $ev->{unicode};
192		335
193	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	336	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
194		337
195	if ($uni == ord "\t") {	338	if ($sym == 9) {
196	$::PL_WINDOW->toggle_visibility;	339	($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
197	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	340	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
198	$::HELP_WINDOW->toggle_visibility;	341	$::HELP_WINDOW->toggle_visibility;
199	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {	342	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
200	::toggle_player_page ($::STATS_PAGE);	343	::toggle_player_page ($::STATS_PAGE);
201	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {	344	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
…		…
204	::toggle_player_page ($::SPELL_PAGE);	347	::toggle_player_page ($::SPELL_PAGE);
205	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {	348	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
206	::toggle_player_page ($::INVENTORY_PAGE);	349	::toggle_player_page ($::INVENTORY_PAGE);
207	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {	350	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
208	$::SETUP_DIALOG->toggle_visibility;	351	$::SETUP_DIALOG->toggle_visibility;
209	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
210	$::BIND_EDITOR->set_binding (undef, undef, [],
211	sub {
212	my ($mod, $sym, $cmds) = @_;
213	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214	});
215	$::BIND_EDITOR->start;
216	$::BIND_EDITOR->show;
217	} elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
218	$::BIND_EDITOR->stop;
219	$::BIND_EDITOR->ask_for_bind_and_commit;
220	$::BIND_EDITOR->hide;
221	} elsif (!$::CONN) {	352	} elsif (!$::CONN) {
222	return 0; # bindings further down need a valid connection	353	return 0; # bindings further down need a valid connection
223		354
224	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
225	$::CONN->user_send ("stay fire");
226	} elsif ($uni == ord ",") {	355	} elsif ($uni == ord ",") {
227	$::CONN->user_send ("take");	356	$::CONN->user_send ("take");
228	} elsif ($uni == ord " ") {	357	} elsif ($uni == ord " ") {
229	$::CONN->user_send ("apply");	358	$::CONN->user_send ("apply");
		359	} elsif ($uni == 13) {
		360	$::CONN->user_send ("examine");
230	} elsif ($uni == ord ".") {	361	} elsif ($uni == ord ".") {
231	$::CONN->user_send ($self->{completer}{last_command})	362	$::CONN->user_send ($self->{completer}{last_command})
232	if exists $self->{completer}{last_command};	363	if exists $self->{completer}{last_command};
233	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {	364	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
234	$::CONN->user_send ($_) for @$bind_cmd;	365	$::CONN->macro_send ($_) for @macros;
235	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {	366	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
236	$::CONN->user_send ("rotateshoottype +");	367	$::CONN->user_send ("rotateshoottype +");
237	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {	368	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
238	$::CONN->user_send ("rotateshoottype -");	369	$::CONN->user_send ("rotateshoottype -");
		370	} elsif ($uni == ord '!') {
		371	$self->{completer}->set_prefix ("shout ");
		372	$self->{completer}->show;
239	} elsif ($uni == ord '"') {	373	} elsif ($uni == ord '"') {
240	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	374	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
241	$self->{completer}->show;	375	$self->{completer}->show;
242	} elsif ($uni == ord "'") {	376	} elsif ($uni == ord "'") {
243	$self->{completer}->set_prefix ("");	377	$self->{completer}->set_prefix ("");
…		…
299	}	433	}
300		434
301	sub set_magicmap {	435	sub set_magicmap {
302	my ($self, $w, $h, $x, $y, $data) = @_;	436	my ($self, $w, $h, $x, $y, $data) = @_;
303		437
304	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	438	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
305	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	439	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
306		440
307	$self->{magicmap} = [$x, $y, $w, $h, $data];	441	$self->{magicmap} = [$x, $y, $w, $h, $data];
308		442
309	$self->update;	443	$self->update;
310	}	444	}
…		…
319		453
320	return	454	return
321	unless $focused \|\| !$::FAST;	455	unless $focused \|\| !$::FAST;
322		456
323	if (delete $self->{need_update}) {	457	if (delete $self->{need_update}) {
324	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	458	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
325		459
		460	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		461	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		462
326	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;	463	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
327	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;	464	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
328		465
329	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;	466	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
330	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;	467	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
331		468
332	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;	469	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
333	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;	470	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
334		471
335	if ($::CFG->{fow_enable}) {	472	if ($::CFG->{fow_enable}) {
336	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);	473	my ($w, $h, $data) = $::MAP->fow_texture (
337		474	$dx, $dy, $sw, $sh,
338	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	475	$::CFG->{fow_smooth},
339	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
340	glConvolutionFilter2D (
341	GL_CONVOLUTION_2D,
342	GL_ALPHA,
343	3, 3,
344	GL_ALPHA, GL_FLOAT,
345	(pack "f*", @{ $self->{smooth_matrix} }),	476	pack "f*", @{ $self->{smooth_matrix} },
346	);	477	);
347	glEnable GL_CONVOLUTION_2D;
348	}
349		478
350	$self->{fow_texture} = new CFPlus::Texture	479	$self->{fow_texture} = new CFPlus::Texture
351	w => $w,	480	w => $w,
352	h => $h,	481	h => $h,
353	data => $data,	482	data => $data,
354	internalformat => GL_ALPHA,	483	internalformat => GL_ALPHA,
355	format => GL_ALPHA;	484	format => GL_ALPHA;
356
357	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
358	} else {	485	} else {
359	delete $self->{fow_texture};	486	delete $self->{fow_texture};
360	}	487	}
361		488
362	glNewList $self->{list};	489	glNewList $self->{list};
363		490
364	glPushMatrix;	491	glPushMatrix;
365	glTranslate $sx0, $sy0;	492	glTranslate $sx0, $sy0;
366	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	493	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
367		494
368	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);	495	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
369		496
370	glScale 32, 32;	497	glScale $self->{tilesize}, $self->{tilesize};
371		498
372	if (my $tex = $self->{fow_texture}) {	499	if (my $tex = $self->{fow_texture}) {
		500	glPushMatrix;
		501	#glScale 1/3, 1/3 if $::CFG->{fow_smooth};
373	glEnable GL_TEXTURE_2D;	502	glEnable GL_TEXTURE_2D;
374	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
375		504
376	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	505	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
377	$self->{fow_texture}->draw_quad_alpha (0, 0);	506	$self->{fow_texture}->draw_quad_alpha (0, 0);
378		507
379	glDisable GL_TEXTURE_2D;	508	glDisable GL_TEXTURE_2D;
		509	glPopMatrix;
380	}	510	}
381		511
382	if ($self->{magicmap}) {	512	if ($self->{magicmap}) {
383	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	513	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
384		514
385	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);	515	$x += $::MAP->ox + $self->{dx};
386	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);	516	$y += $::MAP->oy + $self->{dy};
387		517
388	glTranslate - $x - 1, - $y - 1;	518	glTranslate - $x - 1, - $y - 1;
389	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};	519	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
390	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);	520	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
391	}	521	}
…		…
419	$self->SUPER::DESTROY;	549	$self->SUPER::DESTROY;
420	}	550	}
421		551
422	package CFPlus::MapWidget::MapMap;	552	package CFPlus::MapWidget::MapMap;
423		553
		554	use strict;
		555	use utf8;
		556
424	our @ISA = CFPlus::UI::Base::;	557	our @ISA = CFPlus::UI::Base::;
425		558
426	use Time::HiRes qw(time);	559	use Time::HiRes qw(time);
427	use CFPlus::OpenGL;	560	use CFPlus::OpenGL;
428		561
…		…
450		583
451	$::MAP or return;	584	$::MAP or return;
452		585
453	my ($w, $h) = @$self{qw(w h)};	586	my ($w, $h) = @$self{qw(w h)};
454		587
455	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	588	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
456	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	589	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
457		590
458	my $sx = int $::CFG->{map_shift_x} / 32;	591	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
459	my $sy = int $::CFG->{map_shift_y} / 32;	592	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
460		593
461	my $ox = 0.5 * ($w - $sw);	594	my $ox = 0.5 * ($w - $sw);
462	my $oy = 0.5 * ($h - $sh);	595	my $oy = 0.5 * ($h - $sh);
463		596
464	glEnable GL_BLEND;	597	glEnable GL_BLEND;
…		…
537		670
538	if ($ev->{button} == 3) {	671	if ($ev->{button} == 3) {
539	(new CFPlus::UI::Menu	672	(new CFPlus::UI::Menu
540	items => [	673	items => [
541	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	674	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
542	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	675	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
543	],	676	],
544	)->popup ($ev);	677	)->popup ($ev);
545	return 1;	678	return 1;
546	}	679	}
547	0	680	0
…		…
748		881
749	$self->SUPER::_draw;	882	$self->SUPER::_draw;
750	}	883	}
751		884
752	1	885	1
		886

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs. Revision 1.109 by root, Tue Jul 17 17:39:07 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.109 by root, Tue Jul 17 17:39:07 2007 UTC