| … | |
… | |
| 196 | AnyEvent::Util::fh_nonblocking $fh, 1; |
196 | AnyEvent::Util::fh_nonblocking $fh, 1; |
| 197 | |
197 | |
| 198 | $msg =~ s/\s+$//; |
198 | $msg =~ s/\s+$//; |
| 199 | |
199 | |
| 200 | # backtrace as second step, in case it crashes, too |
200 | # backtrace as second step, in case it crashes, too |
| 201 | crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" |
201 | crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated" |
| 202 | if $backtrace; |
202 | if $backtrace; |
| 203 | }; |
203 | }; |
| 204 | |
204 | |
| 205 | sub clienterror($;$) { |
205 | sub clienterror($;$) { |
| 206 | my ($msg, $backtrace) = @_; |
206 | my ($msg, $backtrace) = @_; |
| … | |
… | |
| 208 | warn $msg; |
208 | warn $msg; |
| 209 | |
209 | |
| 210 | return unless $CONN; |
210 | return unless $CONN; |
| 211 | |
211 | |
| 212 | $CONN->send_exti_msg (clientlog => $msg); |
212 | $CONN->send_exti_msg (clientlog => $msg); |
| 213 | $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace; |
213 | $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated") if $backtrace; |
| 214 | } |
214 | } |
| 215 | |
215 | |
| 216 | ############################################################################# |
216 | ############################################################################# |
| 217 | |
217 | |
| 218 | sub status { |
218 | sub status { |
| … | |
… | |
| 964 | mapw => $mapw, |
964 | mapw => $mapw, |
| 965 | maph => $maph, |
965 | maph => $maph, |
| 966 | |
966 | |
| 967 | c_version => { |
967 | c_version => { |
| 968 | client => "deliantra", |
968 | client => "deliantra", |
| 969 | clientver => $DC::VERSION, |
969 | clientver => "$DC::VERSION$Urlader::EXE_VER", |
| 970 | gl_vendor => DC::OpenGL::gl_vendor, |
970 | gl_vendor => DC::OpenGL::gl_vendor, |
| 971 | gl_version => DC::OpenGL::gl_version, |
971 | gl_version => DC::OpenGL::gl_version, |
| 972 | }, |
972 | }, |
| 973 | |
973 | |
| 974 | map_widget => $MAPWIDGET, |
974 | map_widget => $MAPWIDGET, |
| … | |
… | |
| 2697 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
2697 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
| 2698 | |
2698 | |
| 2699 | ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
2699 | ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
| 2700 | $FULLSCREEN = $CFG->{fullscreen}; |
2700 | $FULLSCREEN = $CFG->{fullscreen}; |
| 2701 | $FAST = $CFG->{fast}; |
2701 | $FAST = $CFG->{fast}; |
|
|
2702 | |
|
|
2703 | DC::SDL_WM_SetCaption "Deliantra MORPG Client $DC::VERSION$Urlader::EXE_VER", "Deliantra"; # must be after SDL_Init |
| 2702 | |
2704 | |
| 2703 | # due to mac os x braindamage, we simply retry with !fullscreen in case of an error |
2705 | # 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 |
2706 | DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN |
| 2705 | or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN |
2707 | or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN |
| 2706 | or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; |
2708 | or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; |
