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.77 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.150 by root, Thu Apr 20 07:12:58 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use Glib; 6use Time::HiRes 'time';
7use Gtk2 -init;
8
9use SDL;
10use SDL::App;
11use SDL::Event; 7use Event;
12use SDL::Surface;
13use SDL::OpenGL;
14use SDL::OpenGL::Constants;
15 8
16use Crossfire; 9use Crossfire;
17use Crossfire::Protocol; 10use Crossfire::Protocol;
18 11
12use Compress::LZF;
13
19use CFClient; 14use CFClient;
20use CFClient::UI; 15use CFClient::UI;
16use CFClient::MapWidget;
21 17
22our $VERSION = '0.1'; 18our $VERSION = '0.1';
23 19
24my $MAX_FPS = 60; 20my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame 21my $MIN_FPS = 5; # unused as of yet
26 22
23our $META_SERVER = "crossfire.real-time.com:13326";
24
25our $FACEMAP;
26our $TILECACHE;
27our $FACECACHE; 27our $MAPCACHE;
28
29our $LAST_REFRESH;
30our $NOW;
28 31
29our $CFG; 32our $CFG;
30our $CONN; 33our $CONN;
34our $FAST; # fast, low-quality mode, possibly useful for software-rendering
31 35
32our @SDL_MODES; 36our @SDL_MODES;
33our $WIDTH; 37our $WIDTH;
34our $HEIGHT; 38our $HEIGHT;
35our $FULLSCREEN; 39our $FULLSCREEN;
40our $FONTSIZE;
36 41
37our $NOW; 42our $MAP;
38
39our $MAPWIDGET; 43our $MAPWIDGET;
40our $FONTSIZE; 44our $BUTTONBAR;
45our $LOGVIEW;
46our $CONSOLE;
47our $METASERVER;
41 48
49our $GAUGES;
50
42our $SDL_TIMER; 51our $SDL_ACTIVE;
43our $SDL_APP;
44our $SDL_EV;
45our %SDL_CB; 52our %SDL_CB;
53
54our $SDL_MIXER;
55our @SOUNDS; # event => file mapping
56our %AUDIO_CHUNKS; # audio files
46 57
47our $ALT_ENTER_MESSAGE; 58our $ALT_ENTER_MESSAGE;
48our $STATUS_LINE; 59our $STATUS_LINE;
49our $DEBUG_STATUS; 60our $DEBUG_STATUS;
50 61
51my $last_refresh; 62sub status {
52my %ANIMATE; 63 $STATUS_LINE->set_text ($_[0]);
53my $refresh_handler; 64 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
65}
54 66
55our ($tw, $te); # Test widget #d# 67sub debug {
68 $DEBUG_STATUS->set_text ($_[0]);
69 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
70}
56 71
57sub init_screen { 72sub start_game {
58 $SDL_APP = new SDL::App 73 status "logging in...";
59 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
60 -title => "Crossfire+ Client",
61 -width => $WIDTH,
62 -height => $HEIGHT,
63 -opengl => 1,
64 -red_size => 5,
65 -green_size => 5,
66 -blue_size => 5,
67 -alpha_size => 0,
68 -double_buffer => 1,
69 -fullscreen => $FULLSCREEN,
70 -resizeable => 0;
71 74
72 $SDL_EV = new SDL::Event; 75 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
73 $SDL_EV->set_unicode (1);
74 76
75 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub { 77 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
76 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
77 while $SDL_EV->poll;
78 78
79 1 79 $MAP = new CFClient::Map $mapsize, $mapsize;
80 };
81 80
82 $last_refresh = SDL::GetTicks; 81 my ($host, $port) = split /:/, $CFG->{host};
83
84 CFClient::gl_init;
85
86 $FONTSIZE = int $HEIGHT / 40;
87
88 #############################################################################
89
90 glClearColor 0.45, 0.45, 0.45, 1;
91
92 glEnable GL_TEXTURE_2D;
93 glEnable GL_COLOR_MATERIAL;
94 glShadeModel GL_FLAT;
95 glDisable GL_DEPTH_TEST;
96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
97
98 #############################################################################
99
100 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
102 82
103 $STATUS_LINE = new CFClient::UI::Label
104 padding => 0,
105 y => $HEIGHT * 49 / 50 - $FONTSIZE;
106 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
107
108 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
109 padding => 0,
110 y => $HEIGHT * 49 / 50,
111 height => $HEIGHT / 50,
112 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
113 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
114
115 $MAPWIDGET = new CFClient::UI::MapWidget;
116 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
117 $MAPWIDGET->focus_in;
118}
119
120sub destroy_screen {
121 remove Glib::Source $SDL_TIMER;
122 undef $SDL_APP;
123 undef $SDL_EV;
124 SDL::Quit;
125}
126
127sub config_dialog {
128 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
129 child => (my $vbox = new CFClient::UI::VBox);
130 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
131 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
132
133 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
134 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
135
136 $hbox->add (my $mode_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
137 $hbox->add (my $mode_label = new CFClient::UI::Label);
138
139 $mode_slider->connect (changed => sub {
140 my (undef, $value) = @_;
141
142 $CFG->{sdl_mode} = $value = int $value + 0.5;
143 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
144 });
145 $mode_slider->emit (changed => $mode_slider->{range}[0]);
146
147 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
148 $table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
149
150 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
151 $table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
152
153 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
154 $table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
155
156 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
157 $table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
158
159 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
160 $table->add (1, 5, my $mapsize_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{mapsize}, 10, 100 + 1, 1]);
161
162 $CFClient::UI::TOPLEVEL->add ($dialog);
163}
164
165sub start_game {
166 $WIDTH = $CFG->{width};
167 $HEIGHT = $CFG->{height};
168 $FULLSCREEN = 0;
169
170 init_screen;
171
172 config_dialog;
173
174 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
175
176 $CONN = new conn 83 $CONN = new conn
177 host => $CFG->{host}, 84 host => $host,
178 port => $CFG->{port}, 85 port => $port || 13327,
179 user => $CFG->{user}, 86 user => $CFG->{user},
180 pass => $CFG->{password}, 87 pass => $CFG->{password},
181 mapw => $mapsize, 88 mapw => $mapsize,
182 maph => $mapsize, 89 maph => $mapsize,
183 ; 90 ;
184 91
92 status "login successful";
93
185 CFClient::lowdelay fileno $CONN->{fh}; 94 CFClient::lowdelay fileno $CONN->{fh};
186} 95}
187 96
188sub stop_game { 97sub stop_game {
189 remove Glib::Source $refresh_handler if $refresh_handler;
190 undef $refresh_handler;
191
192 undef $CONN; 98 undef $CONN;
193 destroy_screen;
194} 99}
195 100
196sub force_refresh { 101sub client_setup {
197 glViewport 0, 0, $WIDTH, $HEIGHT; 102 my $dialog = new CFClient::UI::FancyFrame
103 title => "Client Setup",
104 child => (my $vbox = new CFClient::UI::VBox);
105 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
198 106
199 glMatrixMode GL_PROJECTION; 107 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
200 glLoadIdentity; 108 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
201 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
202 glMatrixMode GL_MODELVIEW;
203 glLoadIdentity;
204 109
205 glClear GL_COLOR_BUFFER_BIT; 110 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
111 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
206 112
207 $CFClient::UI::TOPLEVEL->draw; 113 $mode_slider->connect (changed => sub {
114 my ($self, $value) = @_;
208 115
209 SDL::GLSwapBuffers; 116 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
210} 117 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
118 });
119 $mode_slider->emit (changed => $mode_slider->{range}[0]);
211 120
212sub debug { 121 $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
213 $DEBUG_STATUS->set_text ($_[0]); 122 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
214 my ($w, $h) = $DEBUG_STATUS->size_request; 123 my ($self, $value) = @_;
215 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h); 124 $CFG->{fullscreen} = $value;
216} 125 });
217 126
218my $FPS; 127 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
128 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
129 my ($self, $value) = @_;
130 $CFG->{fast} = $value;
131 });
219 132
220sub refresh { 133 $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
221 $refresh_handler ||= add Glib::Idle sub { 134 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
222 if ($SDL_APP) { 135 my ($self, $value) = @_;
223 $NOW = SDL::GetTicks; 136 $CFG->{fow_enable} = $value;
137 });
224 138
225 if ($NOW - $last_refresh < $TICKS_PER_FRAME) { 139 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
226 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh); 140 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
227 $NOW = SDL::GetTicks; 141 my ($self, $value) = @_;
142 $CFG->{fow_intensity} = $value;
143 });
144
145 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
146 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
147 my ($self, $value) = @_;
148 $CFG->{fow_smooth} = $value;
149 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
150 });
151
152 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
153 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
154 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
155# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
156 });
157
158 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
159 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
160 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
161 });
162
163 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
164 video_shutdown ();
165 video_init ();
166 });
167
168 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
169 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
170 $CFG->{audio_enable} = $_[1];
171 });
172# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
173# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
174# $CFG->{effects_volume} = $_[1];
175# });
176 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
177 $table->add (1, 10, my $hbox = new CFClient::UI::HBox);
178 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
179 $CFG->{bgm_enable} = $_[1];
180 });
181 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
182 $CFG->{bgm_volume} = $_[1];
183 CFClient::MixMusic::volume $_[1] * 128;
184 });
185
186 $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
187 audio_shutdown ();
188 audio_init ();
189 });
190
191 $dialog
192}
193
194sub metaserver_dialog {
195 my $dialog = new CFClient::UI::FancyFrame
196 title => "Metaserver",
197 child => (my $vbox = new CFClient::UI::VBox);
198
199 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
200
201 $dialog
202}
203
204sub update_metaserver {
205 my ($HOST) = @_;
206
207 status "fetching metaserver list...";
208
209 my $buf;
210
211 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
212
213 Event->io (fd => $fh, poll => 'r', cb => sub {
214 my $res = sysread $fh, $buf, 8192, length $buf;
215
216 if (!defined $res) {
217 $_[0]->w->cancel;
218 status "metaserver: $!";
219 } elsif ($res == 0) {
220 $_[0]->w->cancel;
221 status "server list retrieved";
222
223 my $table = $METASERVER->{table};
224
225 $table->clear;
226
227 my @col = qw(Use #Users Host Uptime Version Description);
228 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
229 for 0 .. $#col;
230
231 my @align = qw(1 0 1 1 -1);
232
233 my $y = 0;
234 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
235 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
236
237 for ($desc) {
238 s/<br>/\n/gi;
239 s/<li>/\n· /gi;
240 s/<.*?>//sgi;
241 s/&/&amp;/g;
242 s/</&lt;/g;
243 s/>/&gt;/g;
244 }
245
246 $uptime = sprintf "%dd %02d:%02d:%02d",
247 (int $m->[8] / 86400),
248 (int $m->[8] / 3600) % 24,
249 (int $m->[8] / 60) % 60,
250 $m->[8] % 60;
251
252 $m = [$users, $host, $uptime, $version, $desc];
253
254 $y++;
255
256 $table->add (0, $y, new CFClient::UI::VBox children => [
257 (new CFClient::UI::Button text => " ", connect_activate => sub {
258 $HOST->set_text ($CFG->{host} = $host);
259 }),
260 (new CFClient::UI::Empty expand => 1),
261 ]);
262
263 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
264 for 0 .. $#$m;
228 } 265 }
266 }
267 });
268}
269
270sub server_setup {
271 my $dialog = new CFClient::UI::FancyFrame
272 title => "Server Setup",
273 child => (my $vbox = new CFClient::UI::VBox);
274
275 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
276 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
277
278 {
279 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
280
281 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
282 my ($self, $value) = @_;
283 $CFG->{host} = $value;
284 });
285
286 $METASERVER = metaserver_dialog;
287
288 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
289 update_metaserver $HOST;
290 });
291 }
292
293 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
294 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
295 my ($self, $value) = @_;
296 $CFG->{user} = $value;
297 });
298
299 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
300 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
301 my ($self, $value) = @_;
302 $CFG->{password} = $value;
303 });
304
305 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
306 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
307 my ($self, $value) = @_;
308 $CFG->{say_command} = $value;
309 });
310
311 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
312 $table->add (1, 7, new CFClient::UI::Slider
313 req_w => 100,
314 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
315 connect_changed => sub {
316 my ($self, $value) = @_;
317
318 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
319 },
320 );
321
322 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
323 start_game;
324 });
325
326 $dialog
327}
328
329sub message_window {
330 my $window = new CFClient::UI::FancyFrame
331 title => "Messages",
332 border_bg => [1, 1, 1, 0.5],
333 bg => [0.3, 0.3, 0.3, 0.8],
334 user_w => int $::WIDTH / 3,
335 user_h => int $::HEIGHT / 5,
336 child => (my $vbox = new CFClient::UI::VBox);
337
338 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
339 expand => 1,
340 fontsize => $::CFG->{log_fontsize},
341 );
342
343 $vbox->add (my $input = new CFClient::UI::Entry
344 connect_focus_in => sub {
345 my ($input, $prev_focus) = @_;
346
347 delete $input->{refocus_map};
348
349 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
350 $input->{refocus_map} = 1;
351 }
352 delete $input->{auto_activated};
353 },
354 connect_activate => sub {
355 my ($input, $text) = @_;
356 $input->set_text ('');
357
358 if ($text =~ /^\/(.*)/) {
359 $::CONN->user_send ($1);
360 } else {
361 my $say_cmd = $::CFG->{say_command} || 'say';
362 $::CONN->user_send ("$say_cmd $text");
363 }
364 if ($input->{refocus_map}) {
365 delete $input->{refocus_map};
366 $MAPWIDGET->focus_in
367 }
368 },
369 connect_escape => sub {
370 $MAPWIDGET->focus_in
371 },
372 );
373
374 $CONSOLE = {
375 window => $window,
376 input => $input
377 };
378
379 $window
380}
381
382sub sdl_init {
383 CFClient::SDL_Init
384 and die "SDL::Init failed!\n";
385}
386
387sub video_init {
388 sdl_init;
389
390 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
391 $FULLSCREEN = $CFG->{fullscreen};
392 $FAST = $CFG->{fast};
393
394 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
395 or die "SDL_SetVideoMode failed!\n";
396
397 $SDL_ACTIVE = 1;
398
399 $LAST_REFRESH = time - 0.01;
400
401 CFClient::gl_init;
402
403 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
404
405 #############################################################################
406
407 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
408 $DEBUG_STATUS->show;
409
410 $STATUS_LINE = new CFClient::UI::Label
411 padding => 0,
412 y => $HEIGHT - $FONTSIZE * 1.8;
413 $STATUS_LINE->show;
414
415 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
416 padding => 0,
417 fontsize => 0.8,
418 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
419 $ALT_ENTER_MESSAGE->show;
420 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
421
422 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
423 $MAPWIDGET->focus_in;
424 $MAPWIDGET->connect (activate_console => sub {
425 my ($mapwidget, $preset) = @_;
426
427 if ($CONSOLE) {
428 $CONSOLE->{input}->{auto_activated} = 1;
429 $CONSOLE->{input}->focus_in;
430
431 if ($preset && $CONSOLE->{input}->get_text eq '') {
432 $CONSOLE->{input}->set_text ($preset);
433 }
434 }
435 });
436
437 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
438
439 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
440 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
441 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
442
443 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
444 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
445 status "Configuration Saved";
446 });
447
448 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
449
450 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0, title => "Stats");
451 $tgw->add (my $hbox = new CFClient::UI::HBox ());
452
453 $hbox->add (my $hg = new CFClient::UI::Gauge (type => 'hp'));
454 $hbox->add (my $mg = new CFClient::UI::Gauge (type => 'mana'));
455 $hbox->add (my $gg = new CFClient::UI::Gauge (type => 'grace'));
456 $hbox->add (my $fg = new CFClient::UI::Gauge (type => 'food'));
457
458 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
459 $CFClient::UI::ROOT->add ($tgw);
460}
461
462sub video_shutdown {
463 $CFClient::UI::ROOT->{children} = [];
464 undef $SDL_ACTIVE;
465}
466
467my $bgmusic;#TODO#hack#d#
468
469sub audio_init {
470 if ($CFG->{audio_enable}) {
471 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
229 472
230 my $interval = ($NOW - $last_refresh) * 0.001; 473 $SDL_MIXER = !CFClient::Mix_OpenAudio;
231 $last_refresh = $NOW; 474 CFClient::Mix_AllocateChannels 8;
475 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
232 476
233 if ($interval) { 477 # TODO: hack, do play loop and mood music
234 $FPS ||= 1 / $interval; 478 if ($CFG->{bgm_enable}) {
235 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1; 479 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/game3.ogg";
236 debug sprintf "%5.02f", $FPS; 480 $bgmusic->play;
237 } 481 }
238 482
239 force_refresh; 483 while (<$fh>) {
240 $_->animate ($interval) for grep $_, values %ANIMATE; 484 next if /^\s*#/;
485 next if /^\s*$/;
241 486
242 if (%ANIMATE) { 487 my ($file, $volume, $event) = split /\s+/, $_, 3;
488
489 push @SOUNDS, "$volume,$file";
490
491 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
492 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
493 $chunk->volume ($volume * 128 / 100);
494 $chunk
243 1 495 };
244 } else {
245 undef $refresh_handler;
246 0
247 } 496 }
248 } else { 497 } else {
249 undef $refresh_handler; 498 status "unable to open sound config: $!";
250 0
251 } 499 }
252 }; 500 }
501}
502
503sub audio_shutdown {
504 CFClient::Mix_CloseAudio if $SDL_MIXER;
505 undef $SDL_MIXER;
506 @SOUNDS = ();
507 %AUDIO_CHUNKS = ();
508}
509
510my %animate_object;
511my $animate_timer;
512
513my $want_refresh;
514my $can_refresh;
515
516my $fps = 9;
517
518sub force_refresh {
519 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
520 debug sprintf "%3.2f", $fps;
521
522 $want_refresh = 0;
523 $can_refresh = 0;
524
525 $CFClient::UI::ROOT->draw;
526
527 CFClient::SDL_GL_SwapBuffers;
528
529 $LAST_REFRESH = $NOW;
530}
531
532my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
533 $NOW = time;
534
535 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
536 for CFClient::SDL_PollEvent;
537
538 if (%animate_object) {
539 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
540 $want_refresh++;
541 }
542
543 if ($want_refresh) {
544 force_refresh;
545 } else {
546 $can_refresh = 1;
547 }
548});
549
550sub refresh {
551 $want_refresh++;
253} 552}
254 553
255sub animation_start { 554sub animation_start {
256 my ($widget) = @_; 555 my ($widget) = @_;
257 $ANIMATE{$widget} = $widget; 556 $animate_object{$widget} = $widget;
258 Scalar::Util::weaken $ANIMATE{$widget};
259
260 refresh;
261} 557}
262 558
263sub animation_stop { 559sub animation_stop {
264 my ($widget) = @_; 560 my ($widget) = @_;
265 delete $ANIMATE{$widget}; 561 delete $animate_object{$widget};
562}
563
564@conn::ISA = Crossfire::Protocol::;
565
566sub conn::stats_update {
567 my ($self, $stats) = @_;
568
569 # i love text protocols!!!
570 # FIXME: the stats are somehow weird
571 my $hp = $stats->{1};
572 my $hp_m = $stats->{2};
573 my $sp = $stats->{3};
574 my $sp_m = $stats->{4};
575 my $fo = $stats->{18};
576 my $fo_m = 999;
577 my $gr = $stats->{23};
578 my $gr_m = $stats->{24};
579
580 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
581 $GAUGES->{hp} ->set_value ($hp, $hp_m);
582 $GAUGES->{mana} ->set_value ($sp, $sp_m);
583 $GAUGES->{food} ->set_value ($fo, $fo_m);
584 $GAUGES->{grace}->set_value ($gr, $gr_m);
585}
586
587sub conn::user_send {
588 my ($self, $command) = @_;
589
590 $self->send_command ($command);
591 status $command;
592}
593
594sub conn::map_scroll {
595 my ($self, $dx, $dy) = @_;
596
597 $MAP->scroll ($dx, $dy);
598}
599
600sub conn::feed_map1a {
601 my ($self, $data) = @_;
602
603# $self->Crossfire::Protocol::feed_map1a ($data);
604
605 $MAP->map1a_update ($data);
606 $MAPWIDGET->update;
607}
608
609sub conn::flush_map {
610 my ($self) = @_;
611
612 my $map_info = delete $self->{map_info}
613 or return;
614
615 my ($hash, $x, $y, $w, $h) = @$map_info;
616
617 my $data = $MAP->get_rect ($x, $y, $w, $h);
618 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
619
620 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
621
622}
623
624sub conn::map_clear {
625 my ($self) = @_;
626
627 $self->flush_map;
628 delete $self->{neigh_map};
629
630 $MAP->clear;
631}
632
633
634sub conn::load_map($$$) {
635 my ($self, $hash, $x, $y) = @_;
636
637 if (defined (my $data = $MAPCACHE->get ($hash))) {
638 $data = Compress::LZF::decompress $data;
639 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
640 for my $id ($MAP->set_rect ($x, $y, $data)) {
641 my $data = $TILECACHE->get ($id)
642 or next;
643
644 $self->set_texture ($id => $data);
645 }
646 }
647}
648
649sub conn::flood_fill {
650 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
651
652 # the server does not allow map paths > 6
653 return if 6 <= length $path;
654
655 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
656
657 for (
658 [1, 0, -1],
659 [2, 1, 0],
660 [3, 0, 1],
661 [4, -1, 0],
662 ) {
663 my ($tile, $dx, $dy) = @$_;
664
665 my $gx = $gx + $dx;
666 my $gy = $gy + $dy;
667
668 next unless $flags & (1 << ($tile - 1));
669 next if $self->{neigh_grid}{$gx, $gy}++;
670
671 my $neigh = $self->{neigh_map}{$hash} ||= [];
672 if (my $info = $neigh->[$tile]) {
673 my ($flags, $x, $y, $w, $h, $hash) = @$info;
674
675 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
676 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
677
678 } else {
679 $self->send_mapinfo ("spatial $path$tile", sub {
680 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
681
682 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
683 return if $mode ne "spatial";
684
685 $x += $MAP->ox;
686 $y += $MAP->oy;
687
688 $self->load_map ($hash, $x, $y)
689 unless $self->{neigh_map}{$hash}[5]++;#d#
690
691 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
692
693 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
694 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
695 });
696 }
697 }
698}
699
700sub conn::map_change {
701 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
702
703 $self->flush_map;
704
705 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
706
707 my $mapmapw = 250;
708 my $mapmaph = 250;
709
710 $self->{neigh_rect} = [
711 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
712 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5,
713 ];
714
715 delete $self->{neigh_grid};
716 $self->flood_fill (0, 0, "", $hash, $flags);
717
718 $x += $ox;
719 $y += $oy;
720
721 $self->{map_info} = [$hash, $x, $y, $w, $h];
722
723 $self->load_map ($hash, $x, $y);
724}
725
726sub conn::face_find {
727 my ($self, $facenum, $face) = @_;
728
729 my $hash = "$face->{chksum},$face->{name}";
730
731 my $id = $FACEMAP->get ($hash);
732
733 unless ($id) {
734 # create new id for face
735 # i love transactions
736 for (1..100) {
737 my $txn = $CFClient::DB_ENV->txn_begin;
738 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
739 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
740 $id++;
741 if ($FACEMAP->put (id => $id) == 0
742 && $FACEMAP->put ($hash => $id) == 0) {
743 $txn->txn_commit;
744
745 goto gotid;
746 }
747 }
748 $txn->abort;
749 }
750
751 CFClient::fatal "maximum number of transaction retries reached - database problems?";
752 }
753
754gotid:
755 $face->{id} = $id;
756 $MAP->set_face ($facenum => $id);
757 $TILECACHE->get ($id)
758}
759
760sub conn::face_update {
761 my ($self, $facenum, $face) = @_;
762
763 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
764
765 $self->set_texture ($face->{id} => delete $face->{image});
766}
767
768sub conn::set_texture {
769 my ($self, $id, $data) = @_;
770
771 $self->{texture}[$id] ||= do {
772 my $tex =
773 new_from_image CFClient::Texture
774 $data, minify => 1;
775
776 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
777 $MAPWIDGET->update;
778
779 $tex
780 };
781}
782
783sub conn::sound_play {
784 my ($self, $x, $y, $soundnum, $type) = @_;
785
786 $SDL_MIXER
787 or return;
788
789 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
790 or return;
791
792 $chunk->play;
793# warn "sound $x,$y,$soundnum,$type\n";#d#
794}
795
796sub conn::query {
797 my ($self, $flags, $prompt) = @_;
798
799 #TODO, display dialog with relevant information
800 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
801}
802
803sub conn::drawinfo {
804 my ($self, $color, $text) = @_;
805
806 my @color = (
807 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
808 [1.00, 1.00, 1.00],
809 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
810 [1.00, 0.00, 0.00],
811 [1.00, 0.54, 0.00],
812 [0.11, 0.56, 1.00],
813 [0.93, 0.46, 0.00],
814 [0.18, 0.54, 0.34],
815 [0.56, 0.73, 0.56],
816 [0.80, 0.80, 0.80],
817 [0.55, 0.41, 0.13],
818 [0.99, 0.77, 0.26],
819 [0.74, 0.65, 0.41],
820 );
821
822 $LOGVIEW->add_paragraph ($color[$color], $text);
823}
824
825sub conn::spell_add {
826 my ($self, $spell) = @_;
827
828 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
829 });
830 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
831 });
832}
833
834sub conn::spell_delete {
835 my ($self, $spell) = @_;
836}
837
838sub conn::addme_success {
839 my ($self) = @_;
840
841 for my $skill (values %{$self->{skill_info}}) {
842 $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
843 });
844 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
845 });
846 }
266} 847}
267 848
268%SDL_CB = ( 849%SDL_CB = (
269 SDL_QUIT() => sub { 850 CFClient::SDL_QUIT => sub {
270 main_quit Gtk2; 851 Event::unloop -1;
271 }, 852 },
272 SDL_VIDEORESIZE() => sub { 853 CFClient::SDL_VIDEORESIZE => sub {
273 }, 854 },
274 SDL_VIDEOEXPOSE() => sub { 855 CFClient::SDL_VIDEOEXPOSE => sub {
275 refresh; 856 refresh;
276 }, 857 },
277 SDL_KEYDOWN() => sub { 858 CFClient::SDL_KEYDOWN => sub {
278 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 859 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
279 # alt-enter 860 # alt-enter
280 $FULLSCREEN = !$FULLSCREEN; 861 video_shutdown;
281 init_screen; 862 $CFG->{fullscreen} = !$CFG->{fullscreen};
863 video_init;
282 } else { 864 } else {
283 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 865 CFClient::UI::feed_sdl_key_down_event ($_[0]);
284 } 866 }
285 }, 867 },
286 SDL_KEYUP() => sub { 868 CFClient::SDL_KEYUP => sub {
287 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 869 CFClient::UI::feed_sdl_key_up_event ($_[0]);
288 }, 870 },
289 SDL_MOUSEMOTION() => sub { 871 CFClient::SDL_MOUSEMOTION => sub {
290 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 872 CFClient::UI::feed_sdl_motion_event ($_[0]);
291 }, 873 },
292 SDL_MOUSEBUTTONDOWN() => sub { 874 CFClient::SDL_MOUSEBUTTONDOWN => sub {
293 CFClient::UI::feed_sdl_button_down_event ($SDL_EV); 875 CFClient::UI::feed_sdl_button_down_event ($_[0]);
294 }, 876 },
295 SDL_MOUSEBUTTONUP() => sub { 877 CFClient::SDL_MOUSEBUTTONUP => sub {
296 CFClient::UI::feed_sdl_button_up_event ($SDL_EV); 878 CFClient::UI::feed_sdl_button_up_event ($_[0]);
297 }, 879 },
298 SDL_ACTIVEEVENT() => sub { 880 CFClient::SDL_ACTIVEEVENT => sub {
299# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 881# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
300 }, 882 },
301); 883);
302 884
303@conn::ISA = Crossfire::Protocol::;
304
305sub conn::map_update {
306 my ($self, $dirty) = @_;
307
308 $MAPWIDGET->update;
309}
310
311sub conn::map_scroll {
312 my ($self, $dx, $dy) = @_;
313
314# refresh;
315}
316
317sub conn::map_clear {
318 my ($self) = @_;
319
320# refresh;
321}
322
323sub conn::face_find {
324 my ($self, $face) = @_;
325
326 $FACECACHE->{"$face->{chksum},$face->{name}"}
327}
328
329sub conn::face_update {
330 my ($self, $face) = @_;
331
332 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
333
334 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
335}
336
337sub conn::query {
338 my ($self, $flags, $prompt) = @_;
339
340 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
341}
342
343sub gtk_add_cfg_field {
344 my ($tbl, $cfg, $klbl, $key, $value) = @_;
345 my $i = $cfg->{_i}++;
346 $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
347 $tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
348 if ($key eq 'password') {
349 $ent->set_invisible_char ("*");
350 $ent->set (visibility => 0)
351 }
352 $ent->set_text ($value);
353 $ent->signal_connect (changed => sub {
354 my ($ent) = @_;
355 $cfg->{$key} = $ent->get_text;
356 # TODO: Mapsize should be a slider in the game gui
357 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
358 $cfg->{$key} = 100;
359 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
360 $cfg->{$key} = 50;
361 }
362 });
363}
364
365sub run_config_dialog {
366 my (%events) = @_;
367
368 my $w = Gtk2::Window->new;
369
370 my @cfg = (
371 [qw/Host host/],
372 [qw/Port port/],
373 [qw/Mapsize% mapsize/],
374 [qw/Username user/],
375 [qw/Password password/],
376 );
377
378 my $cfg = {};
379
380 $w->add (my $vb = Gtk2::VBox->new);
381 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
382 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
383 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
384 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
385 my $i = 0;
386 my $act = 0;
387 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
388 if ($_ eq $selmode) { $act = $i }
389 $cb->append_text ($_);
390 $i++;
391 }
392 $cb->set_active ($act);
393 $cb->signal_connect (changed => sub {
394 my ($cb) = @_;
395 my $txt = $cb->get_active_text;
396 if ($txt =~ m/(\d+)x(\d+)/) {
397 $::CFG->{width} = $1;
398 $::CFG->{height} = $2;
399 }
400 });
401
402 $cfg->{_i} = 1;
403 for (@cfg) {
404 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
405 }
406
407 $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
408 $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
409 $cb->signal_connect (clicked => sub {
410 for (keys %$cfg) {
411 $::CFG->{$_} = $cfg->{$_}
412 if $_ ne '_i';
413 }
414 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
415 });
416 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
417 $cb->signal_connect (clicked => sub {
418 for (keys %$cfg) {
419 $::CFG->{$_} = $cfg->{$_}
420 if $_ ne '_i';
421 }
422 my $cb = $events{login} || sub {};
423 $cb->($::CFG->{user}, $::CFG->{password});
424 });
425 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
426 $cb->signal_connect (clicked => sub {
427 my $cb = $events{logout} || sub {};
428 $cb->();
429 });
430 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
431 $cb->signal_connect (clicked => sub { $w->destroy });
432
433 $w->show_all;
434
435 $w->signal_connect (destroy => sub { Gtk2->main_quit });
436}
437
438
439############################################################################# 885#############################################################################
440 886
441SDL::Init SDL_INIT_EVERYTHING; 887$SIG{INT} = $SIG{TERM} = sub { exit };
442 888
443@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)], 889$TILECACHE = CFClient::db_table "tilecache";
444 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE }; 890$FACEMAP = CFClient::db_table "facemap";
445 891
446CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 892CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
447 893
448$CFG ||= { 894my %DEF_CFG = (
895 sdl_mode => 0,
449 width => 640, 896 width => 640,
450 height => 480, 897 height => 480,
898 fullscreen => 0,
899 fast => 0,
900 fow_enable => 1,
901 fow_intensity => 0.45,
902 fow_smooth => 0,
903 gui_fontsize => 1,
904 log_fontsize => 14,
451 mapsize => 100, 905 mapsize => 100,
452 fullscreen => 0,
453 host => "crossfire.schmorp.de", 906 host => "crossfire.schmorp.de",
454 port => 13327, 907 say_command => 'say',
455}; 908 audio_enable => 1,
909 bgm_enable => 1,
910 bgm_volume => 0.25,
911);
912
913while (my ($k, $v) = each %DEF_CFG) {
914 $CFG->{$k} = $v unless exists $CFG->{$k};
915}
916
917sdl_init;
918
919@SDL_MODES = reverse
920 grep $_->[0] >= 640 && $_->[1] >= 480,
921 CFClient::SDL_ListModes;
922
923@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
924
925$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
456 926
457{ 927{
458 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 928 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
459 929
460 CFClient::add_font $_ for @fonts; 930 CFClient::add_font $_ for @fonts;
461 CFClient::set_font $fonts[0]; 931 CFClient::set_font $fonts[0];
462} 932}
463 933
464$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 934video_init;
935audio_init;
465 936
466run_config_dialog 937Event::loop;
467 login => sub { start_game },
468 logout => sub { stop_game };
469 938
470main Gtk2; 939END { CFClient::SDL_Quit }
471 940
472Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 941

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines