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.100 by elmex, Fri Apr 14 10:57:36 2006 UTC vs.
Revision 1.151 by root, Thu Apr 20 07:27:11 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;
12use SDL::Surface;
13use SDL::OpenGL;
14
15use Crossfire; 9use Crossfire;
16use Crossfire::Protocol; 10use Crossfire::Protocol;
17 11
12use Compress::LZF;
13
18use CFClient; 14use CFClient;
19use CFClient::UI; 15use CFClient::UI;
16use CFClient::MapWidget;
20 17
21our $VERSION = '0.1'; 18our $VERSION = '0.1';
22 19
23my $MAX_FPS = 60; 20my $MAX_FPS = 60;
24my $MIN_FPS = 5; # unused as of yet 21my $MIN_FPS = 5; # unused as of yet
25 22
23our $META_SERVER = "crossfire.real-time.com:13326";
24
25our $FACEMAP;
26our $TILECACHE;
26our $FACECACHE; 27our $MAPCACHE;
27 28
28our $LAST_REFRESH; 29our $LAST_REFRESH;
29our $NOW; 30our $NOW;
30 31
31our $CFG; 32our $CFG;
38our $FULLSCREEN; 39our $FULLSCREEN;
39our $FONTSIZE; 40our $FONTSIZE;
40 41
41our $MAP; 42our $MAP;
42our $MAPWIDGET; 43our $MAPWIDGET;
44our $BUTTONBAR;
45our $LOGVIEW;
46our $CONSOLE;
47our $METASERVER;
48
49our $GAUGES;
43 50
44our $SDL_ACTIVE; 51our $SDL_ACTIVE;
45our $SDL_EV;
46our %SDL_CB; 52our %SDL_CB;
53
54our $SDL_MIXER;
55our @SOUNDS; # event => file mapping
56our %AUDIO_CHUNKS; # audio files
47 57
48our $ALT_ENTER_MESSAGE; 58our $ALT_ENTER_MESSAGE;
49our $STATUS_LINE; 59our $STATUS_LINE;
50our $DEBUG_STATUS; 60our $DEBUG_STATUS;
51our $BUTTONBAR;
52our $LOGVIEW;
53 61
54sub status { 62sub status {
55 $STATUS_LINE->set_text ($_[0]); 63 $STATUS_LINE->set_text ($_[0]);
56 my ($w, $h) = $STATUS_LINE->size_request;
57 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 64 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
58} 65}
59 66
60sub debug { 67sub debug {
61 $DEBUG_STATUS->set_text ($_[0]); 68 $DEBUG_STATUS->set_text ($_[0]);
62 my ($w, $h) = $DEBUG_STATUS->size_request; 69 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
63 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
64} 70}
65 71
66sub start_game { 72sub start_game {
67 status "logging in..."; 73 status "logging in...";
68 74
69 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 75 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
76
77 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
70 78
71 $MAP = new CFClient::Map $mapsize, $mapsize; 79 $MAP = new CFClient::Map $mapsize, $mapsize;
80
81 my ($host, $port) = split /:/, $CFG->{host};
72 82
73 $CONN = new conn 83 $CONN = new conn
74 host => $CFG->{host}, 84 host => $host,
75 port => $CFG->{port}, 85 port => $port || 13327,
76 user => $CFG->{user}, 86 user => $CFG->{user},
77 pass => $CFG->{password}, 87 pass => $CFG->{password},
78 mapw => $mapsize, 88 mapw => $mapsize,
79 maph => $mapsize, 89 maph => $mapsize,
80 ; 90 ;
86 96
87sub stop_game { 97sub stop_game {
88 undef $CONN; 98 undef $CONN;
89} 99}
90 100
91sub config_dialog { 101sub client_setup {
92 my $dialog = new CFClient::UI::FancyFrame 102 my $dialog = new CFClient::UI::FancyFrame
103 title => "Client Setup",
93 child => (my $vbox = new CFClient::UI::VBox); 104 child => (my $vbox = new CFClient::UI::VBox);
94 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
95 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 105 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
96 106
97 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 107 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
98 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 108 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
99 109
100 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 110 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
101 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8); 111 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
102 112
103 $mode_slider->connect (changed => sub { 113 $mode_slider->connect (changed => sub {
104 my ($self, $value) = @_; 114 my ($self, $value) = @_;
105 115
106 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 116 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
107 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 117 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
108 }); 118 });
109 $mode_slider->emit (changed => $mode_slider->{range}[0]); 119 $mode_slider->emit (changed => $mode_slider->{range}[0]);
110 120
111 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen"); 121 $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
112 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 122 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
113 my ($self, $value) = @_; 123 my ($self, $value) = @_;
114 $CFG->{fullscreen} = $value; 124 $CFG->{fullscreen} = $value;
115 }); 125 });
116 126
117 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); 127 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
118 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 128 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
119 my ($self, $value) = @_; 129 my ($self, $value) = @_;
120 $CFG->{fast} = $value; 130 $CFG->{fast} = $value;
121 }); 131 });
122 132
123 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); 133 $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
124 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 134 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
125 my ($self, $value) = @_; 135 my ($self, $value) = @_;
126 $CFG->{fow_enable} = $value; 136 $CFG->{fow_enable} = $value;
127 }); 137 });
128 138
129 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); 139 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
130 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 140 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
131 my ($self, $value) = @_; 141 my ($self, $value) = @_;
132 $CFG->{fow_intensity} = $value; 142 $CFG->{fow_intensity} = $value;
133 }); 143 });
134 144
135 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 145 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
136 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 146 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
137 my ($self, $value) = @_; 147 my ($self, $value) = @_;
138 $CFG->{fow_smooth} = $value; 148 $CFG->{fow_smooth} = $value;
149 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
139 }); 150 });
140 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
141 $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 163 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
142 destroy_screen (); 164 video_shutdown ();
143 init_screen (); 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];
144 }); 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;
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);
145 274
146 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
147 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 275 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
148 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); 276 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
149 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}); 277
150 278 {
151 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); 279 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
152 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
153 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
154 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 293 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
155 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}); 294 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
295 my ($self, $value) = @_;
296 $CFG->{user} = $value;
297 });
156 298
157 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 299 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
158 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1); 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 });
159 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
160 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size"); 311 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
161 $table->add (1, 6, new CFClient::UI::Slider 312 $table->add (1, 7, new CFClient::UI::Slider
162 req_w => 100, 313 req_w => 100,
163 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 314 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
164 connect_changed => sub { 315 connect_changed => sub {
165 my ($self, $value) = @_; 316 my ($self, $value) = @_;
166 317
167 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 318 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
168 }, 319 },
169 ); 320 );
170 321
171 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 322 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
172 start_game; 323 start_game;
173 }); 324 });
174 325
175 $vbox->add (my $hbox = new CFClient::UI::HBox);
176
177 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
178 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
179 status "Configuration Saved";
180 });
181
182 $dialog 326 $dialog
183} 327}
184 328
185sub console_window { 329sub message_window {
186 my $window = new CFClient::UI::FancyFrame 330 my $window = new CFClient::UI::FancyFrame
331 title => "Messages",
187 border_bg => [1, 1, 1, 0.5], 332 border_bg => [1, 1, 1, 0.5],
188 bg => [0.3, 0.3, 0.3, 0.8], 333 bg => [0.3, 0.3, 0.3, 0.8],
334 user_w => int $::WIDTH / 3,
335 user_h => int $::HEIGHT / 5,
189 child => (my $vbox = new CFClient::UI::VBox); 336 child => (my $vbox = new CFClient::UI::VBox);
190 337
191 $vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1); 338 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
339 expand => 1,
340 fontsize => $::CFG->{log_fontsize},
341 );
342
192 $vbox->add (my $input = new CFClient::UI::LineEntry); 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 },
193 $input->connect (activate => sub { 354 connect_activate => sub {
194 my ($input, $text) = @_; 355 my ($input, $text) = @_;
195 $input->set_text (''); 356 $input->set_text ('');
196 357
197 if ($text =~ /^\/(.*)/) { 358 if ($text =~ /^\/(.*)/) {
198 $::CONN->user_send ("command $1"); 359 $::CONN->user_send ($1);
199 } else { 360 } else {
361 my $say_cmd = $::CFG->{say_command} || 'say';
200 $::CONN->user_send ("command say $text"); 362 $::CONN->user_send ("$say_cmd $text");
201 } 363 }
364 if ($input->{refocus_map}) {
365 delete $input->{refocus_map};
366 $MAPWIDGET->focus_in
202 1 367 }
203 }); 368 },
369 connect_escape => sub {
370 $MAPWIDGET->focus_in
371 },
372 );
373
374 $CONSOLE = {
375 window => $window,
376 input => $input
377 };
204 378
205 $window 379 $window
206} 380}
207 381
208sub sdl_init { 382sub sdl_init {
209 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO 383 CFClient::SDL_Init
210 and die "SDL::Init failed!\n"; 384 and die "SDL::Init failed!\n";
211} 385}
212 386
213sub init_screen { 387sub video_init {
214 sdl_init; 388 sdl_init;
215 389
216 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 390 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
217 $FULLSCREEN = $CFG->{fullscreen}; 391 $FULLSCREEN = $CFG->{fullscreen};
218 $FAST = $CFG->{fast}; 392 $FAST = $CFG->{fast};
219 393
220 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 394 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
221 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
222 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
223 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
224
225 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
226 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
227 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
228 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
229
230 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
231 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
232 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
233
234 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
235 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
236 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
237 or die "SDL::SetVideoMode failed!\n"; 395 or die "SDL_SetVideoMode failed!\n";
238
239 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
240
241 $SDL_EV = new SDL::Event;
242 $SDL_EV->set_unicode (1);
243 396
244 $SDL_ACTIVE = 1; 397 $SDL_ACTIVE = 1;
245 398
246 $LAST_REFRESH = time - 0.01; 399 $LAST_REFRESH = time - 0.01;
247 400
248 CFClient::gl_init; 401 CFClient::gl_init;
249 402
250 $FONTSIZE = int $HEIGHT / 40; 403 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
251 404
252 ############################################################################# 405 #############################################################################
253 406
254 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 407 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
255 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); 408 $DEBUG_STATUS->show;
256 409
257 $STATUS_LINE = new CFClient::UI::Label 410 $STATUS_LINE = new CFClient::UI::Label
258 padding => 0, 411 padding => 0,
259 y => $HEIGHT * 44 / 45 - $FONTSIZE; 412 y => $HEIGHT - $FONTSIZE * 1.8;
260 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); 413 $STATUS_LINE->show;
261 414
262 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 415 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
263 padding => 0, 416 padding => 0,
264 y => $HEIGHT * 44 / 45, 417 fontsize => 0.8,
265 height => $HEIGHT / 45,
266 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 418 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
267 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 419 $ALT_ENTER_MESSAGE->show;
420 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
268 421
269 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget); 422 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
270 $MAPWIDGET->focus_in; 423 $MAPWIDGET->focus_in;
424 $MAPWIDGET->connect (activate_console => sub {
425 my ($mapwidget, $preset) = @_;
271 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
272 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox); 437 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
273 438
274 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1); 439 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
275 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window); 440 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
276} 441 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
277 442
278sub destroy_screen { 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 {
279 $CFClient::UI::TOPLEVEL->{children} = []; 463 $CFClient::UI::ROOT->{children} = [];
280 undef $SDL_ACTIVE; 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") {
472
473 $SDL_MIXER = !CFClient::Mix_OpenAudio;
474 CFClient::Mix_AllocateChannels 8;
475 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
476
477 # TODO: hack, do play loop and mood music
478 if ($CFG->{bgm_enable}) {
479 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/game3.ogg";
480 $bgmusic->play;
481 }
482
483 while (<$fh>) {
484 next if /^\s*#/;
485 next if /^\s*$/;
486
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
495 };
496 }
497 } else {
498 status "unable to open sound config: $!";
499 }
500 }
501}
502
503sub audio_shutdown {
504 CFClient::Mix_CloseAudio if $SDL_MIXER;
281 undef $SDL_EV; 505 undef $SDL_MIXER;
282 SDL::Quit; 506 @SOUNDS = ();
507 %AUDIO_CHUNKS = ();
283} 508}
284 509
285my %animate_object; 510my %animate_object;
286my $animate_timer; 511my $animate_timer;
287 512
295 debug sprintf "%3.2f", $fps; 520 debug sprintf "%3.2f", $fps;
296 521
297 $want_refresh = 0; 522 $want_refresh = 0;
298 $can_refresh = 0; 523 $can_refresh = 0;
299 524
300 glViewport 0, 0, $WIDTH, $HEIGHT;
301
302 glMatrixMode GL_PROJECTION;
303 glLoadIdentity;
304 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
305 glMatrixMode GL_MODELVIEW;
306 glLoadIdentity;
307
308 glClearColor +($CFG->{fow_intensity}) x 3, 1;
309 glClear GL_COLOR_BUFFER_BIT;
310
311 $CFClient::UI::TOPLEVEL->draw; 525 $CFClient::UI::ROOT->draw;
312 526
313 SDL::GLSwapBuffers; 527 CFClient::SDL_GL_SwapBuffers;
314 528
315 $LAST_REFRESH = $NOW; 529 $LAST_REFRESH = $NOW;
316} 530}
317 531
318my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 532my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
319 $NOW = time; 533 $NOW = time;
320 534
321 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 535 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
322 while $SDL_EV->poll; 536 for CFClient::SDL_PollEvent;
323 537
324 if (%animate_object) { 538 if (%animate_object) {
325 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 539 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
326 $want_refresh++; 540 $want_refresh++;
327 } 541 }
347 delete $animate_object{$widget}; 561 delete $animate_object{$widget};
348} 562}
349 563
350@conn::ISA = Crossfire::Protocol::; 564@conn::ISA = Crossfire::Protocol::;
351 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
352sub conn::user_send { 587sub conn::user_send {
353 my ($self, $command) = @_; 588 my ($self, $command) = @_;
354 589
355 $self->send ($command); 590 $self->send_command ($command);
356 status $command; 591 status $command;
592}
593
594sub conn::map_scroll {
595 my ($self, $dx, $dy) = @_;
596
597 $MAP->scroll ($dx, $dy);
357} 598}
358 599
359sub conn::feed_map1a { 600sub conn::feed_map1a {
360 my ($self, $data) = @_; 601 my ($self, $data) = @_;
361 602
362# $self->Crossfire::Protocol::feed_map1a ($data); 603# $self->Crossfire::Protocol::feed_map1a ($data);
363 604
364 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
365 $MAP->map1a_update ($data); 605 $MAP->map1a_update ($data);
366 $MAPWIDGET->update; 606 $MAPWIDGET->update;
367} 607}
368 608
369#sub conn::map_update { 609sub conn::flush_map {
370# my ($self, $dirty) = @_; 610 my ($self) = @_;
371# 611
372# $MAPWIDGET->update; 612 my $map_info = delete $self->{map_info}
373#} 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}
374 623
375sub conn::map_clear { 624sub conn::map_clear {
376 my ($self) = @_; 625 my ($self) = @_;
377 626
627 $self->flush_map;
628 delete $self->{neigh_map};
629
378 $MAP->clear; 630 $MAP->clear;
631}
379 632
380# refresh; 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 return if $mode ne "spatial";
683
684 $x += $MAP->ox;
685 $y += $MAP->oy;
686
687 $self->load_map ($hash, $x, $y)
688 unless $self->{neigh_map}{$hash}[5]++;#d#
689
690 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
691
692 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
693 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
694 });
695 }
696 }
697}
698
699sub conn::map_change {
700 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
701
702 $self->flush_map;
703
704 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
705
706 my $mapmapw = 250;
707 my $mapmaph = 250;
708
709 $self->{neigh_rect} = [
710 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
711 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5,
712 ];
713
714 delete $self->{neigh_grid};
715 $self->flood_fill (0, 0, "", $hash, $flags);
716
717 $x += $ox;
718 $y += $oy;
719
720 $self->{map_info} = [$hash, $x, $y, $w, $h];
721
722 $self->load_map ($hash, $x, $y);
381} 723}
382 724
383sub conn::face_find { 725sub conn::face_find {
384 my ($self, $face) = @_; 726 my ($self, $facenum, $face) = @_;
385 727
386 $FACECACHE->{"$face->{chksum},$face->{name}"} 728 my $hash = "$face->{chksum},$face->{name}";
729
730 my $id = $FACEMAP->get ($hash);
731
732 unless ($id) {
733 # create new id for face
734 # i love transactions
735 for (1..100) {
736 my $txn = $CFClient::DB_ENV->txn_begin;
737 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
738 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
739 $id++;
740 if ($FACEMAP->put (id => $id) == 0
741 && $FACEMAP->put ($hash => $id) == 0) {
742 $txn->txn_commit;
743
744 goto gotid;
745 }
746 }
747 $txn->abort;
748 }
749
750 CFClient::fatal "maximum number of transaction retries reached - database problems?";
751 }
752
753gotid:
754 $face->{id} = $id;
755 $MAP->set_face ($facenum => $id);
756 $TILECACHE->get ($id)
387} 757}
388 758
389sub conn::face_update { 759sub conn::face_update {
390 my ($self, $facenum, $face) = @_; 760 my ($self, $facenum, $face) = @_;
391 761
392 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 762 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
393 763
394 my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image}; 764 $self->set_texture ($face->{id} => delete $face->{image});
765}
395 766
767sub conn::set_texture {
768 my ($self, $id, $data) = @_;
769
770 $self->{texture}[$id] ||= do {
771 my $tex =
772 new_from_image CFClient::Texture
773 $data, minify => 1;
774
396 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}); 775 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
397 $MAPWIDGET->update; 776 $MAPWIDGET->update;
777
778 $tex
779 };
780}
781
782sub conn::sound_play {
783 my ($self, $x, $y, $soundnum, $type) = @_;
784
785 $SDL_MIXER
786 or return;
787
788 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
789 or return;
790
791 $chunk->play;
792# warn "sound $x,$y,$soundnum,$type\n";#d#
398} 793}
399 794
400sub conn::query { 795sub conn::query {
401 my ($self, $flags, $prompt) = @_; 796 my ($self, $flags, $prompt) = @_;
402 797
403 #TODO 798 #TODO, display dialog with relevant information
404 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 799 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
405} 800}
406 801
407sub conn::drawinfo { 802sub conn::drawinfo {
408 my ($self, $color, $text) = @_; 803 my ($self, $color, $text) = @_;
409 804
410 my @color = ( 805 my @color = (
411 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 806 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
412 [1.00, 1.00, 1.00], 807 [1.00, 1.00, 1.00],
413 [0.00, 0.00, 0.55], 808 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
414 [1.00, 0.00, 0.00], 809 [1.00, 0.00, 0.00],
415 [1.00, 0.54, 0.00], 810 [1.00, 0.54, 0.00],
416 [0.11, 0.56, 1.00], 811 [0.11, 0.56, 1.00],
417 [0.93, 0.46, 0.00], 812 [0.93, 0.46, 0.00],
418 [0.18, 0.54, 0.34], 813 [0.18, 0.54, 0.34],
424 ); 819 );
425 820
426 $LOGVIEW->add_paragraph ($color[$color], $text); 821 $LOGVIEW->add_paragraph ($color[$color], $text);
427} 822}
428 823
824sub conn::spell_add {
825 my ($self, $spell) = @_;
826
827 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
828 });
829 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
830 });
831}
832
833sub conn::spell_delete {
834 my ($self, $spell) = @_;
835}
836
837sub conn::addme_success {
838 my ($self) = @_;
839
840 for my $skill (values %{$self->{skill_info}}) {
841 $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
842 });
843 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
844 });
845 }
846}
847
429%SDL_CB = ( 848%SDL_CB = (
430 SDL_QUIT() => sub { 849 CFClient::SDL_QUIT => sub {
431 Event::unloop -1; 850 Event::unloop -1;
432 }, 851 },
433 SDL_VIDEORESIZE() => sub { 852 CFClient::SDL_VIDEORESIZE => sub {
434 }, 853 },
435 SDL_VIDEOEXPOSE() => sub { 854 CFClient::SDL_VIDEOEXPOSE => sub {
436 refresh; 855 refresh;
437 }, 856 },
438 SDL_KEYDOWN() => sub { 857 CFClient::SDL_KEYDOWN => sub {
439 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 858 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
440 # alt-enter 859 # alt-enter
441 destroy_screen; 860 video_shutdown;
442 $CFG->{fullscreen} = !$CFG->{fullscreen}; 861 $CFG->{fullscreen} = !$CFG->{fullscreen};
443 init_screen; 862 video_init;
444 } else { 863 } else {
445 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 864 CFClient::UI::feed_sdl_key_down_event ($_[0]);
446 } 865 }
447 }, 866 },
448 SDL_KEYUP() => sub { 867 CFClient::SDL_KEYUP => sub {
449 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 868 CFClient::UI::feed_sdl_key_up_event ($_[0]);
450 }, 869 },
451 SDL_MOUSEMOTION() => sub { 870 CFClient::SDL_MOUSEMOTION => sub {
452 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 871 CFClient::UI::feed_sdl_motion_event ($_[0]);
453 }, 872 },
454 SDL_MOUSEBUTTONDOWN() => sub { 873 CFClient::SDL_MOUSEBUTTONDOWN => sub {
455 CFClient::UI::feed_sdl_button_down_event ($SDL_EV); 874 CFClient::UI::feed_sdl_button_down_event ($_[0]);
456 }, 875 },
457 SDL_MOUSEBUTTONUP() => sub { 876 CFClient::SDL_MOUSEBUTTONUP => sub {
458 CFClient::UI::feed_sdl_button_up_event ($SDL_EV); 877 CFClient::UI::feed_sdl_button_up_event ($_[0]);
459 }, 878 },
460 SDL_ACTIVEEVENT() => sub { 879 CFClient::SDL_ACTIVEEVENT => sub {
461# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 880# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
462 }, 881 },
463); 882);
464 883
465############################################################################# 884#############################################################################
466 885
886$SIG{INT} = $SIG{TERM} = sub { exit };
887
888$TILECACHE = CFClient::db_table "tilecache";
889$FACEMAP = CFClient::db_table "facemap";
890
467CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 891CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
468 892
469my %DEF_CFG = ( 893my %DEF_CFG = (
894 sdl_mode => 0,
470 width => 640, 895 width => 640,
471 height => 480, 896 height => 480,
897 fullscreen => 0,
472 fast => 0, 898 fast => 0,
473 fow_enable => 1, 899 fow_enable => 1,
474 fow_intensity => 0.45, 900 fow_intensity => 0.45,
475 fow_smooth => 0, 901 fow_smooth => 0,
476 fullscreen => 0, 902 gui_fontsize => 1,
477 sdl_mode => 0, 903 log_fontsize => 14,
478 mapsize => 100, 904 mapsize => 100,
479 host => "crossfire.schmorp.de", 905 host => "crossfire.schmorp.de",
480 port => 13327, 906 say_command => 'say',
907 audio_enable => 1,
908 bgm_enable => 1,
909 bgm_volume => 0.25,
481); 910);
482 911
483while (my ($k, $v) = each %DEF_CFG) { 912while (my ($k, $v) = each %DEF_CFG) {
484 $CFG->{$k} = $v unless exists $CFG->{$k}; 913 $CFG->{$k} = $v unless exists $CFG->{$k};
485} 914}
486 915
487sdl_init; 916sdl_init;
488 917
489@SDL_MODES = reverse 918@SDL_MODES = reverse
490 grep $_->[0] >= 640 && $_->[1] >= 480, 919 grep $_->[0] >= 640 && $_->[1] >= 480,
491 map [SDL::RectW ($_), SDL::RectH ($_)], 920 CFClient::SDL_ListModes;
492 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
493 921
494@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 922@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
495 923
496$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 924$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
497
498init_screen;
499 925
500{ 926{
501 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 927 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
502 928
503 CFClient::add_font $_ for @fonts; 929 CFClient::add_font $_ for @fonts;
504 CFClient::set_font $fonts[0]; 930 CFClient::set_font $fonts[0];
505} 931}
506 932
507$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 933video_init;
934audio_init;
508 935
509Event::loop; 936Event::loop;
510 937
511Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 938END { CFClient::SDL_Quit }
512 939
940

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines