[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.50 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC

…		…
25	# need to do it again because that pile of garbage called PAR nukes it before main	25	# need to do it again because that pile of garbage called PAR nukes it before main
26	unshift @INC, $ENV{PAR_TEMP}	26	unshift @INC, $ENV{PAR_TEMP}
27	if %PAR::LibCache;	27	if %PAR::LibCache;
28		28
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;
31	use Event;	30	use Event;
32		31
33	use Crossfire;	32	use Crossfire;
34	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
35		34
…		…
38	use CFClient;	37	use CFClient;
39	use CFClient::OpenGL ();	38	use CFClient::OpenGL ();
40	use CFClient::Protocol;	39	use CFClient::Protocol;
41	use CFClient::UI;	40	use CFClient::UI;
42	use CFClient::MapWidget;	41	use CFClient::MapWidget;
		42
		43	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43		44
44	$Event::DIED = sub {	45	$Event::DIED = sub {
45	# TODO: display dialog box or so	46	# TODO: display dialog box or so
46	Carp::confess $_[1];#d#TODO: remove when stable	47	Carp::confess $_[1];#d#TODO: remove when stable
47	CFClient::error $_[1];	48	CFClient::error $_[1];
…		…
90	our $SETUP_NOTEBOOK;	91	our $SETUP_NOTEBOOK;
91	our $SETUP_SERVER;	92	our $SETUP_SERVER;
92	our $SETUP_KEYBOARD;	93	our $SETUP_KEYBOARD;
93	our $SETUP_SPELLS;	94	our $SETUP_SPELLS;
94		95
		96	our $STATS_WINDOW;
		97	our $MESSAGE_WINDOW;
95	our $FLOORBOX;	98	our $FLOORBOX;
96	our $GAUGES;	99	our $GAUGES;
97	our $STATWIDS;	100	our $STATWIDS;
98		101
99	our $SDL_ACTIVE;	102	our $SDL_ACTIVE;
…		…
120	$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]);
121	}	124	}
122		125
123	sub debug {	126	sub debug {
124	$DEBUG_STATUS->set_text ($_[0]);	127	$DEBUG_STATUS->set_text ($_[0]);
		128	}
		129
		130	sub destroy_query_dialog {
		131	(delete $_[0]{query_dialog})->destroy
		132	if $_[0]{query_dialog};
		133	}
		134
		135	# server query dialog
		136	sub 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	[Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
		243	[Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		244	[Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		245	[Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		246	[Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		247	[Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
		248	[Cha => 7, "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;
125	}	309	}
126		310
127	sub start_game {	311	sub start_game {
128	status "logging in...";	312	status "logging in...";
129		313
…		…
148	map_widget => $MAPWIDGET,	332	map_widget => $MAPWIDGET,
149	logview => $LOGVIEW,	333	logview => $LOGVIEW,
150	statusbox => $STATUSBOX,	334	statusbox => $STATUSBOX,
151	map => $MAP,	335	map => $MAP,
152	mapmap => $MAPMAP,	336	mapmap => $MAPMAP,
		337	query => \&server_query,
153		338
154	sound_play => sub {	339	sound_play => sub {
155	my ($x, $y, $soundnum, $type) = @_;	340	my ($x, $y, $soundnum, $type) = @_;
156		341
157	$SDL_MIXER	342	$SDL_MIXER
…		…
174	}	359	}
175	}	360	}
176		361
177	sub stop_game {	362	sub stop_game {
178	$LOGIN_BUTTON->set_text ("Login");	363	$LOGIN_BUTTON->set_text ("Login");
		364	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179	$SETUP_DIALOG->show;	365	$SETUP_DIALOG->show;
180	$INV_WINDOW->hide;	366	$INV_WINDOW->hide;
181	$LOGVIEW->hide;
182		367
183	return unless $CONN;	368	return unless $CONN;
184		369
185	status "connection closed";	370	status "connection closed";
186		371
		372	destroy_query_dialog $CONN;
187	$CONN->destroy;	373	$CONN->destroy;
188	$CONN = 0; # false, does not autovivify	374	$CONN = 0; # false, does not autovivify
189	}	375	}
190		376
191	sub graphics_setup {	377	sub graphics_setup {
…		…
440		626
441	$win	627	$win
442	}	628	}
443		629
444		630
445	sub make_stats_window {	631	sub stats_window {
446	my $tgw = new CFClient::UI::FancyFrame	632	my $tgw = new CFClient::UI::FancyFrame
447	y => $HEIGHT * (2/8),	633	y => $HEIGHT * (2/8),
448	x => "max",	634	x => "max",
449	title => "Stats",	635	title => "Stats",
450	name => "stats_window";	636	name => "stats_window";
…		…
711	my $dialog = new CFClient::UI::FancyFrame	897	my $dialog = new CFClient::UI::FancyFrame
712	title => "Server List",	898	title => "Server List",
713	name => 'metaserver_dialog',	899	name => 'metaserver_dialog',
714	x => 'center',	900	x => 'center',
715	y => 'center',	901	y => 'center',
		902	z => 3,
716	child => (my $vbox = new CFClient::UI::VBox),	903	child => (my $vbox = new CFClient::UI::VBox),
717	on_visibility_change => sub {	904	on_visibility_change => sub {
718	update_metaserver if $_[1];	905	update_metaserver if $_[1];
719	},	906	},
720	;	907	;
…		…
849	title => "Messages",	1036	title => "Messages",
850	border_bg => [1, 1, 1, 1],	1037	border_bg => [1, 1, 1, 1],
851	bg => [0, 0, 0, 0.75],	1038	bg => [0, 0, 0, 0.75],
852	x => "max",	1039	x => "max",
853	y => 0,	1040	y => 0,
854	force_w => $::WIDTH / 3,	1041	force_w => $::WIDTH * 0.4,
855	force_h => $::HEIGHT / 5,	1042	force_h => $::HEIGHT * 0.5,
856	child => (my $vbox = new CFClient::UI::VBox);	1043	child => (my $vbox = new CFClient::UI::VBox);
857		1044
858	$vbox->add ($LOGVIEW);	1045	$vbox->add ($LOGVIEW);
859		1046
860	$vbox->add (my $input = new CFClient::UI::Entry	1047	$vbox->add (my $input = new CFClient::UI::Entry
…		…
903	sub open_quit_dialog {	1090	sub open_quit_dialog {
904	unless ($QUIT_DIALOG) {	1091	unless ($QUIT_DIALOG) {
905	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1092	$QUIT_DIALOG = new CFClient::UI::FancyFrame
906	x => "center",	1093	x => "center",
907	y => "center",	1094	y => "center",
		1095	z => 50,
908	title => "Really Quit?",	1096	title => "Really Quit?",
909	;	1097	;
910		1098
911	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1099	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912		1100
…		…
930		1118
931	$QUIT_DIALOG->show;	1119	$QUIT_DIALOG->show;
932	}	1120	}
933		1121
934	sub autopickup_setup {	1122	sub autopickup_setup {
935	my $vb = new CFClient::UI::VBox;	1123	my $table = new CFClient::UI::Table;
936
937	$vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
938	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
939	$hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
940	$hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
941
942	my $tbl = 0;
943	my $tblrow = 0;
944		1124
945	for (	1125	for (
946	["General", $gen_tbl],	1126	["General", 0, 0,
947	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],	1127	["Enable autopickup" => PICKUP_NEWMODE],
948	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],	1128	["Inhibit autopickup" => PICKUP_INHIBIT],
949	["Stop before pickup" => CFClient::Pickup::PU_STOP],	1129	["Stop before pickup" => PICKUP_STOP],
950	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],	1130	["Debug autopickup" => PICKUP_DEBUG],
		1131	],
951	["Weapons", $ltbl],	1132	["Weapons", 0, 6,
952	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],	1133	["All weapons" => PICKUP_ALLWEAPON],
953	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],	1134	["Missile weapons" => PICKUP_MISSILEWEAPON],
954	["Bows" => CFClient::Pickup::PU_BOW],	1135	["Bows" => PICKUP_BOW],
955	["Arrows" => CFClient::Pickup::PU_ARROW],	1136	["Arrows" => PICKUP_ARROW],
		1137	],
956	["Armour"],	1138	["Armour", 0, 12,
957	["Helmets" => CFClient::Pickup::PU_HELMET],	1139	["Helmets" => PICKUP_HELMET],
958	["Shields" => CFClient::Pickup::PU_SHIELD],	1140	["Shields" => PICKUP_SHIELD],
959	["Body Armour" => CFClient::Pickup::PU_ARMOUR],	1141	["Body Armour" => PICKUP_ARMOUR],
960	["Boots" => CFClient::Pickup::PU_BOOTS],	1142	["Boots" => PICKUP_BOOTS],
961	["Gloves" => CFClient::Pickup::PU_GLOVES],	1143	["Gloves" => PICKUP_GLOVES],
962	["Cloaks" => CFClient::Pickup::PU_CLOAK],	1144	["Cloaks" => PICKUP_CLOAK],
		1145	],
		1146
963	["Readables", $rtbl],	1147	["Readables", 2, 2,
964	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],	1148	["Spellbooks" => PICKUP_SPELLBOOK],
965	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],	1149	["Skillscrolls" => PICKUP_SKILLSCROLL],
966	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],	1150	["Normal Books/Scrolls" => PICKUP_READABLES],
		1151	],
967	["Misc"],	1152	["Misc", 2, 7,
968	["Food" => CFClient::Pickup::PU_FOOD],	1153	["Food" => PICKUP_FOOD],
969	["Drinks" => CFClient::Pickup::PU_DRINK],	1154	["Drinks" => PICKUP_DRINK],
970	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],	1155	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
971	["Keys" => CFClient::Pickup::PU_KEY],	1156	["Keys" => PICKUP_KEY],
972	["Magical Items" => CFClient::Pickup::PU_MAGICAL],	1157	["Magical Items" => PICKUP_MAGICAL],
973	["Potions" => CFClient::Pickup::PU_POTION],	1158	["Potions" => PICKUP_POTION],
974	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],	1159	["Magic Devices" => PICKUP_MAGIC_DEVICE],
975	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],	1160	["Ignore cursed" => PICKUP_NOT_CURSED],
976	["Jewelery" => CFClient::Pickup::PU_JEWELS],	1161	["Jewelery" => PICKUP_JEWELS],
		1162	],
977	)	1163	)
978	{	1164	{
979	if (ref $_->[1]) {	1165	my ($title, $x, $y, @bits) = @$_;
980	$tbl = $_->[1];
981	$tblrow = 0;
982	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);	1166	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
983	} elsif (not defined $_->[1]) {	1167
984	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);	1168	for (@bits) {
985	} else {	1169	++$y;
		1170
986	my $mask = $_->[1];	1171	my $mask = $_->[1];
987	$tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1172	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988	$tbl->add (1, $tblrow++, new CFClient::UI::CheckBox	1173	$table->add ($x+1, $y, new CFClient::UI::CheckBox
989	state => $CFG->{pickup} & $mask,	1174	state => $CFG->{pickup} & $mask,
990	on_changed => sub {	1175	on_changed => sub {
991	my ($box, $value) = @_;	1176	my ($box, $value) = @_;
992	if ($value) {	1177	if ($value) {
993	$::CFG->{pickup} \|= $mask;	1178	$::CFG->{pickup} \|= $mask;
…		…
998	if defined $::CONN;	1183	if defined $::CONN;
999	});	1184	});
1000	}	1185	}
1001	}	1186	}
1002		1187
1003	$vb	1188	$table
1004	}	1189	}
1005		1190
1006	sub make_inventory_window {	1191	sub inventory_window {
1007	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1192	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008	x => "center",	1193	x => "center",
1009	y => "center",	1194	y => "center",
1010	force_w => $WIDTH * 9/10,	1195	force_w => $WIDTH * 9/10,
1011	force_h => $HEIGHT * 9/10,	1196	force_h => $HEIGHT * 9/10,
…		…
1103	$SETUP_DIALOG->show;	1288	$SETUP_DIALOG->show;
1104	},	1289	},
1105	sub {	1290	sub {
1106	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1291	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107	$SETUP_DIALOG->show;	1292	$SETUP_DIALOG->show;
1108	});	1293	},
		1294	);
1109	$SETUP_DIALOG->hide;	1295	$SETUP_DIALOG->hide;
1110	$::BIND_EDITOR->show;	1296	$::BIND_EDITOR->show;
1111	},	1297	},
1112	);	1298	);
1113		1299
…		…
1127		1313
1128	sub make_help_window {	1314	sub make_help_window {
1129	my $win = new CFClient::UI::FancyFrame	1315	my $win = new CFClient::UI::FancyFrame
1130	x => 'center',	1316	x => 'center',
1131	y => 'center',	1317	y => 'center',
		1318	z => 2,
1132	name => 'doc_browser',	1319	name => 'doc_browser',
1133	force_w => int $WIDTH * 7/8,	1320	force_w => int $WIDTH * 7/8,
1134	force_h => int $HEIGHT * 7/8,	1321	force_h => int $HEIGHT * 7/8,
1135	title => "Documentation";	1322	title => "Documentation";
1136		1323
…		…
1148	my ($pod, $label) = @$_;	1335	my ($pod, $label) = @$_;
1149		1336
1150	$buttons->add (new CFClient::UI::Button	1337	$buttons->add (new CFClient::UI::Button
1151	text => $label,	1338	text => $label,
1152	on_activate => sub {	1339	on_activate => sub {
1153	my $parser = new Pod::POM;	1340	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1154	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");	1341	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1155		1342
1156	$viewer->clear;	1343	$viewer->clear;
1157		1344
1158	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1345	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1159	for @{ CFClient::pod_to_pango_list $pom };	1346	for @$pom;
1160		1347
1161	$viewer->set_offset (0);	1348	$viewer->set_offset (0);
1162	},	1349	},
1163	);	1350	);
1164	}	1351	}
…		…
1211	$DEBUG_STATUS->show;	1398	$DEBUG_STATUS->show;
1212		1399
1213	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1400	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214		1401
1215	$STATUSBOX = new CFClient::UI::Statusbox;	1402	$STATUSBOX = new CFClient::UI::Statusbox;
1216	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1403	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1217		1404
1218	(new CFClient::UI::Frame	1405	(new CFClient::UI::Frame
1219	bg => [0, 0, 0, 0.4],	1406	bg => [0, 0, 0, 0.4],
1220	force_x => 0,	1407	force_x => 0,
1221	force_y => "max",	1408	force_y => "max",
…		…
1262	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1449	$SETUP_DIALOG = new CFClient::UI::FancyFrame
1263	title => "Setup",	1450	title => "Setup",
1264	name => "setup_dialog",	1451	name => "setup_dialog",
1265	x => 'center',	1452	x => 'center',
1266	y => 'center',	1453	y => 'center',
		1454	z => 2,
1267	force_w => $::WIDTH * 0.6,	1455	force_w => $::WIDTH * 0.6,
1268	force_h => $::HEIGHT * 0.6,	1456	force_h => $::HEIGHT * 0.6,
1269	;	1457	;
1270		1458
1271	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1459	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1272	filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);	1460	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1273		1461
1274	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1462	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1275	"Configure the server to play on, your username, password and other server-related options.");	1463	"Configure the server to play on, your username, password and other server-related options.");
1276	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1464	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1277	"Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");	1465	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1278	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1466	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1279	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1467	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1280	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1468	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1281	"Configure the use of audio, sound effects and background music.");	1469	"Configure the use of audio, sound effects and background music.");
1282	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1470	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1283	"Lets you define, edit and delete bindings."	1471	"Lets you define, edit and delete bindings."
1284	. "There is a shortcut for making bindings: Left Control + Insert opens the binding editor "	1472	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1285	. "with nothing set and the recording started. After doing the actions you "	1473	. "with nothing set and the recording started. After doing the actions you "
1286	. "want to record press Insert and you will be asked to press a key-combo."	1474	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1287	. "After pressing the combo the binding will be saved automatically and the "	1475	. "After pressing the combo the binding will be saved automatically and the "
1288	. "binding editor closes");	1476	. "binding editor closes");
1289	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,	1477	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1290	"Displays all spells you have and lets you edit keyboard shortcuts for them.");	1478	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
1291		1479
1292	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;	1480	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1293		1481
1294	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1482	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1295	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1483	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1296		1484
1297	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1485	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1298	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1486	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1299		1487
1300	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	1488	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
1301		1489
1302	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1490	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1303	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1491	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1304	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1492	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1305	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."	1493	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1306	."You can also hit the <b>Tab</b>-key to show/hide the Inventory.");	1494	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1307		1495
1308	$BUTTONBAR->add (new CFClient::UI::Button	1496	$BUTTONBAR->add (new CFClient::UI::Button
1309	text => "Save Config",	1497	text => "Save Config",
1310	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1498	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1311	on_activate => sub {	1499	on_activate => sub {
…		…
1571	map_scale => 1,	1759	map_scale => 1,
1572	fow_enable => 1,	1760	fow_enable => 1,
1573	fow_intensity => 0.45,	1761	fow_intensity => 0.45,
1574	fow_smooth => 0,	1762	fow_smooth => 0,
1575	gui_fontsize => 1,	1763	gui_fontsize => 1,
1576	log_fontsize => 1,	1764	log_fontsize => 0.7,
1577	gauge_fontsize=> 1,	1765	gauge_fontsize=> 1,
1578	gauge_size => 0.35,	1766	gauge_size => 0.35,
1579	stat_fontsize => 1,	1767	stat_fontsize => 0.7,
1580	mapsize => 100,	1768	mapsize => 100,
1581	host => "crossfire.schmorp.de",	1769	host => "crossfire.schmorp.de",
1582	say_command => 'say',	1770	say_command => 'say',
1583	audio_enable => 1,	1771	audio_enable => 1,
1584	bgm_enable => 1,	1772	bgm_enable => 1,

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.50 by root, Sat Jun 3 02:32:35 2006 UTC vs. Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.50 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC