aboutsummaryrefslogtreecommitdiffstats
path: root/Game
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-03-31 15:17:09 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-03-31 15:17:09 +0000
commit5b7e8043571bb959891c06a6dd5c7e9ef87d42e5 (patch)
treedc1bf277c3446c7a07baab53a52ee09f488cba60 /Game
parent13bf0be662f660d9f283b6c01b20dc2137dc835e (diff)
downloadusdx-5b7e8043571bb959891c06a6dd5c7e9ef87d42e5.tar.gz
usdx-5b7e8043571bb959891c06a6dd5c7e9ef87d42e5.tar.xz
usdx-5b7e8043571bb959891c06a6dd5c7e9ef87d42e5.zip
beep() removed
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@989 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game')
-rw-r--r--Game/Code/Classes/UCovers.pas3
-rw-r--r--Game/Code/Classes/UJoystick.pas11
-rw-r--r--Game/Code/Classes/ULyrics_bak.pas2
-rw-r--r--Game/Code/Classes/UMain.pas9
-rw-r--r--Game/Code/Classes/UTexture.pas9
-rw-r--r--Game/Code/Menu/UMenu.pas15
-rw-r--r--Game/Code/Screens/UScreenEditSub.pas2
-rw-r--r--Game/Code/Screens/UScreenScore.pas4
-rw-r--r--Game/Code/Screens/UScreenSong.pas1
9 files changed, 22 insertions, 34 deletions
diff --git a/Game/Code/Classes/UCovers.pas b/Game/Code/Classes/UCovers.pas
index 4068e02b..1d3f737c 100644
--- a/Game/Code/Classes/UCovers.pas
+++ b/Game/Code/Classes/UCovers.pas
@@ -262,7 +262,8 @@ begin
C := CoverNumber(FileName);
SetLength(Data, Cover[C].Size);
- if Length(Data) < 6 then beep;
+ if Length(Data) < 6 then
+ Log.LogStatus('Length(Data) < 6', 'TCovers.PrepareData');
Seek(F, Cover[C].Position);
BlockRead(F, Data[0], Cover[C].Size);
CloseFile(F);
diff --git a/Game/Code/Classes/UJoystick.pas b/Game/Code/Classes/UJoystick.pas
index 6b4ea63f..fbbcaebd 100644
--- a/Game/Code/Classes/UJoystick.pas
+++ b/Game/Code/Classes/UJoystick.pas
@@ -57,12 +57,15 @@ begin
{// joystick support
SDL_JoystickEventState(SDL_IGNORE);
SDL_InitSubSystem(SDL_INIT_JOYSTICK);
- if SDL_NumJoysticks <> 1 then beep;
+ if SDL_NumJoysticks <> 1 then
+ Log.LogStatus('Joystick count <> 1', 'TJoy.Create');
SDL_Joy := SDL_JoystickOpen(0);
- if SDL_Joy = nil then beep;
+ if SDL_Joy = nil then
+ Log.LogError('SDL_JoystickOpen failed', 'TJoy.Create');
- if SDL_JoystickNumButtons(SDL_Joy) <> 16 then beep;
+ if SDL_JoystickNumButtons(SDL_Joy) <> 16 then
+ Log.LogStatus('Joystick button count <> 16', 'TJoy.Create');
// SDL_JoystickEventState(SDL_ENABLE);
// Events don't work - thay hang the whole application with SDL_JoystickEventState(SDL_ENABLE)
@@ -109,7 +112,7 @@ begin
exit;
end;
N := SDL_JoystickNumButtons(SDL_Joy);
- //if N < 6 then beep;
+ //if N < 6 then Log.LogStatus('Joystick button count < 6', 'TJoy.Create');
for B := 0 to 5 do begin
JoyUnit.Button[B].Enabled := true;
diff --git a/Game/Code/Classes/ULyrics_bak.pas b/Game/Code/Classes/ULyrics_bak.pas
index 7db7e0d9..0fba05d2 100644
--- a/Game/Code/Classes/ULyrics_bak.pas
+++ b/Game/Code/Classes/ULyrics_bak.pas
@@ -143,7 +143,7 @@ end;
procedure TLyric.SetAlign(Value: integer);
begin
AlignI := Value;
-// if AlignInt = 0 then beep;
+// if AlignInt = 0 then Log.LogStatus('AlignInt = 0', 'TLyric.SetAlign');
end;
function TLyric.GetSize: real;
diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas
index a68445b0..9459334d 100644
--- a/Game/Code/Classes/UMain.pas
+++ b/Game/Code/Classes/UMain.pas
@@ -502,12 +502,12 @@ begin
{
SDL_JOYAXISMOTION:
begin
- beep
+ // not implemented
end;
}
SDL_JOYBUTTONDOWN:
begin
- beep
+ // not implemented
end;
end; // Case
end; // While
@@ -880,8 +880,7 @@ var
Range: integer;
NoteHit:boolean;
begin
-// Log.LogStatus('Beat ' + IntToStr(LineState.CurrentBeat) + ' HalfBeat ' + IntToStr(LineState.AktHalf), 'NewBeat');
-// beep;
+ // Log.LogStatus('Beat ' + IntToStr(LineState.CurrentBeat) + ' HalfBeat ' + IntToStr(LineState.AktHalf), 'NewBeat');
// On linux we get an AV @ NEWNOTE, line 600 of Classes/UMain.pas
if not assigned( AudioInputProcessor.Sound ) then
@@ -1043,7 +1042,7 @@ begin
Player[CP].Note[Player[CP].HighNote].Perfect := true;
end;
end;
- end;// else beep; // if S = SMax
+ end; // if S = SMax
end; // if moze
end; // for CP
diff --git a/Game/Code/Classes/UTexture.pas b/Game/Code/Classes/UTexture.pas
index 48628176..1047ebd3 100644
--- a/Game/Code/Classes/UTexture.pas
+++ b/Game/Code/Classes/UTexture.pas
@@ -297,7 +297,6 @@ begin
Log.LogStatus( ' '+inttostr( integer( Result ) ), ' LoadImage' );
except
Log.LogStatus( 'ERROR Could not load from file' , Identifier);
- beep;
Exit;
end;
end
@@ -323,7 +322,6 @@ begin
TexRWops.type_ := 2;
except
Log.LogStatus( 'ERROR Could not assign resource ('+Identifier+')' , Identifier);
- beep;
Exit;
end;
@@ -342,7 +340,6 @@ begin
if dHandle=0 then
begin
Log.LogStatus( 'ERROR Could not find resource' , ' '+ Identifier);
- beep;
Exit;
end;
@@ -352,7 +349,6 @@ begin
TexStream := TResourceStream.Create(HInstance, Identifier, 'TEX');
except
Log.LogStatus( 'ERROR Could not load from resource' , Identifier);
- beep;
Exit;
end;
@@ -368,7 +364,6 @@ begin
TexRWops.type_ := 2;
except
Log.LogStatus( 'ERROR Could not assign resource' , Identifier);
- beep;
Exit;
end;
@@ -559,7 +554,6 @@ begin
if not assigned(TexSurface) then
begin
Log.LogStatus( 'ERROR Could not load texture' , Identifier +' '+ Format +' '+ TextureTypeToStr(Typ) );
- beep;
Exit;
end;
@@ -861,7 +855,8 @@ begin
glTexImage2D(GL_TEXTURE_2D, 0, 3, W, H, 0, GL_RGB, GL_UNSIGNED_BYTE, @Data[0]);
if Mipmapping then begin
Error := gluBuild2DMipmaps(GL_TEXTURE_2D, 3, W, H, GL_RGB, GL_UNSIGNED_BYTE, @Data[0]);
- if Error > 0 then beep;
+ if Error > 0 then
+ Log.LogError('gluBuild2DMipmaps() failed', 'TTextureUnit.CreateTexture');
end;
Result.X := 0;
diff --git a/Game/Code/Menu/UMenu.pas b/Game/Code/Menu/UMenu.pas
index a4f9f9bf..7ffce9d1 100644
--- a/Game/Code/Menu/UMenu.pas
+++ b/Game/Code/Menu/UMenu.pas
@@ -1531,8 +1531,7 @@ end;
procedure TMenu.onShow;
begin
-// nothing
-// beep;
+ // nothing
(*
if fileexists( fFileName ) then
begin
@@ -1544,8 +1543,7 @@ end;
procedure TMenu.onShowFinish;
begin
-// nothing
-// beep;
+ // nothing
end;
function TMenu.WideCharUpperCase(const wchar : WideChar) : WideString;
@@ -1580,21 +1578,18 @@ end;
procedure TMenu.onHide;
begin
-// nothing
-// beep;
+ // nothing
end;
function TMenu.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
begin
-// nothing
-// Beep;
+ // nothing
Result := true;
end;
procedure TMenu.SetAnimationProgress(Progress: real);
begin
-// nothing
-//beep;
+ // nothing
end;
end.
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 743fd45d..ea116cfa 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -175,7 +175,7 @@ begin
if Lines[0].Line[Lines[0].Current].IlNut >= Lines[0].Line[CopySrc].IlNut then
PasteText
else
- beep;
+ Log.LogStatus('PasteText: invalid range', 'TScreenEditSub.ParseInput');
end;
if SDL_ModState = KMOD_LCTRL + KMOD_LSHIFT then begin
diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas
index 23ff86a5..18ed4494 100644
--- a/Game/Code/Screens/UScreenScore.pas
+++ b/Game/Code/Screens/UScreenScore.pas
@@ -178,10 +178,6 @@ begin
Fadeout := true;
end;
end;
-{ SDLK_SYSREQ:
- begin
- beep;
- end;}
SDLK_SYSREQ:
begin
Display.PrintScreen;
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 4afea262..5d25027d 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -531,7 +531,6 @@ begin
SongCurrent := SongCurrent - I + I2;
SongTarget := SongTarget - I + I2; }
-// if I<>I2 then beep;
// SetScroll4;
//Show Wrong Song when Tabs on Fix