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.133 by root, Tue Apr 18 02:38:51 2006 UTC vs.
Revision 1.141 by root, Wed Apr 19 06:21:07 2006 UTC

… …
8 8
9use SDL; 9use SDL;
10use SDL::App; 10use SDL::App;
11use SDL::Event; 11use SDL::Event;
12use SDL::Surface; 12use SDL::Surface;
13
14use SDL::Mixer;
15use SDL::Sound;
16use SDL::Music;
17
13use SDL::OpenGL; 18use SDL::OpenGL;
14 19
15use Crossfire; 20use Crossfire;
16use Crossfire::Protocol; 21use Crossfire::Protocol;
17 22
18use Compress::LZF; 23use Compress::LZF;
19 24
20use CFClient; 25use CFClient;
21use CFClient::UI; 26use CFClient::UI;
27use CFClient::MapWidget;
22 28
23our $VERSION = '0.1'; 29our $VERSION = '0.1';
24 30
25my $MAX_FPS = 60; 31my $MAX_FPS = 60;
26my $MIN_FPS = 5; # unused as of yet 32my $MIN_FPS = 5; # unused as of yet
… …
54our $GAUGES; 60our $GAUGES;
55 61
56our $SDL_ACTIVE; 62our $SDL_ACTIVE;
57our $SDL_EV; 63our $SDL_EV;
58our %SDL_CB; 64our %SDL_CB;
65
66our $SDL_MIXER;
67our @SOUNDS; # event => file mapping
68our %AUDIO_CHUNKS; # audio files
59 69
60our $ALT_ENTER_MESSAGE; 70our $ALT_ENTER_MESSAGE;
61our $STATUS_LINE; 71our $STATUS_LINE;
62our $DEBUG_STATUS; 72our $DEBUG_STATUS;
63 73
… …
101} 111}
102 112
103sub client_setup { 113sub client_setup {
104 my $dialog = new CFClient::UI::FancyFrame 114 my $dialog = new CFClient::UI::FancyFrame
105 child => (my $vbox = new CFClient::UI::VBox); 115 child => (my $vbox = new CFClient::UI::VBox);
106 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); 116 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
107 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 117 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
108 118
109 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 119 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
110 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 120 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
111 121
112 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 122 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
113 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8); 123 $hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8);
114 124
115 $mode_slider->connect (changed => sub { 125 $mode_slider->connect (changed => sub {
116 my ($self, $value) = @_; 126 my ($self, $value) = @_;
117 127
118 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 128 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
119 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 129 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
120 }); 130 });
121 $mode_slider->emit (changed => $mode_slider->{range}[0]); 131 $mode_slider->emit (changed => $mode_slider->{range}[0]);
122 132
123 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen"); 133 $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
124 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 134 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
125 my ($self, $value) = @_; 135 my ($self, $value) = @_;
126 $CFG->{fullscreen} = $value; 136 $CFG->{fullscreen} = $value;
127 }); 137 });
128 138
129 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); 139 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
130 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 140 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
131 my ($self, $value) = @_; 141 my ($self, $value) = @_;
132 $CFG->{fast} = $value; 142 $CFG->{fast} = $value;
133 }); 143 });
134 144
135 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); 145 $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
136 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 146 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
137 my ($self, $value) = @_; 147 my ($self, $value) = @_;
138 $CFG->{fow_enable} = $value; 148 $CFG->{fow_enable} = $value;
139 }); 149 });
140 150
141 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); 151 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
142 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 152 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
143 my ($self, $value) = @_; 153 my ($self, $value) = @_;
144 $CFG->{fow_intensity} = $value; 154 $CFG->{fow_intensity} = $value;
145 }); 155 });
146 156
147 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 157 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
148 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 158 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
149 my ($self, $value) = @_; 159 my ($self, $value) = @_;
150 $CFG->{fow_smooth} = $value; 160 $CFG->{fow_smooth} = $value;
151 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 161 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
152 }); 162 });
153 163
154 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 164 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
165 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
166 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
167# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
168 });
169
170 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
155 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 171 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
156 my ($self, $value) = @_;
157 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 172 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
158 }); 173 });
159 174
160 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 175 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
161 destroy_screen (); 176 video_shutdown ();
162 init_screen (); 177 video_init ();
178 });
179
180 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
181 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
182 $CFG->{audio_enable} = $_[1];
183 });
184# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
185# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
186# $CFG->{effects_volume} = $_[1];
187# });
188 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
189 $table->add (1, 10, my $hbox = new CFClient::UI::HBox);
190 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
191 $CFG->{bgm_enable} = $_[1];
192 });
193 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 128, 1], connect_changed => sub {
194 $CFG->{bgm_volume} = $_[1];
195 $SDL_MIXER->music_volume ($_[1]);
196 });
197
198 $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
199 audio_shutdown ();
200 audio_init ();
163 }); 201 });
164 202
165 $dialog 203 $dialog
166} 204}
167 205
… …
231 $HOST->set_text ($CFG->{host} = $host); 269 $HOST->set_text ($CFG->{host} = $host);
232 }), 270 }),
233 (new CFClient::UI::Empty expand => 1), 271 (new CFClient::UI::Empty expand => 1),
234 ]); 272 ]);
235 273
236 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 274 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
237 for 0 .. $#$m; 275 for 0 .. $#$m;
238 } 276 }
239 } 277 }
240 }); 278 });
241} 279}
242 280
243sub server_setup { 281sub server_setup {
244 my $dialog = new CFClient::UI::FancyFrame 282 my $dialog = new CFClient::UI::FancyFrame
245 child => (my $vbox = new CFClient::UI::VBox); 283 child => (my $vbox = new CFClient::UI::VBox);
246 284
247 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); 285 $vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
248 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 286 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
249 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); 287 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
250 288
251 { 289 {
252 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 290 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
253 291
254 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 292 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
255 my ($self, $value) = @_; 293 my ($self, $value) = @_;
256 $CFG->{host} = $value; 294 $CFG->{host} = $value;
257 }); 295 });
258 296
259 $METASERVER = metaserver_dialog; 297 $METASERVER = metaserver_dialog;
260 298
261 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub { 299 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
262 update_metaserver $HOST; 300 update_metaserver $HOST;
263 }); 301 });
264 } 302 }
265 303
266 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 304 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
267 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { 305 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
268 my ($self, $value) = @_; 306 my ($self, $value) = @_;
269 $CFG->{user} = $value; 307 $CFG->{user} = $value;
270 }); 308 });
271 309
272 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 310 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
273 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 311 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
274 my ($self, $value) = @_; 312 my ($self, $value) = @_;
275 $CFG->{password} = $value; 313 $CFG->{password} = $value;
276 }); 314 });
277 315
278 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 316 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
279 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 317 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
280 my ($self, $value) = @_; 318 my ($self, $value) = @_;
281 $CFG->{say_command} = $value; 319 $CFG->{say_command} = $value;
282 }); 320 });
283 321
284 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); 322 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
285 $table->add (1, 7, new CFClient::UI::Slider 323 $table->add (1, 7, new CFClient::UI::Slider
286 req_w => 100, 324 req_w => 100,
287 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 325 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
288 connect_changed => sub { 326 connect_changed => sub {
289 my ($self, $value) = @_; 327 my ($self, $value) = @_;
… …
355 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 393 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
356 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO 394 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
357 and die "SDL::Init failed!\n"; 395 and die "SDL::Init failed!\n";
358} 396}
359 397
360sub init_screen { 398sub video_init {
361 sdl_init; 399 sdl_init;
362 400
363 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 401 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
364 $FULLSCREEN = $CFG->{fullscreen}; 402 $FULLSCREEN = $CFG->{fullscreen};
365 $FAST = $CFG->{fast}; 403 $FAST = $CFG->{fast};
… …
392 430
393 $LAST_REFRESH = time - 0.01; 431 $LAST_REFRESH = time - 0.01;
394 432
395 CFClient::gl_init; 433 CFClient::gl_init;
396 434
397 $FONTSIZE = int $HEIGHT / 40; 435 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
398 436
399 ############################################################################# 437 #############################################################################
400 438
401 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 439 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
402 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 440 $DEBUG_STATUS->show;
403 441
404 $STATUS_LINE = new CFClient::UI::Label 442 $STATUS_LINE = new CFClient::UI::Label
405 padding => 0, 443 padding => 0,
406 y => $HEIGHT * 44 / 45 - $FONTSIZE; 444 y => $HEIGHT - $FONTSIZE * 1.8;
407 $CFClient::UI::ROOT->add ($STATUS_LINE); 445 $STATUS_LINE->show;
408 446
409 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 447 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
410 padding => 0, 448 padding => 0,
411 y => $HEIGHT * 44 / 45,
412 fontsize => $HEIGHT / 45, 449 fontsize => 0.8,
413 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 450 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
414 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 451 $ALT_ENTER_MESSAGE->show;
452 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
415 453
416 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 454 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
417 $MAPWIDGET->focus_in; 455 $MAPWIDGET->focus_in;
418 $MAPWIDGET->connect (activate_console => sub { 456 $MAPWIDGET->connect (activate_console => sub {
419 my ($mapwidget, $preset) = @_; 457 my ($mapwidget, $preset) = @_;
420 458
421 if ($CONSOLE) { 459 if ($CONSOLE) {
… …
451 489
452 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg }; 490 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
453 $CFClient::UI::ROOT->add ($tgw); 491 $CFClient::UI::ROOT->add ($tgw);
454} 492}
455 493
456sub destroy_screen { 494sub video_shutdown {
457 $CFClient::UI::ROOT->{children} = []; 495 $CFClient::UI::ROOT->{children} = [];
458 undef $SDL_ACTIVE; 496 undef $SDL_ACTIVE;
459 undef $SDL_EV; 497 undef $SDL_EV;
460 SDL::Quit; 498}
499
500my $bgmusic;#TODO#hack#d#
501
502sub audio_init {
503 if ($CFG->{audio_enable}) {
504 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
505 $SDL_MIXER = new SDL::Mixer;
506 $SDL_MIXER->allocate_channels (8);
507
508 # TODO: hack, do play loop and mood music
509 if ($CFG->{bgm_enable}) {
510 $bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
511 $SDL_MIXER->play_music ($bgmusic, -1);
512 $SDL_MIXER->music_volume ($CFG->{bgm_volume});
513 }
514
515 while (<$fh>) {
516 next if /^\s*#/;
517 next if /^\s*$/;
518
519 my ($file, $volume, $event) = split /\s+/, $_, 3;
520
521 push @SOUNDS, "$volume,$file";
522
523 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
524 my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";
525 $chunk->volume ($volume * 128 / 100);
526 $chunk
527 };
528 }
529 } else {
530 status "unable to open sound config: $!";
531 }
532 }
533}
534
535sub audio_shutdown {
536 undef $SDL_MIXER;
537 @SOUNDS = ();
538 %AUDIO_CHUNKS = ();
461} 539}
462 540
463my %animate_object; 541my %animate_object;
464my $animate_timer; 542my $animate_timer;
465 543
… …
706 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 784 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
707 $MAPWIDGET->update; 785 $MAPWIDGET->update;
708 786
709 $tex 787 $tex
710 }; 788 };
789}
790
791sub conn::sound_play {
792 my ($self, $x, $y, $soundnum, $type) = @_;
793
794 $SDL_MIXER
795 or return;
796
797 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
798 or return;
799
800 $SDL_MIXER->play_channel (-1, $chunk);
801 warn "sound $x,$y,$soundnum,$type\n";#d#
711} 802}
712 803
713sub conn::query { 804sub conn::query {
714 my ($self, $flags, $prompt) = @_; 805 my ($self, $flags, $prompt) = @_;
715 806
… …
749 refresh; 840 refresh;
750 }, 841 },
751 SDL_KEYDOWN() => sub { 842 SDL_KEYDOWN() => sub {
752 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 843 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
753 # alt-enter 844 # alt-enter
754 destroy_screen; 845 video_shutdown;
755 $CFG->{fullscreen} = !$CFG->{fullscreen}; 846 $CFG->{fullscreen} = !$CFG->{fullscreen};
756 init_screen; 847 video_init;
757 } else { 848 } else {
758 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 849 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
759 } 850 }
760 }, 851 },
761 SDL_KEYUP() => sub { 852 SDL_KEYUP() => sub {
… …
791 fullscreen => 0, 882 fullscreen => 0,
792 fast => 0, 883 fast => 0,
793 fow_enable => 1, 884 fow_enable => 1,
794 fow_intensity => 0.45, 885 fow_intensity => 0.45,
795 fow_smooth => 0, 886 fow_smooth => 0,
887 gui_fontsize => 1,
796 log_fontsize => 14, 888 log_fontsize => 14,
797 mapsize => 100, 889 mapsize => 100,
798 host => "crossfire.schmorp.de", 890 host => "crossfire.schmorp.de",
799 say_command => 'say', 891 say_command => 'say',
892 audio_enable => 1,
893 bgm_enable => 1,
894 bgm_volume => 64,
800); 895);
801 896
802while (my ($k, $v) = each %DEF_CFG) { 897while (my ($k, $v) = each %DEF_CFG) {
803 $CFG->{$k} = $v unless exists $CFG->{$k}; 898 $CFG->{$k} = $v unless exists $CFG->{$k};
804} 899}
… …
819 914
820 CFClient::add_font $_ for @fonts; 915 CFClient::add_font $_ for @fonts;
821 CFClient::set_font $fonts[0]; 916 CFClient::set_font $fonts[0];
822} 917}
823 918
824init_screen; 919video_init;
920audio_init;
825 921
826Event::loop; 922Event::loop;
827 923
828END { SDL::Quit } 924END { SDL::Quit }
829 925

Diff Legend

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