aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Classes
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-01 21:22:20 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-01 21:22:20 +0000
commit6067cf3b947e25409146a71684762159cb00ce4a (patch)
tree4c6f753ee3b8f0866b1986245e80601fb030f9f1 /Game/Code/Classes
parent60e6d3f9904a8114e985fccd14454b9b604ea275 (diff)
downloadusdx-6067cf3b947e25409146a71684762159cb00ce4a.tar.gz
usdx-6067cf3b947e25409146a71684762159cb00ce4a.tar.xz
usdx-6067cf3b947e25409146a71684762159cb00ce4a.zip
- added dutch translation (by Bruut)
- update of acinerella.dll - update of changelogs git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2327 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Classes')
-rw-r--r--Game/Code/Classes/UGraphic.pas8
-rw-r--r--Game/Code/Classes/UVideo.pas17
2 files changed, 17 insertions, 8 deletions
diff --git a/Game/Code/Classes/UGraphic.pas b/Game/Code/Classes/UGraphic.pas
index 563873a5..4aed06f3 100644
--- a/Game/Code/Classes/UGraphic.pas
+++ b/Game/Code/Classes/UGraphic.pas
@@ -405,7 +405,7 @@ begin
SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, 8 );
pbo_supported := false;
- if (Ini.EnablePBO=1) then
+ {if (Ini.EnablePBO=1) then
begin
try
pbo_supported := glext_LoadExtension('GL_ARB_pixel_buffer_object') and
@@ -414,7 +414,7 @@ begin
pbo_supported := false;
Log.LogError('The device does not support Pixel Buffer Object (UVideo)!');
end;
- end;
+ end;}
if (Ini.FullScreen = 0) and (Not Params.FullScreen) then
screen := SDL_SetVideoMode(W, H, (Depth+1) * 16, videoFlags)
@@ -427,9 +427,7 @@ begin
Log.LogError('SDL_SetVideoMode Failed', 'Initialize3D');
exit;
end;
-
-
-
+
// clear screen once window is being shown
glClearColor(1, 1, 1, 1);
glClear(GL_COLOR_BUFFER_BIT);
diff --git a/Game/Code/Classes/UVideo.pas b/Game/Code/Classes/UVideo.pas
index 25c13886..97c1e79b 100644
--- a/Game/Code/Classes/UVideo.pas
+++ b/Game/Code/Classes/UVideo.pas
@@ -232,7 +232,8 @@ begin
fAspect := VideoAspect;
- VideoTimeBase:=info.additional_info.video_info.frames_per_second;
+ if (info.additional_info.video_info.frames_per_second>0) then
+ VideoTimeBase:=1/info.additional_info.video_info.frames_per_second;
glBindTexture(GL_TEXTURE_2D, VideoTex);
@@ -290,10 +291,20 @@ begin
if Start+Gap > 0 then
begin
VideoTime:=Start+Gap;
- ac_seek(videodecoder, -1, Floor((Start+Gap)*1000));
+ try
+ ac_seek(videodecoder, -1, Floor((Start+Gap)*1000));
+ except
+ Log.LogError('Error seeking Video "acSkip2" on video ('+fName+')');
+ acClose;
+ end;
end else
begin
- ac_seek(videodecoder, 0, 0);
+ try
+ ac_seek(videodecoder, 0, 0);
+ except
+ Log.LogError('Error seeking Video "acSkip2" on video ('+fName+')');
+ acClose;
+ end;
VideoTime:=0;
end;
end;