ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.5 by elmex, Thu May 25 18:48:45 2006 UTC vs.
Revision 1.19 by elmex, Sat May 27 21:15:57 2006 UTC

… …
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM; 30use Pod::POM;
31use Event; 31use Event;
32 32
33use Crossfire; 33use Crossfire;
34use Crossfire::Protocol; 34use Crossfire::Protocol::Constants;
35 35
36use Compress::LZF; 36use Compress::LZF;
37 37
38use CFClient; 38use CFClient;
39use CFClient::OpenGL ();
40use CFClient::Protocol;
39use CFClient::UI; 41use CFClient::UI;
40use CFClient::MapWidget; 42use CFClient::MapWidget;
41 43
42$Event::DIED = sub { 44$Event::DIED = sub {
43 # TODO: display dialog box or so 45 # TODO: display dialog box or so
… …
50 52
51my $MAX_FPS = 60; 53my $MAX_FPS = 60;
52my $MIN_FPS = 5; # unused as of yet 54my $MIN_FPS = 5; # unused as of yet
53 55
54our $META_SERVER = "crossfire.real-time.com:13326"; 56our $META_SERVER = "crossfire.real-time.com:13326";
55
56our $FACEMAP;
57our $TILECACHE;
58our $MAPCACHE;
59 57
60our $LAST_REFRESH; 58our $LAST_REFRESH;
61our $NOW; 59our $NOW;
62 60
63our $CFG; 61our $CFG;
… …
99 97
100our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 99our $STATUSBOX;
102our $DEBUG_STATUS; 100our $DEBUG_STATUS;
103 101
104our $INVWIN;
105our $INV; 102our $INV;
106our $INVR; 103our $INVR;
107our $INVR_LBL; 104our $INVR_LBL;
108 105
109sub status { 106sub status {
… …
119sub start_game { 116sub start_game {
120 status "logging in..."; 117 status "logging in...";
121 118
122 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
123 120
124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 121 my ($host, $port) = split /:/, $CFG->{host};
122
125 $MAP = new CFClient::Map $mapsize, $mapsize; 123 $MAP = new CFClient::Map $mapsize, $mapsize;
126
127 my ($host, $port) = split /:/, $CFG->{host};
128 124
129 $CONN = eval { 125 $CONN = eval {
130 new conn 126 new CFClient::Protocol
131 host => $host, 127 host => $host,
132 port => $port || 13327, 128 port => $port || 13327,
133 user => $CFG->{user}, 129 user => $CFG->{user},
134 pass => $CFG->{password}, 130 pass => $CFG->{password},
135 mapw => $mapsize, 131 mapw => $mapsize,
136 maph => $mapsize, 132 maph => $mapsize,
137 ; 133
134 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW,
136 statusbox => $STATUSBOX,
137 map => $MAP,
138 mapmap => $MAPMAP,
139
140 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_;
142
143 $SDL_MIXER
144 or return;
145
146 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
147 or return;
148
149 $chunk->play;
150 },
138 }; 151 };
139 152
140 if ($CONN) { 153 if ($CONN) {
141 CFClient::lowdelay fileno $CONN->{fh}; 154 CFClient::lowdelay fileno $CONN->{fh};
142 155
… …
160 $CONN->destroy; 173 $CONN->destroy;
161 $CONN = 0; # false, does not autovivify 174 $CONN = 0; # false, does not autovivify
162 175
163 $BUTTONBAR->{children}[1]->emit ("activate") 176 $BUTTONBAR->{children}[1]->emit ("activate")
164 unless $BUTTONBAR->{children}[1]->{state}; 177 unless $BUTTONBAR->{children}[1]->{state};
165
166 undef $MAPCACHE;
167 undef $MAP;
168} 178}
169 179
170sub client_setup { 180sub client_setup {
171 my $dialog = new CFClient::UI::FancyFrame 181 my $dialog = new CFClient::UI::FancyFrame
182 req_x => 1,
183 req_y => $HEIGHT * (1/8),
184 name => "client_setup",
172 title => "Client Setup", 185 title => "Client Setup",
173 child => (my $vbox = new CFClient::UI::VBox); 186 child => (my $vbox = new CFClient::UI::VBox);
174 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 187 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
175 188
176 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 189 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
… …
191 204
192 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 205 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
193 $table->add (1, $row++, new CFClient::UI::CheckBox 206 $table->add (1, $row++, new CFClient::UI::CheckBox
194 state => $CFG->{fullscreen}, 207 state => $CFG->{fullscreen},
195 tooltip => "Bring the client into fullscreen mode.", 208 tooltip => "Bring the client into fullscreen mode.",
196 connect_changed => sub { 209 on_changed => sub {
197 my ($self, $value) = @_; 210 my ($self, $value) = @_;
198 $CFG->{fullscreen} = $value; 211 $CFG->{fullscreen} = $value;
199 } 212 }
200 ); 213 );
201 214
202 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 215 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
203 $table->add (1, $row++, new CFClient::UI::CheckBox 216 $table->add (1, $row++, new CFClient::UI::CheckBox
204 state => $CFG->{fast}, 217 state => $CFG->{fast},
205 tooltip => "Lower the visual quality considerably to speed up rendering.", 218 tooltip => "Lower the visual quality considerably to speed up rendering.",
206 connect_changed => sub { 219 on_changed => sub {
207 my ($self, $value) = @_; 220 my ($self, $value) = @_;
208 $CFG->{fast} = $value; 221 $CFG->{fast} = $value;
209 } 222 }
210 ); 223 );
211 224
212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 225 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
213 $table->add (1, $row++, new CFClient::UI::Slider 226 $table->add (1, $row++, new CFClient::UI::Slider
214 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 227 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
215 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 228 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
216 connect_changed => sub { 229 on_changed => sub {
217 my ($self, $value) = @_; 230 my ($self, $value) = @_;
218 $CFG->{map_scale} = 2 ** $value; 231 $CFG->{map_scale} = 2 ** $value;
219 } 232 }
220 ); 233 );
221 234
222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 235 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 236 $table->add (1, $row++, new CFClient::UI::CheckBox
224 state => $CFG->{fow_enable}, 237 state => $CFG->{fow_enable},
225 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 238 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
226 connect_changed => sub { 239 on_changed => sub {
227 my ($self, $value) = @_; 240 my ($self, $value) = @_;
228 $CFG->{fow_enable} = $value; 241 $CFG->{fow_enable} = $value;
229 } 242 }
230 ); 243 );
231 244
232 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 245 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
233 $table->add (1, $row++, new CFClient::UI::Slider 246 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 247 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
235 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 248 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
236 connect_changed => sub { 249 on_changed => sub {
237 my ($self, $value) = @_; 250 my ($self, $value) = @_;
238 $CFG->{fow_intensity} = $value; 251 $CFG->{fow_intensity} = $value;
239 } 252 }
240 ); 253 );
241 254
242 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 255 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 256 $table->add (1, $row++, new CFClient::UI::CheckBox
244 state => $CFG->{fow_smooth}, 257 state => $CFG->{fow_smooth},
245 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 258 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
246 connect_changed => sub { 259 on_changed => sub {
247 my ($self, $value) = @_; 260 my ($self, $value) = @_;
248 $CFG->{fow_smooth} = $value; 261 $CFG->{fow_smooth} = $value;
249 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 262 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
250 } 263 }
251 ); 264 );
252 265
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 266 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
254 $table->add (1, $row++, new CFClient::UI::Slider 267 $table->add (1, $row++, new CFClient::UI::Slider
255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 268 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
256 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 269 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
257 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 270 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
258 ); 271 );
259 272
260 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
261 $table->add (1, $row++, new CFClient::UI::Slider 274 $table->add (1, $row++, new CFClient::UI::Slider
262 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 275 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
263 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 276 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 277 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
265 ); 278 );
266 279
267 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
268 281
269 $table->add (1, $row++, new CFClient::UI::Slider 282 $table->add (1, $row++, new CFClient::UI::Slider
270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 283 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
271 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 284 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
272 connect_changed => sub { 285 on_changed => sub {
273 $CFG->{stat_fontsize} = $_[1]; 286 $CFG->{stat_fontsize} = $_[1];
274 &set_stats_window_fontsize; 287 &set_stats_window_fontsize;
275 } 288 }
276 ); 289 );
277 290
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 291 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
279 $table->add (1, $row++, new CFClient::UI::Slider 292 $table->add (1, $row++, new CFClient::UI::Slider
280 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 293 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
281 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 294 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
282 connect_changed => sub { 295 on_changed => sub {
283 $CFG->{gauge_fontsize} = $_[1]; 296 $CFG->{gauge_fontsize} = $_[1];
284 &set_gauge_window_fontsize; 297 &set_gauge_window_fontsize;
285 } 298 }
286 ); 299 );
287 300
288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 301 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
289 $table->add (1, $row++, new CFClient::UI::Slider 302 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_size}, 0.2, 0.8], 303 range => [$CFG->{gauge_size}, 0.2, 0.8],
291 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 304 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
292 connect_changed => sub { 305 on_changed => sub {
293 $CFG->{gauge_size} = $_[1]; 306 $CFG->{gauge_size} = $_[1];
294 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 307 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
295 } 308 }
296 ); 309 );
297 310
298 $table->add (1, $row++, new CFClient::UI::Button 311 $table->add (1, $row++, new CFClient::UI::Button
299 expand => 1, align => 0, text => "Apply", 312 expand => 1, align => 0, text => "Apply",
300 tooltip => "Apply the video settings", 313 tooltip => "Apply the video settings",
301 connect_activate => sub { 314 on_activate => sub {
302 video_shutdown (); 315 video_shutdown ();
303 video_init (); 316 video_init ();
304 } 317 }
305 ); 318 );
306 319
307 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
308 $table->add (1, $row++, new CFClient::UI::CheckBox 321 $table->add (1, $row++, new CFClient::UI::CheckBox
309 state => $CFG->{audio_enable}, 322 state => $CFG->{audio_enable},
310 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 323 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
311 connect_changed => sub { 324 on_changed => sub {
312 $CFG->{audio_enable} = $_[1]; 325 $CFG->{audio_enable} = $_[1];
313 } 326 }
314 ); 327 );
315# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 328# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
316# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 329# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
317# $CFG->{effects_volume} = $_[1]; 330# $CFG->{effects_volume} = $_[1];
318# }); 331# });
319 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 332 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
320 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 333 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
321 $hbox->add (new CFClient::UI::CheckBox 334 $hbox->add (new CFClient::UI::CheckBox
322 expand => 1, state => $CFG->{bgm_enable}, 335 expand => 1, state => $CFG->{bgm_enable},
323 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 336 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
324 connect_changed => sub { 337 on_changed => sub {
325 $CFG->{bgm_enable} = $_[1]; 338 $CFG->{bgm_enable} = $_[1];
326 } 339 }
327 ); 340 );
328 $hbox->add (new CFClient::UI::Slider 341 $hbox->add (new CFClient::UI::Slider
329 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 342 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
330 tooltip => "The volume of the background music. Changes are instant.", 343 tooltip => "The volume of the background music. Changes are instant.",
331 connect_changed => sub { 344 on_changed => sub {
332 $CFG->{bgm_volume} = $_[1]; 345 $CFG->{bgm_volume} = $_[1];
333 CFClient::MixMusic::volume $_[1] * 128; 346 CFClient::MixMusic::volume $_[1] * 128;
334 } 347 }
335 ); 348 );
336 349
337 $table->add (1, $row++, new CFClient::UI::Button 350 $table->add (1, $row++, new CFClient::UI::Button
338 expand => 1, align => 0, text => "Apply", 351 expand => 1, align => 0, text => "Apply",
339 tooltip => "Apply the audio settings", 352 tooltip => "Apply the audio settings",
340 connect_activate => sub { 353 on_activate => sub {
341 audio_shutdown (); 354 audio_shutdown ();
342 audio_init (); 355 audio_init ();
343 } 356 }
344 ); 357 );
345 358
… …
347 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 360 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
348 text => $CFG->{say_command}, 361 text => $CFG->{say_command},
349 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 362 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
350 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 363 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
351 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 364 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
352 connect_changed => sub { 365 on_changed => sub {
353 my ($self, $value) = @_; 366 my ($self, $value) = @_;
354 $CFG->{say_command} = $value; 367 $CFG->{say_command} = $value;
355 } 368 }
356 ); 369 );
357 370
… …
421 434
422 $win 435 $win
423} 436}
424 437
425sub make_stats_window { 438sub make_stats_window {
426 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 439 my $tgw = new CFClient::UI::FancyFrame
440 req_y => $HEIGHT * (2/8),
441 req_x => -1,
442 title => "Stats",
443 name => "stats_window";
427 444
428 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 445 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
429 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 446 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
430 can_hover => 1, can_events => 1, 447 can_hover => 1, can_events => 1,
431 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 448 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
434 tooltip => "The map you are currently on (if supported by the server)."); 451 tooltip => "The map you are currently on (if supported by the server).");
435 452
436 $vb->add (my $hb0 = new CFClient::UI::HBox); 453 $vb->add (my $hb0 = new CFClient::UI::HBox);
437 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 454 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
438 can_hover => 1, can_events => 1, 455 can_hover => 1, can_events => 1,
439 tooltip => "This is the amount the Player weights."); 456 tooltip => "The weight of the player including all inventory items.");
440 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 457 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
441 can_hover => 1, can_events => 1, 458 can_hover => 1, can_events => 1,
442 tooltip => "The weight limit, you can't carry more than this."); 459 tooltip => "The weight limit: you cannot carry more than this.");
443 460
444 461
445 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 462 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
446 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 463 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
447 464
… …
537} 554}
538 555
539sub update_stats_window { 556sub update_stats_window {
540 my ($stats) = @_; 557 my ($stats) = @_;
541 558
542 # i love text protocols!!! 559 # I love text protocols...
560
543 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1; 561 my $hp = $stats->{+CS_STAT_HP} * 1;
544 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1; 562 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
545 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1; 563 my $sp = $stats->{+CS_STAT_SP} * 1;
546 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1; 564 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
547 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1; 565 my $fo = $stats->{+CS_STAT_FOOD} * 1;
548 my $fo_m = 999; 566 my $fo_m = 999;
549 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1; 567 my $gr = $stats->{+CS_STAT_GRACE} * 1;
550 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1; 568 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
551 569
552 $GAUGES->{hp} ->set_value ($hp, $hp_m); 570 $GAUGES->{hp} ->set_value ($hp, $hp_m);
553 $GAUGES->{mana} ->set_value ($sp, $sp_m); 571 $GAUGES->{mana} ->set_value ($sp, $sp_m);
554 $GAUGES->{food} ->set_value ($fo, $fo_m); 572 $GAUGES->{food} ->set_value ($fo, $fo_m);
555 $GAUGES->{grace} ->set_value ($gr, $gr_m); 573 $GAUGES->{grace} ->set_value ($gr, $gr_m);
556 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64}) 574 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
557 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")"); 575 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
558 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE}; 576 my $rng = $stats->{+CS_STAT_RANGE};
559 $rng =~ s/^Range: //; # thank you so much dear server 577 $rng =~ s/^Range: //; # thank you so much dear server
560 $GAUGES->{range} ->set_text ("Rng: " . $rng); 578 $GAUGES->{range} ->set_text ("Rng: " . $rng);
561 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE}; 579 my $title = $stats->{+CS_STAT_TITLE};
562 $title =~ s/^Player: //; 580 $title =~ s/^Player: //;
563 $STATWIDS->{title} ->set_text ("Title: " . $title); 581 $STATWIDS->{title} ->set_text ("Title: " . $title);
564 582
565 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 583 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
566 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 584 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
567 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 585 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
568 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 586 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
569 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 587 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
570 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 588 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
571 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 589 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
572 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 590 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
573 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 591 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
574 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 592 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
575 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 593 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
576 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED}); 594 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
577 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP}); 595 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
578 596
579 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::CS_STAT_WEIGHT_LIM} / 1000); 597 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
580 598
599 # TODO: replace by CS_STAT_RES_xxx constants
581 my %tbl = ( 600 my %tbl = (
582 phys => 100, 601 phys => 100,
583 magic => 101, 602 magic => 101,
584 fire => 102, 603 fire => 102,
585 elec => 103, 604 elec => 103,
… …
594 tund => 112, 613 tund => 112,
595 fear => 113, 614 fear => 113,
596 depl => 113, 615 depl => 113,
597 deat => 115, 616 deat => 115,
598 holyw => 116, 617 holyw => 116,
599 blind => 117 618 blind => 117,
600 ); 619 );
601 620
602 for (keys %tbl) {
603 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 621 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
604 } 622 for keys %tbl;
605
606} 623}
607 624
608sub metaserver_dialog { 625sub metaserver_dialog {
609 my $dialog = new CFClient::UI::FancyFrame 626 my $dialog = new CFClient::UI::FancyFrame
610 title => "Server List", 627 title => "Server List",
… …
678 $m = [$users, $host, $uptime, $version, $desc]; 695 $m = [$users, $host, $uptime, $version, $desc];
679 696
680 $y++; 697 $y++;
681 698
682 $table->add (0, $y, new CFClient::UI::VBox children => [ 699 $table->add (0, $y, new CFClient::UI::VBox children => [
683 (new CFClient::UI::Button text => "Use", connect_activate => sub { 700 (new CFClient::UI::Button text => "Use", on_activate => sub {
684 $HOST->set_text ($CFG->{host} = $host); 701 $HOST->set_text ($CFG->{host} = $host);
685 }), 702 }),
686 (new CFClient::UI::Empty expand => 1), 703 (new CFClient::UI::Empty expand => 1),
687 ]); 704 ]);
688 705
… …
694 }); 711 });
695} 712}
696 713
697sub server_setup { 714sub server_setup {
698 my $dialog = new CFClient::UI::FancyFrame 715 my $dialog = new CFClient::UI::FancyFrame
716 x => $WIDTH * (1/3),
717 y => $HEIGHT * (1/8),
718 name => "server_setup",
699 title => "Server Setup", 719 title => "Server Setup",
700 child => (my $vbox = new CFClient::UI::VBox); 720 child => (my $vbox = new CFClient::UI::VBox),
701 721 on_visibility_change => sub {
722 $_[0]->show_centered if $_[1]
723 };
724
702 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 725 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
703 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 726 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
704 727
705 { 728 {
706 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 729 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
… …
708 $vbox->add ( 731 $vbox->add (
709 my $HOST = new CFClient::UI::Entry 732 my $HOST = new CFClient::UI::Entry
710 expand => 1, 733 expand => 1,
711 text => $CFG->{host}, 734 text => $CFG->{host},
712 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 735 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
713 connect_changed => sub { 736 on_changed => sub {
714 my ($self, $value) = @_; 737 my ($self, $value) = @_;
715 $CFG->{host} = $value; 738 $CFG->{host} = $value;
716 } 739 }
717 ); 740 );
718 741
… …
721 $vbox->add (new CFClient::UI::Flopper 744 $vbox->add (new CFClient::UI::Flopper
722 expand => 1, 745 expand => 1,
723 text => "Server List", 746 text => "Server List",
724 other => $METASERVER, 747 other => $METASERVER,
725 tooltip => "Show a list of available crossfire servers", 748 tooltip => "Show a list of available crossfire servers",
726 connect_open => sub { 749 on_open => sub {
727 update_metaserver $HOST; 750 update_metaserver $HOST;
728 } 751 }
729 ); 752 );
730 } 753 }
731 754
732 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 755 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
733 $table->add (1, 4, new CFClient::UI::Entry 756 $table->add (1, 4, new CFClient::UI::Entry
734 text => $CFG->{user}, 757 text => $CFG->{user},
735 tooltip => "The name of your character on the server", 758 tooltip => "The name of your character on the server",
736 connect_changed => sub { 759 on_changed => sub {
737 my ($self, $value) = @_; 760 my ($self, $value) = @_;
738 $CFG->{user} = $value; 761 $CFG->{user} = $value;
739 } 762 }
740 ); 763 );
741 764
742 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 765 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
743 $table->add (1, 5, new CFClient::UI::Entry 766 $table->add (1, 5, new CFClient::UI::Entry
744 text => $CFG->{password}, 767 text => $CFG->{password},
745 hidden => 1, 768 hidden => 1,
746 tooltip => "The password for your character", 769 tooltip => "The password for your character",
747 connect_changed => sub { 770 on_changed => sub {
748 my ($self, $value) = @_; 771 my ($self, $value) = @_;
749 $CFG->{password} = $value; 772 $CFG->{password} = $value;
750 } 773 }
751 ); 774 );
752 775
… …
756 range => [$CFG->{mapsize}, 10, 100, 0, 1], 779 range => [$CFG->{mapsize}, 10, 100, 0, 1],
757 tooltip => "This is the size of the portion of the map update the server sends you. " 780 tooltip => "This is the size of the portion of the map update the server sends you. "
758 . "If you set this to a high value you will be able to see further, " 781 . "If you set this to a high value you will be able to see further, "
759 . "but you also increase bandwidth requirements and latency. " 782 . "but you also increase bandwidth requirements and latency. "
760 . "This option is only used once at log-in.", 783 . "This option is only used once at log-in.",
761 connect_changed => sub { 784 on_changed => sub {
762 my ($self, $value) = @_; 785 my ($self, $value) = @_;
763 786
764 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 787 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
765 }, 788 },
766 ); 789 );
… …
773 . "This might increase or create lag, but increases the chances " 796 . "This might increase or create lag, but increases the chances "
774 . "of faces being ready for display when you encounter them. " 797 . "of faces being ready for display when you encounter them. "
775 . "It also uses up server bandwidth on every connect, " 798 . "It also uses up server bandwidth on every connect, "
776 . "so only set it if you really need to prefetch images. " 799 . "so only set it if you really need to prefetch images. "
777 . "This option can be set and unset any time.", 800 . "This option can be set and unset any time.",
778 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 801 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
779 ); 802 );
780 803
781 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 804 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
782 $table->add (1, 9, new CFClient::UI::Entry 805 $table->add (1, 9, new CFClient::UI::Entry
783 text => $CFG->{output_count}, 806 text => $CFG->{output_count},
784 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 807 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
785 connect_changed => sub { $CFG->{output_count} = $_[1] }, 808 on_changed => sub { $CFG->{output_count} = $_[1] },
786 ); 809 );
787 810
788 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 811 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
789 $table->add (1, 10, new CFClient::UI::Entry 812 $table->add (1, 10, new CFClient::UI::Entry
790 text => $CFG->{output_sync}, 813 text => $CFG->{output_sync},
791 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 814 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
792 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 815 on_changed => sub { $CFG->{output_sync} = $_[1] },
793 ); 816 );
794 817
795 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 818 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
796 expand => 1, 819 expand => 1,
797 align => 0, 820 align => 0,
798 text => "Login", 821 text => "Login",
799 connect_activate => sub { 822 on_activate => sub {
800 $CONN ? stop_game 823 $CONN ? stop_game
801 : start_game; 824 : start_game;
802 }, 825 },
803 ); 826 );
804 827
805 $dialog 828 $dialog
806} 829}
807 830
808sub message_window { 831sub message_window {
809 my $window = new CFClient::UI::FancyFrame 832 my $window = new CFClient::UI::FancyFrame
833 name => "message_window",
810 title => "Messages", 834 title => "Messages",
811 border_bg => [1, 1, 1, 1], 835 border_bg => [1, 1, 1, 1],
812 bg => [0, 0, 0, 0.75], 836 bg => [0, 0, 0, 0.75],
837 req_x => -1,
813 user_w => int $::WIDTH / 3, 838 user_w => int $::WIDTH / 3,
814 user_h => int $::HEIGHT / 5, 839 user_h => int $::HEIGHT / 5,
815 child => (my $vbox = new CFClient::UI::VBox); 840 child => (my $vbox = new CFClient::UI::VBox);
816 841
817 $vbox->add ($LOGVIEW); 842 $vbox->add ($LOGVIEW);
… …
819 $vbox->add (my $input = new CFClient::UI::Entry 844 $vbox->add (my $input = new CFClient::UI::Entry
820 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 845 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
821 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 846 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
822 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 847 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
823 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 848 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
824 connect_focus_in => sub { 849 on_focus_in => sub {
825 my ($input, $prev_focus) = @_; 850 my ($input, $prev_focus) = @_;
826 851
827 delete $input->{refocus_map}; 852 delete $input->{refocus_map};
828 853
829 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 854 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
830 $input->{refocus_map} = 1; 855 $input->{refocus_map} = 1;
831 } 856 }
832 delete $input->{auto_activated}; 857 delete $input->{auto_activated};
833 }, 858 },
834 connect_activate => sub { 859 on_activate => sub {
835 my ($input, $text) = @_; 860 my ($input, $text) = @_;
836 $input->set_text (''); 861 $input->set_text ('');
837 862
838 if ($text =~ /^\/(.*)/) { 863 if ($text =~ /^\/(.*)/) {
839 $::CONN->user_send ($1); 864 $::CONN->user_send ($1);
… …
844 if ($input->{refocus_map}) { 869 if ($input->{refocus_map}) {
845 delete $input->{refocus_map}; 870 delete $input->{refocus_map};
846 $MAPWIDGET->focus_in 871 $MAPWIDGET->focus_in
847 } 872 }
848 }, 873 },
849 connect_escape => sub { 874 on_escape => sub {
850 $MAPWIDGET->focus_in 875 $MAPWIDGET->focus_in
851 }, 876 },
852 ); 877 );
853 878
854 $CONSOLE = { 879 $CONSOLE = {
… …
873 ); 898 );
874 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 899 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
875 $hb->add (new CFClient::UI::Button 900 $hb->add (new CFClient::UI::Button
876 text => "Ok", 901 text => "Ok",
877 expand => 1, 902 expand => 1,
878 connect_activate => sub { $QUIT_DIALOG->hide }, 903 on_activate => sub { $QUIT_DIALOG->hide },
879 ); 904 );
880 $hb->add (new CFClient::UI::Button 905 $hb->add (new CFClient::UI::Button
881 text => "Quit anyway", 906 text => "Quit anyway",
882 expand => 1, 907 expand => 1,
883 connect_activate => sub { exit }, 908 on_activate => sub { exit },
884 ); 909 );
885 910
886 $QUIT_DIALOG->show_centered; 911 $QUIT_DIALOG->show_centered;
887 } else { 912 } else {
888 $QUIT_DIALOG->show_centered; 913 $QUIT_DIALOG->show_centered;
889 } 914 }
890} 915}
891 916
892sub make_inventory_window { 917sub make_inventory_window {
893 my $invwin = new CFClient::UI::FancyFrame 918 my $invwin = new CFClient::UI::FancyFrame
894 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 919 user_w => $WIDTH * (7/8),
920 user_h => $HEIGHT * (7/8),
921 title => "Inventory",
922 name => "inventory_window",
923 on_visibility_change => sub {
924 $_[0]->show_centered if $_[1]
925 };
895 926
896 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 927 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
897 928
898 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 929 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
899 $vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5); 930 $vb1->add (my $lbl = new CFClient::UI::Label align => 0);
900 $lbl->set_text ("Player"); 931 $lbl->set_text ("Player");
901 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 932 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
902 933
903 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 934 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
935
936 $vb2->add (my $hb2 = new CFClient::UI::HBox);
904 $vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5); 937 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
938 $hb2->add (new CFClient::UI::Button
939 text => "Close",
940 tooltip => "Close the currently open container (if one is open)",
941 on_activate => sub {
942 $CONN->send ("apply $CONN->{open_container}")
943 if $CONN->{open_container} != 0;
944 },
945 );
946
905 $INVR_LBL->set_text ("Floor"); 947 $INVR_LBL->set_text ("Floor");
906 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 948 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
907 949
908 $invwin 950 $invwin
909} 951}
… …
925 ) { 967 ) {
926 my ($pod, $label) = @$_; 968 my ($pod, $label) = @$_;
927 969
928 $buttons->add (new CFClient::UI::Button 970 $buttons->add (new CFClient::UI::Button
929 text => $label, 971 text => $label,
930 connect_activate => sub { 972 on_activate => sub {
931 my $parser = new Pod::POM; 973 my $parser = new Pod::POM;
932 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 974 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
933 975
934 $viewer->clear; 976 $viewer->clear;
935 977
… …
966 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1008 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
967 1009
968 $SDL_ACTIVE = 1; 1010 $SDL_ACTIVE = 1;
969 $LAST_REFRESH = time - 0.01; 1011 $LAST_REFRESH = time - 0.01;
970 1012
971 CFClient::gl_init; 1013 CFClient::OpenGL::init;
972 1014
973 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1015 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
974 1016
975 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1017 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
976 1018
… …
1043 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1085 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
1044 1086
1045 $BUTTONBAR->add (new CFClient::UI::Button 1087 $BUTTONBAR->add (new CFClient::UI::Button
1046 text => "Save Config", 1088 text => "Save Config",
1047 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1089 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1048 connect_activate => sub { 1090 on_activate => sub {
1091 $::CFG->{layout} = CFClient::UI::get_layout;
1049 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1092 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
1050 status "Configuration Saved"; 1093 status "Configuration Saved";
1051 }, 1094 },
1052 ); 1095 );
1053 1096
1054 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1097 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1055 tooltip => "View Documentation"); 1098 tooltip => "View Documentation");
1056 1099
1057 $BUTTONBAR->add (new CFClient::UI::Button 1100 $BUTTONBAR->add (new CFClient::UI::Button
1058 text => "Quit", 1101 text => "Quit",
1059 tooltip => "Terminates the program", 1102 tooltip => "Terminates the program",
1060 connect_activate => sub { 1103 on_activate => sub {
1061 if ($CONN) { 1104 if ($CONN) {
1062 open_quit_dialog; 1105 open_quit_dialog;
1063 } else { 1106 } else {
1064 exit; 1107 exit;
1065 } 1108 }
… …
1245sub animation_stop { 1288sub animation_stop {
1246 my ($widget) = @_; 1289 my ($widget) = @_;
1247 delete $animate_object{$widget}; 1290 delete $animate_object{$widget};
1248} 1291}
1249 1292
1250@conn::ISA = Crossfire::Protocol::;
1251
1252sub conn::new {
1253 my $class = shift;
1254
1255 my $self = $class->Crossfire::Protocol::new (@_);
1256
1257 $MAPWIDGET->clr_commands;
1258
1259 my $parser = new Pod::POM;
1260 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1261
1262 for my $head2 ($pod->head2) {
1263 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1264 or next;
1265
1266 my $cmd = $1;
1267 my @args = split /\|/, $2;
1268 @args = (".*") unless @args;
1269
1270 my $text = CFClient::pod_to_pango $head2->content;
1271
1272 for my $arg (@args) {
1273 $arg = $arg eq ".*" ? "" : " $arg";
1274
1275 $MAPWIDGET->add_command ("$cmd$arg", $text);
1276 }
1277 }
1278
1279 $self->{noface} = new_from_file CFClient::Texture
1280 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1281
1282 $self
1283}
1284
1285sub conn::stats_update {
1286 my ($self, $stats) = @_;
1287
1288 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1289 my $diff = $exp - $self->{prev_exp};
1290 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1291 if exists $self->{prev_exp} && $diff;
1292 $self->{prev_exp} = $exp;
1293 }
1294
1295 update_stats_window ($stats);
1296}
1297
1298sub conn::user_send {
1299 my ($self, $command) = @_;
1300
1301 $self->send_command ($command);
1302 status $command;
1303}
1304
1305sub conn::map_scroll {
1306 my ($self, $dx, $dy) = @_;
1307
1308 $MAP->scroll ($dx, $dy);
1309}
1310
1311sub conn::feed_map1a {
1312 my ($self, $data) = @_;
1313
1314# $self->Crossfire::Protocol::feed_map1a ($data);
1315
1316 $MAP->map1a_update ($data);
1317 $MAPWIDGET->update;
1318}
1319
1320sub conn::flush_map {
1321 my ($self) = @_;
1322
1323 my $map_info = delete $self->{map_info}
1324 or return;
1325
1326 my ($hash, $x, $y, $w, $h) = @$map_info;
1327
1328 my $data = $MAP->get_rect ($x, $y, $w, $h);
1329 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
1330 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
1331}
1332
1333sub conn::map_clear {
1334 my ($self) = @_;
1335
1336 $self->flush_map;
1337 delete $self->{neigh_map};
1338
1339 $MAP->clear;
1340}
1341
1342
1343sub conn::load_map($$$) {
1344 my ($self, $hash, $x, $y) = @_;
1345
1346 if (defined (my $data = $MAPCACHE->get ($hash))) {
1347 $data = Compress::LZF::decompress $data;
1348 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
1349 for my $id ($MAP->set_rect ($x, $y, $data)) {
1350 my $data = $TILECACHE->get ($id)
1351 or next;
1352
1353 $self->set_texture ($id => $data);
1354 }
1355 }
1356}
1357
1358# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1359# (server resource,s latency, bandwidth), so this hack is warranted.
1360# the right fix is to make real tiled maps with an overview file
1361sub conn::send_mapinfo {
1362 my ($self, $data, $cb) = @_;
1363
1364 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1365 my ($wx, $wy) = ($1, $2);
1366
1367 if ($data =~ /^spatial ([1-4]+)$/) {
1368 my @dx = (0, 0, 1, 0, -1);
1369 my @dy = (0, -1, 0, 1, 0);
1370 my ($dx, $dy);
1371
1372 for (split //, $1) {
1373 $dx += $dx[$_];
1374 $dy += $dy[$_];
1375 }
1376
1377 $cb->(spatial => 15,
1378 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1379 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1380 50, 50,
1381 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1382 );
1383
1384 return;
1385 }
1386 }
1387
1388 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1389}
1390
1391# this method does a "flood fill" into every tile direction
1392# it assumes that tiles are arranged in a rectangular grid,
1393# i.e. a map is the same as the left of the right map etc.
1394# failure to comply are harmless and result in display errors
1395# at worst.
1396sub conn::flood_fill {
1397 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1398
1399 # the server does not allow map paths > 6
1400 return if 7 <= length $path;
1401
1402 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1403
1404 for (
1405 [1, 3, 0, -1],
1406 [2, 4, 1, 0],
1407 [3, 1, 0, 1],
1408 [4, 2, -1, 0],
1409 ) {
1410 my ($tile, $tile2, $dx, $dy) = @$_;
1411
1412 next if $block & (1 << $tile);
1413 my $block = $block | (1 << $tile2);
1414
1415 my $gx = $gx + $dx;
1416 my $gy = $gy + $dy;
1417
1418 next unless $flags & (1 << ($tile - 1));
1419 next if $self->{neigh_grid}{$gx, $gy}++;
1420
1421 my $neigh = $self->{neigh_map}{$hash} ||= [];
1422 if (my $info = $neigh->[$tile]) {
1423 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1424
1425 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1426 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1427
1428 } else {
1429 $self->send_mapinfo ("spatial $path$tile", sub {
1430 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1431
1432 return if $mode ne "spatial";
1433
1434 $x += $MAP->ox;
1435 $y += $MAP->oy;
1436
1437 $self->load_map ($hash, $x, $y)
1438 unless $self->{neigh_map}{$hash}[5]++;#d#
1439
1440 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1441
1442 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1443 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1444 });
1445 }
1446 }
1447}
1448
1449sub conn::map_change {
1450 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1451
1452 $self->flush_map;
1453
1454 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1455
1456 my $mapmapw = $MAPMAP->{w};
1457 my $mapmaph = $MAPMAP->{h};
1458
1459 $self->{neigh_rect} = [
1460 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1461 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1462 ];
1463
1464 delete $self->{neigh_grid};
1465
1466 $x += $ox;
1467 $y += $oy;
1468
1469 $self->{map_info} = [$hash, $x, $y, $w, $h];
1470
1471 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1472 $STATWIDS->{map}->set_text ("Map: " . $map);
1473
1474 $self->load_map ($hash, $x, $y);
1475 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1476}
1477
1478sub conn::face_find {
1479 my ($self, $facenum, $face) = @_;
1480
1481 my $hash = "$face->{chksum},$face->{name}";
1482
1483 my $id = $FACEMAP->get ($hash);
1484
1485 unless ($id) {
1486 # create new id for face
1487 # I love transactions
1488 for (1..100) {
1489 my $txn = $CFClient::DB_ENV->txn_begin;
1490 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1491 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1492 $id = ($id || 16) + 1;
1493 if ($FACEMAP->put (id => $id) == 0
1494 && $FACEMAP->put ($hash => $id) == 0) {
1495 $txn->txn_commit;
1496
1497 goto gotid;
1498 }
1499 }
1500 $txn->abort;
1501 }
1502
1503 CFClient::fatal "maximum number of transaction retries reached - database problems?";
1504 }
1505
1506gotid:
1507 $face->{id} = $id;
1508 $MAP->set_face ($facenum => $id);
1509 $self->{faceid}[$facenum] = $id;#d#
1510
1511 my $face = $TILECACHE->get ($id);
1512
1513 if ($face) {
1514 #$self->face_prefetch;
1515 $face
1516 } else {
1517 my $tex = $self->{noface};
1518 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1519 undef
1520 };
1521}
1522
1523sub conn::face_update {
1524 my ($self, $facenum, $face) = @_;
1525
1526 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
1527
1528 $self->set_texture ($face->{id} => delete $face->{image});
1529}
1530
1531sub conn::set_texture {
1532 my ($self, $id, $data) = @_;
1533
1534 $self->{texture}[$id] ||= do {
1535 my $tex =
1536 new_from_image CFClient::Texture
1537 $data, minify => 1, mipmap => 1;
1538
1539 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1540 $MAPWIDGET->update;
1541
1542 $tex
1543 };
1544}
1545
1546sub conn::sound_play {
1547 my ($self, $x, $y, $soundnum, $type) = @_;
1548
1549 $SDL_MIXER
1550 or return;
1551
1552 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1553 or return;
1554
1555 $chunk->play;
1556# warn "sound $x,$y,$soundnum,$type\n";#d#
1557}
1558
1559my $LAST_QUERY; # server is stupid, stupid, stupid
1560
1561sub conn::query {
1562 my ($self, $flags, $prompt) = @_;
1563
1564 $prompt = $LAST_QUERY unless length $prompt;
1565 $LAST_QUERY = $prompt;
1566
1567 my $dialog = new CFClient::UI::FancyFrame
1568 title => "Query",
1569 child => my $vbox = new CFClient::UI::VBox;
1570
1571 $vbox->add (new CFClient::UI::Label
1572 max_w => $::WIDTH * 0.4,
1573 ellipsise => 0,
1574 text => $prompt);
1575
1576 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1577 $vbox->add (my $hbox = new CFClient::HBox);
1578 $hbox->add (new CFClient::Button
1579 text => "No",
1580 connect_activate => sub {
1581 $self->send ("reply n");
1582 $dialog->destroy;
1583 $MAPWIDGET->focus_in;
1584 }
1585 );
1586 $hbox->add (new CFClient::Button
1587 text => "Yes",
1588 connect_activate => sub {
1589 $self->send ("reply y");
1590 $dialog->destroy;
1591 },
1592 );
1593
1594 $dialog->focus_in;
1595
1596 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1597 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1598 $vbox->add (my $entry = new CFClient::UI::Entry
1599 connect_changed => sub {
1600 $self->send ("reply $_[1]");
1601 $dialog->destroy;
1602 },
1603 );
1604
1605 $entry->focus_in;
1606
1607 } else {
1608 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1609
1610 $vbox->add (my $entry = new CFClient::UI::Entry
1611 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1612 connect_activate => sub {
1613 $self->send ("reply $_[1]");
1614 $dialog->destroy;
1615 },
1616 );
1617
1618 $entry->focus_in;
1619 }
1620
1621 $dialog->show_centered;
1622}
1623
1624sub conn::drawinfo {
1625 my ($self, $color, $text) = @_;
1626
1627 my @color = (
1628 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1629 [1.00, 1.00, 1.00],
1630 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
1631 [1.00, 0.00, 0.00],
1632 [1.00, 0.54, 0.00],
1633 [0.11, 0.56, 1.00],
1634 [0.93, 0.46, 0.00],
1635 [0.18, 0.54, 0.34],
1636 [0.56, 0.73, 0.56],
1637 [0.80, 0.80, 0.80],
1638 [0.55, 0.41, 0.13],
1639 [0.99, 0.77, 0.26],
1640 [0.74, 0.65, 0.41],
1641 );
1642
1643 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1644
1645 $text = CFClient::UI::Label::escape $text;
1646 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1647 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1648
1649 $LOGVIEW->add_paragraph ($color[$color],
1650 join "\n", map "$time $_", split /\n/, $text);
1651
1652 $STATUSBOX->add ($text,
1653 group => $text,
1654 fg => $color[$color],
1655 timeout => 10,
1656 tooltip_font => $::FONT_FIXED,
1657 );
1658}
1659
1660sub conn::drawextinfo {
1661 my ($self, $color, $type, $subtype, $message) = @_;
1662
1663 $self->drawinfo ($color, $message);
1664}
1665
1666sub conn::spell_add {
1667 my ($self, $spell) = @_;
1668
1669 # TODO
1670 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1671 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1672 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1673}
1674
1675sub conn::spell_delete {
1676 my ($self, $spell) = @_;
1677}
1678
1679sub conn::addme_success {
1680 my ($self) = @_;
1681
1682 $self->send ("command output-sync $CFG->{output_sync}");
1683 $self->send ("command output-count $CFG->{output_count}");
1684
1685 my $parser = new Pod::POM;
1686 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1687
1688 my %skill_tooltip;
1689
1690 for my $head2 ($pod->head2) {
1691 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1692 }
1693
1694 for my $skill (values %{$self->{skill_info}}) {
1695 $MAPWIDGET->add_command ("ready_skill $skill",
1696 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1697 . $skill_tooltip{$skill});
1698 $MAPWIDGET->add_command ("use_skill $skill",
1699 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1700 . $skill_tooltip{$skill});
1701 }
1702}
1703
1704sub conn::eof {
1705 $MAPWIDGET->clr_commands;
1706
1707 stop_game;
1708}
1709
1710sub conn::image_info {
1711 my ($self, $numfaces) = @_;
1712
1713 $self->{num_faces} = $numfaces;
1714 $self->{face_prefetch} = [1 .. $numfaces];
1715 $self->face_prefetch;
1716}
1717
1718sub conn::face_prefetch {
1719 my ($self) = @_;
1720
1721 return unless $CFG->{face_prefetch};
1722
1723 if ($self->{num_faces}) {
1724 return if @{ $self->{send_queue} || [] };
1725 my $todo = @{ $self->{face_prefetch} }
1726 or return;
1727
1728 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
1729
1730 $self->send ("requestinfo image_sums $face $face");
1731
1732 $STATUSBOX->add (CFClient::UI::Label::escape "prefetching $todo",
1733 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1734 } elsif (!exists $self->{num_faces}) {
1735 $self->send ("requestinfo image_info");
1736
1737 $self->{num_faces} = 0;
1738
1739 $STATUSBOX->add (CFClient::UI::Label::escape "starting to prefetch",
1740 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1741 }
1742}
1743
1744# check once/second for faces that need to be prefetched 1293# check once/second for faces that need to be prefetched
1745# this should, of course, only run on demand, but 1294# this should, of course, only run on demand, but
1746# SDL forces worse things on us.... 1295# SDL forces worse things on us....
1747 1296
1748Event->timer (after => 1, interval => 0.25, cb => sub { 1297Event->timer (after => 1, interval => 0.25, cb => sub {
1749 $CONN->face_prefetch 1298 $CONN->face_prefetch
1750 if $CONN; 1299 if $CONN;
1751}); 1300});
1752
1753sub update_floorbox {
1754 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1755 return unless $CONN;
1756
1757 $FLOORBOX->clear;
1758 $FLOORBOX->add (0, 1, new CFClient::UI::Empty expand => 1);
1759
1760 my $row;
1761 for (@{ $CONN->{container}{0} }) {
1762 if (++$row < 7) {
1763 local $_->{face_widget}; # hack to force recreation of widget
1764 local $_->{desc_widget}; # hack to force recreation of widget
1765 CFClient::Item::update_widgets $_;
1766
1767 $FLOORBOX->add (0, $row, $_->{face_widget});
1768 $FLOORBOX->add (1, $row, $_->{desc_widget});
1769 } else {
1770 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1771 last;
1772 }
1773 }
1774 });
1775
1776 $WANT_REFRESH++;
1777}
1778
1779sub set_opencont {
1780 my ($conn, $tag, $name) = @_;
1781 $conn->{open_container} = $tag;
1782 $INVR_LBL->set_text ($name);
1783 $INVR->set_items ($conn->{container}{$tag});
1784}
1785
1786sub update_container {
1787 my ($tag) = @_;
1788 $INVR->set_items ($::CONN->{container}{$CONN->{open_container}})
1789 if $tag == $CONN->{open_container};
1790}
1791
1792sub conn::container_add {
1793 my ($self, $tag, $items) = @_;
1794
1795 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1796
1797 if ($tag == 0) {
1798 update_floorbox;
1799 update_container (0);
1800 } elsif ($tag == $self->{player}{tag}) {
1801 $INV->set_items ($self->{container}{$self->{player}{tag}})
1802 } else {
1803 update_container ($tag);
1804 }
1805
1806 # $self-<{player}{tag} => player inv
1807 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1808}
1809
1810sub conn::container_clear {
1811 my ($self, $tag) = @_;
1812
1813 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1814
1815 if ($tag == 0) {
1816 update_floorbox;
1817 } elsif ($tag == $self->{player}{tag}) {
1818 $INV->set_items ($self->{container}{$tag})
1819 }
1820
1821# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1822}
1823
1824sub conn::item_delete {
1825 my ($self, @items) = @_;
1826
1827 for (@items) {
1828 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1829
1830 if ($_->{container} == 0) {
1831 update_floorbox;
1832 update_container ($_->{tag});
1833 } elsif ($_->{container} == $self->{player}{tag}) {
1834 $INV->set_items ($self->{container}{$self->{player}{tag}})
1835 } else {
1836 update_container ($_->{tag});
1837 }
1838 }
1839}
1840
1841sub conn::item_update {
1842 my ($self, $item) = @_;
1843
1844 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($CONN->{open_container})\n";
1845
1846 if ($item->{tag} == $self->{player}{tag}) {
1847 $STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
1848 return
1849 }
1850
1851 CFClient::Item::update_widgets $item;
1852
1853 if ($item->{tag} == $CONN->{open_container} && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1854 set_opencont ($CONN, 0, "Floor");
1855
1856 } elsif ($item->{flags} & Crossfire::Protocol::F_OPEN) {
1857 set_opencont ($CONN, $item->{tag}, CFClient::Item::desc_string $item);
1858 } else {
1859 if ($item->{container} == 0) {
1860 update_floorbox;
1861 } elsif ($item->{container} == $self->{player}{tag}) {
1862 $INV->set_items ($self->{container}{$item->{container}})
1863 }
1864 }
1865}
1866 1301
1867%SDL_CB = ( 1302%SDL_CB = (
1868 CFClient::SDL_QUIT => sub { 1303 CFClient::SDL_QUIT => sub {
1869 Event::unloop -1; 1304 Event::unloop -1;
1870 }, 1305 },
… …
1905 1340
1906{ 1341{
1907 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1908 1343
1909 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1910 1345 CFClient::UI::set_layout ($::CFG->{layout});
1911 $TILECACHE = CFClient::db_table "tilecache";
1912 $FACEMAP = CFClient::db_table "facemap";
1913 1346
1914 my %DEF_CFG = ( 1347 my %DEF_CFG = (
1915 sdl_mode => 0, 1348 sdl_mode => 0,
1916 width => 640, 1349 width => 640,
1917 height => 480, 1350 height => 480,

Diff Legend

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