… | |
… | |
18 | use CFClient; |
18 | use CFClient; |
19 | use CFClient::UI; |
19 | use CFClient::UI; |
20 | |
20 | |
21 | our $VERSION = '0.1'; |
21 | our $VERSION = '0.1'; |
22 | |
22 | |
23 | my $MAX_FPS = 500; |
23 | my $MAX_FPS = 60; |
24 | my $MIN_FPS = 5; # unused as of yet |
24 | my $MIN_FPS = 5; # unused as of yet |
|
|
25 | |
|
|
26 | our $META_SERVER = "crossfire.real-time.com:13326"; |
25 | |
27 | |
26 | our $FACECACHE; |
28 | our $FACECACHE; |
27 | |
29 | |
28 | our $LAST_REFRESH; |
30 | our $LAST_REFRESH; |
29 | our $NOW; |
31 | our $NOW; |
… | |
… | |
34 | |
36 | |
35 | our @SDL_MODES; |
37 | our @SDL_MODES; |
36 | our $WIDTH; |
38 | our $WIDTH; |
37 | our $HEIGHT; |
39 | our $HEIGHT; |
38 | our $FULLSCREEN; |
40 | our $FULLSCREEN; |
|
|
41 | our $FONTSIZE; |
39 | |
42 | |
40 | our $MAP; |
43 | our $MAP; |
41 | our $MAPWIDGET; |
44 | our $MAPWIDGET; |
42 | our $FONTSIZE; |
45 | our $BUTTONBAR; |
|
|
46 | our $LOGVIEW; |
|
|
47 | our $CONSOLE; |
|
|
48 | our $METASERVER; |
43 | |
49 | |
44 | our $SDL_ACTIVE; |
50 | our $SDL_ACTIVE; |
45 | our $SDL_EV; |
51 | our $SDL_EV; |
46 | our %SDL_CB; |
52 | our %SDL_CB; |
47 | |
53 | |
… | |
… | |
62 | } |
68 | } |
63 | |
69 | |
64 | sub start_game { |
70 | sub start_game { |
65 | status "logging in..."; |
71 | status "logging in..."; |
66 | |
72 | |
67 | my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
73 | my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
68 | |
74 | |
69 | $MAP = new CFClient::Map $mapsize, $mapsize; |
75 | $MAP = new CFClient::Map $mapsize, $mapsize; |
|
|
76 | |
|
|
77 | my ($host, $port) = split /:/, $CFG->{host}; |
70 | |
78 | |
71 | $CONN = new conn |
79 | $CONN = new conn |
72 | host => $CFG->{host}, |
80 | host => $host, |
73 | port => $CFG->{port}, |
81 | port => $port || 13327, |
74 | user => $CFG->{user}, |
82 | user => $CFG->{user}, |
75 | pass => $CFG->{password}, |
83 | pass => $CFG->{password}, |
76 | mapw => $mapsize, |
84 | mapw => $mapsize, |
77 | maph => $mapsize, |
85 | maph => $mapsize, |
78 | ; |
86 | ; |
… | |
… | |
84 | |
92 | |
85 | sub stop_game { |
93 | sub stop_game { |
86 | undef $CONN; |
94 | undef $CONN; |
87 | } |
95 | } |
88 | |
96 | |
89 | sub config_dialog { |
97 | sub client_setup { |
90 | my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, |
98 | my $dialog = new CFClient::UI::FancyFrame |
91 | child => (my $vbox = new CFClient::UI::VBox); |
99 | child => (my $vbox = new CFClient::UI::VBox); |
92 | $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); |
100 | $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); |
93 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
101 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
94 | |
102 | |
95 | $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); |
103 | $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); |
… | |
… | |
117 | my ($self, $value) = @_; |
125 | my ($self, $value) = @_; |
118 | $CFG->{fast} = $value; |
126 | $CFG->{fast} = $value; |
119 | }); |
127 | }); |
120 | |
128 | |
121 | $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); |
129 | $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); |
|
|
130 | $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { |
|
|
131 | my ($self, $value) = @_; |
|
|
132 | $CFG->{fow_enable} = $value; |
|
|
133 | }); |
|
|
134 | |
|
|
135 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); |
122 | $table->add (1, 3, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { |
136 | $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { |
123 | my ($self, $value) = @_; |
137 | my ($self, $value) = @_; |
124 | $CFG->{fow_intensity} = $value; |
138 | $CFG->{fow_intensity} = $value; |
125 | }); |
139 | }); |
126 | |
140 | |
127 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Smooth FoW"); |
141 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); |
128 | $table->add (1, 4, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { |
142 | $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { |
129 | my ($self, $value) = @_; |
143 | my ($self, $value) = @_; |
130 | $CFG->{fow_smooth} = $value; |
144 | $CFG->{fow_smooth} = $value; |
131 | }); |
145 | }); |
132 | |
146 | |
|
|
147 | $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); |
|
|
148 | $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { |
|
|
149 | my ($self, $value) = @_; |
|
|
150 | $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); |
|
|
151 | }); |
|
|
152 | |
133 | $table->add (1, 5, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { |
153 | $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { |
134 | destroy_screen (); |
154 | destroy_screen (); |
135 | init_screen (); |
155 | init_screen (); |
136 | }); |
156 | }); |
|
|
157 | |
|
|
158 | $dialog |
|
|
159 | } |
|
|
160 | |
|
|
161 | sub metaserver_dialog { |
|
|
162 | my $dialog = new CFClient::UI::FancyFrame |
|
|
163 | child => (my $vbox = new CFClient::UI::VBox); |
|
|
164 | |
|
|
165 | $vbox->add ($dialog->{table} = new CFClient::UI::Table); |
|
|
166 | |
|
|
167 | $dialog |
|
|
168 | } |
|
|
169 | |
|
|
170 | sub update_metaserver { |
|
|
171 | status "fetching metaserver list..."; |
|
|
172 | |
|
|
173 | my $buf; |
|
|
174 | |
|
|
175 | my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; |
|
|
176 | |
|
|
177 | Event->io (fd => $fh, poll => 'r', cb => sub { |
|
|
178 | my $res = sysread $fh, $buf, 8192, length $buf; |
|
|
179 | |
|
|
180 | if (!defined $res) { |
|
|
181 | $_[0]->w->cancel; |
|
|
182 | status "metaserver: $!"; |
|
|
183 | } elsif ($res == 0) { |
|
|
184 | $_[0]->w->cancel; |
|
|
185 | status "server list retrieved"; |
|
|
186 | |
|
|
187 | my $table = $METASERVER->{table}; |
|
|
188 | |
|
|
189 | $table->clear; |
|
|
190 | |
|
|
191 | my @col = qw(#Users Host Uptime Version Description); |
|
|
192 | $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) |
|
|
193 | for 0 .. $#col; |
|
|
194 | |
|
|
195 | my @align = qw(1 0 1 1 -1); |
|
|
196 | |
|
|
197 | my $y = 0; |
|
|
198 | for my $m (map [split /\|/], split /\015?\012/, $buf) { |
|
|
199 | my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; |
|
|
200 | |
|
|
201 | for ($desc) { |
|
|
202 | s/<br>/\n/gi; |
|
|
203 | s/<li>/\n· /gi; |
|
|
204 | s/<.*?>//sgi; |
|
|
205 | s/&/&/g; |
|
|
206 | s/</</g; |
|
|
207 | s/>/>/g; |
|
|
208 | } |
|
|
209 | |
|
|
210 | $uptime = sprintf "%dd %02d:%02d:%02d", |
|
|
211 | (int $m->[8] / 86400), |
|
|
212 | (int $m->[8] / 3600) % 24, |
|
|
213 | (int $m->[8] / 60) % 60, |
|
|
214 | $m->[8] % 60; |
|
|
215 | |
|
|
216 | $m = [$users, $host, $uptime, $version, $desc]; |
|
|
217 | |
|
|
218 | $y++; |
|
|
219 | $table->add ($_, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8) |
|
|
220 | for 0 .. $#$m; |
|
|
221 | } |
|
|
222 | } |
|
|
223 | }); |
|
|
224 | } |
|
|
225 | |
|
|
226 | sub server_setup { |
|
|
227 | my $dialog = new CFClient::UI::FancyFrame |
|
|
228 | child => (my $vbox = new CFClient::UI::VBox); |
137 | |
229 | |
138 | $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); |
230 | $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); |
139 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
231 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
140 | $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); |
232 | $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port"); |
141 | $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}); |
233 | |
142 | |
234 | { |
143 | $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); |
235 | $table->add (1, 2, my $vbox = new CFClient::UI::VBox); |
144 | $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}); |
236 | |
|
|
237 | $vbox->add (new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { |
|
|
238 | my ($self, $value) = @_; |
|
|
239 | $CFG->{host} = $value; |
|
|
240 | }); |
|
|
241 | |
|
|
242 | $METASERVER = metaserver_dialog; |
|
|
243 | |
|
|
244 | $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub { |
|
|
245 | update_metaserver; |
|
|
246 | }); |
|
|
247 | } |
145 | |
248 | |
146 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); |
249 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); |
147 | $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}); |
250 | $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { |
|
|
251 | my ($self, $value) = @_; |
|
|
252 | $CFG->{user} = $value; |
|
|
253 | }); |
148 | |
254 | |
149 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); |
255 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); |
150 | $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1); |
256 | $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { |
|
|
257 | my ($self, $value) = @_; |
|
|
258 | $CFG->{password} = $value; |
|
|
259 | }); |
151 | |
260 | |
|
|
261 | $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); |
|
|
262 | $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { |
|
|
263 | my ($self, $value) = @_; |
|
|
264 | $CFG->{say_command} = $value; |
|
|
265 | }); |
|
|
266 | |
152 | $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size"); |
267 | $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); |
153 | $table->add (1, 6, new CFClient::UI::Slider |
268 | $table->add (1, 7, new CFClient::UI::Slider |
154 | req_w => 100, |
269 | req_w => 100, |
155 | range => [$CFG->{mapsize}, 10, 100 + 1, 1], |
270 | range => [$CFG->{mapsize}, 10, 100 + 1, 1], |
156 | connect_changed => sub { |
271 | connect_changed => sub { |
157 | my ($self, $value) = @_; |
272 | my ($self, $value) = @_; |
158 | |
273 | |
159 | $CFG->{mapsize} = $self->{range}[0] = $value = int $value; |
274 | $CFG->{mapsize} = $self->{range}[0] = $value = int $value; |
160 | }, |
275 | }, |
161 | ); |
276 | ); |
162 | |
277 | |
163 | $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { |
278 | $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { |
164 | start_game; |
279 | start_game; |
165 | }); |
280 | }); |
166 | |
281 | |
167 | $vbox->add (my $hbox = new CFClient::UI::HBox); |
282 | $dialog |
|
|
283 | } |
168 | |
284 | |
169 | $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub { |
285 | sub message_window { |
170 | CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; |
286 | my $window = new CFClient::UI::FancyFrame |
171 | status "Configuration Saved"; |
287 | border_bg => [1, 1, 1, 0.5], |
|
|
288 | bg => [0.3, 0.3, 0.3, 0.8], |
|
|
289 | user_w => $::WIDTH/4, |
|
|
290 | user_h => $::HEIGHT, |
|
|
291 | child => (my $vbox = new CFClient::UI::VBox); |
|
|
292 | |
|
|
293 | $vbox->add ($LOGVIEW = new CFClient::UI::TextView |
|
|
294 | expand => 1, |
|
|
295 | fontsize => $::CFG->{log_fontsize}, |
172 | }); |
296 | ); |
173 | $CFClient::UI::TOPLEVEL->add ($dialog); |
297 | |
|
|
298 | $vbox->add (my $input = new CFClient::UI::LineEntry); |
|
|
299 | $input->connect (activate => sub { |
|
|
300 | my ($input, $text) = @_; |
|
|
301 | $input->set_text (''); |
|
|
302 | |
|
|
303 | if ($text =~ /^\/(.*)/) { |
|
|
304 | $::CONN->user_send ("command $1"); |
|
|
305 | } else { |
|
|
306 | my $say_cmd = $::CFG->{say_command} || 'say'; |
|
|
307 | $::CONN->user_send ("command $say_cmd $text"); |
|
|
308 | } |
|
|
309 | 1 |
|
|
310 | }); |
|
|
311 | $input->connect (escape => sub { |
|
|
312 | $MAPWIDGET->focus_in |
|
|
313 | }); |
|
|
314 | $input->focus_in; |
|
|
315 | |
|
|
316 | $CONSOLE = { |
|
|
317 | window => $window, |
|
|
318 | input => $input |
|
|
319 | }; |
|
|
320 | |
|
|
321 | $window |
174 | } |
322 | } |
175 | |
323 | |
176 | sub sdl_init { |
324 | sub sdl_init { |
177 | SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE |
325 | #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE |
|
|
326 | SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO |
178 | and die "SDL::Init failed!\n"; |
327 | and die "SDL::Init failed!\n"; |
179 | } |
328 | } |
180 | |
329 | |
181 | sub init_screen { |
330 | sub init_screen { |
182 | sdl_init; |
331 | sdl_init; |
… | |
… | |
217 | |
366 | |
218 | $FONTSIZE = int $HEIGHT / 40; |
367 | $FONTSIZE = int $HEIGHT / 40; |
219 | |
368 | |
220 | ############################################################################# |
369 | ############################################################################# |
221 | |
370 | |
222 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0; |
371 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; |
223 | $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); |
372 | $CFClient::UI::ROOT->add ($DEBUG_STATUS); |
224 | |
373 | |
225 | $STATUS_LINE = new CFClient::UI::Label |
374 | $STATUS_LINE = new CFClient::UI::Label |
226 | padding => 0, |
375 | padding => 0, |
227 | y => $HEIGHT * 49 / 50 - $FONTSIZE; |
376 | y => $HEIGHT * 44 / 45 - $FONTSIZE; |
228 | $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); |
377 | $CFClient::UI::ROOT->add ($STATUS_LINE); |
229 | |
378 | |
230 | $ALT_ENTER_MESSAGE = new CFClient::UI::Label |
379 | $ALT_ENTER_MESSAGE = new CFClient::UI::Label |
231 | padding => 0, |
380 | padding => 0, |
232 | y => $HEIGHT * 49 / 50, |
381 | y => $HEIGHT * 44 / 45, |
233 | height => $HEIGHT / 50, |
382 | height => $HEIGHT / 45, |
234 | text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; |
383 | text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; |
235 | $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); |
384 | $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); |
236 | |
385 | |
237 | $MAPWIDGET = new CFClient::UI::MapWidget; |
386 | $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); |
238 | $CFClient::UI::TOPLEVEL->add ($MAPWIDGET); |
|
|
239 | $MAPWIDGET->focus_in; |
387 | $MAPWIDGET->focus_in; |
|
|
388 | $MAPWIDGET->connect (activate_console => sub { |
|
|
389 | my ($mapwidget, $preset) = @_; |
240 | |
390 | |
241 | config_dialog; |
391 | if ($CONSOLE) { |
|
|
392 | $CONSOLE->{input}->focus_in; |
|
|
393 | |
|
|
394 | if ($preset && $CONSOLE->{input}->get_text eq '') { |
|
|
395 | $CONSOLE->{input}->set_text ($preset); |
|
|
396 | } |
|
|
397 | } |
|
|
398 | }); |
|
|
399 | |
|
|
400 | $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); |
|
|
401 | |
|
|
402 | $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); |
|
|
403 | $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); |
|
|
404 | $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); |
|
|
405 | |
|
|
406 | $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { |
|
|
407 | CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; |
|
|
408 | status "Configuration Saved"; |
|
|
409 | }); |
|
|
410 | |
|
|
411 | $BUTTONBAR->{children}[0]->emit ("activate"); |
242 | } |
412 | } |
243 | |
413 | |
244 | sub destroy_screen { |
414 | sub destroy_screen { |
245 | $CFClient::UI::TOPLEVEL->{children} = []; |
415 | $CFClient::UI::ROOT->{children} = []; |
246 | undef $SDL_ACTIVE; |
416 | undef $SDL_ACTIVE; |
247 | undef $SDL_EV; |
417 | undef $SDL_EV; |
248 | SDL::Quit; |
418 | SDL::Quit; |
249 | } |
419 | } |
250 | |
420 | |
… | |
… | |
258 | |
428 | |
259 | sub force_refresh { |
429 | sub force_refresh { |
260 | $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; |
430 | $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; |
261 | debug sprintf "%3.2f", $fps; |
431 | debug sprintf "%3.2f", $fps; |
262 | |
432 | |
263 | # $want_refresh = 0;#d# |
433 | $want_refresh = 0; |
264 | $can_refresh = 0; |
434 | $can_refresh = 0; |
265 | |
435 | |
266 | glViewport 0, 0, $WIDTH, $HEIGHT; |
|
|
267 | |
|
|
268 | glMatrixMode GL_PROJECTION; |
|
|
269 | glLoadIdentity; |
|
|
270 | glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; |
|
|
271 | glMatrixMode GL_MODELVIEW; |
|
|
272 | glLoadIdentity; |
|
|
273 | |
|
|
274 | glClearColor +($CFG->{fow_intensity}) x 3, 1; |
|
|
275 | glClear GL_COLOR_BUFFER_BIT; |
|
|
276 | |
|
|
277 | $CFClient::UI::TOPLEVEL->draw; |
436 | $CFClient::UI::ROOT->draw; |
278 | |
437 | |
279 | SDL::GLSwapBuffers; |
438 | SDL::GLSwapBuffers; |
280 | |
439 | |
281 | $LAST_REFRESH = $NOW; |
440 | $LAST_REFRESH = $NOW; |
282 | } |
441 | } |
… | |
… | |
355 | sub conn::face_update { |
514 | sub conn::face_update { |
356 | my ($self, $facenum, $face) = @_; |
515 | my ($self, $facenum, $face) = @_; |
357 | |
516 | |
358 | $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; |
517 | $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; |
359 | |
518 | |
360 | my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image}; |
519 | my $tex = $face->{texture} = |
|
|
520 | new_from_image CFClient::Texture |
|
|
521 | delete $face->{image}, minify => 1; |
361 | |
522 | |
362 | $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}); |
523 | $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
363 | $MAPWIDGET->update; |
524 | $MAPWIDGET->update; |
364 | } |
525 | } |
365 | |
526 | |
366 | sub conn::query { |
527 | sub conn::query { |
367 | my ($self, $flags, $prompt) = @_; |
528 | my ($self, $flags, $prompt) = @_; |
368 | |
529 | |
|
|
530 | #TODO |
369 | warn "<<<<QUERY:$flags:$prompt>>>\n";#d# |
531 | warn "<<<<QUERY:$flags:$prompt>>>\n";#d# |
|
|
532 | } |
|
|
533 | |
|
|
534 | sub conn::drawinfo { |
|
|
535 | my ($self, $color, $text) = @_; |
|
|
536 | |
|
|
537 | my @color = ( |
|
|
538 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
|
|
539 | [1.00, 1.00, 1.00], |
|
|
540 | [0.00, 0.00, 0.55], |
|
|
541 | [1.00, 0.00, 0.00], |
|
|
542 | [1.00, 0.54, 0.00], |
|
|
543 | [0.11, 0.56, 1.00], |
|
|
544 | [0.93, 0.46, 0.00], |
|
|
545 | [0.18, 0.54, 0.34], |
|
|
546 | [0.56, 0.73, 0.56], |
|
|
547 | [0.80, 0.80, 0.80], |
|
|
548 | [0.55, 0.41, 0.13], |
|
|
549 | [0.99, 0.77, 0.26], |
|
|
550 | [0.74, 0.65, 0.41], |
|
|
551 | ); |
|
|
552 | |
|
|
553 | $LOGVIEW->add_paragraph ($color[$color], $text); |
370 | } |
554 | } |
371 | |
555 | |
372 | %SDL_CB = ( |
556 | %SDL_CB = ( |
373 | SDL_QUIT() => sub { |
557 | SDL_QUIT() => sub { |
374 | Event::unloop -1; |
558 | Event::unloop -1; |
… | |
… | |
379 | refresh; |
563 | refresh; |
380 | }, |
564 | }, |
381 | SDL_KEYDOWN() => sub { |
565 | SDL_KEYDOWN() => sub { |
382 | if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { |
566 | if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { |
383 | # alt-enter |
567 | # alt-enter |
384 | $FULLSCREEN = !$FULLSCREEN; |
|
|
385 | destroy_screen; |
568 | destroy_screen; |
|
|
569 | $CFG->{fullscreen} = !$CFG->{fullscreen}; |
386 | init_screen; |
570 | init_screen; |
387 | } else { |
571 | } else { |
388 | CFClient::UI::feed_sdl_key_down_event ($SDL_EV); |
572 | CFClient::UI::feed_sdl_key_down_event ($SDL_EV); |
389 | } |
573 | } |
390 | }, |
574 | }, |
… | |
… | |
408 | ############################################################################# |
592 | ############################################################################# |
409 | |
593 | |
410 | CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; |
594 | CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; |
411 | |
595 | |
412 | my %DEF_CFG = ( |
596 | my %DEF_CFG = ( |
|
|
597 | sdl_mode => 0, |
413 | width => 640, |
598 | width => 640, |
414 | height => 480, |
599 | height => 480, |
|
|
600 | fullscreen => 0, |
415 | fast => 0, |
601 | fast => 0, |
|
|
602 | fow_enable => 1, |
416 | fow_intensity => 0.45, |
603 | fow_intensity => 0.45, |
417 | fow_smooth => 0, |
604 | fow_smooth => 0, |
418 | fullscreen => 0, |
605 | log_fontsize => 14, |
419 | sdl_mode => 0, |
|
|
420 | mapsize => 100, |
606 | mapsize => 100, |
421 | host => "crossfire.schmorp.de", |
607 | host => "crossfire.schmorp.de", |
422 | port => 13327, |
608 | say_command => 'say', |
423 | ); |
609 | ); |
424 | |
610 | |
425 | while (my ($k, $v) = each %DEF_CFG) { |
611 | while (my ($k, $v) = each %DEF_CFG) { |
426 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
612 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
427 | } |
613 | } |