aboutsummaryrefslogtreecommitdiffstats
path: root/Game
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-08-08 11:43:41 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-08-08 11:43:41 +0000
commita4de5895a4cb1c3bf06948c27af50b6d27de306e (patch)
tree098c336cf4ec45d52f4b09d7f57978e4cd2d6f26 /Game
parent887199a1ed8727b1968dd4cfe11c3c7311f3f311 (diff)
downloadusdx-a4de5895a4cb1c3bf06948c27af50b6d27de306e.tar.gz
usdx-a4de5895a4cb1c3bf06948c27af50b6d27de306e.tar.xz
usdx-a4de5895a4cb1c3bf06948c27af50b6d27de306e.zip
somw warnings removed
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1231 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game')
-rw-r--r--Game/Code/Classes/UCommon.pas4
-rw-r--r--Game/Code/Classes/UCore.pas12
-rw-r--r--Game/Code/Classes/UDataBase.pas5
-rw-r--r--Game/Code/Classes/UFiles.pas2
-rw-r--r--Game/Code/Classes/UParty.pas12
-rw-r--r--Game/Code/Classes/UPlaylist.pas4
6 files changed, 36 insertions, 3 deletions
diff --git a/Game/Code/Classes/UCommon.pas b/Game/Code/Classes/UCommon.pas
index a8f2f028..7eefedac 100644
--- a/Game/Code/Classes/UCommon.pas
+++ b/Game/Code/Classes/UCommon.pas
@@ -77,6 +77,7 @@ uses
{$IFDEF Delphi}
Dialogs,
{$ENDIF}
+ {$WARNINGS OFF}
{$IFDEF LINUX}
{$IFDEF FPC}
{$IF FPC_VERSION_INT >= 2002002} // >= 2.2.2
@@ -84,9 +85,11 @@ uses
{$IFEND}
{$ENDIF}
{$ENDIF}
+ {$WARNINGS ON}
UMain;
+{$WARNINGS OFF}
// data used by the ...Locale() functions
{$IFDEF LINUX}
var
@@ -101,6 +104,7 @@ function setlocale(category: integer; locale: pchar): pchar; cdecl; external 'c'
{$IFEND}
{$ENDIF}
{$ENDIF}
+{$WARNINGS ON}
// In Linux and maybe MacOSX some units (like cwstring) call setlocale(LC_ALL, '')
// to set the language/country specific locale (e.g. charset) for this application.
diff --git a/Game/Code/Classes/UCore.pas b/Game/Code/Classes/UCore.pas
index cb632b79..2e8ad5b2 100644
--- a/Game/Code/Classes/UCore.pas
+++ b/Game/Code/Classes/UCore.pas
@@ -437,6 +437,9 @@ begin
LastErrorString := String(PChar(Pointer(wParam)));
Hooks.CallEventChain(hError, wParam, lParam);
+
+ // FIXME: return a correct result
+ Result := 0;
end;
//-------------
@@ -445,6 +448,9 @@ end;
function TCore.ReportDebug(wParam: TwParam; lParam: TlParam): integer;
begin
Hooks.CallEventChain(hDebug, wParam, lParam);
+
+ // FIXME: return a correct result
+ Result := 0;
end;
//-------------
@@ -453,6 +459,9 @@ end;
function TCore.Retranslate(wParam: TwParam; lParam: TlParam): integer;
begin
Hooks.CallEventChain(hTranslate, 1, nil);
+
+ // FIXME: return a correct result
+ Result := 0;
end;
//-------------
@@ -461,6 +470,9 @@ end;
function TCore.ReloadTextures(wParam: TwParam; lParam: TlParam): integer;
begin
Hooks.CallEventChain(hLoadTextures, 1, nil);
+
+ // FIXME: return a correct result
+ Result := 0;
end;
//-------------
diff --git a/Game/Code/Classes/UDataBase.pas b/Game/Code/Classes/UDataBase.pas
index ff97b739..cd315df3 100644
--- a/Game/Code/Classes/UDataBase.pas
+++ b/Game/Code/Classes/UDataBase.pas
@@ -401,6 +401,7 @@ begin
end;
Result := TList.Create;
+ Stat := nil;
// Copy result to stats array
while not TableData.EOF do
@@ -441,7 +442,9 @@ begin
ArtistName := UTF8Decode(TableData.Fields[0]);
TimesSungTot := TableData.FieldAsInteger(1);
end;
- end;
+ end
+ else
+ Log.LogCritical('Unknown stat-type', 'TDataBaseSystem.GetStats');
end;
Stat.Typ := Typ;
diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas
index af434b94..ca43bb21 100644
--- a/Game/Code/Classes/UFiles.pas
+++ b/Game/Code/Classes/UFiles.pas
@@ -143,6 +143,8 @@ begin
Writeln(SongFile, 'E');
CloseFile(SongFile);
+
+ Result := true;
end;
end.
diff --git a/Game/Code/Classes/UParty.pas b/Game/Code/Classes/UParty.pas
index aac304f4..01a182b1 100644
--- a/Game/Code/Classes/UParty.pas
+++ b/Game/Code/Classes/UParty.pas
@@ -175,6 +175,9 @@ begin
end
else
Core.ReportError(Integer(PChar('Plugins try to Register Modi with wrong Pointer, or wrong TUS_ModiInfo Record.')), PChar('TPartySession'));
+
+ // FIXME: return a valid result
+ Result := 0;
end;
//----------
@@ -366,6 +369,9 @@ begin
//Set Players to play this Round
for I := 0 to Teams.NumTeams-1 do
Teams.Teaminfo[I].CurPlayer := GetRandomPlayer(I);
+
+ // FIXME: return a valid result
+ Result := 0;
end
else
Result := -1;
@@ -427,6 +433,9 @@ begin
end;
end;
End;
+
+ // FIXME: return a valid result
+ Result := 0;
end;
//----------
@@ -480,6 +489,9 @@ begin
end
else if (@Modis[Rounds[CurRound].Modi].Info.ModiDeInit <> nil) then
Modis[Rounds[CurRound].Modi].Info.ModiDeInit(Modis[Rounds[CurRound].Modi].Info.ID);
+
+ // FIXME: return a valid result
+ Result := 0;
end;
//----------
diff --git a/Game/Code/Classes/UPlaylist.pas b/Game/Code/Classes/UPlaylist.pas
index a08f33ec..c867c356 100644
--- a/Game/Code/Classes/UPlaylist.pas
+++ b/Game/Code/Classes/UPlaylist.pas
@@ -468,6 +468,8 @@ var
P: Integer;
I: Integer;
begin
+ Result := -1;
+
if iPlaylist = -1 then
P := CurPlaylist
else if (iPlaylist >= 0) AND (iPlaylist <= high(Playlists)) then
@@ -475,8 +477,6 @@ begin
else
exit;
- Result := -1;
-
For I := 0 to high(Playlists[P].Items) do
begin
if (Playlists[P].Items[I].SongID = Int(SongID)) then