ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Main.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents):
Revision 1.10 by root, Fri Jan 6 05:02:39 2012 UTC vs.
Revision 1.14 by root, Sat Jan 7 20:07:12 2012 UTC

597 my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0; 597 my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0;
598 598
599 if ($fh) { 599 if ($fh) {
600 $error ||= Coro::AIO::aio_stat "$override.tmp"; 600 $error ||= Coro::AIO::aio_stat "$override.tmp";
601 $error ||= -s _ != $size; 601 $error ||= -s _ != $size;
602 $error ||= Coro::AIO::aio_readahead $fh, 0, $size; 602 Coro::AIO::aio_readahead $fh, 0, $size;
603 603
604 my $f_md5 = new Digest::MD5; 604 my $f_md5 = new Digest::MD5;
605 binmode $fh; # ugh :(
605 $f_md5->addfile ($fh); 606 $f_md5->addfile ($fh);
606 $f_md5 = $f_md5->hexdigest; 607 $f_md5 = $f_md5->hexdigest;
607 $error ||= $md5 ne $f_md5; 608 $error ||= $md5 ne $f_md5;
608 } 609 }
609 } 610 }
2697 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2698 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2698 2699
2699 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2700 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2700 $FULLSCREEN = $CFG->{fullscreen}; 2701 $FULLSCREEN = $CFG->{fullscreen};
2701 $FAST = $CFG->{fast}; 2702 $FAST = $CFG->{fast};
2703
2704 DC::SDL_WM_SetCaption "Deliantra MORPG Client $DC::VERSION$Urlader::EXE_VER", "Deliantra"; # must be after SDL_Init
2702 2705
2703 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error 2706 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2704 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2707 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2705 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN 2708 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2706 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2709 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines