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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines