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.127 by elmex, Mon Apr 17 21:07:03 2006 UTC vs.
Revision 1.157 by elmex, Fri Apr 21 15:03:47 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
125 $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");
126 $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 {
127 my ($self, $value) = @_; 124 my ($self, $value) = @_;
128 $CFG->{fullscreen} = $value; 125 $CFG->{fullscreen} = $value;
129 }); 126 });
130 127
131 $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");
132 $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 {
133 my ($self, $value) = @_; 130 my ($self, $value) = @_;
134 $CFG->{fast} = $value; 131 $CFG->{fast} = $value;
135 }); 132 });
136 133
137 $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");
138 $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 {
139 my ($self, $value) = @_; 136 my ($self, $value) = @_;
140 $CFG->{fow_enable} = $value; 137 $CFG->{fow_enable} = $value;
141 }); 138 });
142 139
143 $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");
144 $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 {
145 my ($self, $value) = @_; 142 my ($self, $value) = @_;
146 $CFG->{fow_intensity} = $value; 143 $CFG->{fow_intensity} = $value;
147 }); 144 });
148 145
149 $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");
150 $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 {
151 my ($self, $value) = @_; 148 my ($self, $value) = @_;
152 $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;
153 }); 151 });
154 152
155 $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");
156 $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 {
157 my ($self, $value) = @_;
158 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 161 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
159 }); 162 });
160 163
164 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
165 $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{stat_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
166 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
167 &set_stats_window_fontsize;
168 });
169
170
161 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 171 $table->add (1, 9, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
162 destroy_screen (); 172 video_shutdown ();
163 init_screen (); 173 video_init ();
174 });
175
176 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
177 $table->add (1, 10, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
178 $CFG->{audio_enable} = $_[1];
179 });
180# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
181# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
182# $CFG->{effects_volume} = $_[1];
183# });
184 $table->add (0, 11, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
185 $table->add (1, 11, my $hbox = new CFClient::UI::HBox);
186 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
187 $CFG->{bgm_enable} = $_[1];
188 });
189 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
190 $CFG->{bgm_volume} = $_[1];
191 CFClient::MixMusic::volume $_[1] * 128;
192 });
193
194 $table->add (1, 12, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
195 audio_shutdown ();
196 audio_init ();
164 }); 197 });
165 198
166 $dialog 199 $dialog
200}
201
202sub set_stats_window_fontsize {
203 for (values %{$STATWIDS}, values %{$GAUGES}) {
204 $_->set_fontsize ($::CFG->{stat_fontsize});
205 }
206}
207
208sub make_stats_window {
209 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
210
211 $tgw->add (my $vb = new CFClient::UI::VBox);
212 $vb->add (my $uhb = new CFClient::UI::HBox);
213 $uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
214 $uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
215 $vb->add (my $dhb = new CFClient::UI::HBox);
216 $dhb->add ($STATWIDS->{exp} = new CFClient::UI::Label valign => 0, align => -1, text => "Exp:", expand => 1);
217 $dhb->add ($STATWIDS->{lvl} = new CFClient::UI::Label valign => 0, align => -1, text => "Level:", expand => 1);
218
219 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
220 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', expand => 1);
221 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', expand => 1);
222 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);
223 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', expand => 1);
224 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
225
226 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
227
228 if (0) { # this code can vanish, just wanted to preserver it for a checkin
229 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "S");
230 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "D");
231 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "Co");
232 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "I");
233 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "W");
234 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "P");
235 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "Ch");
236
237 $tbl->add (1, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
238 $tbl->add (1, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
239 $tbl->add (1, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
240 $tbl->add (1, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
241 $tbl->add (1, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
242 $tbl->add (1, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
243 } else {
244 $tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "S");
245 $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "D");
246 $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Co");
247 $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "I");
248 $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "W");
249 $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "P");
250 $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
251
252 $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
253 $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
254 $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
255 $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
256 $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
257 $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
258 $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
259
260 $tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
261 $tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
262 $tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
263 $tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
264 $tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
265 $tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
266
267 $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
268 $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
269 $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
270 $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
271 $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
272 $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
273 }
274
275 $hb->add (my $tbl2 = new CFClient::UI::Table);
276
277 my $row = 0;
278 my $col = 0;
279
280 for (qw/slow holyw conf fire depl magic
281 drain acid pois para deat phys
282 blind fear tund elec cold ghit/)
283 {
284 $tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
285 $tbl2->add ($col + 1, $row,
286 $STATWIDS->{"res_$_"} =
287 new CFClient::UI::Label text => "0", align => -1, valign => 0
288 );
289
290 $row++;
291 if ($row % 6 == 0) {
292 $col += 2;
293 $row = 0;
294 }
295 }
296
297 &set_stats_window_fontsize;
298 update_stats_window ({});
299
300 $tgw
301}
302
303sub update_stats_window {
304 my ($stats) = @_;
305
306 # i love text protocols!!!
307 my $hp = $stats->{1} * 1;
308 my $hp_m = $stats->{2} * 1;
309 my $sp = $stats->{3} * 1;
310 my $sp_m = $stats->{4} * 1;
311 my $fo = $stats->{18} * 1;
312 my $fo_m = 999;
313 my $gr = $stats->{23} * 1;
314 my $gr_m = $stats->{24} * 1;
315
316 $GAUGES->{hp} ->set_value ($hp, $hp_m);
317 $GAUGES->{mana} ->set_value ($sp, $sp_m);
318 $GAUGES->{food} ->set_value ($fo, $fo_m);
319 $GAUGES->{grace} ->set_value ($gr, $gr_m);
320 $STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
321 $STATWIDS->{exp} ->set_text ("Exp.: " . ($stats->{11} || $stats->{28}));
322 $STATWIDS->{lvl} ->set_text ("Level: " . $stats->{12});
323
324 if (0) { # this code can vanish, just wanted to preserver it for a checkin
325 $STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
326 $STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
327 $STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
328 $STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
329 $STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
330 $STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
331 $STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
332 $STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
333 $STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
334 $STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
335 $STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
336 $STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
337 $STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
338 } else {
339 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
340 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
341 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
342 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
343 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
344 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
345 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
346 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
347 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
348 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
349 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
350 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
351 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
352 }
353
354 my %tbl = (
355 phys => 100,
356 magic => 101,
357 fire => 102,
358 elec => 103,
359 cold => 104,
360 conf => 105,
361 acid => 106,
362 drain => 107,
363 ghit => 108,
364 pois => 109,
365 slow => 110,
366 para => 111,
367 tund => 112,
368 fear => 113,
369 deat => 115,
370 holyw => 116,
371 blind => 117
372 );
373
374 for (keys %tbl) {
375 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
376 }
377
167} 378}
168 379
169sub metaserver_dialog { 380sub metaserver_dialog {
170 my $dialog = new CFClient::UI::FancyFrame 381 my $dialog = new CFClient::UI::FancyFrame
382 title => "Metaserver",
171 child => (my $vbox = new CFClient::UI::VBox); 383 child => (my $vbox = new CFClient::UI::VBox);
172 384
173 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 385 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
174 386
175 $dialog 387 $dialog
… …
232 $HOST->set_text ($CFG->{host} = $host); 444 $HOST->set_text ($CFG->{host} = $host);
233 }), 445 }),
234 (new CFClient::UI::Empty expand => 1), 446 (new CFClient::UI::Empty expand => 1),
235 ]); 447 ]);
236 448
237 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) 449 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
238 for 0 .. $#$m; 450 for 0 .. $#$m;
239 } 451 }
240 } 452 }
241 }); 453 });
242} 454}
243 455
244sub server_setup { 456sub server_setup {
245 my $dialog = new CFClient::UI::FancyFrame 457 my $dialog = new CFClient::UI::FancyFrame
458 title => "Server Setup",
246 child => (my $vbox = new CFClient::UI::VBox); 459 child => (my $vbox = new CFClient::UI::VBox);
247 460
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]); 461 $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"); 462 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
251 463
252 { 464 {
253 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 465 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
254 466
255 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { 467 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
256 my ($self, $value) = @_; 468 my ($self, $value) = @_;
257 $CFG->{host} = $value; 469 $CFG->{host} = $value;
258 }); 470 });
259 471
260 $METASERVER = metaserver_dialog; 472 $METASERVER = metaserver_dialog;
261 473
262 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub { 474 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
263 update_metaserver $HOST; 475 update_metaserver $HOST;
264 }); 476 });
265 } 477 }
266 478
267 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 479 $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 { 480 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
269 my ($self, $value) = @_; 481 my ($self, $value) = @_;
270 $CFG->{user} = $value; 482 $CFG->{user} = $value;
271 }); 483 });
272 484
273 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 485 $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 { 486 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
275 my ($self, $value) = @_; 487 my ($self, $value) = @_;
276 $CFG->{password} = $value; 488 $CFG->{password} = $value;
277 }); 489 });
278 490
279 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); 491 $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 { 492 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
281 my ($self, $value) = @_; 493 my ($self, $value) = @_;
282 $CFG->{say_command} = $value; 494 $CFG->{say_command} = $value;
283 }); 495 });
284 496
285 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); 497 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
286 $table->add (1, 7, new CFClient::UI::Slider 498 $table->add (1, 7, new CFClient::UI::Slider
287 req_w => 100, 499 req_w => 100,
288 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 500 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
289 connect_changed => sub { 501 connect_changed => sub {
290 my ($self, $value) = @_; 502 my ($self, $value) = @_;
… …
300 $dialog 512 $dialog
301} 513}
302 514
303sub message_window { 515sub message_window {
304 my $window = new CFClient::UI::FancyFrame 516 my $window = new CFClient::UI::FancyFrame
517 title => "Messages",
305 border_bg => [1, 1, 1, 0.5], 518 border_bg => [1, 1, 1, 0.5],
306 bg => [0.3, 0.3, 0.3, 0.8], 519 bg => [0.3, 0.3, 0.3, 0.8],
307 user_w => int $::WIDTH / 3, 520 user_w => int $::WIDTH / 3,
308 user_h => int $::HEIGHT / 5, 521 user_h => int $::HEIGHT / 5,
309 child => (my $vbox = new CFClient::UI::VBox); 522 child => (my $vbox = new CFClient::UI::VBox);
… …
351 564
352 $window 565 $window
353} 566}
354 567
355sub sdl_init { 568sub sdl_init {
356 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 569 CFClient::SDL_Init
357 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
358 and die "SDL::Init failed!\n"; 570 and die "SDL::Init failed!\n";
359} 571}
360 572
361sub init_screen { 573sub video_init {
362 sdl_init; 574 sdl_init;
363 575
364 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 576 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
365 $FULLSCREEN = $CFG->{fullscreen}; 577 $FULLSCREEN = $CFG->{fullscreen};
366 $FAST = $CFG->{fast}; 578 $FAST = $CFG->{fast};
367 579
368 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 580 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"; 581 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 582
392 $SDL_ACTIVE = 1; 583 $SDL_ACTIVE = 1;
393 584
394 $LAST_REFRESH = time - 0.01; 585 $LAST_REFRESH = time - 0.01;
395 586
396 CFClient::gl_init; 587 CFClient::gl_init;
397 588
398 $FONTSIZE = int $HEIGHT / 40; 589 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
399 590
400 ############################################################################# 591 #############################################################################
401 592
402 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 593 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
403 $CFClient::UI::ROOT->add ($DEBUG_STATUS); 594 $DEBUG_STATUS->show;
404 595
405 $STATUS_LINE = new CFClient::UI::Label 596 $STATUS_LINE = new CFClient::UI::Label
406 padding => 0, 597 padding => 0,
407 y => $HEIGHT * 44 / 45 - $FONTSIZE; 598 y => $HEIGHT - $FONTSIZE * 1.8;
408 $CFClient::UI::ROOT->add ($STATUS_LINE); 599 $STATUS_LINE->show;
409 600
410 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 601 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
411 padding => 0, 602 padding => 0,
412 y => $HEIGHT * 44 / 45,
413 fontsize => $HEIGHT / 45, 603 fontsize => 0.8,
414 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 604 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
415 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 605 $ALT_ENTER_MESSAGE->show;
606 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
416 607
417 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 608 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
418 $MAPWIDGET->focus_in; 609 $MAPWIDGET->focus_in;
419 $MAPWIDGET->connect (activate_console => sub { 610 $MAPWIDGET->connect (activate_console => sub {
420 my ($mapwidget, $preset) = @_; 611 my ($mapwidget, $preset) = @_;
421 612
422 if ($CONSOLE) { 613 if ($CONSOLE) {
… …
440 status "Configuration Saved"; 631 status "Configuration Saved";
441 }); 632 });
442 633
443 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 634 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
444 635
445 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
446 $tgw->add (my $hbox = new CFClient::UI::HBox ());
447 636
448 $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food', expand => 1));
449 $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana', expand => 1));
450 $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp', expand => 1));
451 $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace', expand => 1));
452
453 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
454 $CFClient::UI::ROOT->add ($tgw); 637 $CFClient::UI::ROOT->add (make_stats_window);
455} 638}
456 639
457sub destroy_screen { 640sub video_shutdown {
458 $CFClient::UI::ROOT->{children} = []; 641 $CFClient::UI::ROOT->{children} = [];
459 undef $SDL_ACTIVE; 642 undef $SDL_ACTIVE;
643}
644
645my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
646my $bgmusic;#TODO#hack#d#
647
648sub audio_music_finished {
649 return unless $CFG->{bgm_enable};
650
651 # TODO: hack, do play loop and mood music
652 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
653 $bgmusic->play (0);
654
655 push @bgmusic, shift @bgmusic;
656}
657
658sub audio_init {
659 if ($CFG->{audio_enable}) {
660 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
661 $SDL_MIXER = !CFClient::Mix_OpenAudio;
662 CFClient::Mix_AllocateChannels 8;
663 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
664
665 audio_music_finished;
666
667 while (<$fh>) {
668 next if /^\s*#/;
669 next if /^\s*$/;
670
671 my ($file, $volume, $event) = split /\s+/, $_, 3;
672
673 push @SOUNDS, "$volume,$file";
674
675 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
676 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
677 $chunk->volume ($volume * 128 / 100);
678 $chunk
679 };
680 }
681 } else {
682 status "unable to open sound config: $!";
683 }
684 }
685}
686
687sub audio_shutdown {
688 CFClient::Mix_CloseAudio if $SDL_MIXER;
460 undef $SDL_EV; 689 undef $SDL_MIXER;
461 SDL::Quit; 690 @SOUNDS = ();
691 %AUDIO_CHUNKS = ();
462} 692}
463 693
464my %animate_object; 694my %animate_object;
465my $animate_timer; 695my $animate_timer;
466 696
… …
476 $want_refresh = 0; 706 $want_refresh = 0;
477 $can_refresh = 0; 707 $can_refresh = 0;
478 708
479 $CFClient::UI::ROOT->draw; 709 $CFClient::UI::ROOT->draw;
480 710
481 SDL::GLSwapBuffers; 711 CFClient::SDL_GL_SwapBuffers;
482 712
483 $LAST_REFRESH = $NOW; 713 $LAST_REFRESH = $NOW;
484} 714}
485 715
486my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 716my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
487 $NOW = time; 717 $NOW = time;
488 718
489 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 719 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
490 while $SDL_EV->poll; 720 for CFClient::SDL_PollEvent;
491 721
492 if (%animate_object) { 722 if (%animate_object) {
493 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 723 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
494 $want_refresh++; 724 $want_refresh++;
495 } 725 }
… …
518@conn::ISA = Crossfire::Protocol::; 748@conn::ISA = Crossfire::Protocol::;
519 749
520sub conn::stats_update { 750sub conn::stats_update {
521 my ($self, $stats) = @_; 751 my ($self, $stats) = @_;
522 752
523 # i love text protocols!!! 753 update_stats_window ($stats);
524 # FIXME: the stats are somehow weird
525 my $hp = $stats->{1};
526 my $hp_m = $stats->{2};
527 my $sp = $stats->{3};
528 my $sp_m = $stats->{4};
529 my $fo = $stats->{18};
530 my $fo_m = 1000;
531 my $gr = $stats->{23};
532 my $gr_m = $stats->{24};
533
534 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
535 $GAUGES->{hp}->set_value ($hp, $hp_m);
536 $GAUGES->{mana}->set_value ($sp, $sp_m);
537 $GAUGES->{food}->set_value ($fo, $fo_m);
538 $GAUGES->{grace}->set_value ($gr, $gr_m);
539} 754}
540 755
541sub conn::user_send { 756sub conn::user_send {
542 my ($self, $command) = @_; 757 my ($self, $command) = @_;
543 758
… …
568 783
569 my ($hash, $x, $y, $w, $h) = @$map_info; 784 my ($hash, $x, $y, $w, $h) = @$map_info;
570 785
571 my $data = $MAP->get_rect ($x, $y, $w, $h); 786 my $data = $MAP->get_rect ($x, $y, $w, $h);
572 $MAPCACHE->put ($hash => Compress::LZF::compress $data); 787 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
573
574 warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 788 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
575
576} 789}
577 790
578sub conn::map_clear { 791sub conn::map_clear {
579 my ($self) = @_; 792 my ($self) = @_;
580 793
581 $self->flush_map; 794 $self->flush_map;
582 delete $self->{neigh}; 795 delete $self->{neigh_map};
583 796
584 $MAP->clear; 797 $MAP->clear;
585} 798}
586 799
587 800
588sub conn::load_map($$$) { 801sub conn::load_map($$$) {
589 my ($self, $hash, $x, $y) = @_; 802 my ($self, $hash, $x, $y) = @_;
590 803
591 if (defined (my $data = $MAPCACHE->get ($hash))) { 804 if (defined (my $data = $MAPCACHE->get ($hash))) {
592 $data = Compress::LZF::decompress $data; 805 $data = Compress::LZF::decompress $data;
593 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 806 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
594 for my $id ($MAP->set_rect ($x, $y, $data)) { 807 for my $id ($MAP->set_rect ($x, $y, $data)) {
595 my $data = $TILECACHE->get ($id) 808 my $data = $TILECACHE->get ($id)
596 or next; 809 or next;
597 810
598 $self->set_texture ($id => $data); 811 $self->set_texture ($id => $data);
599 } 812 }
600 } 813 }
601} 814}
602 815
816# this method does a "flood fill" into every tile direction
817# it assumes that tiles are arranged in a rectangular grid,
818# i.e. a map is the same as the left of the right map etc.
819# failure to comply are harmless and result in display errors
820# at worst.
603sub conn::flood_fill { 821sub conn::flood_fill {
604 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_; 822 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
605 823
606 # the server does not allow map paths > 6 824 # the server does not allow map paths > 6
607 return if 6 <= length $path; 825 return if 6 <= length $path;
608 826
609 for my $tile (1..4) { 827 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
610 next if $self->{neigh}{$hash}[$tile]; 828
829 for (
830 [1, 0, -1],
831 [2, 1, 0],
832 [3, 0, 1],
833 [4, -1, 0],
834 ) {
835 my ($tile, $dx, $dy) = @$_;
836
837 my $gx = $gx + $dx;
838 my $gy = $gy + $dy;
839
611 next unless $flags & (1 << ($tile - 1)); 840 next unless $flags & (1 << ($tile - 1));
841 next if $self->{neigh_grid}{$gx, $gy}++;
612 842
613 my $neigh = $self->{neigh}{$hash} ||= []; 843 my $neigh = $self->{neigh_map}{$hash} ||= [];
614 844 if (my $info = $neigh->[$tile]) {
615 $self->send_mapinfo ("spatial $path$tile", sub {
616 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 845 my ($flags, $x, $y, $w, $h, $hash) = @$info;
617 846
618 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
619 return if $mode ne "spatial";
620
621 $x += $MAP->ox;
622 $y += $MAP->oy;
623
624 $self->load_map ($hash, $x, $y)
625 unless $self->{neigh}{$hash}[5]++;#d#
626
627 $neigh->[$tile] = [$x, $y, $w, $h];
628
629 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1) 847 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
630 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 848 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
849
850 } else {
851 $self->send_mapinfo ("spatial $path$tile", sub {
852 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
853
854 return if $mode ne "spatial";
855
856 $x += $MAP->ox;
857 $y += $MAP->oy;
858
859 $self->load_map ($hash, $x, $y)
860 unless $self->{neigh_map}{$hash}[5]++;#d#
861
862 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
863
864 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
865 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
866 });
631 }); 867 }
632 } 868 }
633} 869}
634 870
635sub conn::map_change { 871sub conn::map_change {
636 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 872 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
637 873
638 $self->flush_map; 874 $self->flush_map;
639 875
640 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 876 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
641 877
642 warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
643
644 my $mapmapw = 250; 878 my $mapmapw = 250;
645 my $mapmaph = 250; 879 my $mapmaph = 250;
880
881 $self->{neigh_rect} = [
882 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
883 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
884 ];
646 885
886 delete $self->{neigh_grid};
647 $self->flood_fill ("", $hash, $flags, 887 $self->flood_fill (0, 0, "", $hash, $flags);
648 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
649 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
650 888
651 $x += $ox; 889 $x += $ox;
652 $y += $oy; 890 $y += $oy;
653 891
654 $self->{map_info} = [$hash, $x, $y, $w, $h]; 892 $self->{map_info} = [$hash, $x, $y, $w, $h];
893
894 $STATWIDS->{map}->set_text ("Map: " . $self->{map_info}[0]);
655 895
656 $self->load_map ($hash, $x, $y); 896 $self->load_map ($hash, $x, $y);
657} 897}
658 898
659sub conn::face_find { 899sub conn::face_find {
… …
711 951
712 $tex 952 $tex
713 }; 953 };
714} 954}
715 955
956sub conn::sound_play {
957 my ($self, $x, $y, $soundnum, $type) = @_;
958
959 $SDL_MIXER
960 or return;
961
962 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
963 or return;
964
965 $chunk->play;
966# warn "sound $x,$y,$soundnum,$type\n";#d#
967}
968
716sub conn::query { 969sub conn::query {
717 my ($self, $flags, $prompt) = @_; 970 my ($self, $flags, $prompt) = @_;
718 971
719 #TODO 972 #TODO, display dialog with relevant information
720 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 973 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
721} 974}
722 975
723sub conn::drawinfo { 976sub conn::drawinfo {
724 my ($self, $color, $text) = @_; 977 my ($self, $color, $text) = @_;
… …
740 ); 993 );
741 994
742 $LOGVIEW->add_paragraph ($color[$color], $text); 995 $LOGVIEW->add_paragraph ($color[$color], $text);
743} 996}
744 997
998sub conn::spell_add {
999 my ($self, $spell) = @_;
1000
1001 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
1002 });
1003 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
1004 });
1005}
1006
1007sub conn::spell_delete {
1008 my ($self, $spell) = @_;
1009}
1010
1011sub conn::addme_success {
1012 my ($self) = @_;
1013
1014 for my $skill (values %{$self->{skill_info}}) {
1015 $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
1016 });
1017 $MAPWIDGET->add_command ("use_skill $skill", "", sub {
1018 });
1019 }
1020}
1021
745%SDL_CB = ( 1022%SDL_CB = (
746 SDL_QUIT() => sub { 1023 CFClient::SDL_QUIT => sub {
747 Event::unloop -1; 1024 Event::unloop -1;
748 }, 1025 },
749 SDL_VIDEORESIZE() => sub { 1026 CFClient::SDL_VIDEORESIZE => sub {
750 }, 1027 },
751 SDL_VIDEOEXPOSE() => sub { 1028 CFClient::SDL_VIDEOEXPOSE => \&refresh,
752 refresh; 1029 CFClient::SDL_ACTIVEEVENT => sub {
1030# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
753 }, 1031 },
754 SDL_KEYDOWN() => sub { 1032 CFClient::SDL_KEYDOWN => sub {
755 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 1033 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
756 # alt-enter 1034 # alt-enter
757 destroy_screen; 1035 video_shutdown;
758 $CFG->{fullscreen} = !$CFG->{fullscreen}; 1036 $CFG->{fullscreen} = !$CFG->{fullscreen};
759 init_screen; 1037 video_init;
760 } else { 1038 } else {
761 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 1039 CFClient::UI::feed_sdl_key_down_event ($_[0]);
762 } 1040 }
763 }, 1041 },
764 SDL_KEYUP() => sub { 1042 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
765 CFClient::UI::feed_sdl_key_up_event ($SDL_EV); 1043 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
766 }, 1044 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
767 SDL_MOUSEMOTION() => sub { 1045 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
768 CFClient::UI::feed_sdl_motion_event ($SDL_EV); 1046 CFClient::SDL_USEREVENT => \&audio_music_finished,
769 },
770 SDL_MOUSEBUTTONDOWN() => sub {
771 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
772 },
773 SDL_MOUSEBUTTONUP() => sub {
774 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
775 },
776 SDL_ACTIVEEVENT() => sub {
777# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
778 },
779); 1047);
780 1048
781############################################################################# 1049#############################################################################
1050
1051$SIG{INT} = $SIG{TERM} = sub { exit };
782 1052
783$TILECACHE = CFClient::db_table "tilecache"; 1053$TILECACHE = CFClient::db_table "tilecache";
784$FACEMAP = CFClient::db_table "facemap"; 1054$FACEMAP = CFClient::db_table "facemap";
785 1055
786CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1056CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
… …
792 fullscreen => 0, 1062 fullscreen => 0,
793 fast => 0, 1063 fast => 0,
794 fow_enable => 1, 1064 fow_enable => 1,
795 fow_intensity => 0.45, 1065 fow_intensity => 0.45,
796 fow_smooth => 0, 1066 fow_smooth => 0,
1067 gui_fontsize => 1,
797 log_fontsize => 14, 1068 log_fontsize => 1,
1069 stat_fontsize => 1,
798 mapsize => 100, 1070 mapsize => 100,
799 host => "crossfire.schmorp.de", 1071 host => "crossfire.schmorp.de",
800 say_command => 'say', 1072 say_command => 'say',
1073 audio_enable => 1,
1074 bgm_enable => 1,
1075 bgm_volume => 0.25,
801); 1076);
802 1077
803while (my ($k, $v) = each %DEF_CFG) { 1078while (my ($k, $v) = each %DEF_CFG) {
804 $CFG->{$k} = $v unless exists $CFG->{$k}; 1079 $CFG->{$k} = $v unless exists $CFG->{$k};
805} 1080}
806 1081
807sdl_init; 1082sdl_init;
808 1083
809@SDL_MODES = reverse 1084@SDL_MODES = reverse
810 grep $_->[0] >= 640 && $_->[1] >= 480, 1085 grep $_->[0] >= 640 && $_->[1] >= 480,
811 map [SDL::RectW ($_), SDL::RectH ($_)], 1086 CFClient::SDL_ListModes;
812 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
813 1087
814@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1088@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
815 1089
816$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1090$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
817 1091
… …
820 1094
821 CFClient::add_font $_ for @fonts; 1095 CFClient::add_font $_ for @fonts;
822 CFClient::set_font $fonts[0]; 1096 CFClient::set_font $fonts[0];
823} 1097}
824 1098
825init_screen; 1099video_init;
1100audio_init;
826 1101
827Event::loop; 1102Event::loop;
828 1103
1104END { CFClient::SDL_Quit }
829 1105
1106

Diff Legend

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