ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.134 by root, Tue Apr 18 05:13:15 2006 UTC vs.
Revision 1.146 by root, Wed Apr 19 21:17:16 2006 UTC

… …
4use utf8; 4use utf8;
5 5
6use Time::HiRes 'time'; 6use Time::HiRes 'time';
7use Event; 7use Event;
8 8
9use SDL;
10use SDL::App;
11use SDL::Event; 9use SDL::Event;
12use SDL::Surface;
13
14use SDL::Sound;
15use SDL::Mixer;
16 10
17use SDL::OpenGL; 11use SDL::OpenGL;
18 12
19use Crossfire; 13use Crossfire;
20use Crossfire::Protocol; 14use Crossfire::Protocol;
21 15
22use Compress::LZF; 16use Compress::LZF;
23 17
24use CFClient; 18use CFClient;
25use CFClient::UI; 19use CFClient::UI;
20use CFClient::MapWidget;
26 21
27our $VERSION = '0.1'; 22our $VERSION = '0.1';
28 23
29my $MAX_FPS = 60; 24my $MAX_FPS = 60;
30my $MIN_FPS = 5; # unused as of yet 25my $MIN_FPS = 5; # unused as of yet
… …
109} 104}
110 105
111sub client_setup { 106sub client_setup {
112 my $dialog = new CFClient::UI::FancyFrame 107 my $dialog = new CFClient::UI::FancyFrame
113 child => (my $vbox = new CFClient::UI::VBox); 108 child => (my $vbox = new CFClient::UI::VBox);
114 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); 109 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
115 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 110 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
116 111
117 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 112 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
118 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 113 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
119 114
120 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 115 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
121 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8); 116 $hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8);
122 117
123 $mode_slider->connect (changed => sub { 118 $mode_slider->connect (changed => sub {
124 my ($self, $value) = @_; 119 my ($self, $value) = @_;
125 120
126 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 121 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
127 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 122 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
128 }); 123 });
129 $mode_slider->emit (changed => $mode_slider->{range}[0]); 124 $mode_slider->emit (changed => $mode_slider->{range}[0]);
130 125
131 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen"); 126 $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
132 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 127 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
133 my ($self, $value) = @_; 128 my ($self, $value) = @_;
134 $CFG->{fullscreen} = $value; 129 $CFG->{fullscreen} = $value;
135 }); 130 });
136 131
137 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); 132 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
138 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 133 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
139 my ($self, $value) = @_; 134 my ($self, $value) = @_;
140 $CFG->{fast} = $value; 135 $CFG->{fast} = $value;
141 }); 136 });
142 137
143 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); 138 $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
144 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 139 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
145 my ($self, $value) = @_; 140 my ($self, $value) = @_;
146 $CFG->{fow_enable} = $value; 141 $CFG->{fow_enable} = $value;
147 }); 142 });
148 143
149 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); 144 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
150 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 145 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
151 my ($self, $value) = @_; 146 my ($self, $value) = @_;
152 $CFG->{fow_intensity} = $value; 147 $CFG->{fow_intensity} = $value;
153 }); 148 });
154 149
155 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 150 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
156 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 151 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
157 my ($self, $value) = @_; 152 my ($self, $value) = @_;
158 $CFG->{fow_smooth} = $value; 153 $CFG->{fow_smooth} = $value;
159 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 154 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
160 }); 155 });
161 156
162 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 157 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
158 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
159 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
160# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
161 });
162
163 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
163 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 164 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
164 my ($self, $value) = @_;
165 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 165 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
166 }); 166 });
167 167
168 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 168 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
169 video_shutdown (); 169 video_shutdown ();
170 video_init (); 170 video_init ();
171 });
172
173 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
174 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
175 $CFG->{audio_enable} = $_[1];
176 });
177# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
178# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
179# $CFG->{effects_volume} = $_[1];
180# });
181 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
182 $table->add (1, 10, my $hbox = new CFClient::UI::HBox);
183 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
184 $CFG->{bgm_enable} = $_[1];
185 });
186 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
187 $CFG->{bgm_volume} = $_[1];
188 CFClient::Mix_VolumeMusic ($_[1]);
189 });
190
191 $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
192 audio_shutdown ();
193 audio_init ();
171 }); 194 });
172 195
173 $dialog 196 $dialog
174} 197}
175 198
… …
239 $HOST->set_text ($CFG->{host} = $host); 262 $HOST->set_text ($CFG->{host} = $host);
240 }), 263 }),
241 (new CFClient::UI::Empty expand => 1), 264 (new CFClient::UI::Empty expand => 1),
242 ]); 265 ]);
243 266
244 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 267 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
245 for 0 .. $#$m; 268 for 0 .. $#$m;
246 } 269 }
247 } 270 }
248 }); 271 });
249} 272}
250 273
251sub server_setup { 274sub server_setup {
252 my $dialog = new CFClient::UI::FancyFrame 275 my $dialog = new CFClient::UI::FancyFrame
253 child => (my $vbox = new CFClient::UI::VBox); 276 child => (my $vbox = new CFClient::UI::VBox);
254 277
255 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); 278 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
256 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 279 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
257 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); 280 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
258 281
259 { 282 {
260 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 283 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
261 284
262 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 285 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
263 my ($self, $value) = @_; 286 my ($self, $value) = @_;
264 $CFG->{host} = $value; 287 $CFG->{host} = $value;
265 }); 288 });
266 289
267 $METASERVER = metaserver_dialog; 290 $METASERVER = metaserver_dialog;
268 291
269 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub { 292 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
270 update_metaserver $HOST; 293 update_metaserver $HOST;
271 }); 294 });
272 } 295 }
273 296
274 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 297 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
275 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { 298 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
276 my ($self, $value) = @_; 299 my ($self, $value) = @_;
277 $CFG->{user} = $value; 300 $CFG->{user} = $value;
278 }); 301 });
279 302
280 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 303 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
281 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 304 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
282 my ($self, $value) = @_; 305 my ($self, $value) = @_;
283 $CFG->{password} = $value; 306 $CFG->{password} = $value;
284 }); 307 });
285 308
286 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 309 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
287 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 310 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
288 my ($self, $value) = @_; 311 my ($self, $value) = @_;
289 $CFG->{say_command} = $value; 312 $CFG->{say_command} = $value;
290 }); 313 });
291 314
292 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); 315 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
293 $table->add (1, 7, new CFClient::UI::Slider 316 $table->add (1, 7, new CFClient::UI::Slider
294 req_w => 100, 317 req_w => 100,
295 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 318 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
296 connect_changed => sub { 319 connect_changed => sub {
297 my ($self, $value) = @_; 320 my ($self, $value) = @_;
… …
358 381
359 $window 382 $window
360} 383}
361 384
362sub sdl_init { 385sub sdl_init {
363 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 386 CFClient::SDL_Init
364 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
365 and die "SDL::Init failed!\n"; 387 and die "SDL::Init failed!\n";
366} 388}
367 389
368sub video_init { 390sub video_init {
369 sdl_init; 391 sdl_init;
370 392
371 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 393 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
372 $FULLSCREEN = $CFG->{fullscreen}; 394 $FULLSCREEN = $CFG->{fullscreen};
373 $FAST = $CFG->{fast}; 395 $FAST = $CFG->{fast};
374 396
375 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 397 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
376 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
377 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
378 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
379
380 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
381 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
382 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
383 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
384
385 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
386 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
387 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
388
389 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
390 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
391 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
392 or die "SDL::SetVideoMode failed!\n"; 398 or die "SDL_SetVideoMode failed!\n";
393
394 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
395 399
396 $SDL_EV = new SDL::Event; 400 $SDL_EV = new SDL::Event;
397 $SDL_EV->set_unicode (1); 401 $SDL_EV->set_unicode (1);
398 402
399 $SDL_ACTIVE = 1; 403 $SDL_ACTIVE = 1;
400 404
401 $LAST_REFRESH = time - 0.01; 405 $LAST_REFRESH = time - 0.01;
402 406
403 CFClient::gl_init; 407 CFClient::gl_init;
404 408
405 $FONTSIZE = int $HEIGHT / 40; 409 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
406 410
407 ############################################################################# 411 #############################################################################
408 412
409 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 413 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
410 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 414 $DEBUG_STATUS->show;
411 415
412 $STATUS_LINE = new CFClient::UI::Label 416 $STATUS_LINE = new CFClient::UI::Label
413 padding => 0, 417 padding => 0,
414 y => $HEIGHT * 44 / 45 - $FONTSIZE; 418 y => $HEIGHT - $FONTSIZE * 1.8;
415 $CFClient::UI::ROOT->add ($STATUS_LINE); 419 $STATUS_LINE->show;
416 420
417 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 421 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
418 padding => 0, 422 padding => 0,
419 y => $HEIGHT * 44 / 45,
420 fontsize => $HEIGHT / 45, 423 fontsize => 0.8,
421 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 424 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
422 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 425 $ALT_ENTER_MESSAGE->show;
426 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
423 427
424 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 428 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
425 $MAPWIDGET->focus_in; 429 $MAPWIDGET->focus_in;
426 $MAPWIDGET->connect (activate_console => sub { 430 $MAPWIDGET->connect (activate_console => sub {
427 my ($mapwidget, $preset) = @_; 431 my ($mapwidget, $preset) = @_;
428 432
429 if ($CONSOLE) { 433 if ($CONSOLE) {
… …
465 $CFClient::UI::ROOT->{children} = []; 469 $CFClient::UI::ROOT->{children} = [];
466 undef $SDL_ACTIVE; 470 undef $SDL_ACTIVE;
467 undef $SDL_EV; 471 undef $SDL_EV;
468} 472}
469 473
474my $bgmusic;#TODO#hack#d#
475
470sub audio_init { 476sub audio_init {
471 if ($CFG->{sound} || 1) { 477 if ($CFG->{audio_enable}) {
472 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 478 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
473 $SDL_MIXER = new SDL::Mixer; 479
474 $SDL_MIXER->allocate_channels (8); 480 $SDL_MIXER = !CFClient::Mix_OpenAudio;
481 CFClient::Mix_AllocateChannels 8;
482 CFClient::MixMusic::volume $CFG->{bgm_volume};
483
484 # TODO: hack, do play loop and mood music
485 if ($CFG->{bgm_enable}) {
486 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/game3.ogg";
487 $bgmusic->play;
488 }
475 489
476 while (<$fh>) { 490 while (<$fh>) {
477 next if /^\s*#/; 491 next if /^\s*#/;
478 next if /^\s*$/; 492 next if /^\s*$/;
479 493
480 my ($file, $volume, $event) = split /\s+/, $_, 3; 494 my ($file, $volume, $event) = split /\s+/, $_, 3;
481 495
482 push @SOUNDS, "$volume,$file"; 496 push @SOUNDS, "$volume,$file";
483 497
484 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 498 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
485 my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file"; 499 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
486 $chunk->volume ($volume * 128 / 100); 500 $chunk->volume ($volume * 128 / 100);
487 $chunk 501 $chunk
488 }; 502 };
489 } 503 }
490 } else { 504 } else {
… …
492 } 506 }
493 } 507 }
494} 508}
495 509
496sub audio_shutdown { 510sub audio_shutdown {
511 CFClient::Mix_CloseAudio if $SDL_MIXER;
497 undef $SDL_MIXER; 512 undef $SDL_MIXER;
498 @SOUNDS = (); 513 @SOUNDS = ();
499 %AUDIO_CHUNKS = (); 514 %AUDIO_CHUNKS = ();
500} 515}
501 516
… …
750} 765}
751 766
752sub conn::sound_play { 767sub conn::sound_play {
753 my ($self, $x, $y, $soundnum, $type) = @_; 768 my ($self, $x, $y, $soundnum, $type) = @_;
754 769
770 $SDL_MIXER
771 or return;
772
755 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]} 773 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
756 or return; 774 or return;
757 775
758 $SDL_MIXER->play_channel (-1, $chunk); 776 $chunk->play;
759 warn "sound $x,$y,$soundnum,$type\n";#d# 777# warn "sound $x,$y,$soundnum,$type\n";#d#
760} 778}
761 779
762sub conn::query { 780sub conn::query {
763 my ($self, $flags, $prompt) = @_; 781 my ($self, $flags, $prompt) = @_;
764 782
765 #TODO 783 #TODO, display dialog with relevant information
766 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 784 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
767} 785}
768 786
769sub conn::drawinfo { 787sub conn::drawinfo {
770 my ($self, $color, $text) = @_; 788 my ($self, $color, $text) = @_;
… …
786 ); 804 );
787 805
788 $LOGVIEW->add_paragraph ($color[$color], $text); 806 $LOGVIEW->add_paragraph ($color[$color], $text);
789} 807}
790 808
809sub conn::spell_add {
810 my ($self, $spell) = @_;
811
812 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
813 });
814 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
815 });
816}
817
818sub conn::spell_delete {
819 my ($self, $spell) = @_;
820}
821
822sub conn::addme_success {
823 my ($self) = @_;
824
825 for my $skill (values %{$self->{skill_info}}) {
826 $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
827 });
828 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
829 });
830 }
831}
832
791%SDL_CB = ( 833%SDL_CB = (
792 SDL_QUIT() => sub { 834 CFClient::SDL_QUIT => sub {
793 Event::unloop -1; 835 Event::unloop -1;
794 }, 836 },
795 SDL_VIDEORESIZE() => sub { 837 CFClient::SDL_VIDEORESIZE => sub {
796 }, 838 },
797 SDL_VIDEOEXPOSE() => sub { 839 CFClient::SDL_VIDEOEXPOSE => sub {
798 refresh; 840 refresh;
799 }, 841 },
800 SDL_KEYDOWN() => sub { 842 CFClient::SDL_KEYDOWN => sub {
801 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 843 if ($SDL_EV->key_mod & CFClient::KMOD_ALT && $SDL_EV->key_sym == 13) {
802 # alt-enter 844 # alt-enter
803 video_shutdown; 845 video_shutdown;
804 $CFG->{fullscreen} = !$CFG->{fullscreen}; 846 $CFG->{fullscreen} = !$CFG->{fullscreen};
805 video_init; 847 video_init;
806 } else { 848 } else {
807 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 849 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
808 } 850 }
809 }, 851 },
810 SDL_KEYUP() => sub { 852 CFClient::SDL_KEYUP => sub {
811 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 853 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
812 }, 854 },
813 SDL_MOUSEMOTION() => sub { 855 CFClient::SDL_MOUSEMOTION => sub {
814 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 856 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
815 }, 857 },
816 SDL_MOUSEBUTTONDOWN() => sub { 858 CFClient::SDL_MOUSEBUTTONDOWN => sub {
817 CFClient::UI::feed_sdl_button_down_event ($SDL_EV); 859 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
818 }, 860 },
819 SDL_MOUSEBUTTONUP() => sub { 861 CFClient::SDL_MOUSEBUTTONUP => sub {
820 CFClient::UI::feed_sdl_button_up_event ($SDL_EV); 862 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
821 }, 863 },
822 SDL_ACTIVEEVENT() => sub { 864 CFClient::SDL_ACTIVEEVENT => sub {
823# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 865# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
824 }, 866 },
825); 867);
826 868
827############################################################################# 869#############################################################################
… …
840 fullscreen => 0, 882 fullscreen => 0,
841 fast => 0, 883 fast => 0,
842 fow_enable => 1, 884 fow_enable => 1,
843 fow_intensity => 0.45, 885 fow_intensity => 0.45,
844 fow_smooth => 0, 886 fow_smooth => 0,
887 gui_fontsize => 1,
845 log_fontsize => 14, 888 log_fontsize => 14,
846 mapsize => 100, 889 mapsize => 100,
847 host => "crossfire.schmorp.de", 890 host => "crossfire.schmorp.de",
848 say_command => 'say', 891 say_command => 'say',
892 audio_enable => 1,
893 bgm_enable => 1,
894 bgm_volume => 64,
849); 895);
850 896
851while (my ($k, $v) = each %DEF_CFG) { 897while (my ($k, $v) = each %DEF_CFG) {
852 $CFG->{$k} = $v unless exists $CFG->{$k}; 898 $CFG->{$k} = $v unless exists $CFG->{$k};
853} 899}
854 900
855sdl_init; 901sdl_init;
856 902
857@SDL_MODES = reverse 903@SDL_MODES = reverse
858 grep $_->[0] >= 640 && $_->[1] >= 480, 904 grep $_->[0] >= 640 && $_->[1] >= 480,
859 map [SDL::RectW ($_), SDL::RectH ($_)], 905 CFClient::SDL_ListModes;
860 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
861 906
862@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 907@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
863 908
864$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 909$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
865 910

Diff Legend

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