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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC vs.
Revision 1.156 by elmex, Fri Apr 21 12:27:20 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC vs. Revision 1.156 by elmex, Fri Apr 21 12:27:20 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC vs.
Revision 1.156 by elmex, Fri Apr 21 12:27:20 2006 UTC