ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.82 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.109 by root, Tue Jul 17 17:39:07 2007 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
13 14
14my $magicmap_tex = 15my $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
… …
38 ; 40 ;
39 41
40 $self 42 $self
41} 43}
42 44
45sub set_tilesize {
46 my ($self, $tilesize) = @_;
47
48 $self->{tilesize} = $tilesize;
49}
50
43sub add_command { 51sub 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
72sub server_login {
73 my ($server) = @_;
74
75 ::stop_game ();
76 local $::PROFILE->{host} = $server;
77 ::start_game ();
78}
79
80sub 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
64sub invoke_button_down { 182sub invoke_button_down {
65 my ($self, $ev, $x, $y) = @_; 183 my ($self, $ev, $x, $y) = @_;
66 184
67 if ($ev->{button} == 1) { 185 if ($ev->{button} == 1) {
68 $self->grab_focus; 186 $self->grab_focus;
69 return unless $::CONN; 187 return unless $::CONN;
70 188
71 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};
72 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};
73 191
74 $x -= int 0.5 * $self->{sw}; 192 $x -= CFPlus::floor $::MAP->w * 0.5;
75 $y -= int 0.5 * $self->{sh}; 193 $y -= CFPlus::floor $::MAP->h * 0.5;
76 194
195 if ($::CONN) {
196 if ($::IN_BUILD_MODE) {
197 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
198 } else {
77 $::CONN->lookat ($x, $y) 199 $::CONN->lookat ($x, $y)
78 if $::CONN; 200 }
201 }
79 202
80 } elsif ($ev->{button} == 2) { 203 } elsif ($ev->{button} == 2) {
81 $self->grab_focus; 204 $self->grab_focus;
82 return unless $::CONN; 205 return unless $::CONN;
83 206
… …
93 $::CFG->{map_shift_y} = $bh + $y - $oy; 216 $::CFG->{map_shift_y} = $bh + $y - $oy;
94 217
95 $self->update; 218 $self->update;
96 }; 219 };
97 } elsif ($ev->{button} == 3) { 220 } elsif ($ev->{button} == 3) {
98 (new CFPlus::UI::Menu 221 my @items = (
99 items => [
100 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 222 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
101 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 223 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
102 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 224 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
103 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 225 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
104 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 226 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
108 $::PICKUP_ENABLE->{state} 230 $::PICKUP_ENABLE->{state}
109 ? "Disable automatic pickup" 231 ? "Disable automatic pickup"
110 : "Enable automatic pickup", 232 : "Enable automatic pickup",
111 sub { $::PICKUP_ENABLE->toggle } 233 sub { $::PICKUP_ENABLE->toggle }
112 ], 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,
113 ["Quit", 257 ["Quit",
114 sub { 258 sub {
115 if ($::CONN) { 259 if ($::CONN) {
116 &::open_quit_dialog; 260 &::open_quit_dialog;
117 } else { 261 } else {
118 exit; 262 exit;
119 }
120 } 263 }
121 ], 264 }
122 ], 265 ],
266 ;
267
268 (new CFPlus::UI::Menu
269 items => \@items,
123 )->popup ($ev); 270 )->popup ($ev);
124 } 271 }
125 272
126 1 273 1
127} 274}
… …
145 292
146 1 293 1
147} 294}
148 295
149sub size_request { 296sub size_request {
297 my ($self) = @_;
298
150 ( 299 (
151 32 * CFPlus::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
152 32 * CFPlus::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
153 ) 302 )
154} 303}
155 304
156sub update { 305sub update {
157 my ($self) = @_; 306 my ($self) = @_;
… …
159 $self->{need_update} = 1; 308 $self->{need_update} = 1;
160 $self->SUPER::update; 309 $self->SUPER::update;
161} 310}
162 311
163my %DIR = ( 312my %DIR = (
313 CFPlus::SDLK_KP5, [0, "stay fire"],
164 CFPlus::SDLK_KP8, [1, "north"], 314 CFPlus::SDLK_KP8, [1, "north"],
165 CFPlus::SDLK_KP9, [2, "northeast"], 315 CFPlus::SDLK_KP9, [2, "northeast"],
166 CFPlus::SDLK_KP6, [3, "east"], 316 CFPlus::SDLK_KP6, [3, "east"],
167 CFPlus::SDLK_KP3, [4, "southeast"], 317 CFPlus::SDLK_KP3, [4, "southeast"],
168 CFPlus::SDLK_KP2, [5, "south"], 318 CFPlus::SDLK_KP2, [5, "south"],
… …
183 my $sym = $ev->{sym}; 333 my $sym = $ev->{sym};
184 my $uni = $ev->{unicode}; 334 my $uni = $ev->{unicode};
185 335
186 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 336 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
187 337
188 if ($uni == ord "\t") { 338 if ($sym == 9) {
189 $::PL_WINDOW->toggle_visibility; 339 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
190 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
191 $::HELP_WINDOW->toggle_visibility; 341 $::HELP_WINDOW->toggle_visibility;
192 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
193 ::toggle_player_page ($::STATS_PAGE); 343 ::toggle_player_page ($::STATS_PAGE);
194 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 344 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
197 ::toggle_player_page ($::SPELL_PAGE); 347 ::toggle_player_page ($::SPELL_PAGE);
198 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 348 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
199 ::toggle_player_page ($::INVENTORY_PAGE); 349 ::toggle_player_page ($::INVENTORY_PAGE);
200 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 350 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
201 $::SETUP_DIALOG->toggle_visibility; 351 $::SETUP_DIALOG->toggle_visibility;
202 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
203 $::BIND_EDITOR->set_binding (undef, undef, [],
204 sub {
205 my ($mod, $sym, $cmds) = @_;
206 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
207 });
208 $::BIND_EDITOR->start;
209 $::BIND_EDITOR->show;
210#TODO: elmex, what was this supposed to do? it currently crashes the client.
211# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
212# $::BIND_EDITOR->stop;
213# $::BIND_EDITOR->ask_for_bind_and_commit;
214# $::BIND_EDITOR->hide;
215 } elsif (!$::CONN) { 352 } elsif (!$::CONN) {
216 return 0; # bindings further down need a valid connection 353 return 0; # bindings further down need a valid connection
217 354
218 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
219 $::CONN->user_send ("stay fire");
220 } elsif ($uni == ord ",") { 355 } elsif ($uni == ord ",") {
221 $::CONN->user_send ("take"); 356 $::CONN->user_send ("take");
222 } elsif ($uni == ord " ") { 357 } elsif ($uni == ord " ") {
223 $::CONN->user_send ("apply"); 358 $::CONN->user_send ("apply");
224 } elsif ($uni == 13) { 359 } elsif ($uni == 13) {
225 $::CONN->user_send ("examine"); 360 $::CONN->user_send ("examine");
226 } elsif ($uni == ord ".") { 361 } elsif ($uni == ord ".") {
227 $::CONN->user_send ($self->{completer}{last_command}) 362 $::CONN->user_send ($self->{completer}{last_command})
228 if exists $self->{completer}{last_command}; 363 if exists $self->{completer}{last_command};
229 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 364 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
230 $::CONN->user_send ($_) for @$bind_cmd; 365 $::CONN->macro_send ($_) for @macros;
231 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 366 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
232 $::CONN->user_send ("rotateshoottype +"); 367 $::CONN->user_send ("rotateshoottype +");
233 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 368 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
234 $::CONN->user_send ("rotateshoottype -"); 369 $::CONN->user_send ("rotateshoottype -");
370 } elsif ($uni == ord '!') {
371 $self->{completer}->set_prefix ("shout ");
372 $self->{completer}->show;
235 } elsif ($uni == ord '"') { 373 } elsif ($uni == ord '"') {
236 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 374 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
237 $self->{completer}->show; 375 $self->{completer}->show;
238 } elsif ($uni == ord "'") { 376 } elsif ($uni == ord "'") {
239 $self->{completer}->set_prefix (""); 377 $self->{completer}->set_prefix ("");
… …
295} 433}
296 434
297sub set_magicmap { 435sub set_magicmap {
298 my ($self, $w, $h, $x, $y, $data) = @_; 436 my ($self, $w, $h, $x, $y, $data) = @_;
299 437
300 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 438 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
301 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 439 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
302 440
303 $self->{magicmap} = [$x, $y, $w, $h, $data]; 441 $self->{magicmap} = [$x, $y, $w, $h, $data];
304 442
305 $self->update; 443 $self->update;
306} 444}
… …
315 453
316 return 454 return
317 unless $focused || !$::FAST; 455 unless $focused || !$::FAST;
318 456
319 if (delete $self->{need_update}) { 457 if (delete $self->{need_update}) {
320 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 458 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
321 459
460 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
461 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
462
322 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 463 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
323 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 464 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
324 465
325 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 466 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
326 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 467 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
327 468
328 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 469 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
329 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 470 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
330 471
331 if ($::CFG->{fow_enable}) { 472 if ($::CFG->{fow_enable}) {
332 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 473 my ($w, $h, $data) = $::MAP->fow_texture (
333 474 $dx, $dy, $sw, $sh,
334 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 475 $::CFG->{fow_smooth},
335 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
336 glConvolutionFilter2D (
337 GL_CONVOLUTION_2D,
338 GL_ALPHA,
339 3, 3,
340 GL_ALPHA, GL_FLOAT,
341 (pack "f*", @{ $self->{smooth_matrix} }), 476 pack "f*", @{ $self->{smooth_matrix} },
342 ); 477 );
343 glEnable GL_CONVOLUTION_2D;
344 }
345 478
346 $self->{fow_texture} = new CFPlus::Texture 479 $self->{fow_texture} = new CFPlus::Texture
347 w => $w, 480 w => $w,
348 h => $h, 481 h => $h,
349 data => $data, 482 data => $data,
350 internalformat => GL_ALPHA, 483 internalformat => GL_ALPHA,
351 format => GL_ALPHA; 484 format => GL_ALPHA;
352
353 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
354 } else { 485 } else {
355 delete $self->{fow_texture}; 486 delete $self->{fow_texture};
356 } 487 }
357 488
358 glNewList $self->{list}; 489 glNewList $self->{list};
359 490
360 glPushMatrix; 491 glPushMatrix;
361 glTranslate $sx0, $sy0; 492 glTranslate $sx0, $sy0;
362 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 493 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
363 494
364 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 495 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
365 496
366 glScale 32, 32; 497 glScale $self->{tilesize}, $self->{tilesize};
367 498
368 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};
369 glEnable GL_TEXTURE_2D; 502 glEnable GL_TEXTURE_2D;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
371 504
372 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 505 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
373 $self->{fow_texture}->draw_quad_alpha (0, 0); 506 $self->{fow_texture}->draw_quad_alpha (0, 0);
374 507
375 glDisable GL_TEXTURE_2D; 508 glDisable GL_TEXTURE_2D;
509 glPopMatrix;
376 } 510 }
377 511
378 if ($self->{magicmap}) { 512 if ($self->{magicmap}) {
379 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 513 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
380 514
381 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 515 $x += $::MAP->ox + $self->{dx};
382 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 516 $y += $::MAP->oy + $self->{dy};
383 517
384 glTranslate - $x - 1, - $y - 1; 518 glTranslate - $x - 1, - $y - 1;
385 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 519 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
386 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 520 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
387 } 521 }
… …
415 $self->SUPER::DESTROY; 549 $self->SUPER::DESTROY;
416} 550}
417 551
418package CFPlus::MapWidget::MapMap; 552package CFPlus::MapWidget::MapMap;
419 553
554use strict;
555use utf8;
556
420our @ISA = CFPlus::UI::Base::; 557our @ISA = CFPlus::UI::Base::;
421 558
422use Time::HiRes qw(time); 559use Time::HiRes qw(time);
423use CFPlus::OpenGL; 560use CFPlus::OpenGL;
424 561
… …
446 583
447 $::MAP or return; 584 $::MAP or return;
448 585
449 my ($w, $h) = @$self{qw(w h)}; 586 my ($w, $h) = @$self{qw(w h)};
450 587
451 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 588 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
452 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 589 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
453 590
454 my $sx = int $::CFG->{map_shift_x} / 32; 591 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
455 my $sy = int $::CFG->{map_shift_y} / 32; 592 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
456 593
457 my $ox = 0.5 * ($w - $sw); 594 my $ox = 0.5 * ($w - $sw);
458 my $oy = 0.5 * ($h - $sh); 595 my $oy = 0.5 * ($h - $sh);
459 596
460 glEnable GL_BLEND; 597 glEnable GL_BLEND;
… …
533 670
534 if ($ev->{button} == 3) { 671 if ($ev->{button} == 3) {
535 (new CFPlus::UI::Menu 672 (new CFPlus::UI::Menu
536 items => [ 673 items => [
537 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 674 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
538 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 675 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
539 ], 676 ],
540 )->popup ($ev); 677 )->popup ($ev);
541 return 1; 678 return 1;
542 } 679 }
543 0 680 0
… …
744 881
745 $self->SUPER::_draw; 882 $self->SUPER::_draw;
746} 883}
747 884
7481 8851
886

Diff Legend

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