Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
games/ivan/patches/patch-Main_Source_rain.cpp Normal file
View File

@@ -0,0 +1,23 @@
$NetBSD: patch-Main_Source_rain.cpp,v 1.1 2014/02/09 17:09:03 wiedi Exp $
fix ambiguous math functions on SunOS
--- Main/Source/rain.cpp.orig 2004-10-26 19:37:04.000000000 +0000
+++ Main/Source/rain.cpp
@@ -12,7 +12,7 @@
/* Compiled through materset.cpp */
-rain::rain(liquid* Liquid, lsquare* LSquareUnder, v2 Speed, int Team, truth OwnLiquid) : entity(OwnLiquid ? HAS_BE : 0), Next(0), Drop(0), Liquid(Liquid), LSquareUnder(LSquareUnder), Speed(Speed), SpeedAbs(long(sqrt(Speed.GetLengthSquare()))), Drops(0), OwnLiquid(OwnLiquid), Team(Team)
+rain::rain(liquid* Liquid, lsquare* LSquareUnder, v2 Speed, int Team, truth OwnLiquid) : entity(OwnLiquid ? HAS_BE : 0), Next(0), Drop(0), Liquid(Liquid), LSquareUnder(LSquareUnder), Speed(Speed), SpeedAbs(long(sqrt((double)Speed.GetLengthSquare()))), Drops(0), OwnLiquid(OwnLiquid), Team(Team)
{
Emitation = Liquid->GetEmitation();
BeCounter = RAND_N(50);
@@ -164,7 +164,7 @@ void rain::Load(inputfile& SaveFile)
Emitation = Liquid->GetEmitation();
SaveFile >> Speed;
Team = ReadType<uchar>(SaveFile);
- SpeedAbs = long(sqrt(Speed.GetLengthSquare()));
+ SpeedAbs = long(sqrt((double)Speed.GetLengthSquare()));
}
outputfile& operator<<(outputfile& SaveFile, const rain* Rain)