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.123 by root, Mon Apr 17 19:36:27 2006 UTC vs.
Revision 1.150 by root, Thu Apr 20 07:12:58 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
18use Compress::LZF; 12use Compress::LZF;
19 13
20use CFClient; 14use CFClient;
21use CFClient::UI; 15use CFClient::UI;
16use CFClient::MapWidget;
22 17
23our $VERSION = '0.1'; 18our $VERSION = '0.1';
24 19
25my $MAX_FPS = 60; 20my $MAX_FPS = 60;
26my $MIN_FPS = 5; # unused as of yet 21my $MIN_FPS = 5; # unused as of yet
… …
49our $BUTTONBAR; 44our $BUTTONBAR;
50our $LOGVIEW; 45our $LOGVIEW;
51our $CONSOLE; 46our $CONSOLE;
52our $METASERVER; 47our $METASERVER;
53 48
49our $GAUGES;
50
54our $SDL_ACTIVE; 51our $SDL_ACTIVE;
55our $SDL_EV;
56our %SDL_CB; 52our %SDL_CB;
53
54our $SDL_MIXER;
55our @SOUNDS; # event => file mapping
56our %AUDIO_CHUNKS; # audio files
57 57
58our $ALT_ENTER_MESSAGE; 58our $ALT_ENTER_MESSAGE;
59our $STATUS_LINE; 59our $STATUS_LINE;
60our $DEBUG_STATUS; 60our $DEBUG_STATUS;
61 61
62sub status { 62sub status {
63 $STATUS_LINE->set_text ($_[0]); 63 $STATUS_LINE->set_text ($_[0]);
64 my ($w, $h) = $STATUS_LINE->size_request;
65 $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});
66} 65}
67 66
68sub debug { 67sub debug {
69 $DEBUG_STATUS->set_text ($_[0]); 68 $DEBUG_STATUS->set_text ($_[0]);
70 my ($w, $h) = $DEBUG_STATUS->size_request; 69 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
71 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
72} 70}
73 71
74sub start_game { 72sub start_game {
75 status "logging in..."; 73 status "logging in...";
76 74
… …
100 undef $CONN; 98 undef $CONN;
101} 99}
102 100
103sub client_setup { 101sub client_setup {
104 my $dialog = new CFClient::UI::FancyFrame 102 my $dialog = new CFClient::UI::FancyFrame
103 title => "Client Setup",
105 child => (my $vbox = new CFClient::UI::VBox); 104 child => (my $vbox = new CFClient::UI::VBox);
106 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
107 $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]);
108 106
109 $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");
110 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 108 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
111 109
112 $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]);
113 $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");
114 112
115 $mode_slider->connect (changed => sub { 113 $mode_slider->connect (changed => sub {
116 my ($self, $value) = @_; 114 my ($self, $value) = @_;
117 115
118 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 116 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
119 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 117 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
120 }); 118 });
121 $mode_slider->emit (changed => $mode_slider->{range}[0]); 119 $mode_slider->emit (changed => $mode_slider->{range}[0]);
122 120
123 $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");
124 $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 {
125 my ($self, $value) = @_; 123 my ($self, $value) = @_;
126 $CFG->{fullscreen} = $value; 124 $CFG->{fullscreen} = $value;
127 }); 125 });
128 126
129 $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");
130 $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 {
131 my ($self, $value) = @_; 129 my ($self, $value) = @_;
132 $CFG->{fast} = $value; 130 $CFG->{fast} = $value;
133 }); 131 });
134 132
135 $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");
136 $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 {
137 my ($self, $value) = @_; 135 my ($self, $value) = @_;
138 $CFG->{fow_enable} = $value; 136 $CFG->{fow_enable} = $value;
139 }); 137 });
140 138
141 $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");
142 $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 {
143 my ($self, $value) = @_; 141 my ($self, $value) = @_;
144 $CFG->{fow_intensity} = $value; 142 $CFG->{fow_intensity} = $value;
145 }); 143 });
146 144
147 $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");
148 $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 {
149 my ($self, $value) = @_; 147 my ($self, $value) = @_;
150 $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;
151 }); 150 });
152 151
153 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 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");
154 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 159 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
155 my ($self, $value) = @_;
156 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 160 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
157 }); 161 });
158 162
159 $table->add (1, 7, 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 {
160 destroy_screen (); 164 video_shutdown ();
161 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];
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 ();
162 }); 189 });
163 190
164 $dialog 191 $dialog
165} 192}
166 193
167sub metaserver_dialog { 194sub metaserver_dialog {
168 my $dialog = new CFClient::UI::FancyFrame 195 my $dialog = new CFClient::UI::FancyFrame
196 title => "Metaserver",
169 child => (my $vbox = new CFClient::UI::VBox); 197 child => (my $vbox = new CFClient::UI::VBox);
170 198
171 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 199 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
172 200
173 $dialog 201 $dialog
… …
230 $HOST->set_text ($CFG->{host} = $host); 258 $HOST->set_text ($CFG->{host} = $host);
231 }), 259 }),
232 (new CFClient::UI::Empty expand => 1), 260 (new CFClient::UI::Empty expand => 1),
233 ]); 261 ]);
234 262
235 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 263 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
236 for 0 .. $#$m; 264 for 0 .. $#$m;
237 } 265 }
238 } 266 }
239 }); 267 });
240} 268}
241 269
242sub server_setup { 270sub server_setup {
243 my $dialog = new CFClient::UI::FancyFrame 271 my $dialog = new CFClient::UI::FancyFrame
272 title => "Server Setup",
244 child => (my $vbox = new CFClient::UI::VBox); 273 child => (my $vbox = new CFClient::UI::VBox);
245 274
246 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
247 $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]);
248 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); 276 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
249 277
250 { 278 {
251 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 279 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
252 280
253 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 281 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
254 my ($self, $value) = @_; 282 my ($self, $value) = @_;
255 $CFG->{host} = $value; 283 $CFG->{host} = $value;
256 }); 284 });
257 285
258 $METASERVER = metaserver_dialog; 286 $METASERVER = metaserver_dialog;
259 287
260 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub { 288 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
261 update_metaserver $HOST; 289 update_metaserver $HOST;
262 }); 290 });
263 } 291 }
264 292
265 $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");
266 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { 294 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
267 my ($self, $value) = @_; 295 my ($self, $value) = @_;
268 $CFG->{user} = $value; 296 $CFG->{user} = $value;
269 }); 297 });
270 298
271 $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");
272 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 300 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
273 my ($self, $value) = @_; 301 my ($self, $value) = @_;
274 $CFG->{password} = $value; 302 $CFG->{password} = $value;
275 }); 303 });
276 304
277 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 305 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
278 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 306 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
279 my ($self, $value) = @_; 307 my ($self, $value) = @_;
280 $CFG->{say_command} = $value; 308 $CFG->{say_command} = $value;
281 }); 309 });
282 310
283 $table->add (0, 7, 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");
284 $table->add (1, 7, new CFClient::UI::Slider 312 $table->add (1, 7, new CFClient::UI::Slider
285 req_w => 100, 313 req_w => 100,
286 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 314 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
287 connect_changed => sub { 315 connect_changed => sub {
288 my ($self, $value) = @_; 316 my ($self, $value) = @_;
… …
298 $dialog 326 $dialog
299} 327}
300 328
301sub message_window { 329sub message_window {
302 my $window = new CFClient::UI::FancyFrame 330 my $window = new CFClient::UI::FancyFrame
331 title => "Messages",
303 border_bg => [1, 1, 1, 0.5], 332 border_bg => [1, 1, 1, 0.5],
304 bg => [0.3, 0.3, 0.3, 0.8], 333 bg => [0.3, 0.3, 0.3, 0.8],
305 user_w => $::WIDTH/4, 334 user_w => int $::WIDTH / 3,
306 user_h => $::HEIGHT, 335 user_h => int $::HEIGHT / 5,
307 child => (my $vbox = new CFClient::UI::VBox); 336 child => (my $vbox = new CFClient::UI::VBox);
308 337
309 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 338 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
310 expand => 1, 339 expand => 1,
311 fontsize => $::CFG->{log_fontsize}, 340 fontsize => $::CFG->{log_fontsize},
… …
349 378
350 $window 379 $window
351} 380}
352 381
353sub sdl_init { 382sub sdl_init {
354 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 383 CFClient::SDL_Init
355 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
356 and die "SDL::Init failed!\n"; 384 and die "SDL::Init failed!\n";
357} 385}
358 386
359sub init_screen { 387sub video_init {
360 sdl_init; 388 sdl_init;
361 389
362 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 390 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
363 $FULLSCREEN = $CFG->{fullscreen}; 391 $FULLSCREEN = $CFG->{fullscreen};
364 $FAST = $CFG->{fast}; 392 $FAST = $CFG->{fast};
365 393
366 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 394 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
367 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
368 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
369 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
370
371 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
372 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
373 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
374 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
375
376 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
377 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
378 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
379
380 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
381 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
382 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
383 or die "SDL::SetVideoMode failed!\n"; 395 or die "SDL_SetVideoMode failed!\n";
384
385 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
386
387 $SDL_EV = new SDL::Event;
388 $SDL_EV->set_unicode (1);
389 396
390 $SDL_ACTIVE = 1; 397 $SDL_ACTIVE = 1;
391 398
392 $LAST_REFRESH = time - 0.01; 399 $LAST_REFRESH = time - 0.01;
393 400
394 CFClient::gl_init; 401 CFClient::gl_init;
395 402
396 $FONTSIZE = int $HEIGHT / 40; 403 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
397 404
398 ############################################################################# 405 #############################################################################
399 406
400 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 407 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
401 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 408 $DEBUG_STATUS->show;
402 409
403 $STATUS_LINE = new CFClient::UI::Label 410 $STATUS_LINE = new CFClient::UI::Label
404 padding => 0, 411 padding => 0,
405 y => $HEIGHT * 44 / 45 - $FONTSIZE; 412 y => $HEIGHT - $FONTSIZE * 1.8;
406 $CFClient::UI::ROOT->add ($STATUS_LINE); 413 $STATUS_LINE->show;
407 414
408 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 415 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
409 padding => 0, 416 padding => 0,
410 y => $HEIGHT * 44 / 45,
411 fontsize => $HEIGHT / 45, 417 fontsize => 0.8,
412 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 418 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
413 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 419 $ALT_ENTER_MESSAGE->show;
420 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
414 421
415 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 422 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
416 $MAPWIDGET->focus_in; 423 $MAPWIDGET->focus_in;
417 $MAPWIDGET->connect (activate_console => sub { 424 $MAPWIDGET->connect (activate_console => sub {
418 my ($mapwidget, $preset) = @_; 425 my ($mapwidget, $preset) = @_;
419 426
420 if ($CONSOLE) { 427 if ($CONSOLE) {
… …
437 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 444 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
438 status "Configuration Saved"; 445 status "Configuration Saved";
439 }); 446 });
440 447
441 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 448 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
442}
443 449
444sub destroy_screen { 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 {
445 $CFClient::UI::ROOT->{children} = []; 463 $CFClient::UI::ROOT->{children} = [];
446 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;
447 undef $SDL_EV; 505 undef $SDL_MIXER;
448 SDL::Quit; 506 @SOUNDS = ();
507 %AUDIO_CHUNKS = ();
449} 508}
450 509
451my %animate_object; 510my %animate_object;
452my $animate_timer; 511my $animate_timer;
453 512
… …
463 $want_refresh = 0; 522 $want_refresh = 0;
464 $can_refresh = 0; 523 $can_refresh = 0;
465 524
466 $CFClient::UI::ROOT->draw; 525 $CFClient::UI::ROOT->draw;
467 526
468 SDL::GLSwapBuffers; 527 CFClient::SDL_GL_SwapBuffers;
469 528
470 $LAST_REFRESH = $NOW; 529 $LAST_REFRESH = $NOW;
471} 530}
472 531
473my $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 {
474 $NOW = time; 533 $NOW = time;
475 534
476 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 535 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
477 while $SDL_EV->poll; 536 for CFClient::SDL_PollEvent;
478 537
479 if (%animate_object) { 538 if (%animate_object) {
480 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 539 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
481 $want_refresh++; 540 $want_refresh++;
482 } 541 }
… …
502 delete $animate_object{$widget}; 561 delete $animate_object{$widget};
503} 562}
504 563
505@conn::ISA = Crossfire::Protocol::; 564@conn::ISA = Crossfire::Protocol::;
506 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
507sub conn::user_send { 587sub conn::user_send {
508 my ($self, $command) = @_; 588 my ($self, $command) = @_;
509 589
510 $self->send_command ($command); 590 $self->send_command ($command);
511 status $command; 591 status $command;
… …
543 623
544sub conn::map_clear { 624sub conn::map_clear {
545 my ($self) = @_; 625 my ($self) = @_;
546 626
547 $self->flush_map; 627 $self->flush_map;
548 delete $self->{neigh}; 628 delete $self->{neigh_map};
549 629
550 $MAP->clear; 630 $MAP->clear;
551} 631}
552 632
553 633
… …
565 } 645 }
566 } 646 }
567} 647}
568 648
569sub conn::flood_fill { 649sub conn::flood_fill {
570 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 650 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
571 651
572 # the server does not allow map paths > 6 652 # the server does not allow map paths > 6
573 return if 6 <= length $path; 653 return if 6 <= length $path;
574 654
575 for my $tile (1..4) { 655 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
576 next if $self->{neigh}{$hash}[$tile]; 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
577 next unless $flags & (1 << ($tile - 1)); 668 next unless $flags & (1 << ($tile - 1));
669 next if $self->{neigh_grid}{$gx, $gy}++;
578 670
579 my $neigh = $self->{neigh}{$hash} ||= []; 671 my $neigh = $self->{neigh_map}{$hash} ||= [];
580 672 if (my $info = $neigh->[$tile]) {
581 $self->send_mapinfo ("spatial $path$tile", sub {
582 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 673 my ($flags, $x, $y, $w, $h, $hash) = @$info;
583 674
584 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
585 return if $mode ne "spatial";
586
587 $x += $MAP->ox;
588 $y += $MAP->oy;
589
590 $self->load_map ($hash, $x, $y);
591
592 $neigh->[$tile] = [$x, $y, $w, $h];
593
594 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 675 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
595 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 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 });
596 }); 696 }
597 } 697 }
598} 698}
599 699
600sub conn::map_change { 700sub conn::map_change {
601 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 701 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
602 702
603 $self->flush_map; 703 $self->flush_map;
604 704
605 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 705 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
606 706
607 warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
608
609 my $mapmapw = 250; 707 my $mapmapw = 250;
610 my $mapmaph = 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 ];
611 714
715 delete $self->{neigh_grid};
612 $self->flood_fill ("", $hash, $flags, 716 $self->flood_fill (0, 0, "", $hash, $flags);
613 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
614 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
615 717
616 $x += $ox; 718 $x += $ox;
617 $y += $oy; 719 $y += $oy;
618 720
619 $self->{map_info} = [$hash, $x, $y, $w, $h]; 721 $self->{map_info} = [$hash, $x, $y, $w, $h];
… …
676 778
677 $tex 779 $tex
678 }; 780 };
679} 781}
680 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
681sub conn::query { 796sub conn::query {
682 my ($self, $flags, $prompt) = @_; 797 my ($self, $flags, $prompt) = @_;
683 798
684 #TODO 799 #TODO, display dialog with relevant information
685 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 800 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
686} 801}
687 802
688sub conn::drawinfo { 803sub conn::drawinfo {
689 my ($self, $color, $text) = @_; 804 my ($self, $color, $text) = @_;
… …
705 ); 820 );
706 821
707 $LOGVIEW->add_paragraph ($color[$color], $text); 822 $LOGVIEW->add_paragraph ($color[$color], $text);
708} 823}
709 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 }
847}
848
710%SDL_CB = ( 849%SDL_CB = (
711 SDL_QUIT() => sub { 850 CFClient::SDL_QUIT => sub {
712 Event::unloop -1; 851 Event::unloop -1;
713 }, 852 },
714 SDL_VIDEORESIZE() => sub { 853 CFClient::SDL_VIDEORESIZE => sub {
715 }, 854 },
716 SDL_VIDEOEXPOSE() => sub { 855 CFClient::SDL_VIDEOEXPOSE => sub {
717 refresh; 856 refresh;
718 }, 857 },
719 SDL_KEYDOWN() => sub { 858 CFClient::SDL_KEYDOWN => sub {
720 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 859 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
721 # alt-enter 860 # alt-enter
722 destroy_screen; 861 video_shutdown;
723 $CFG->{fullscreen} = !$CFG->{fullscreen}; 862 $CFG->{fullscreen} = !$CFG->{fullscreen};
724 init_screen; 863 video_init;
725 } else { 864 } else {
726 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 865 CFClient::UI::feed_sdl_key_down_event ($_[0]);
727 } 866 }
728 }, 867 },
729 SDL_KEYUP() => sub { 868 CFClient::SDL_KEYUP => sub {
730 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 869 CFClient::UI::feed_sdl_key_up_event ($_[0]);
731 }, 870 },
732 SDL_MOUSEMOTION() => sub { 871 CFClient::SDL_MOUSEMOTION => sub {
733 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 872 CFClient::UI::feed_sdl_motion_event ($_[0]);
734 }, 873 },
735 SDL_MOUSEBUTTONDOWN() => sub { 874 CFClient::SDL_MOUSEBUTTONDOWN => sub {
736 CFClient::UI::feed_sdl_button_down_event ($SDL_EV); 875 CFClient::UI::feed_sdl_button_down_event ($_[0]);
737 }, 876 },
738 SDL_MOUSEBUTTONUP() => sub { 877 CFClient::SDL_MOUSEBUTTONUP => sub {
739 CFClient::UI::feed_sdl_button_up_event ($SDL_EV); 878 CFClient::UI::feed_sdl_button_up_event ($_[0]);
740 }, 879 },
741 SDL_ACTIVEEVENT() => sub { 880 CFClient::SDL_ACTIVEEVENT => sub {
742# 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#
743 }, 882 },
744); 883);
745 884
746############################################################################# 885#############################################################################
886
887$SIG{INT} = $SIG{TERM} = sub { exit };
747 888
748$TILECACHE = CFClient::db_table "tilecache"; 889$TILECACHE = CFClient::db_table "tilecache";
749$FACEMAP = CFClient::db_table "facemap"; 890$FACEMAP = CFClient::db_table "facemap";
750 891
751CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 892CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
… …
757 fullscreen => 0, 898 fullscreen => 0,
758 fast => 0, 899 fast => 0,
759 fow_enable => 1, 900 fow_enable => 1,
760 fow_intensity => 0.45, 901 fow_intensity => 0.45,
761 fow_smooth => 0, 902 fow_smooth => 0,
903 gui_fontsize => 1,
762 log_fontsize => 14, 904 log_fontsize => 14,
763 mapsize => 100, 905 mapsize => 100,
764 host => "crossfire.schmorp.de", 906 host => "crossfire.schmorp.de",
765 say_command => 'say', 907 say_command => 'say',
908 audio_enable => 1,
909 bgm_enable => 1,
910 bgm_volume => 0.25,
766); 911);
767 912
768while (my ($k, $v) = each %DEF_CFG) { 913while (my ($k, $v) = each %DEF_CFG) {
769 $CFG->{$k} = $v unless exists $CFG->{$k}; 914 $CFG->{$k} = $v unless exists $CFG->{$k};
770} 915}
771 916
772sdl_init; 917sdl_init;
773 918
774@SDL_MODES = reverse 919@SDL_MODES = reverse
775 grep $_->[0] >= 640 && $_->[1] >= 480, 920 grep $_->[0] >= 640 && $_->[1] >= 480,
776 map [SDL::RectW ($_), SDL::RectH ($_)], 921 CFClient::SDL_ListModes;
777 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
778 922
779@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 923@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
780 924
781$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 925$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
782 926
… …
785 929
786 CFClient::add_font $_ for @fonts; 930 CFClient::add_font $_ for @fonts;
787 CFClient::set_font $fonts[0]; 931 CFClient::set_font $fonts[0];
788} 932}
789 933
790init_screen; 934video_init;
935audio_init;
791 936
792Event::loop; 937Event::loop;
793 938
939END { CFClient::SDL_Quit }
794 940
941

Diff Legend

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