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.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.65 by root, Thu Jun 8 01:51:32 2006 UTC

… …
91our $SETUP_NOTEBOOK; 91our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 92our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 93our $SETUP_KEYBOARD;
94our $SETUP_SPELLS; 94our $SETUP_SPELLS;
95 95
96our $STATS_WINDOW;
97our $MESSAGE_WINDOW;
96our $FLOORBOX; 98our $FLOORBOX;
97our $GAUGES; 99our $GAUGES;
98our $STATWIDS; 100our $STATWIDS;
99 101
100our $SDL_ACTIVE; 102our $SDL_ACTIVE;
… …
121 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 123 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
122} 124}
123 125
124sub debug { 126sub debug {
125 $DEBUG_STATUS->set_text ($_[0]); 127 $DEBUG_STATUS->set_text ($_[0]);
128}
129
130sub destroy_query_dialog {
131 (delete $_[0]{query_dialog})->destroy
132 if $_[0]{query_dialog};
133}
134
135# server query dialog
136sub server_query {
137 my ($conn, $flags, $prompt) = @_;
138
139 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
140 x => "center",
141 y => "center",
142 title => "Server Query",
143 child => my $vbox = new CFClient::UI::VBox,
144 ;
145
146 my @dialog = my $label = new CFClient::UI::Label
147 max_w => $::WIDTH * 0.4,
148 ellipsise => 0,
149 text => $prompt;
150
151 if ($flags & CS_QUERY_YESNO) {
152 push @dialog, my $hbox = new CFClient::UI::HBox;
153
154 $hbox->add (new CFClient::UI::Button
155 text => "No",
156 on_activate => sub {
157 $conn->send ("reply n");
158 $dialog->destroy;
159 }
160 );
161 $hbox->add (new CFClient::UI::Button
162 text => "Yes",
163 on_activate => sub {
164 $conn->send ("reply y");
165 destroy_query_dialog $conn;
166 },
167 );
168
169 $dialog->focus_in;
170
171 } elsif ($flags & CS_QUERY_SINGLECHAR) {
172 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173
174 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
175 $MESSAGE_WINDOW->show;
176
177 unshift @dialog, new CFClient::UI::Label
178 max_w => $::WIDTH * 0.4,
179 ellipsise => 0,
180 markup => "\nOr use your keyboard:\n";
181
182 unshift @dialog, my $table = new CFClient::UI::Table;
183
184 $table->add (0, 0, new CFClient::UI::Button
185 text => "Next Race",
186 on_activate => sub {
187 $conn->send ("reply n");
188 destroy_query_dialog $conn;
189 },
190 );
191 $table->add (2, 0, new CFClient::UI::Button
192 text => "Accept",
193 on_activate => sub {
194 $conn->send ("reply d");
195 destroy_query_dialog $conn;
196 },
197 );
198
199 unshift @dialog, new CFClient::UI::Label
200 max_w => $::WIDTH * 0.4,
201 ellipsise => 0,
202 markup =>
203 "<big><b>Character Creation: Race</b></big>\n\n"
204 . "Look at the <b>Messages</b> window to see a description of this race "
205 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
206 . "and the center of the screen to see how this race looks like "
207 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
208 . "You can look at another race, or accept this race (you will come back to this race eventually, "
209 . "so you can take your time making this important choice."
210 ;
211
212 } elsif ($prompt =~ /roll new stats/) {
213 if (my $stat = delete $conn->{stat_change_with}) {
214 $conn->send ("reply $stat");
215 destroy_query_dialog $conn;
216 return;
217 }
218
219 $STATS_WINDOW->show;
220 $MESSAGE_WINDOW->hide;
221
222 unshift @dialog, new CFClient::UI::Label
223 max_w => $::WIDTH * 0.4,
224 ellipsise => 0,
225 markup => "\nOr use your keyboard:\n";
226
227 unshift @dialog, my $table = new CFClient::UI::Table;
228
229 # left: re-roll
230 $table->add (0, 0, new CFClient::UI::Button
231 text => "Roll Again",
232 on_activate => sub {
233 $conn->send ("reply y");
234 destroy_query_dialog $conn;
235 },
236 );
237
238 # center: swap stats
239 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240 value => $_,
241 options => [
242 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249 ],
250 ), 1 .. 2;
251
252 $table->add (2, 0, new CFClient::UI::Button
253 text => "Swap Stats",
254 on_activate => sub {
255 $conn->{stat_change_with} = $sw2->{value};
256 $conn->send ("reply $sw1->{value}");
257 destroy_query_dialog $conn;
258 },
259 );
260 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261
262 # right: accept
263 $table->add (4, 0, new CFClient::UI::Button
264 text => "Accept",
265 on_activate => sub {
266 $conn->send ("reply n");
267 $STATS_WINDOW->hide;
268 destroy_query_dialog $conn;
269 },
270 );
271
272 unshift @dialog, new CFClient::UI::Label
273 max_w => $::WIDTH * 0.4,
274 ellipsise => 0,
275 markup =>
276 "<big><b>Character Creation: Stats</b></big>\n\n"
277 . "Look at the <b>Stats</b> window to see your basic stats "
278 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
279 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
280 . "Race selection will influence those values later on."
281 ;
282 }
283
284 push @dialog, my $entry = new CFClient::UI::Entry
285 on_changed => sub {
286 $conn->send ("reply $_[1]");
287 destroy_query_dialog $conn;
288 },
289 ;
290
291 $entry->focus_in;
292
293 } else {
294 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298 on_activate => sub {
299 $conn->send ("reply $_[1]");
300 destroy_query_dialog $conn;
301 },
302 ;
303
304 $entry->focus_in;
305 }
306
307 $vbox->add (@dialog);
308 $dialog->show;
126} 309}
127 310
128sub start_game { 311sub start_game {
129 status "logging in..."; 312 status "logging in...";
130 313
… …
149 map_widget => $MAPWIDGET, 332 map_widget => $MAPWIDGET,
150 logview => $LOGVIEW, 333 logview => $LOGVIEW,
151 statusbox => $STATUSBOX, 334 statusbox => $STATUSBOX,
152 map => $MAP, 335 map => $MAP,
153 mapmap => $MAPMAP, 336 mapmap => $MAPMAP,
337 query => \&server_query,
154 338
155 sound_play => sub { 339 sound_play => sub {
156 my ($x, $y, $soundnum, $type) = @_; 340 my ($x, $y, $soundnum, $type) = @_;
157 341
158 $SDL_MIXER 342 $SDL_MIXER
… …
183 367
184 return unless $CONN; 368 return unless $CONN;
185 369
186 status "connection closed"; 370 status "connection closed";
187 371
372 destroy_query_dialog $CONN;
188 $CONN->destroy; 373 $CONN->destroy;
189 $CONN = 0; # false, does not autovivify 374 $CONN = 0; # false, does not autovivify
190} 375}
191 376
192sub graphics_setup { 377sub graphics_setup {
… …
440 &set_gauge_window_fontsize; 625 &set_gauge_window_fontsize;
441 626
442 $win 627 $win
443} 628}
444 629
630sub debug_setup {
631 my $table = new CFClient::UI::Table;
445 632
633 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
634 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
635 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
636 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
637 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
638 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
639 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
640 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
641
642 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
643
644 for my $x (0..2) {
645 for my $y (0 .. 2) {
646 $table->add ($x + 3, $y,
647 new CFClient::UI::Entry
648 text => $default_smooth[$x * 3 + $y],
649 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
650 );
651 }
652 }
653
654
655 $table
656}
657
446sub make_stats_window { 658sub stats_window {
447 my $tgw = new CFClient::UI::FancyFrame 659 my $tgw = new CFClient::UI::FancyFrame
448 y => $HEIGHT * (2/8), 660 y => $HEIGHT * (2/8),
449 x => "max", 661 x => "max",
450 title => "Stats", 662 title => "Stats",
451 name => "stats_window"; 663 name => "stats_window";
… …
661 873
662 utf8::decode $buf if utf8::valid $buf; 874 utf8::decode $buf if utf8::valid $buf;
663 875
664 $table->clear; 876 $table->clear;
665 877
878 my @tip = (
879 "The current number of users logged in on the server.",
880 "The hostname of the server.",
881 "The time this server has been running without being restarted.",
882 "The server software version - a '+' indicates a Crossfire+ server.",
883 "Short information about this server provided by its admins.",
884 );
666 my @col = qw(Use #Users Host Uptime Version Description); 885 my @col = qw(#Users Host Uptime Version Description);
667 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 886 $table->add ($_, 0, new CFClient::UI::Label
887 can_hover => 1, can_events => 1,
888 align => 0, fg => [1, 1, 0],
889 text => $col[$_], tooltip => $tip[$_])
668 for 0 .. $#col; 890 for 0 .. $#col;
669 891
670 my @align = qw(1 0 1 1 -1); 892 my @align = qw(1 0 1 1 -1);
671 893
672 my $y = 0; 894 my $y = 0;
673 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 895 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
690 912
691 $m = [$users, $host, $uptime, $version, $desc]; 913 $m = [$users, $host, $uptime, $version, $desc];
692 914
693 $y++; 915 $y++;
694 916
695 $table->add (0, $y, new CFClient::UI::VBox children => [ 917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
696 (new CFClient::UI::Button text => "Use", on_activate => sub { 918 (new CFClient::UI::Button
919 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub {
697 $HOST_ENTRY->set_text ($CFG->{host} = $host); 922 $HOST_ENTRY->set_text ($CFG->{host} = $host);
698 $METASERVER->toggle_visibility; 923 $METASERVER->hide;
924 },
699 }), 925 ),
700 (new CFClient::UI::Empty expand => 1), 926 (new CFClient::UI::Empty expand => 1),
701 ]); 927 ]);
702 928
703 $table->add ($_ + 1, $y, new CFClient::UI::Label 929 $table->add ($_, $y, new CFClient::UI::Label
704 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 930 ellipsise => 0,
931 align => $align[$_],
932 text => $m->[$_],
933 tooltip => $tip[$_],
934 can_hover => 1,
935 can_events => 1,
936 fontsize => 0.8)
705 for 0 .. $#$m; 937 for 0 .. $#$m;
706 } 938 }
707 } 939 }
708 }); 940 });
709} 941}
710 942
711sub metaserver_dialog { 943sub metaserver_dialog {
712 my $dialog = new CFClient::UI::FancyFrame 944 my $dialog = new CFClient::UI::FancyFrame
713 title => "Server List", 945 title => "Server List",
714 name => 'metaserver_dialog', 946 name => 'metaserver_dialog',
715 x => 'center', 947 x => 'center',
716 y => 'center', 948 y => 'center',
717 z => 3, 949 z => 3,
950 force_h => $::HEIGHT * 0.4,
718 child => (my $vbox = new CFClient::UI::VBox), 951 child => (my $vbox = new CFClient::UI::VBox),
719 on_visibility_change => sub { 952 on_visibility_change => sub {
720 update_metaserver if $_[1]; 953 update_metaserver if $_[1];
721 }, 954 },
722 ; 955 ;
723 956
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
725 960
726 $dialog 961 $dialog
727} 962}
728 963
729sub server_setup { 964sub server_setup {
… …
752 expand => 1, 987 expand => 1,
753 text => "Server List", 988 text => "Server List",
754 other => $METASERVER, 989 other => $METASERVER,
755 tooltip => "Show a list of available crossfire servers", 990 tooltip => "Show a list of available crossfire servers",
756 on_activate => sub { $METASERVER->toggle_visibility }, 991 on_activate => sub { $METASERVER->toggle_visibility },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
757 ); 993 );
758 } 994 }
759 995
760 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 996 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
761 $table->add (1, 4, new CFClient::UI::Entry 997 $table->add (1, 4, new CFClient::UI::Entry
… …
851 title => "Messages", 1087 title => "Messages",
852 border_bg => [1, 1, 1, 1], 1088 border_bg => [1, 1, 1, 1],
853 bg => [0, 0, 0, 0.75], 1089 bg => [0, 0, 0, 0.75],
854 x => "max", 1090 x => "max",
855 y => 0, 1091 y => 0,
856 force_w => $::WIDTH / 3, 1092 force_w => $::WIDTH * 0.4,
857 force_h => $::HEIGHT / 5, 1093 force_h => $::HEIGHT * 0.5,
858 child => (my $vbox = new CFClient::UI::VBox); 1094 child => (my $vbox = new CFClient::UI::VBox);
859 1095
860 $vbox->add ($LOGVIEW); 1096 $vbox->add ($LOGVIEW);
861 1097
862 $vbox->add (my $input = new CFClient::UI::Entry 1098 $vbox->add (my $input = new CFClient::UI::Entry
… …
987 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1223 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1224 $table->add ($x+1, $y, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask, 1225 state => $CFG->{pickup} & $mask,
990 on_changed => sub { 1226 on_changed => sub {
991 my ($box, $value) = @_; 1227 my ($box, $value) = @_;
1228
992 if ($value) { 1229 if ($value) {
993 $::CFG->{pickup} |= $mask; 1230 $::CFG->{pickup} |= $mask;
994 } else { 1231 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1232 $::CFG->{pickup} &= ~$mask;
996 } 1233 }
1234
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1235 $::CONN->send_command ("pickup $::CFG->{pickup}")
998 if defined $::CONN; 1236 if defined $::CONN;
999 }); 1237 });
1000 } 1238 }
1001 } 1239 }
1002 1240
1003 $table 1241 $table
1004} 1242}
1005 1243
1006sub make_inventory_window { 1244sub inventory_window {
1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1245 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center", 1246 x => "center",
1009 y => "center", 1247 y => "center",
1010 force_w => $WIDTH * 9/10, 1248 force_w => $WIDTH * 9/10,
1011 force_h => $HEIGHT * 9/10, 1249 force_h => $HEIGHT * 9/10,
… …
1124 $refresh->(); 1362 $refresh->();
1125 1363
1126 $vb 1364 $vb
1127} 1365}
1128 1366
1129sub make_help_window { 1367sub help_window {
1130 my $win = new CFClient::UI::FancyFrame 1368 my $win = new CFClient::UI::FancyFrame
1131 x => 'center', 1369 x => 'center',
1132 y => 'center', 1370 y => 'center',
1133 z => 2, 1371 z => 2,
1134 name => 'doc_browser', 1372 name => 'doc_browser',
… …
1137 title => "Documentation"; 1375 title => "Documentation";
1138 1376
1139 $win->add (my $vbox = new CFClient::UI::VBox); 1377 $win->add (my $vbox = new CFClient::UI::VBox);
1140 1378
1141 $vbox->add (my $buttons = new CFClient::UI::HBox); 1379 $vbox->add (my $buttons = new CFClient::UI::HBox);
1142 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1380 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1381 expand => 1, fontsize => 0.8, padding_x => 4);
1143 1382
1144 for ( 1383 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1384 $buttons->add (my $combo = new CFClient::UI::Combobox
1385 value => undef,
1386 options => [
1145 [intro => "Introduction"], 1387 [intro => "Introduction"],
1146 [manual => "Manual"], 1388 [manual => "Manual"],
1389 [skill_help => "Skills"],
1147 [command_help => "Commands"], 1390 [command_help => "Commands"],
1148 [skill_help => "Skills"], 1391 [dmcommand_help => "DM Commands"],
1149 ) { 1392 [COPYING => "License Terms"],
1150 my ($pod, $label) = @$_; 1393 ],
1394 on_changed => sub {
1395 my ($self, $pod) = @_;
1151 1396
1152 $buttons->add (new CFClient::UI::Button
1153 text => $label,
1154 on_activate => sub {
1155 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1397 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1156 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1398 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1157 1399
1158 $viewer->clear; 1400 $viewer->clear;
1159 1401
1160 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1402 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1161 for @$pom; 1403 for @$pom;
1162 1404
1163 $viewer->set_offset (0); 1405 $viewer->set_offset (0);
1164 }, 1406 },
1407 on_visibility_change => sub {
1408 my ($self, $visible) = @_;
1409 return unless $visible;
1410 return if $self->{value};
1411 $self->set_value ("intro");
1412 },
1165 ); 1413 );
1166 }
1167
1168 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1169 1414
1170 $win 1415 $win
1171} 1416}
1172 1417
1173sub sdl_init { 1418sub sdl_init {
… …
1250 } 1495 }
1251 }); 1496 });
1252 $MAPWIDGET->show; 1497 $MAPWIDGET->show;
1253 $MAPWIDGET->focus_in; 1498 $MAPWIDGET->focus_in;
1254 1499
1255 $LOGVIEW = new CFClient::UI::TextView 1500 $LOGVIEW = new CFClient::UI::TextScroller
1256 expand => 1, 1501 expand => 1,
1257 font => $FONT_FIXED, 1502 font => $FONT_FIXED,
1258 fontsize => $::CFG->{log_fontsize}, 1503 fontsize => $::CFG->{log_fontsize},
1504 indent => -4,
1259 can_hover => 1, 1505 can_hover => 1,
1260 can_events => 1, 1506 can_events => 1,
1261 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1507 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1262 ; 1508 ;
1263 1509
… …
1270 force_w => $::WIDTH * 0.6, 1516 force_w => $::WIDTH * 0.6,
1271 force_h => $::HEIGHT * 0.6, 1517 force_h => $::HEIGHT * 0.6,
1272 ; 1518 ;
1273 1519
1274 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1520 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1275 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1521 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1276 1522
1277 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1523 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1278 "Configure the server to play on, your username, password and other server-related options."); 1524 "Configure the server to play on, your username, password and other server-related options.");
1279 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1525 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1280 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1526 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1289 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1535 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1290 . "After pressing the combo the binding will be saved automatically and the " 1536 . "After pressing the combo the binding will be saved automatically and the "
1291 . "binding editor closes"); 1537 . "binding editor closes");
1292 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1538 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1293 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1539 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1540 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1541 "Some debuggign options. Do not ask.");
1294 1542
1295 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1543 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1296 1544
1297 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1545 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1298 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1546 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1299 1547
1300 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1548 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1301 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1549 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1302 1550
1303 make_gauge_window->show; # 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 1551 make_gauge_window->show; # 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
1304 1552
1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1553 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1306 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1554 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1307 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1555 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1308 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1556 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1309 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."); 1557 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1310 1558
1311 $BUTTONBAR->add (new CFClient::UI::Button 1559 $BUTTONBAR->add (new CFClient::UI::Button
1312 text => "Save Config", 1560 text => "Save Config",
… …
1316 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1564 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1317 status "Configuration Saved"; 1565 status "Configuration Saved";
1318 }, 1566 },
1319 ); 1567 );
1320 1568
1321 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1569 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1322 tooltip => "View Documentation"); 1570 tooltip => "View Documentation");
1323 1571
1324 $BUTTONBAR->add (new CFClient::UI::Button 1572 $BUTTONBAR->add (new CFClient::UI::Button
1325 text => "Quit", 1573 text => "Quit",
1326 tooltip => "Terminates the program", 1574 tooltip => "Terminates the program",
… …
1574 map_scale => 1, 1822 map_scale => 1,
1575 fow_enable => 1, 1823 fow_enable => 1,
1576 fow_intensity => 0.45, 1824 fow_intensity => 0.45,
1577 fow_smooth => 0, 1825 fow_smooth => 0,
1578 gui_fontsize => 1, 1826 gui_fontsize => 1,
1579 log_fontsize => 1, 1827 log_fontsize => 0.7,
1580 gauge_fontsize=> 1, 1828 gauge_fontsize=> 1,
1581 gauge_size => 0.35, 1829 gauge_size => 0.35,
1582 stat_fontsize => 1, 1830 stat_fontsize => 0.7,
1583 mapsize => 100, 1831 mapsize => 100,
1584 host => "crossfire.schmorp.de", 1832 host => "crossfire.schmorp.de",
1585 say_command => 'say', 1833 say_command => 'say',
1586 audio_enable => 1, 1834 audio_enable => 1,
1587 bgm_enable => 1, 1835 bgm_enable => 1,
1588 bgm_volume => 0.25, 1836 bgm_volume => 0.25,
1589 face_prefetch => 0, 1837 face_prefetch => 0,
1590 output_sync => 1, 1838 output_sync => 1,
1591 output_count => 1, 1839 output_count => 1,
1840 pickup => 0,
1592 ); 1841 );
1593 1842
1594 while (my ($k, $v) = each %DEF_CFG) { 1843 while (my ($k, $v) = each %DEF_CFG) {
1595 $CFG->{$k} = $v unless exists $CFG->{$k}; 1844 $CFG->{$k} = $v unless exists $CFG->{$k};
1596 } 1845 }

Diff Legend

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