ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.182 by elmex, Sat Jul 21 20:30:41 2007 UTC vs.
Revision 1.197 by root, Tue Jul 31 02:25:52 2007 UTC

… …
71unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 72 if %PAR::LibCache;
73 73
74use Time::HiRes 'time'; 74use Time::HiRes 'time';
75use Event; 75use Event;
76use List::Util qw(max min);
76 77
77use Crossfire; 78use Crossfire;
78use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
79 80
80use Compress::LZF; 81use Compress::LZF;
… …
160our $SDL_ACTIVE; 161our $SDL_ACTIVE;
161our %SDL_CB; 162our %SDL_CB;
162 163
163our $SDL_MIXER; 164our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT; 166our $MUSIC_WANT; # arryref of ambient music
167our @MUSIC_HAVE; # ambient music we want now
166our $MUSIC_START; 168our $MUSIC_START;
169our @MUSIC_JINGLE; # which jingles to play
167our $MUSIC_PLAYING; 170our $MUSIC_PLAYING_DATA;
171our $MUSIC_PLAYING_META;
168our $MUSIC_PLAYER; 172our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 173our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
170our @SOUNDS; # event => file mapping 174our @SOUNDS; # event => file mapping
171our %AUDIO_CHUNKS; # audio files 175our %AUDIO_CHUNK; # audio files
172 176
173our $ALT_ENTER_MESSAGE; 177our $ALT_ENTER_MESSAGE;
174our $STATUSBOX; 178our $STATUSBOX;
175our $DEBUG_STATUS; 179our $DEBUG_STATUS;
176 180
… …
178our $INVR; 182our $INVR;
179our $INV_RIGHT_HB; 183our $INV_RIGHT_HB;
180 184
181our $PICKUP_CFG; 185our $PICKUP_CFG;
182 186
183our $IN_BUILD_MODE; 187#############################################################################
184our $BUILD_BUTTON; 188#TODO: maybe move into own audio module...
189
190sub audio_channel_finished {
191 my ($channel) = @_;
192
193# warn "channel $channel finished\n";#d#
194}
195
196our %AUDIO_PLAY;
197our %AUDIO_CHUNK;
198
199sub audio_sound_push($) {
200 my ($face) = @_;
201
202 if (my $chunk = $AUDIO_CHUNK{$face}) {
203 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
204 my (undef, $dx, $dy, $vol) = @$_;
205
206 my $channel = CFPlus::Channel::find;
207 $channel->volume ($vol * 128 / 255);
208 $dx = $dx / 10 * 255;
209 $channel->set_panning (255 - $dx, 255 + $dx);
210
211# my $angle = $dx ? : $dx < 0 ?
212# my $distance = -$vol;
213# $channel->set_position ($angle, $distance);
214
215 $chunk->play ($channel);
216 }
217 } else {
218 # sound_meta not set means data is in flight either way
219 my $meta = $CONN->{sound_meta}{$face}
220 or return;
221
222 # if its a jingle, play it as ambient music
223 if ($meta->{meta}{jingle}) {
224 push @MUSIC_JINGLE, $meta;
225 delete $AUDIO_PLAY{$face};
226 &audio_music_push ($face);
227 } else {
228 # fetch from database
229 CFPlus::DB::get res_data => $meta->{name}, sub {
230 my $rwops = new CFPlus::RW $_[0];
231 my $chunk = new CFPlus::MixChunk $rwops;
232 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
233 $AUDIO_CHUNK{$face} = $chunk;
234
235 audio_sound_push ($face);
236 };
237 }
238 }
239}
240
241sub audio_sound_play {
242 my ($face, $dx, $dy, $vol) = @_;
243
244 $SDL_MIXER
245 or return;
246
247 my $queue = $AUDIO_PLAY{$face} ||= [];
248 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
249 audio_sound_push $face
250 unless @$queue > 1;
251}
252
253sub audio_music_update_volume {
254 return unless $MUSIC_PLAYING_META;
255 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
256 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
257 CFPlus::MixMusic::volume $base * $volume * 128;
258}
259
260sub audio_music_start {
261 my $meta = $MUSIC_PLAYING_META;
262
263 CFPlus::DB::get res_data => $meta->{name}, sub {
264 return unless $SDL_MIXER;
265
266 # music might have changed...
267 $meta eq $MUSIC_PLAYING_META
268 or return &audio_music_start ();
269
270 audio_music_update_volume;
271
272 $MUSIC_PLAYING_DATA = \$_[0];
273
274 my $rwops = $meta->{path}
275 ? new_from_file CFPlus::RW $meta->{path}
276 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
277
278 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
279 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
280
281 my $NOW = time;
282
283 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
284 my $pos = $MUSIC_PLAYING_META->{stop_pos};
285 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
286 $MUSIC_START = time - $pos;
287 } else {
288 $MUSIC_PLAYER->play (0);
289 $MUSIC_START = time;
290 }
291
292 delete $MUSIC_PLAYING_META->{stop_time};
293 delete $MUSIC_PLAYING_META->{stop_pos};
294 }
295}
296
297sub audio_music_push {
298 return unless $SDL_MIXER;
299
300 my $fade_out;
301
302 if (@MUSIC_JINGLE) {
303 @MUSIC_HAVE = $MUSIC_JINGLE[0];
304 $fade_out = 333;
305 } else {
306 return unless $CFG->{bgm_enable};
307
308 my @have =
309 grep $_,
310 map $CONN->{music_meta}{$_},
311 @$MUSIC_WANT;
312
313 @MUSIC_HAVE = @have
314 if @have;
315
316 # default MUSIC_HAVE == MUSIC_DEFAULT
317 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
318 $fade_out = 1000;
319 }
320
321 # if the currently playing song is acceptable, let it continue
322 return if $MUSIC_PLAYING_META
323 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
324
325 my $NOW = time;
326
327 if ($MUSIC_PLAYING_META) {
328 $MUSIC_PLAYING_META->{stop_time} = $NOW;
329 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
330 CFPlus::MixMusic::fade_out $fade_out;
331 } else {
332 # sort by stop time, oldest first
333 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
334
335 # if the most recently-played piece played very recently,
336 # resume it, else choose the oldest piece for rotation.
337 $MUSIC_PLAYING_META =
338 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
339 ? $MUSIC_HAVE[-1]
340 : $MUSIC_HAVE[0];
341
342 audio_music_start;
343 }
344}
345
346sub audio_music_set_ambient {
347 my ($songs) = @_;
348
349 $MUSIC_WANT = $songs;
350 audio_music_push;
351}
352
353sub audio_music_finished {
354 shift @MUSIC_JINGLE
355 if $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
356
357 undef $MUSIC_PLAYER;
358 undef $MUSIC_PLAYING_META;
359 undef $MUSIC_PLAYING_DATA;
360
361 audio_music_push;
362}
363
364#############################################################################
185 365
186sub status { 366sub status {
187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 367 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
188} 368}
189 369
… …
462 query => \&server_query, 642 query => \&server_query,
463 643
464 setup_req => { 644 setup_req => {
465 smoothing => $CFG->{map_smoothing}*1, 645 smoothing => $CFG->{map_smoothing}*1,
466 }, 646 },
467
468 sound_play => sub {
469 my ($x, $y, $soundnum, $type) = @_;
470
471 $SDL_MIXER
472 or return;
473
474 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
475 or return;
476
477 $chunk->play;
478 },
479 }; 647 };
480 648
481 if ($CONN) { 649 if ($CONN) {
482 CFPlus::lowdelay fileno $CONN->{fh}; 650 CFPlus::lowdelay fileno $CONN->{fh};
483 651
… …
494 $SETUP_DIALOG->show; 662 $SETUP_DIALOG->show;
495 $PL_WINDOW->hide; 663 $PL_WINDOW->hide;
496 $SPELL_LIST->clear_spells; 664 $SPELL_LIST->clear_spells;
497 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 665 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
498 666
499 &audio_music_set ([]); 667 &audio_music_set_ambient ([]);
500 668
501 return unless $CONN; 669 return unless $CONN;
502 670
503 status "connection closed"; 671 status "connection closed";
504 672
… …
661 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 829 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
662 ); 830 );
663 $hbox->add (new CFPlus::UI::Slider 831 $hbox->add (new CFPlus::UI::Slider
664 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 832 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
665 tooltip => "The volume of the background music. Changes are instant.", 833 tooltip => "The volume of the background music. Changes are instant.",
666 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 834 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
667 ); 835 );
668 836
669 $table->add_at (1, $row++, new CFPlus::UI::Button 837 $table->add_at (1, $row++, new CFPlus::UI::Button
670 expand => 1, align => 0, text => "Apply", 838 expand => 1, align => 0, text => "Apply",
671 tooltip => "Apply the audio settings", 839 tooltip => "Apply the audio settings",
… …
1084 text => $CFG->{profile}{default}{host}, 1252 text => $CFG->{profile}{default}{host},
1085 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1253 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1086 on_changed => sub { 1254 on_changed => sub {
1087 my ($self, $value) = @_; 1255 my ($self, $value) = @_;
1088 $CFG->{profile}{default}{host} = $value; 1256 $CFG->{profile}{default}{host} = $value;
1089 0 1257 1
1090 } 1258 }
1091 ); 1259 );
1092 1260
1093 $vbox->add (new CFPlus::UI::Button 1261 $vbox->add (new CFPlus::UI::Button
1094 expand => 1, 1262 expand => 1,
1095 text => "Server List", 1263 text => "Server List",
1096 other => $METASERVER, 1264 other => $METASERVER,
1097 tooltip => "Show a list of available crossfire servers", 1265 tooltip => "Show a list of available crossfire servers",
1098 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1266 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1099 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1267 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1100 ); 1268 );
1101 } 1269 }
1102 1270
1103 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1271 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1104 $table->add_at (1, 4, new CFPlus::UI::Entry 1272 $table->add_at (1, 4, new CFPlus::UI::Entry
1105 text => $CFG->{profile}{default}{user}, 1273 text => $CFG->{profile}{default}{user},
1106 tooltip => "The name of your character on the server", 1274 tooltip => "The name of your character on the server",
1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1275 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1108 ); 1276 );
1109 1277
1110 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1278 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1111 $table->add_at (1, 5, new CFPlus::UI::Entry 1279 $table->add_at (1, 5, new CFPlus::UI::Entry
1112 text => $CFG->{profile}{default}{password}, 1280 text => $CFG->{profile}{default}{password},
1113 hidden => 1, 1281 hidden => 1,
1114 tooltip => "The password for your character", 1282 tooltip => "The password for your character",
1115 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1283 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1116 ); 1284 );
1117 1285
1118 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1286 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1119 $table->add_at (1, 7, new CFPlus::UI::Slider 1287 $table->add_at (1, 7, new CFPlus::UI::Slider
1120 force_w => 100, 1288 force_w => 100,
1121 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1289 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1122 tooltip => "This is the size of the portion of the map update the server sends you. " 1290 tooltip => "This is the size of the portion of the map update the server sends you. "
1123 . "If you set this to a high value you will be able to see further, " 1291 . "If you set this to a high value you will be able to see further, "
1124 . "but you also increase bandwidth requirements and latency. " 1292 . "but you also increase bandwidth requirements and latency. "
1125 . "This option is only used once at log-in.", 1293 . "This option is only used once at log-in.",
1126 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1294 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1127 ); 1295 );
1128 1296
1129 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1130 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1131 state => $CFG->{face_prefetch},
1132 tooltip => "<b>Background Image Prefetch</b>\n\n"
1133 . "If enabled, the client automatically pre-fetches images from the server. "
1134 . "This might increase or create lag, but increases the chances "
1135 . "of faces being ready for display when you encounter them. "
1136 . "It also uses up server bandwidth on every connect, "
1137 . "so only set it if you really need to prefetch images. "
1138 . "This option can be set and unset any time.",
1139 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1140 );
1141
1142 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1297 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1298 $table->add_at (1, 8, new CFPlus::UI::Entry
1299 text => $CFG->{output_rate},
1300 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1301 . "when sending data. When 0 or unset, the server "
1302 . "default will be used, which is usually around 100kb/s. Most servers will "
1303 . "dynamically find an optimal rate, so adjust this only when necessary.",
1304 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1305 );
1306
1307 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1143 $table->add_at (1, 9, new CFPlus::UI::Entry 1308 $table->add_at (1, 9, new CFPlus::UI::Entry
1144 text => $CFG->{output_rate},
1145 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1146 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1147 . "default will be used, which is usually around 100kb/s.",
1148 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1149 );
1150
1151 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1152 $table->add_at (1, 10, new CFPlus::UI::Entry
1153 text => $CFG->{output_count}, 1309 text => $CFG->{output_count},
1154 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1310 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1155 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1311 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1156 ); 1312 );
1157 1313
1158 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1314 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1159 $table->add_at (1, 11, new CFPlus::UI::Entry 1315 $table->add_at (1, 10, new CFPlus::UI::Entry
1160 text => $CFG->{output_sync}, 1316 text => $CFG->{output_sync},
1161 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1317 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1162 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1318 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1163 ); 1319 );
1164 1320
1165 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1321 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1166 expand => 1, 1322 expand => 1,
1167 align => 0, 1323 align => 0,
1168 text => "Login", 1324 text => "Login",
1169 on_activate => sub { 1325 on_activate => sub {
1170 $CONN ? stop_game 1326 $CONN ? stop_game
1171 : start_game; 1327 : start_game;
1172 0 1328 1
1173 }, 1329 },
1174 ); 1330 );
1175 1331
1176 $vbox->add (new CFPlus::UI::FancyFrame 1332 $vbox->add (new CFPlus::UI::FancyFrame
1177 label => "Server Info", 1333 label => "Server Info",
… …
1183 1339
1184sub client_setup { 1340sub client_setup {
1185 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1341 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1186 1342
1187 my $row = 0; 1343 my $row = 0;
1188
1189 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1190 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1191 text => $CFG->{say_command},
1192 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1193 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1194 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1195 on_changed => sub {
1196 my ($self, $value) = @_;
1197 $CFG->{say_command} = $value;
1198 0
1199 }
1200 );
1201 1344
1202 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1345 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1203 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 1346 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1204 state => $CFG->{show_tips}, 1347 state => $CFG->{show_tips},
1205 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1348 tooltip => "Show the <b>Tip of the day</b> window at startup?",
… …
1417 1560
1418 my $ntb = 1561 my $ntb =
1419 $PL_NOTEBOOK = 1562 $PL_NOTEBOOK =
1420 new CFPlus::UI::Notebook expand => 1; 1563 new CFPlus::UI::Notebook expand => 1;
1421 1564
1422 $ntb->add ( 1565 $ntb->add_tab (
1423 "Statistics (F2)" => $STATS_PAGE = stats_window, 1566 "Statistics (F2)" => $STATS_PAGE = stats_window,
1424 "Shows statistics, where all your Stats and Resistances are shown." 1567 "Shows statistics, where all your Stats and Resistances are shown."
1425 ); 1568 );
1426 $ntb->add ( 1569 $ntb->add_tab (
1427 "Skills (F3)" => $SKILL_PAGE = skill_window, 1570 "Skills (F3)" => $SKILL_PAGE = skill_window,
1428 "Shows all your Skills." 1571 "Shows all your Skills."
1429 ); 1572 );
1430 1573
1431 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1574 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1432 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1575 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1433 $ntb->add ( 1576 $ntb->add_tab (
1434 "Spellbook (F4)" => $spellsw, 1577 "Spellbook (F4)" => $spellsw,
1435 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1578 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1436 ); 1579 );
1437 $ntb->add ( 1580 $ntb->add_tab (
1438 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1581 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1439 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1582 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1440 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1583 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1441 ); 1584 );
1442 $ntb->add (Pickup => autopickup_setup, 1585 $ntb->add_tab (Pickup => autopickup_setup,
1443 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1586 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1444 1587
1445 $ntb->set_current_page ($INVENTORY_PAGE); 1588 $ntb->set_current_page ($INVENTORY_PAGE);
1446 1589
1447 $plwin->add ($ntb); 1590 $plwin->add ($ntb);
… …
1753 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow; 1896 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1754 1897
1755 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1898 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1756 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1899 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1757 1900
1758 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1901 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1759 "Configure the server to play on, your username, password and other server-related options."); 1902 "Configure the server to play on, your username, password and other server-related options.");
1760 $SETUP_NOTEBOOK->add (Client => client_setup, 1903 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1761 "Configure various client-specific settings."); 1904 "Configure various client-specific settings.");
1762 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1905 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1763 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1906 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1764 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1907 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1765 "Configure the use of audio, sound effects and background music."); 1908 "Configure the use of audio, sound effects and background music.");
1766 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1909 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1767 "Lets you define, edit and delete key bindings." 1910 "Lets you define, edit and delete key bindings."
1768 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1911 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1769 . "with nothing set and the recording started. After doing the actions you " 1912 . "with nothing set and the recording started. After doing the actions you "
1770 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1913 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1771 . "After pressing the combo the binding will be saved automatically and the " 1914 . "After pressing the combo the binding will be saved automatically and the "
1772 . "binding editor closes"); 1915 . "binding editor closes");
1773 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1916 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1774 "Some debuggin' options. Do not ask."); 1917 "Some debuggin' options. Do not ask.");
1775 1918
1776 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1919 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1777 1920
1778 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1921 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
… …
1819 } 1962 }
1820 1963
1821 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1964 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1822} 1965}
1823 1966
1824sub setup_build_button {
1825 my ($enabled) = @_;
1826 if ($enabled) {
1827 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1828 $BUILD_BUTTON ||= new CFPlus::UI::Button
1829 text => "Build",
1830 tooltip => "Opens the ingame builder",
1831 on_activate => sub {
1832 if ($CONN) {
1833 $CONN->send_ext_req (builder_player_items => sub {
1834 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1835 });
1836 }
1837 0
1838 };
1839 $BUTTONBAR->add ($BUILD_BUTTON);
1840 } else {
1841 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1842 }
1843}
1844
1845sub open_ingame_editor {
1846 my ($msg) = @_;
1847
1848 my $win = new CFPlus::UI::Toplevel
1849 x => 0,
1850 y => 'center',
1851 z => 4,
1852 name => 'builder_window',
1853 force_w => int $WIDTH * 1/4,
1854 force_h => int $HEIGHT * 3/4,
1855 title => "In game builder",
1856 has_close_button => 1;
1857
1858 my $r = new CFPlus::UI::ScrolledWindow (
1859 expand => 1,
1860 scroll_y => 1
1861 );
1862 $r->add (my $vb = new CFPlus::UI::VBox);
1863 $win->add ($r);
1864
1865
1866 $vb->add (
1867 new CFPlus::UI::Button
1868 text => "Disable build mode",
1869 on_activate => sub { $::IN_BUILD_MODE = undef }
1870 );
1871 $vb->add (
1872 new CFPlus::UI::Button
1873 text => "ERASE",
1874 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1875 );
1876
1877 for my $itemarchname (
1878 sort {
1879 $msg->{items}->{$a}->{build_arch_name}
1880 cmp $msg->{items}->{$b}->{build_arch_name}
1881 } keys %{$msg->{items}}
1882 ) {
1883 my $info = $msg->{items}->{$itemarchname};
1884 $vb->add (
1885 new CFPlus::UI::Button text => $info->{build_arch_name},
1886 on_activate => sub {
1887 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1888
1889 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1890 build_mode_query_arch_info ();
1891 }
1892 }
1893 );
1894 }
1895
1896 $win->show;
1897}
1898
1899sub build_mode_query_arch_info {
1900 my ($iteminfo) = $::IN_BUILD_MODE;
1901 my $itemarchname = $iteminfo->{item};
1902 my $info = $iteminfo->{info};
1903
1904 my $dialog = new CFPlus::UI::Toplevel
1905 x => "center",
1906 y => "center",
1907 z => 50,
1908 force_w => int $WIDTH * 1/2,
1909 title => "Enter information for placement of '$itemarchname'",
1910 has_close_button => 1;
1911
1912 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1913
1914 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1915 my $row = 0;
1916 if ($info->{has_name}) {
1917 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1918 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1919 }
1920 if ($info->{has_text}) {
1921 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1922 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1923 }
1924 if ($info->{has_connection}) {
1925 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1926 $table->add_at (1, $row++,
1927 new CFPlus::UI::Entry
1928 expand => 1,
1929 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1930 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1931 );
1932 }
1933
1934 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1935 $hb->add (new CFPlus::UI::Button
1936 text => "Close",
1937 expand => 1,
1938 on_activate => sub { $dialog->hide; 0 },
1939 );
1940 $dialog->show;
1941}
1942
1943sub video_shutdown { 1967sub video_shutdown {
1944 CFPlus::OpenGL::shutdown; 1968 CFPlus::OpenGL::shutdown;
1945 1969
1946 undef $SDL_ACTIVE; 1970 undef $SDL_ACTIVE;
1947} 1971}
1948 1972
1949sub audio_channel_finished {
1950 my ($channel) = @_;
1951
1952 #warn "channel $channel finished\n";#d#
1953}
1954
1955sub audio_music_set {
1956 my ($songs) = @_;
1957
1958 my @want =
1959 grep $_,
1960 map $CONN->{music_meta}{$_},
1961 @$songs;
1962
1963 if (@want) {
1964 @MUSIC_WANT = @want;
1965 &audio_music_changed ();
1966 }
1967}
1968
1969sub audio_music_start {
1970 my $path = $MUSIC_PLAYING->{path}
1971 or return;
1972
1973 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1974 # music might have changed...
1975 $path eq $MUSIC_PLAYING->{path}
1976 or return &audio_music_start ();
1977
1978 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
1979
1980 my $NOW = time;
1981
1982 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1983 my $pos = $MUSIC_PLAYING->{stop_pos};
1984 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1985 $MUSIC_START = time - $pos;
1986 } else {
1987 $MUSIC_PLAYER->play (0);
1988 $MUSIC_START = time;
1989 }
1990
1991 delete $MUSIC_PLAYING->{stop_time};
1992 delete $MUSIC_PLAYING->{stop_pos};
1993 }
1994}
1995
1996sub audio_music_changed {
1997 return unless $CFG->{bgm_enable};
1998
1999 # default MUSIC_WANT == MUSIC_DEFAULT
2000 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2001
2002 # if the currently playing song is acceptable, let it continue
2003 return if $MUSIC_PLAYING
2004 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2005
2006 my $NOW = time;
2007
2008 if ($MUSIC_PLAYING) {
2009 $MUSIC_PLAYING->{stop_time} = $NOW;
2010 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2011 CFPlus::MixMusic::fade_out 1000;
2012 } else {
2013 # sort by stop time, oldest first
2014 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2015
2016 # if the most recently-played piece played very recently,
2017 # resume it, else choose the oldest piece for rotation.
2018 $MUSIC_PLAYING =
2019 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2020 ? $MUSIC_WANT[-1]
2021 : $MUSIC_WANT[0];
2022
2023 audio_music_start;
2024 }
2025}
2026
2027sub audio_music_finished {
2028 $MUSIC_PLAYING = undef;
2029 undef $MUSIC_PLAYER;
2030
2031 audio_music_changed;
2032}
2033
2034sub audio_init { 1973sub audio_init {
2035 if ($CFG->{audio_enable}) { 1974 if ($CFG->{audio_enable}) {
2036 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1975 $ENV{MIX_EFFECTSMAXSPEED} = 1;
2037 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1976 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2038 1977
2039 unless ($SDL_MIXER) { 1978 unless ($SDL_MIXER) {
2040 status "Unable to open sound device: there will be no sound"; 1979 status "Unable to open sound device: there will be no sound";
2041 return; 1980 return;
2042 }
2043
2044 CFPlus::Mix_AllocateChannels 8;
2045 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2046
2047 audio_music_finished;
2048
2049 local $_;
2050 while (<$fh>) {
2051 next if /^\s*#/;
2052 next if /^\s*$/;
2053
2054 my ($file, $volume, $event) = split /\s+/, $_, 3;
2055
2056 push @SOUNDS, "$volume,$file";
2057
2058 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2059 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2060 $chunk->volume ($volume * 128 / 100);
2061 $chunk
2062 };
2063 }
2064 } else {
2065 status "unable to open sound config: $!";
2066 } 1981 }
1982
1983 CFPlus::Mix_AllocateChannels 16;
1984
1985 audio_music_finished;
1986 } else {
1987 undef $SDL_MIXER;
2067 } 1988 }
2068} 1989}
2069 1990
2070sub audio_shutdown { 1991sub audio_shutdown {
2071 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1992 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2072 undef $SDL_MIXER; 1993 undef $SDL_MIXER;
2073 @SOUNDS = (); 1994 @SOUNDS = ();
2074 %AUDIO_CHUNKS = (); 1995 %AUDIO_CHUNK = ();
2075} 1996}
2076 1997
2077my %animate_object; 1998my %animate_object;
2078my $animate_timer; 1999my $animate_timer;
2079 2000
2080my $fps = 9; 2001my $fps = 9;
2081
2082my %demo;#d#
2083 2002
2084sub force_refresh { 2003sub force_refresh {
2085 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2004 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2086 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2005 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2087 2006
… …
2119 2038
2120sub animation_stop { 2039sub animation_stop {
2121 my ($widget) = @_; 2040 my ($widget) = @_;
2122 delete $animate_object{$widget}; 2041 delete $animate_object{$widget};
2123} 2042}
2124
2125# check once/second for faces that need to be prefetched
2126# this should, of course, only run on demand, but
2127# SDL forces worse things on us....
2128
2129Event->timer (after => 1, interval => 0.25, cb => sub {
2130 $CONN->face_prefetch
2131 if $CONN;
2132});
2133 2043
2134%SDL_CB = ( 2044%SDL_CB = (
2135 CFPlus::SDL_QUIT => sub { 2045 CFPlus::SDL_QUIT => sub {
2136 exit; 2046 exit;
2137 }, 2047 },
… …
2181 2091
2182 CFPlus::UI::set_layout ($::CFG->{layout}); 2092 CFPlus::UI::set_layout ($::CFG->{layout});
2183 2093
2184 my %DEF_CFG = ( 2094 my %DEF_CFG = (
2185 sdl_mode => 0, 2095 sdl_mode => 0,
2186 width => 640,
2187 height => 480,
2188 fullscreen => 0, 2096 fullscreen => 0,
2189 fast => 0, 2097 fast => 0,
2190 map_scale => 1, 2098 map_scale => 1,
2191 fow_enable => 1, 2099 fow_enable => 1,
2192 fow_intensity => 0, 2100 fow_intensity => 0,
… …
2195 log_fontsize => 0.7, 2103 log_fontsize => 0.7,
2196 gauge_fontsize => 1, 2104 gauge_fontsize => 1,
2197 gauge_size => 0.35, 2105 gauge_size => 0.35,
2198 stat_fontsize => 0.7, 2106 stat_fontsize => 0.7,
2199 mapsize => 100, 2107 mapsize => 100,
2200 say_command => 'chat',
2201 audio_enable => 1, 2108 audio_enable => 1,
2202 bgm_enable => 1, 2109 bgm_enable => 1,
2203 bgm_volume => 0.25, 2110 bgm_volume => 0.25,
2204 face_prefetch => 0,
2205 output_sync => 1, 2111 output_sync => 1,
2206 output_count => 1, 2112 output_count => 1,
2207 output_rate => "", 2113 output_rate => "",
2208 pickup => 0, 2114 pickup => 0,
2209 inv_sort => "mtime", 2115 inv_sort => "mtime",

Diff Legend

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