- Update to 38.1b

PR:		ports/78306
Submitted by:	Guy P. <guy@device.dyndns.org> (maintainer)
This commit is contained in:
Pav Lucistnik 2005-03-03 21:43:50 +00:00
parent 03948d5644
commit 2c42609769
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=130294
14 changed files with 298 additions and 44 deletions

View file

@ -6,7 +6,7 @@
# $FreeBSD$
PORTNAME= scorched3d
PORTVERSION= 0.${SCORCH_VERSION}
PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION}
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= scorched3d
@ -17,7 +17,8 @@ COMMENT= Scorched is a game based loosely on the classic DOS game
LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
SCORCH_VERSION= 38
SCORCH_VERSION= 38.1
SCORCH_REVISION= b
.if defined(WITH_MYSQL)
USE_MYSQL= yes

View file

@ -1,2 +1,2 @@
MD5 (Scorched3D-38-src.tar.gz) = 7f4d384a488e9d7055e216543ec0c57b
SIZE (Scorched3D-38-src.tar.gz) = 23887340
MD5 (Scorched3D-38.1-src.tar.gz) = 3c32897814c4fc71be864fdb8d6f5505
SIZE (Scorched3D-38.1-src.tar.gz) = 24342906

View file

@ -1,15 +0,0 @@
--- ./src/3dsparse/aseFile.tab.cpp.orig Mon Mar 1 18:48:17 2004
+++ ./src/3dsparse/aseFile.tab.cpp Tue Jan 25 19:34:16 2005
@@ -327,10 +327,10 @@
#include <alloca.h>
#else /* not sparc */
#if defined (MSDOS) && !defined (__TURBOC__)
-#include <malloc.h>
+#include <stdlib.h>
#else /* not MSDOS, or __TURBOC__ */
#if defined(_AIX)
-#include <malloc.h>
+#include <stdlib.h>
#pragma alloca
#else /* not MSDOS, __TURBOC__, or _AIX */
#ifdef __hpux

View file

@ -1,9 +1,9 @@
--- ./src/common/Logger.cpp.orig Tue Jul 13 23:02:56 2004
+++ ./src/common/Logger.cpp Tue Jan 25 19:34:22 2005
--- src/common/Logger.cpp.orig Thu Feb 24 09:44:06 2005
+++ src/common/Logger.cpp Thu Feb 24 09:44:25 2005
@@ -21,7 +21,7 @@
#include <common/Defines.h>
#include <common/Logger.h>
#include <tank/TankContainer.h>
#include <GLEXT/GLTexture.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
#include <time.h>

View file

@ -0,0 +1,100 @@
--- ./src/common/Vector.cpp.orig Wed Jun 2 19:35:42 2004
+++ ./src/common/Vector.cpp Fri Feb 25 09:47:57 2005
@@ -105,15 +105,22 @@
Vector Vector::operator/(const float a)
{
- Vector v(V[0]/a, V[1]/a, V[2]/a);
+ const float b = (a==0.0f?0.00001f:a);
+ Vector v(V[0]/b, V[1]/b, V[2]/b);
return v;
}
Vector Vector::operator/(const Vector &Vin)
{
- Vector v(V[0]/ ((Vector &) Vin)[0],
- V[1]/ ((Vector &) Vin)[1],
- V[2]/ ((Vector &) Vin)[2]);
+ float a = ((Vector &)Vin)[0];
+ float b = ((Vector &)Vin)[1];
+ float c = ((Vector &)Vin)[2];
+
+ const float a2 = (a==0.0f?0.00001f:a);
+ const float b2 = (b==0.0f?0.00001f:b);
+ const float c2 = (c==0.0f?0.00001f:c);
+
+ Vector v(V[0]/ a2, V[1]/ b2, V[2]/ c2);
return v;
}
@@ -152,10 +159,8 @@
{
float mag = Magnitude();
Vector v;
- if (mag != 0.0f)
- {
- v = (*this) / mag;
- }
+ if (mag == 0.0f) mag = 0.00001f;
+ v = (*this) / mag;
return v;
}
@@ -163,10 +168,8 @@
{
float mag = float(sqrt(V[0]*V[0] + V[1]*V[1]));
Vector v;
- if (mag != 0.0f)
- {
- v = (*this) / mag;
- }
+ if (mag == 0.0f) mag = 0.00001f;
+ v = (*this) / mag;
return v;
}
@@ -185,10 +188,8 @@
void Vector::StoreNormalize()
{
float mag = Magnitude();
- if (mag != 0.0f)
- {
- (*this) /= mag;
- }
+ if (mag == 0.0f) mag = 0.00001f;
+ (*this) /= mag;
}
float Vector::dotP(const Vector &Vin)
@@ -233,16 +234,25 @@
void Vector::operator/=(const float a)
{
- V[0] /= a;
- V[1] /= a;
- V[2] /= a;
+ const float b = (a==0.0f?0.00001f:a);
+ V[0] /= b;
+ V[1] /= b;
+ V[2] /= b;
}
void Vector::operator/=(const Vector &Vin)
{
- V[0] /= ((Vector &)Vin)[0];
- V[1] /= ((Vector &)Vin)[1];
- V[2] /= ((Vector &)Vin)[2];
+ float a = ((Vector &)Vin)[0];
+ float b = ((Vector &)Vin)[1];
+ float c = ((Vector &)Vin)[2];
+
+ const float a2 = (a==0.0f?0.00001f:a);
+ const float b2 = (b==0.0f?0.00001f:b);
+ const float c2 = (c==0.0f?0.00001f:c);
+
+ V[0] /= a2;
+ V[1] /= b2;
+ V[2] /= c2;
}
void Vector::operator+=(const float a)

View file

@ -0,0 +1,11 @@
--- src/server/ServerBrowserInfo.h.orig Thu Feb 24 10:01:20 2005
+++ src/server/ServerBrowserInfo.h Thu Feb 24 10:01:35 2005
@@ -21,7 +21,7 @@
#if !defined(__INCLUDE_ServerBrowserInfoh_INCLUDE__)
#define __INCLUDE_ServerBrowserInfoh_INCLUDE__
-#include <SDL/SDL_net.h>
+#include <SDL11/SDL_net.h>
class ServerBrowserInfo
{

View file

@ -29,6 +29,9 @@ games/scorched3d/data/accessories/hawkmissile/gradient.bmp
games/scorched3d/data/accessories/hawkmissile/hawk.txt
games/scorched3d/data/accessories/hawkmissile/white.bmp
games/scorched3d/data/accessories/hawkmissile/yellow.bmp
games/scorched3d/data/accessories/herring/body.bmp
games/scorched3d/data/accessories/herring/eyes.bmp
games/scorched3d/data/accessories/herring/herring.txt
games/scorched3d/data/accessories/icbm/black.bmp
games/scorched3d/data/accessories/icbm/gradient.bmp
games/scorched3d/data/accessories/icbm/icbm.txt
@ -89,7 +92,29 @@ games/scorched3d/data/accessories/v2missile/yellow.bmp
games/scorched3d/data/accessories/white.bmp
games/scorched3d/data/ainames.txt
games/scorched3d/data/autoexec.xml
games/scorched3d/data/avatars/agreement.txt
games/scorched3d/data/avatars/animal.gif
games/scorched3d/data/avatars/baby.gif
games/scorched3d/data/avatars/bavia.gif
games/scorched3d/data/avatars/computer.gif
games/scorched3d/data/avatars/daisy.gif
games/scorched3d/data/avatars/fish.gif
games/scorched3d/data/avatars/flower.gif
games/scorched3d/data/avatars/floyd.gif
games/scorched3d/data/avatars/heart.gif
games/scorched3d/data/avatars/lips.gif
games/scorched3d/data/avatars/mxpx.gif
games/scorched3d/data/avatars/pint.gif
games/scorched3d/data/avatars/player.gif
games/scorched3d/data/avatars/prot.gif
games/scorched3d/data/avatars/termin.gif
games/scorched3d/data/avatars/vader.gif
games/scorched3d/data/avatars/web.gif
games/scorched3d/data/avatars/yoda.gif
games/scorched3d/data/fonts/courier.ttf
games/scorched3d/data/fonts/licence.txt
games/scorched3d/data/fonts/test.ttf
games/scorched3d/data/fonts/testout.ttf
games/scorched3d/data/globalmods/apoc/authors.txt
games/scorched3d/data/globalmods/apoc/data/accessories.xml
games/scorched3d/data/globalmods/apoc/data/accessories/black.bmp
@ -604,6 +629,7 @@ games/scorched3d/data/tanks/ram.ase
games/scorched3d/data/tanks/ram.bmp
games/scorched3d/data/tanks/rapier.ase
games/scorched3d/data/tanks/rapier.bmp
games/scorched3d/data/tanks/rlauncher.bmp
games/scorched3d/data/tanks/sa-19.ase
games/scorched3d/data/tanks/sa-19.bmp
games/scorched3d/data/tanks/sa6.ase
@ -619,6 +645,8 @@ games/scorched3d/data/tanks/scud.ase
games/scorched3d/data/tanks/scud.bmp
games/scorched3d/data/tanks/seasparrow.ase
games/scorched3d/data/tanks/seasparrow.bmp
games/scorched3d/data/tanks/shark.bmp
games/scorched3d/data/tanks/shark.txt
games/scorched3d/data/tanks/siegetank.ase
games/scorched3d/data/tanks/siegetank.bmp
games/scorched3d/data/tanks/siegetank2.ase
@ -1127,6 +1155,7 @@ games/scorched3d/documentation/html/screenshots/wind.gif
@dirrm games/scorched3d/data/globalmods/apoc
@dirrm games/scorched3d/data/globalmods
@dirrm games/scorched3d/data/fonts
@dirrm games/scorched3d/data/avatars
@dirrm games/scorched3d/data/accessories/v2missile
@dirrm games/scorched3d/data/accessories/smallpine
@dirrm games/scorched3d/data/accessories/shell
@ -1140,6 +1169,7 @@ games/scorched3d/documentation/html/screenshots/wind.gif
@dirrm games/scorched3d/data/accessories/m48
@dirrm games/scorched3d/data/accessories/littleboy
@dirrm games/scorched3d/data/accessories/icbm
@dirrm games/scorched3d/data/accessories/herring
@dirrm games/scorched3d/data/accessories/hawkmissile
@dirrm games/scorched3d/data/accessories/fatman
@dirrm games/scorched3d/data/accessories/dirt

View file

@ -6,7 +6,7 @@
# $FreeBSD$
PORTNAME= scorched3d
PORTVERSION= 0.${SCORCH_VERSION}
PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION}
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= scorched3d
@ -17,7 +17,8 @@ COMMENT= Scorched is a game based loosely on the classic DOS game
LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
SCORCH_VERSION= 38
SCORCH_VERSION= 38.1
SCORCH_REVISION= b
.if defined(WITH_MYSQL)
USE_MYSQL= yes

View file

@ -1,2 +1,2 @@
MD5 (Scorched3D-38-src.tar.gz) = 7f4d384a488e9d7055e216543ec0c57b
SIZE (Scorched3D-38-src.tar.gz) = 23887340
MD5 (Scorched3D-38.1-src.tar.gz) = 3c32897814c4fc71be864fdb8d6f5505
SIZE (Scorched3D-38.1-src.tar.gz) = 24342906

View file

@ -1,15 +0,0 @@
--- ./src/3dsparse/aseFile.tab.cpp.orig Mon Mar 1 18:48:17 2004
+++ ./src/3dsparse/aseFile.tab.cpp Tue Jan 25 19:34:16 2005
@@ -327,10 +327,10 @@
#include <alloca.h>
#else /* not sparc */
#if defined (MSDOS) && !defined (__TURBOC__)
-#include <malloc.h>
+#include <stdlib.h>
#else /* not MSDOS, or __TURBOC__ */
#if defined(_AIX)
-#include <malloc.h>
+#include <stdlib.h>
#pragma alloca
#else /* not MSDOS, __TURBOC__, or _AIX */
#ifdef __hpux

View file

@ -1,9 +1,9 @@
--- ./src/common/Logger.cpp.orig Tue Jul 13 23:02:56 2004
+++ ./src/common/Logger.cpp Tue Jan 25 19:34:22 2005
--- src/common/Logger.cpp.orig Thu Feb 24 09:44:06 2005
+++ src/common/Logger.cpp Thu Feb 24 09:44:25 2005
@@ -21,7 +21,7 @@
#include <common/Defines.h>
#include <common/Logger.h>
#include <tank/TankContainer.h>
#include <GLEXT/GLTexture.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
#include <time.h>

View file

@ -0,0 +1,100 @@
--- ./src/common/Vector.cpp.orig Wed Jun 2 19:35:42 2004
+++ ./src/common/Vector.cpp Fri Feb 25 09:47:57 2005
@@ -105,15 +105,22 @@
Vector Vector::operator/(const float a)
{
- Vector v(V[0]/a, V[1]/a, V[2]/a);
+ const float b = (a==0.0f?0.00001f:a);
+ Vector v(V[0]/b, V[1]/b, V[2]/b);
return v;
}
Vector Vector::operator/(const Vector &Vin)
{
- Vector v(V[0]/ ((Vector &) Vin)[0],
- V[1]/ ((Vector &) Vin)[1],
- V[2]/ ((Vector &) Vin)[2]);
+ float a = ((Vector &)Vin)[0];
+ float b = ((Vector &)Vin)[1];
+ float c = ((Vector &)Vin)[2];
+
+ const float a2 = (a==0.0f?0.00001f:a);
+ const float b2 = (b==0.0f?0.00001f:b);
+ const float c2 = (c==0.0f?0.00001f:c);
+
+ Vector v(V[0]/ a2, V[1]/ b2, V[2]/ c2);
return v;
}
@@ -152,10 +159,8 @@
{
float mag = Magnitude();
Vector v;
- if (mag != 0.0f)
- {
- v = (*this) / mag;
- }
+ if (mag == 0.0f) mag = 0.00001f;
+ v = (*this) / mag;
return v;
}
@@ -163,10 +168,8 @@
{
float mag = float(sqrt(V[0]*V[0] + V[1]*V[1]));
Vector v;
- if (mag != 0.0f)
- {
- v = (*this) / mag;
- }
+ if (mag == 0.0f) mag = 0.00001f;
+ v = (*this) / mag;
return v;
}
@@ -185,10 +188,8 @@
void Vector::StoreNormalize()
{
float mag = Magnitude();
- if (mag != 0.0f)
- {
- (*this) /= mag;
- }
+ if (mag == 0.0f) mag = 0.00001f;
+ (*this) /= mag;
}
float Vector::dotP(const Vector &Vin)
@@ -233,16 +234,25 @@
void Vector::operator/=(const float a)
{
- V[0] /= a;
- V[1] /= a;
- V[2] /= a;
+ const float b = (a==0.0f?0.00001f:a);
+ V[0] /= b;
+ V[1] /= b;
+ V[2] /= b;
}
void Vector::operator/=(const Vector &Vin)
{
- V[0] /= ((Vector &)Vin)[0];
- V[1] /= ((Vector &)Vin)[1];
- V[2] /= ((Vector &)Vin)[2];
+ float a = ((Vector &)Vin)[0];
+ float b = ((Vector &)Vin)[1];
+ float c = ((Vector &)Vin)[2];
+
+ const float a2 = (a==0.0f?0.00001f:a);
+ const float b2 = (b==0.0f?0.00001f:b);
+ const float c2 = (c==0.0f?0.00001f:c);
+
+ V[0] /= a2;
+ V[1] /= b2;
+ V[2] /= c2;
}
void Vector::operator+=(const float a)

View file

@ -0,0 +1,11 @@
--- src/server/ServerBrowserInfo.h.orig Thu Feb 24 10:01:20 2005
+++ src/server/ServerBrowserInfo.h Thu Feb 24 10:01:35 2005
@@ -21,7 +21,7 @@
#if !defined(__INCLUDE_ServerBrowserInfoh_INCLUDE__)
#define __INCLUDE_ServerBrowserInfoh_INCLUDE__
-#include <SDL/SDL_net.h>
+#include <SDL11/SDL_net.h>
class ServerBrowserInfo
{

View file

@ -29,6 +29,9 @@ games/scorched3d/data/accessories/hawkmissile/gradient.bmp
games/scorched3d/data/accessories/hawkmissile/hawk.txt
games/scorched3d/data/accessories/hawkmissile/white.bmp
games/scorched3d/data/accessories/hawkmissile/yellow.bmp
games/scorched3d/data/accessories/herring/body.bmp
games/scorched3d/data/accessories/herring/eyes.bmp
games/scorched3d/data/accessories/herring/herring.txt
games/scorched3d/data/accessories/icbm/black.bmp
games/scorched3d/data/accessories/icbm/gradient.bmp
games/scorched3d/data/accessories/icbm/icbm.txt
@ -89,7 +92,29 @@ games/scorched3d/data/accessories/v2missile/yellow.bmp
games/scorched3d/data/accessories/white.bmp
games/scorched3d/data/ainames.txt
games/scorched3d/data/autoexec.xml
games/scorched3d/data/avatars/agreement.txt
games/scorched3d/data/avatars/animal.gif
games/scorched3d/data/avatars/baby.gif
games/scorched3d/data/avatars/bavia.gif
games/scorched3d/data/avatars/computer.gif
games/scorched3d/data/avatars/daisy.gif
games/scorched3d/data/avatars/fish.gif
games/scorched3d/data/avatars/flower.gif
games/scorched3d/data/avatars/floyd.gif
games/scorched3d/data/avatars/heart.gif
games/scorched3d/data/avatars/lips.gif
games/scorched3d/data/avatars/mxpx.gif
games/scorched3d/data/avatars/pint.gif
games/scorched3d/data/avatars/player.gif
games/scorched3d/data/avatars/prot.gif
games/scorched3d/data/avatars/termin.gif
games/scorched3d/data/avatars/vader.gif
games/scorched3d/data/avatars/web.gif
games/scorched3d/data/avatars/yoda.gif
games/scorched3d/data/fonts/courier.ttf
games/scorched3d/data/fonts/licence.txt
games/scorched3d/data/fonts/test.ttf
games/scorched3d/data/fonts/testout.ttf
games/scorched3d/data/globalmods/apoc/authors.txt
games/scorched3d/data/globalmods/apoc/data/accessories.xml
games/scorched3d/data/globalmods/apoc/data/accessories/black.bmp
@ -604,6 +629,7 @@ games/scorched3d/data/tanks/ram.ase
games/scorched3d/data/tanks/ram.bmp
games/scorched3d/data/tanks/rapier.ase
games/scorched3d/data/tanks/rapier.bmp
games/scorched3d/data/tanks/rlauncher.bmp
games/scorched3d/data/tanks/sa-19.ase
games/scorched3d/data/tanks/sa-19.bmp
games/scorched3d/data/tanks/sa6.ase
@ -619,6 +645,8 @@ games/scorched3d/data/tanks/scud.ase
games/scorched3d/data/tanks/scud.bmp
games/scorched3d/data/tanks/seasparrow.ase
games/scorched3d/data/tanks/seasparrow.bmp
games/scorched3d/data/tanks/shark.bmp
games/scorched3d/data/tanks/shark.txt
games/scorched3d/data/tanks/siegetank.ase
games/scorched3d/data/tanks/siegetank.bmp
games/scorched3d/data/tanks/siegetank2.ase
@ -1127,6 +1155,7 @@ games/scorched3d/documentation/html/screenshots/wind.gif
@dirrm games/scorched3d/data/globalmods/apoc
@dirrm games/scorched3d/data/globalmods
@dirrm games/scorched3d/data/fonts
@dirrm games/scorched3d/data/avatars
@dirrm games/scorched3d/data/accessories/v2missile
@dirrm games/scorched3d/data/accessories/smallpine
@dirrm games/scorched3d/data/accessories/shell
@ -1140,6 +1169,7 @@ games/scorched3d/documentation/html/screenshots/wind.gif
@dirrm games/scorched3d/data/accessories/m48
@dirrm games/scorched3d/data/accessories/littleboy
@dirrm games/scorched3d/data/accessories/icbm
@dirrm games/scorched3d/data/accessories/herring
@dirrm games/scorched3d/data/accessories/hawkmissile
@dirrm games/scorched3d/data/accessories/fatman
@dirrm games/scorched3d/data/accessories/dirt