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.125 by elmex, Mon Apr 17 20:29:37 2006 UTC vs.
Revision 1.159 by elmex, Sat Apr 22 22:13:16 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
50our $LOGVIEW; 45our $LOGVIEW;
51our $CONSOLE; 46our $CONSOLE;
52our $METASERVER; 47our $METASERVER;
53 48
54our $GAUGES; 49our $GAUGES;
50our $STATWIDS;
55 51
56our $SDL_ACTIVE; 52our $SDL_ACTIVE;
57our $SDL_EV;
58our %SDL_CB; 53our %SDL_CB;
54
55our $SDL_MIXER;
56our @SOUNDS; # event => file mapping
57our %AUDIO_CHUNKS; # audio files
59 58
60our $ALT_ENTER_MESSAGE; 59our $ALT_ENTER_MESSAGE;
61our $STATUS_LINE; 60our $STATUS_LINE;
62our $DEBUG_STATUS; 61our $DEBUG_STATUS;
63 62
64sub status { 63sub status {
65 $STATUS_LINE->set_text ($_[0]); 64 $STATUS_LINE->set_text ($_[0]);
66 my ($w, $h) = $STATUS_LINE->size_request;
67 $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});
68} 66}
69 67
70sub debug { 68sub debug {
71 $DEBUG_STATUS->set_text ($_[0]); 69 $DEBUG_STATUS->set_text ($_[0]);
72 my ($w, $h) = $DEBUG_STATUS->size_request; 70 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
73 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
74} 71}
75 72
76sub start_game { 73sub start_game {
77 status "logging in..."; 74 status "logging in...";
78 75
102 undef $CONN; 99 undef $CONN;
103} 100}
104 101
105sub client_setup { 102sub client_setup {
106 my $dialog = new CFClient::UI::FancyFrame 103 my $dialog = new CFClient::UI::FancyFrame
104 title => "Client Setup",
107 child => (my $vbox = new CFClient::UI::VBox); 105 child => (my $vbox = new CFClient::UI::VBox);
108 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
109 $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]);
110 107
111 $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");
112 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 109 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
113 110
114 $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]);
115 $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");
116 113
117 $mode_slider->connect (changed => sub { 114 $mode_slider->connect (changed => sub {
118 my ($self, $value) = @_; 115 my ($self, $value) = @_;
119 116
120 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 117 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
121 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 118 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
122 }); 119 });
123 $mode_slider->emit (changed => $mode_slider->{range}[0]); 120 $mode_slider->emit (changed => $mode_slider->{range}[0]);
124 121
122 my $row = 1;
123
125 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen"); 124 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
126 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 125 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
127 my ($self, $value) = @_; 126 my ($self, $value) = @_;
128 $CFG->{fullscreen} = $value; 127 $CFG->{fullscreen} = $value;
129 }); 128 });
130 129
131 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly"); 130 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
132 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 131 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
133 my ($self, $value) = @_; 132 my ($self, $value) = @_;
134 $CFG->{fast} = $value; 133 $CFG->{fast} = $value;
135 }); 134 });
136 135
137 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); 136 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
138 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 137 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
139 my ($self, $value) = @_; 138 my ($self, $value) = @_;
140 $CFG->{fow_enable} = $value; 139 $CFG->{fow_enable} = $value;
141 }); 140 });
142 141
143 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); 142 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
144 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 143 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
145 my ($self, $value) = @_; 144 my ($self, $value) = @_;
146 $CFG->{fow_intensity} = $value; 145 $CFG->{fow_intensity} = $value;
147 }); 146 });
148 147
149 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 148 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
150 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 149 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
151 my ($self, $value) = @_; 150 my ($self, $value) = @_;
152 $CFG->{fow_smooth} = $value; 151 $CFG->{fow_smooth} = $value;
152 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
153 }); 153 });
154 154
155 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 155 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
156 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
157 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
158# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
159 });
160
161 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
156 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 162 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
157 my ($self, $value) = @_;
158 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 163 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
159 }); 164 });
160 165
166 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
167 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{stat_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
168 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
169 &set_stats_window_fontsize;
170 });
171
172 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge width");
173 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_w_size}, 0.1, 0.5, 0.02], connect_changed => sub {
174 $CFG->{gauge_w_size} = $_[1];
175 my $h = int ($HEIGHT * $CFG->{gauge_size});
176 my $w = int ($WIDTH * $CFG->{gauge_w_size});
177 $GAUGES->{win}->set_size ($w, $h);
178 $GAUGES->{win}->{y} = $HEIGHT - $h;
179 $GAUGES->{win}->{x} = $WIDTH - $w;
180 $GAUGES->{win}->update;
181 });
182
183 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge height");
184 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], connect_changed => sub {
185 $CFG->{gauge_size} = $_[1];
186 my $h = int ($HEIGHT * $CFG->{gauge_size});
187 my $w = int ($WIDTH * $CFG->{gauge_w_size});
188 $GAUGES->{win}->set_size ($w, $h);
189 $GAUGES->{win}->{y} = $HEIGHT - $h;
190 $GAUGES->{win}->{x} = $WIDTH - $w;
191 $GAUGES->{win}->update;
192 });
193
194
195 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
196 $table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
197 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
198 &set_gauge_window_fontsize;
199 $GAUGES->{win}->check_size;
200 $GAUGES->{win}->update;
201 });
202
203
204
161 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 205 $table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
162 destroy_screen (); 206 video_shutdown ();
163 init_screen (); 207 video_init ();
208 });
209
210 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
211 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
212 $CFG->{audio_enable} = $_[1];
213 });
214# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
215# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
216# $CFG->{effects_volume} = $_[1];
217# });
218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
219 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
220 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
221 $CFG->{bgm_enable} = $_[1];
222 });
223 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
224 $CFG->{bgm_volume} = $_[1];
225 CFClient::MixMusic::volume $_[1] * 128;
226 });
227
228 $table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
229 audio_shutdown ();
230 audio_init ();
164 }); 231 });
165 232
166 $dialog 233 $dialog
234}
235
236sub set_stats_window_fontsize {
237 for (values %{$STATWIDS}) {
238 $_->set_fontsize ($::CFG->{stat_fontsize});
239 }
240}
241
242sub set_gauge_window_fontsize {
243 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
244 $_->set_fontsize ($::CFG->{gauge_fontsize});
245 }
246}
247
248sub make_gauge_window {
249 my $gh = int ($HEIGHT * $CFG->{gauge_size});
250 my $gw = int ($WIDTH * $CFG->{gauge_w_size});
251
252 my $win = new CFClient::UI::Frame (
253 y => $HEIGHT - $gh, x => $WIDTH - $gw, req_w => $gw, req_h => $gh
254 );
255 $win->add (my $vb = new CFClient::UI::VBox);
256
257 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
258 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', expand => 1);
259 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', expand => 1);
260 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);
261 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', expand => 1);
262 $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => -1, text => "XP:");
263 $vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => -1, text => "Lvl:");
264 $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => -1, text => "Rng:");
265
266
267 $GAUGES = {
268 exp => $exp, lvl => $lvl, win => $win, range => $rng,
269 food => $fg, mana => $mg, hp => $hg, grace => $gg
270 };
271 $win
272}
273
274sub make_stats_window {
275 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
276
277 $tgw->add (my $vb = new CFClient::UI::VBox);
278 $vb->add (my $uhb = new CFClient::UI::HBox);
279 $uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
280 $uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
281
282 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
283
284 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
285
286 $tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "S");
287 $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "D");
288 $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Co");
289 $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "I");
290 $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "W");
291 $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "P");
292 $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
293
294 $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
295 $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
296 $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
297 $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
298 $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
299 $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
300 $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
301
302 $tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
303 $tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
304 $tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
305 $tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
306 $tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
307 $tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
308
309 $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
310 $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
311 $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
312 $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
313 $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
314 $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
315
316 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
317
318 my $row = 0;
319 my $col = 0;
320
321 for (qw/slow holyw conf fire depl magic
322 drain acid pois para deat phys
323 blind fear tund elec cold ghit/)
324 {
325 $tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
326 $tbl2->add ($col + 1, $row,
327 $STATWIDS->{"res_$_"} =
328 new CFClient::UI::Label text => "0", align => -1, valign => 0
329 );
330
331 $row++;
332 if ($row % 6 == 0) {
333 $col += 2;
334 $row = 0;
335 }
336 }
337
338 &set_stats_window_fontsize;
339 update_stats_window ({});
340
341 $tgw
342}
343
344sub update_stats_window {
345 my ($stats) = @_;
346
347 # i love text protocols!!!
348 my $hp = $stats->{1} * 1;
349 my $hp_m = $stats->{2} * 1;
350 my $sp = $stats->{3} * 1;
351 my $sp_m = $stats->{4} * 1;
352 my $fo = $stats->{18} * 1;
353 my $fo_m = 999;
354 my $gr = $stats->{23} * 1;
355 my $gr_m = $stats->{24} * 1;
356
357 $GAUGES->{hp} ->set_value ($hp, $hp_m);
358 $GAUGES->{mana} ->set_value ($sp, $sp_m);
359 $GAUGES->{food} ->set_value ($fo, $fo_m);
360 $GAUGES->{grace} ->set_value ($gr, $gr_m);
361 $GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} || $stats->{28}));
362 my $rng = $stats->{20};
363 $rng =~ s/^Range: //; # thank you so much dear server
364 $GAUGES->{range} ->set_text ("Rng: " . $rng);
365 $GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});
366 $STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
367
368 if (0) { # this code can vanish, just wanted to preserver it for a checkin
369 $STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
370 $STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
371 $STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
372 $STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
373 $STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
374 $STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
375 $STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
376 $STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
377 $STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
378 $STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
379 $STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
380 $STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
381 $STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
382 } else {
383 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
384 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
385 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
386 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
387 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
388 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
389 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
390 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
391 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
392 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
393 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
394 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
395 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
396 }
397
398 my %tbl = (
399 phys => 100,
400 magic => 101,
401 fire => 102,
402 elec => 103,
403 cold => 104,
404 conf => 105,
405 acid => 106,
406 drain => 107,
407 ghit => 108,
408 pois => 109,
409 slow => 110,
410 para => 111,
411 tund => 112,
412 fear => 113,
413 deat => 115,
414 holyw => 116,
415 blind => 117
416 );
417
418 for (keys %tbl) {
419 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
420 }
421
167} 422}
168 423
169sub metaserver_dialog { 424sub metaserver_dialog {
170 my $dialog = new CFClient::UI::FancyFrame 425 my $dialog = new CFClient::UI::FancyFrame
426 title => "Metaserver",
171 child => (my $vbox = new CFClient::UI::VBox); 427 child => (my $vbox = new CFClient::UI::VBox);
172 428
173 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 429 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
174 430
175 $dialog 431 $dialog
232 $HOST->set_text ($CFG->{host} = $host); 488 $HOST->set_text ($CFG->{host} = $host);
233 }), 489 }),
234 (new CFClient::UI::Empty expand => 1), 490 (new CFClient::UI::Empty expand => 1),
235 ]); 491 ]);
236 492
237 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 493 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
238 for 0 .. $#$m; 494 for 0 .. $#$m;
239 } 495 }
240 } 496 }
241 }); 497 });
242} 498}
243 499
244sub server_setup { 500sub server_setup {
245 my $dialog = new CFClient::UI::FancyFrame 501 my $dialog = new CFClient::UI::FancyFrame
502 title => "Server Setup",
246 child => (my $vbox = new CFClient::UI::VBox); 503 child => (my $vbox = new CFClient::UI::VBox);
247 504
248 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
249 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 505 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
250 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); 506 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
251 507
252 { 508 {
253 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 509 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
254 510
255 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 511 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
256 my ($self, $value) = @_; 512 my ($self, $value) = @_;
257 $CFG->{host} = $value; 513 $CFG->{host} = $value;
258 }); 514 });
259 515
260 $METASERVER = metaserver_dialog; 516 $METASERVER = metaserver_dialog;
261 517
262 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub { 518 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
263 update_metaserver $HOST; 519 update_metaserver $HOST;
264 }); 520 });
265 } 521 }
266 522
267 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 523 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
268 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { 524 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
269 my ($self, $value) = @_; 525 my ($self, $value) = @_;
270 $CFG->{user} = $value; 526 $CFG->{user} = $value;
271 }); 527 });
272 528
273 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 529 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
274 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 530 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
275 my ($self, $value) = @_; 531 my ($self, $value) = @_;
276 $CFG->{password} = $value; 532 $CFG->{password} = $value;
277 }); 533 });
278 534
279 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 535 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
280 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 536 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
281 my ($self, $value) = @_; 537 my ($self, $value) = @_;
282 $CFG->{say_command} = $value; 538 $CFG->{say_command} = $value;
283 }); 539 });
284 540
285 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); 541 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
286 $table->add (1, 7, new CFClient::UI::Slider 542 $table->add (1, 7, new CFClient::UI::Slider
287 req_w => 100, 543 req_w => 100,
288 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 544 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
289 connect_changed => sub { 545 connect_changed => sub {
290 my ($self, $value) = @_; 546 my ($self, $value) = @_;
300 $dialog 556 $dialog
301} 557}
302 558
303sub message_window { 559sub message_window {
304 my $window = new CFClient::UI::FancyFrame 560 my $window = new CFClient::UI::FancyFrame
561 title => "Messages",
305 border_bg => [1, 1, 1, 0.5], 562 border_bg => [1, 1, 1, 0.5],
306 bg => [0.3, 0.3, 0.3, 0.8], 563 bg => [0.3, 0.3, 0.3, 0.8],
307 user_w => int $::WIDTH / 3, 564 user_w => int $::WIDTH / 3,
308 user_h => int $::HEIGHT / 5, 565 user_h => int $::HEIGHT / 5,
309 child => (my $vbox = new CFClient::UI::VBox); 566 child => (my $vbox = new CFClient::UI::VBox);
351 608
352 $window 609 $window
353} 610}
354 611
355sub sdl_init { 612sub sdl_init {
356 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 613 CFClient::SDL_Init
357 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
358 and die "SDL::Init failed!\n"; 614 and die "SDL::Init failed!\n";
359} 615}
360 616
361sub init_screen { 617sub video_init {
362 sdl_init; 618 sdl_init;
363 619
364 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 620 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
365 $FULLSCREEN = $CFG->{fullscreen}; 621 $FULLSCREEN = $CFG->{fullscreen};
366 $FAST = $CFG->{fast}; 622 $FAST = $CFG->{fast};
367 623
368 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 624 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
369 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
370 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
371 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
372
373 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
374 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
375 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
376 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
377
378 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
379 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
380 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
381
382 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
383 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
384 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
385 or die "SDL::SetVideoMode failed!\n"; 625 or die "SDL_SetVideoMode failed!\n";
386
387 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
388
389 $SDL_EV = new SDL::Event;
390 $SDL_EV->set_unicode (1);
391 626
392 $SDL_ACTIVE = 1; 627 $SDL_ACTIVE = 1;
393 628
394 $LAST_REFRESH = time - 0.01; 629 $LAST_REFRESH = time - 0.01;
395 630
396 CFClient::gl_init; 631 CFClient::gl_init;
397 632
398 $FONTSIZE = int $HEIGHT / 40; 633 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
399 634
400 ############################################################################# 635 #############################################################################
401 636
402 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 637 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
403 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 638 $DEBUG_STATUS->show;
404 639
405 $STATUS_LINE = new CFClient::UI::Label 640 $STATUS_LINE = new CFClient::UI::Label
406 padding => 0, 641 padding => 0,
407 y => $HEIGHT * 44 / 45 - $FONTSIZE; 642 y => $HEIGHT - $FONTSIZE * 1.8;
408 $CFClient::UI::ROOT->add ($STATUS_LINE); 643 $STATUS_LINE->show;
409 644
410 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 645 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
411 padding => 0, 646 padding => 0,
412 y => $HEIGHT * 44 / 45,
413 fontsize => $HEIGHT / 45, 647 fontsize => 0.8,
414 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 648 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
415 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 649 $ALT_ENTER_MESSAGE->show;
650 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
416 651
417 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 652 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
418 $MAPWIDGET->focus_in; 653 $MAPWIDGET->focus_in;
419 $MAPWIDGET->connect (activate_console => sub { 654 $MAPWIDGET->connect (activate_console => sub {
420 my ($mapwidget, $preset) = @_; 655 my ($mapwidget, $preset) = @_;
421 656
422 if ($CONSOLE) { 657 if ($CONSOLE) {
438 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 673 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
439 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 674 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
440 status "Configuration Saved"; 675 status "Configuration Saved";
441 }); 676 });
442 677
678 $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
679 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
680
443 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 681 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
444 682
445 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 150, y => 0);
446 $tgw->add (my $hb = new CFClient::UI::HBox (req_w => 60, req_h => 150));
447 $hb->add (my $fg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'food', expand => 1));
448 $hb->add (my $mg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'mana', expand => 1));
449 $hb->add (my $hg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'hp', expand => 1));
450 $hb->add (my $gg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'grace', expand => 1));
451 683
452 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
453 $CFClient::UI::ROOT->add ($tgw);
454} 684}
455 685
456sub destroy_screen { 686sub video_shutdown {
457 $CFClient::UI::ROOT->{children} = []; 687 $CFClient::UI::ROOT->{children} = [];
458 undef $SDL_ACTIVE; 688 undef $SDL_ACTIVE;
689}
690
691my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
692my $bgmusic;#TODO#hack#d#
693
694sub audio_music_finished {
695 return unless $CFG->{bgm_enable};
696
697 # TODO: hack, do play loop and mood music
698 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
699 $bgmusic->play (0);
700
701 push @bgmusic, shift @bgmusic;
702}
703
704sub audio_init {
705 if ($CFG->{audio_enable}) {
706 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
707 $SDL_MIXER = !CFClient::Mix_OpenAudio;
708 CFClient::Mix_AllocateChannels 8;
709 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
710
711 audio_music_finished;
712
713 while (<$fh>) {
714 next if /^\s*#/;
715 next if /^\s*$/;
716
717 my ($file, $volume, $event) = split /\s+/, $_, 3;
718
719 push @SOUNDS, "$volume,$file";
720
721 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
722 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
723 $chunk->volume ($volume * 128 / 100);
724 $chunk
725 };
726 }
727 } else {
728 status "unable to open sound config: $!";
729 }
730 }
731}
732
733sub audio_shutdown {
734 CFClient::Mix_CloseAudio if $SDL_MIXER;
459 undef $SDL_EV; 735 undef $SDL_MIXER;
460 SDL::Quit; 736 @SOUNDS = ();
737 %AUDIO_CHUNKS = ();
461} 738}
462 739
463my %animate_object; 740my %animate_object;
464my $animate_timer; 741my $animate_timer;
465 742
475 $want_refresh = 0; 752 $want_refresh = 0;
476 $can_refresh = 0; 753 $can_refresh = 0;
477 754
478 $CFClient::UI::ROOT->draw; 755 $CFClient::UI::ROOT->draw;
479 756
480 SDL::GLSwapBuffers; 757 CFClient::SDL_GL_SwapBuffers;
481 758
482 $LAST_REFRESH = $NOW; 759 $LAST_REFRESH = $NOW;
483} 760}
484 761
485my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 762my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
486 $NOW = time; 763 $NOW = time;
487 764
488 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 765 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
489 while $SDL_EV->poll; 766 for CFClient::SDL_PollEvent;
490 767
491 if (%animate_object) { 768 if (%animate_object) {
492 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 769 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
493 $want_refresh++; 770 $want_refresh++;
494 } 771 }
517@conn::ISA = Crossfire::Protocol::; 794@conn::ISA = Crossfire::Protocol::;
518 795
519sub conn::stats_update { 796sub conn::stats_update {
520 my ($self, $stats) = @_; 797 my ($self, $stats) = @_;
521 798
522 # i love text protocols!!! 799 update_stats_window ($stats);
523 # FIXME: the stats are somehow weird
524 my $hp = $stats->{1};
525 my $hp_m = $stats->{2};
526 my $sp = $stats->{3};
527 my $sp_m = $stats->{4};
528 my $fo = $stats->{18};
529 my $fo_m = 1000;
530 my $gr = $stats->{23};
531 my $gr_m = $stats->{24};
532
533 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
534 $GAUGES->{hp}->set_value ($hp, $hp_m);
535 $GAUGES->{mana}->set_value ($sp, $sp_m);
536 $GAUGES->{food}->set_value ($fo, $fo_m);
537 $GAUGES->{grace}->set_value ($gr, $gr_m);
538} 800}
539 801
540sub conn::user_send { 802sub conn::user_send {
541 my ($self, $command) = @_; 803 my ($self, $command) = @_;
542 804
567 829
568 my ($hash, $x, $y, $w, $h) = @$map_info; 830 my ($hash, $x, $y, $w, $h) = @$map_info;
569 831
570 my $data = $MAP->get_rect ($x, $y, $w, $h); 832 my $data = $MAP->get_rect ($x, $y, $w, $h);
571 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 833 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
572
573 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 834 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
574
575} 835}
576 836
577sub conn::map_clear { 837sub conn::map_clear {
578 my ($self) = @_; 838 my ($self) = @_;
579 839
580 $self->flush_map; 840 $self->flush_map;
581 delete $self->{neigh}; 841 delete $self->{neigh_map};
582 842
583 $MAP->clear; 843 $MAP->clear;
584} 844}
585 845
586 846
587sub conn::load_map($$$) { 847sub conn::load_map($$$) {
588 my ($self, $hash, $x, $y) = @_; 848 my ($self, $hash, $x, $y) = @_;
589 849
590 if (defined (my $data = $MAPCACHE->get ($hash))) { 850 if (defined (my $data = $MAPCACHE->get ($hash))) {
591 $data = Compress::LZF::decompress $data; 851 $data = Compress::LZF::decompress $data;
592 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 852 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
593 for my $id ($MAP->set_rect ($x, $y, $data)) { 853 for my $id ($MAP->set_rect ($x, $y, $data)) {
594 my $data = $TILECACHE->get ($id) 854 my $data = $TILECACHE->get ($id)
595 or next; 855 or next;
596 856
597 $self->set_texture ($id => $data); 857 $self->set_texture ($id => $data);
598 } 858 }
599 } 859 }
600} 860}
601 861
862# this method does a "flood fill" into every tile direction
863# it assumes that tiles are arranged in a rectangular grid,
864# i.e. a map is the same as the left of the right map etc.
865# failure to comply are harmless and result in display errors
866# at worst.
602sub conn::flood_fill { 867sub conn::flood_fill {
603 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 868 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
604 869
605 # the server does not allow map paths > 6 870 # the server does not allow map paths > 6
606 return if 6 <= length $path; 871 return if 6 <= length $path;
607 872
608 for my $tile (1..4) { 873 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
609 next if $self->{neigh}{$hash}[$tile]; 874
875 for (
876 [1, 0, -1],
877 [2, 1, 0],
878 [3, 0, 1],
879 [4, -1, 0],
880 ) {
881 my ($tile, $dx, $dy) = @$_;
882
883 my $gx = $gx + $dx;
884 my $gy = $gy + $dy;
885
610 next unless $flags & (1 << ($tile - 1)); 886 next unless $flags & (1 << ($tile - 1));
887 next if $self->{neigh_grid}{$gx, $gy}++;
611 888
612 my $neigh = $self->{neigh}{$hash} ||= []; 889 my $neigh = $self->{neigh_map}{$hash} ||= [];
613 890 if (my $info = $neigh->[$tile]) {
614 $self->send_mapinfo ("spatial $path$tile", sub {
615 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 891 my ($flags, $x, $y, $w, $h, $hash) = @$info;
616 892
617 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
618 return if $mode ne "spatial";
619
620 $x += $MAP->ox;
621 $y += $MAP->oy;
622
623 $self->load_map ($hash, $x, $y)
624 unless $self->{neigh}{$hash}[5]++;#d#
625
626 $neigh->[$tile] = [$x, $y, $w, $h];
627
628 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 893 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
629 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 894 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
895
896 } else {
897 $self->send_mapinfo ("spatial $path$tile", sub {
898 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
899
900 return if $mode ne "spatial";
901
902 $x += $MAP->ox;
903 $y += $MAP->oy;
904
905 $self->load_map ($hash, $x, $y)
906 unless $self->{neigh_map}{$hash}[5]++;#d#
907
908 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
909
910 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
911 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
912 });
630 }); 913 }
631 } 914 }
632} 915}
633 916
634sub conn::map_change { 917sub conn::map_change {
635 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 918 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
636 919
637 $self->flush_map; 920 $self->flush_map;
638 921
639 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 922 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
640 923
641 warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
642
643 my $mapmapw = 250; 924 my $mapmapw = 250;
644 my $mapmaph = 250; 925 my $mapmaph = 250;
926
927 $self->{neigh_rect} = [
928 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
929 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
930 ];
645 931
932 delete $self->{neigh_grid};
646 $self->flood_fill ("", $hash, $flags, 933 $self->flood_fill (0, 0, "", $hash, $flags);
647 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
648 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
649 934
650 $x += $ox; 935 $x += $ox;
651 $y += $oy; 936 $y += $oy;
652 937
653 $self->{map_info} = [$hash, $x, $y, $w, $h]; 938 $self->{map_info} = [$hash, $x, $y, $w, $h];
939
940 my $map = $self->{map_info}[0];
941 $map =~ s/^.*?\/([^\/]+)$/\1/;
942 $STATWIDS->{map}->set_text ("Map: " . $map);
654 943
655 $self->load_map ($hash, $x, $y); 944 $self->load_map ($hash, $x, $y);
656} 945}
657 946
658sub conn::face_find { 947sub conn::face_find {
710 999
711 $tex 1000 $tex
712 }; 1001 };
713} 1002}
714 1003
1004sub conn::sound_play {
1005 my ($self, $x, $y, $soundnum, $type) = @_;
1006
1007 $SDL_MIXER
1008 or return;
1009
1010 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1011 or return;
1012
1013 $chunk->play;
1014# warn "sound $x,$y,$soundnum,$type\n";#d#
1015}
1016
715sub conn::query { 1017sub conn::query {
716 my ($self, $flags, $prompt) = @_; 1018 my ($self, $flags, $prompt) = @_;
717 1019
718 #TODO 1020 #TODO, display dialog with relevant information
719 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1021 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
720} 1022}
721 1023
722sub conn::drawinfo { 1024sub conn::drawinfo {
723 my ($self, $color, $text) = @_; 1025 my ($self, $color, $text) = @_;
739 ); 1041 );
740 1042
741 $LOGVIEW->add_paragraph ($color[$color], $text); 1043 $LOGVIEW->add_paragraph ($color[$color], $text);
742} 1044}
743 1045
1046sub conn::spell_add {
1047 my ($self, $spell) = @_;
1048
1049 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
1050 });
1051 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
1052 });
1053}
1054
1055sub conn::spell_delete {
1056 my ($self, $spell) = @_;
1057}
1058
1059sub conn::addme_success {
1060 my ($self) = @_;
1061
1062 for my $skill (values %{$self->{skill_info}}) {
1063 $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
1064 });
1065 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
1066 });
1067 }
1068}
1069
744%SDL_CB = ( 1070%SDL_CB = (
745 SDL_QUIT() => sub { 1071 CFClient::SDL_QUIT => sub {
746 Event::unloop -1; 1072 Event::unloop -1;
747 }, 1073 },
748 SDL_VIDEORESIZE() => sub { 1074 CFClient::SDL_VIDEORESIZE => sub {
749 }, 1075 },
750 SDL_VIDEOEXPOSE() => sub { 1076 CFClient::SDL_VIDEOEXPOSE => \&refresh,
751 refresh; 1077 CFClient::SDL_ACTIVEEVENT => sub {
1078# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
752 }, 1079 },
753 SDL_KEYDOWN() => sub { 1080 CFClient::SDL_KEYDOWN => sub {
754 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 1081 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
755 # alt-enter 1082 # alt-enter
756 destroy_screen; 1083 video_shutdown;
757 $CFG->{fullscreen} = !$CFG->{fullscreen}; 1084 $CFG->{fullscreen} = !$CFG->{fullscreen};
758 init_screen; 1085 video_init;
759 } else { 1086 } else {
760 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 1087 CFClient::UI::feed_sdl_key_down_event ($_[0]);
761 } 1088 }
762 }, 1089 },
763 SDL_KEYUP() => sub { 1090 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
764 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 1091 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
765 }, 1092 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
766 SDL_MOUSEMOTION() => sub { 1093 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
767 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 1094 CFClient::SDL_USEREVENT => \&audio_music_finished,
768 },
769 SDL_MOUSEBUTTONDOWN() => sub {
770 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
771 },
772 SDL_MOUSEBUTTONUP() => sub {
773 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
774 },
775 SDL_ACTIVEEVENT() => sub {
776# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
777 },
778); 1095);
779 1096
780############################################################################# 1097#############################################################################
1098
1099$SIG{INT} = $SIG{TERM} = sub { exit };
781 1100
782$TILECACHE = CFClient::db_table "tilecache"; 1101$TILECACHE = CFClient::db_table "tilecache";
783$FACEMAP = CFClient::db_table "facemap"; 1102$FACEMAP = CFClient::db_table "facemap";
784 1103
785CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1104CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
791 fullscreen => 0, 1110 fullscreen => 0,
792 fast => 0, 1111 fast => 0,
793 fow_enable => 1, 1112 fow_enable => 1,
794 fow_intensity => 0.45, 1113 fow_intensity => 0.45,
795 fow_smooth => 0, 1114 fow_smooth => 0,
1115 gui_fontsize => 1,
796 log_fontsize => 14, 1116 log_fontsize => 1,
1117 gauge_fontsize => 1,
1118 gauge_size => 0.35,
1119 gauge_w_size => 0.14,
1120 stat_fontsize => 1,
797 mapsize => 100, 1121 mapsize => 100,
798 host => "crossfire.schmorp.de", 1122 host => "crossfire.schmorp.de",
799 say_command => 'say', 1123 say_command => 'say',
1124 audio_enable => 1,
1125 bgm_enable => 1,
1126 bgm_volume => 0.25,
800); 1127);
801 1128
802while (my ($k, $v) = each %DEF_CFG) { 1129while (my ($k, $v) = each %DEF_CFG) {
803 $CFG->{$k} = $v unless exists $CFG->{$k}; 1130 $CFG->{$k} = $v unless exists $CFG->{$k};
804} 1131}
805 1132
806sdl_init; 1133sdl_init;
807 1134
808@SDL_MODES = reverse 1135@SDL_MODES = reverse
809 grep $_->[0] >= 640 && $_->[1] >= 480, 1136 grep $_->[0] >= 640 && $_->[1] >= 480,
810 map [SDL::RectW ($_), SDL::RectH ($_)], 1137 CFClient::SDL_ListModes;
811 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
812 1138
813@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1139@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
814 1140
815$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1141$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
816 1142
819 1145
820 CFClient::add_font $_ for @fonts; 1146 CFClient::add_font $_ for @fonts;
821 CFClient::set_font $fonts[0]; 1147 CFClient::set_font $fonts[0];
822} 1148}
823 1149
824init_screen; 1150video_init;
1151audio_init;
825 1152
826Event::loop; 1153Event::loop;
827 1154
1155END { CFClient::SDL_Quit }
828 1156
1157

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines