… | |
… | |
65 | } |
65 | } |
66 | |
66 | |
67 | sub start_game { |
67 | sub start_game { |
68 | status "logging in..."; |
68 | status "logging in..."; |
69 | |
69 | |
70 | my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
70 | my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
71 | |
71 | |
72 | $MAP = new CFClient::Map $mapsize, $mapsize; |
72 | $MAP = new CFClient::Map $mapsize, $mapsize; |
73 | |
73 | |
74 | $CONN = new conn |
74 | $CONN = new conn |
75 | host => $CFG->{host}, |
75 | host => $CFG->{host}, |
… | |
… | |
87 | |
87 | |
88 | sub stop_game { |
88 | sub stop_game { |
89 | undef $CONN; |
89 | undef $CONN; |
90 | } |
90 | } |
91 | |
91 | |
92 | sub config_dialog { |
92 | sub client_setup { |
93 | my $dialog = new CFClient::UI::FancyFrame |
93 | my $dialog = new CFClient::UI::FancyFrame |
94 | child => (my $vbox = new CFClient::UI::VBox); |
94 | child => (my $vbox = new CFClient::UI::VBox); |
95 | $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); |
95 | $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); |
96 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
96 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
97 | |
97 | |
… | |
… | |
137 | $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { |
137 | $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { |
138 | my ($self, $value) = @_; |
138 | my ($self, $value) = @_; |
139 | $CFG->{fow_smooth} = $value; |
139 | $CFG->{fow_smooth} = $value; |
140 | }); |
140 | }); |
141 | |
141 | |
|
|
142 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize"); |
|
|
143 | $table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { |
|
|
144 | my ($self, $value) = @_; |
|
|
145 | $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); |
|
|
146 | }); |
|
|
147 | |
142 | $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { |
148 | $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { |
143 | destroy_screen (); |
149 | destroy_screen (); |
144 | init_screen (); |
150 | init_screen (); |
145 | }); |
151 | }); |
|
|
152 | |
|
|
153 | $dialog |
|
|
154 | } |
|
|
155 | |
|
|
156 | sub server_setup { |
|
|
157 | my $dialog = new CFClient::UI::FancyFrame |
|
|
158 | child => (my $vbox = new CFClient::UI::VBox); |
146 | |
159 | |
147 | $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); |
160 | $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); |
148 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
161 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
149 | $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); |
162 | $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); |
150 | $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { |
163 | $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { |
… | |
… | |
189 | |
202 | |
190 | $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { |
203 | $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { |
191 | start_game; |
204 | start_game; |
192 | }); |
205 | }); |
193 | |
206 | |
194 | $vbox->add (my $hbox = new CFClient::UI::HBox); |
|
|
195 | |
|
|
196 | $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub { |
|
|
197 | CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; |
|
|
198 | status "Configuration Saved"; |
|
|
199 | }); |
|
|
200 | |
|
|
201 | $dialog |
207 | $dialog |
202 | } |
208 | } |
203 | |
209 | |
204 | sub console_window { |
210 | sub message_window { |
205 | my $window = new CFClient::UI::FancyFrame |
211 | my $window = new CFClient::UI::FancyFrame |
206 | border_bg => [1, 1, 1, 0.5], |
212 | border_bg => [1, 1, 1, 0.5], |
207 | bg => [0.3, 0.3, 0.3, 0.8], |
213 | bg => [0.3, 0.3, 0.3, 0.8], |
|
|
214 | user_w => $::WIDTH/4, |
|
|
215 | user_h => $::HEIGHT, |
208 | child => (my $vbox = new CFClient::UI::VBox); |
216 | child => (my $vbox = new CFClient::UI::VBox); |
209 | |
217 | |
210 | $vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1); |
218 | $vbox->add ($LOGVIEW = new CFClient::UI::TextView |
|
|
219 | expand => 1, |
|
|
220 | fontsize => $::CFG->{log_fontsize}, |
|
|
221 | ); |
|
|
222 | |
211 | $vbox->add (my $input = new CFClient::UI::LineEntry); |
223 | $vbox->add (my $input = new CFClient::UI::LineEntry); |
212 | $input->connect (activate => sub { |
224 | $input->connect (activate => sub { |
213 | my ($input, $text) = @_; |
225 | my ($input, $text) = @_; |
214 | $input->set_text (''); |
226 | $input->set_text (''); |
215 | |
227 | |
… | |
… | |
233 | |
245 | |
234 | $window |
246 | $window |
235 | } |
247 | } |
236 | |
248 | |
237 | sub sdl_init { |
249 | sub sdl_init { |
|
|
250 | #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE |
238 | SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO |
251 | SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO |
239 | and die "SDL::Init failed!\n"; |
252 | and die "SDL::Init failed!\n"; |
240 | } |
253 | } |
241 | |
254 | |
242 | sub init_screen { |
255 | sub init_screen { |
… | |
… | |
279 | $FONTSIZE = int $HEIGHT / 40; |
292 | $FONTSIZE = int $HEIGHT / 40; |
280 | |
293 | |
281 | ############################################################################# |
294 | ############################################################################# |
282 | |
295 | |
283 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; |
296 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; |
284 | $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); |
297 | $CFClient::UI::ROOT->add ($DEBUG_STATUS); |
285 | |
298 | |
286 | $STATUS_LINE = new CFClient::UI::Label |
299 | $STATUS_LINE = new CFClient::UI::Label |
287 | padding => 0, |
300 | padding => 0, |
288 | y => $HEIGHT * 44 / 45 - $FONTSIZE; |
301 | y => $HEIGHT * 44 / 45 - $FONTSIZE; |
289 | $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); |
302 | $CFClient::UI::ROOT->add ($STATUS_LINE); |
290 | |
303 | |
291 | $ALT_ENTER_MESSAGE = new CFClient::UI::Label |
304 | $ALT_ENTER_MESSAGE = new CFClient::UI::Label |
292 | padding => 0, |
305 | padding => 0, |
293 | y => $HEIGHT * 44 / 45, |
306 | y => $HEIGHT * 44 / 45, |
294 | height => $HEIGHT / 45, |
307 | height => $HEIGHT / 45, |
295 | text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; |
308 | text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; |
296 | $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); |
309 | $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); |
297 | |
310 | |
298 | $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget); |
311 | $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); |
299 | $MAPWIDGET->focus_in; |
312 | $MAPWIDGET->focus_in; |
300 | $MAPWIDGET->connect (activate_console => sub { |
313 | $MAPWIDGET->connect (activate_console => sub { |
|
|
314 | my ($mapwidget, $preset) = @_; |
|
|
315 | |
301 | if ($CONSOLE) { |
316 | if ($CONSOLE) { |
302 | $CONSOLE->{input}->focus_in; |
317 | $CONSOLE->{input}->focus_in; |
|
|
318 | |
|
|
319 | if ($preset && $CONSOLE->{input}->get_text eq '') { |
|
|
320 | $CONSOLE->{input}->set_text ($preset); |
|
|
321 | } |
303 | } |
322 | } |
304 | }); |
323 | }); |
305 | |
324 | |
306 | $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox); |
325 | $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); |
307 | |
326 | |
308 | $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1); |
327 | $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); |
309 | $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window); |
328 | $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); |
|
|
329 | $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); |
|
|
330 | |
|
|
331 | $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { |
|
|
332 | CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; |
|
|
333 | status "Configuration Saved"; |
|
|
334 | }); |
|
|
335 | |
|
|
336 | $BUTTONBAR->{children}[0]->emit ("activate"); |
310 | } |
337 | } |
311 | |
338 | |
312 | sub destroy_screen { |
339 | sub destroy_screen { |
313 | $CFClient::UI::TOPLEVEL->{children} = []; |
340 | $CFClient::UI::ROOT->{children} = []; |
314 | undef $SDL_ACTIVE; |
341 | undef $SDL_ACTIVE; |
315 | undef $SDL_EV; |
342 | undef $SDL_EV; |
316 | SDL::Quit; |
343 | SDL::Quit; |
317 | } |
344 | } |
318 | |
345 | |
… | |
… | |
329 | debug sprintf "%3.2f", $fps; |
356 | debug sprintf "%3.2f", $fps; |
330 | |
357 | |
331 | $want_refresh = 0; |
358 | $want_refresh = 0; |
332 | $can_refresh = 0; |
359 | $can_refresh = 0; |
333 | |
360 | |
334 | glViewport 0, 0, $WIDTH, $HEIGHT; |
|
|
335 | |
|
|
336 | glMatrixMode GL_PROJECTION; |
|
|
337 | glLoadIdentity; |
|
|
338 | glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; |
|
|
339 | glMatrixMode GL_MODELVIEW; |
|
|
340 | glLoadIdentity; |
|
|
341 | |
|
|
342 | glClearColor +($CFG->{fow_intensity}) x 3, 1; |
|
|
343 | glClear GL_COLOR_BUFFER_BIT; |
|
|
344 | |
|
|
345 | $CFClient::UI::TOPLEVEL->draw; |
361 | $CFClient::UI::ROOT->draw; |
346 | |
362 | |
347 | SDL::GLSwapBuffers; |
363 | SDL::GLSwapBuffers; |
348 | |
364 | |
349 | $LAST_REFRESH = $NOW; |
365 | $LAST_REFRESH = $NOW; |
350 | } |
366 | } |
… | |
… | |
423 | sub conn::face_update { |
439 | sub conn::face_update { |
424 | my ($self, $facenum, $face) = @_; |
440 | my ($self, $facenum, $face) = @_; |
425 | |
441 | |
426 | $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; |
442 | $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; |
427 | |
443 | |
428 | my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image}; |
444 | my $tex = $face->{texture} = |
|
|
445 | new_from_image CFClient::Texture |
|
|
446 | delete $face->{image}, minify => 1; |
429 | |
447 | |
430 | $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}); |
448 | $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
431 | $MAPWIDGET->update; |
449 | $MAPWIDGET->update; |
432 | } |
450 | } |
433 | |
451 | |
434 | sub conn::query { |
452 | sub conn::query { |
435 | my ($self, $flags, $prompt) = @_; |
453 | my ($self, $flags, $prompt) = @_; |
… | |
… | |
499 | ############################################################################# |
517 | ############################################################################# |
500 | |
518 | |
501 | CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; |
519 | CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; |
502 | |
520 | |
503 | my %DEF_CFG = ( |
521 | my %DEF_CFG = ( |
|
|
522 | sdl_mode => 0, |
504 | width => 640, |
523 | width => 640, |
505 | height => 480, |
524 | height => 480, |
|
|
525 | fullscreen => 0, |
506 | fast => 0, |
526 | fast => 0, |
507 | fow_enable => 1, |
527 | fow_enable => 1, |
508 | fow_intensity => 0.45, |
528 | fow_intensity => 0.45, |
509 | fow_smooth => 0, |
529 | fow_smooth => 0, |
510 | fullscreen => 0, |
530 | log_fontsize => 14, |
511 | sdl_mode => 0, |
|
|
512 | mapsize => 100, |
531 | mapsize => 100, |
513 | host => "crossfire.schmorp.de", |
532 | host => "crossfire.schmorp.de", |
514 | port => 13327, |
533 | port => 13327, |
515 | say_command => 'say', |
534 | say_command => 'say', |
516 | ); |
535 | ); |