rpms/scorched3d/devel scorched3d-64bit.patch,1.2,1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Feb 8 21:42:05 UTC 2006
- Previous message: fedora-security/audit fc4,1.148,1.149 fc5,1.57,1.58
- Next message: rpms/nautilus-actions/devel .cvsignore, 1.2, 1.3 nautilus-actions.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20700
Modified Files:
scorched3d-64bit.patch
Log Message:
final? version of scorched3d 64bit fixes, these work, hurray!
scorched3d-64bit.patch:
Index: scorched3d-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-64bit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scorched3d-64bit.patch 7 Feb 2006 21:07:38 -0000 1.2
+++ scorched3d-64bit.patch 8 Feb 2006 21:42:04 -0000 1.3
@@ -1,6 +1,32 @@
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/GLEXT/GLTexture.cpp scorched/src/GLEXT/GLTexture.cpp
+--- scorched.orig/src/GLEXT/GLTexture.cpp 2005-06-05 23:54:01.000000000 +0200
++++ scorched/src/GLEXT/GLTexture.cpp 2006-02-08 20:35:07.000000000 +0100
+@@ -119,7 +119,7 @@
+ if (height == 1 || width == 1) texType_ = GL_TEXTURE_1D;
+ else texType_ = GL_TEXTURE_2D;
+
+- if (!textureValid())
++ if (!texNum_ || !textureValid())
+ {
+ GLfloat priority = 1.0f;
+ glGenTextures(1, &texNum_);
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/client/ClientConnectionAcceptHandler.cpp scorched/src/client/ClientConnectionAcceptHandler.cpp
+--- scorched.orig/src/client/ClientConnectionAcceptHandler.cpp 2006-02-06 22:37:12.000000000 +0100
++++ scorched/src/client/ClientConnectionAcceptHandler.cpp 2006-02-08 21:14:07.000000000 +0100
+@@ -66,7 +66,9 @@
+
+ if (OptionsParam::instance()->getConnectedToServer())
+ {
+- unsigned int ip = NetServer::getIpAddress((TCPsocket) id);
++ NetServer *netServer = (NetServer *)
++ ScorchedClient::instance()->getContext().netInterface;
++ unsigned int ip = netServer->getIpAddress(id);
+ if (!ConnectDialog::instance()->getIdStore().saveUniqueId(
+ ip, message.getUniqueId(), message.getPublishAddress()))
+ {
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/client/ServerBrowser.cpp scorched/src/client/ServerBrowser.cpp
--- scorched.orig/src/client/ServerBrowser.cpp 2003-10-21 18:58:11.000000000 +0200
-+++ scorched/src/client/ServerBrowser.cpp 2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/client/ServerBrowser.cpp 2006-02-07 20:41:25.000000000 +0100
@@ -50,7 +50,7 @@
int ServerBrowser::threadFunc(void *var)
@@ -12,7 +38,7 @@
else result = instance_->serverList_.fetchServerList();
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServer.cpp scorched/src/coms/NetServer.cpp
--- scorched.orig/src/coms/NetServer.cpp 2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServer.cpp 2006-02-07 20:25:49.000000000 +0100
++++ scorched/src/coms/NetServer.cpp 2006-02-07 20:41:25.000000000 +0100
@@ -33,6 +33,7 @@
{
sockSet_ = SDLNet_AllocSocketSet(1);
@@ -199,11 +225,16 @@
}
unsigned int NetServer::getIpAddress(TCPsocket destination)
-Only in scorched/src/coms: NetServer.cpp~
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServer.h scorched/src/coms/NetServer.h
--- scorched.orig/src/coms/NetServer.h 2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServer.h 2006-02-07 20:26:01.000000000 +0100
-@@ -52,22 +52,24 @@
++++ scorched/src/coms/NetServer.h 2006-02-08 20:18:31.000000000 +0100
+@@ -47,27 +47,29 @@
+ virtual void sendMessage(NetBuffer &buffer, unsigned int destination);
+ void setSentNotification() { sentNotification_ = true; }
+
++ unsigned int getIpAddress(unsigned int destination);
+ static unsigned int getIpAddress(TCPsocket destination);
+
protected:
NetServerProtocol *protocol_;
TCPsocket server_;
@@ -227,14 +258,12 @@
void addClient(TCPsocket client);
- void sendMessage(TCPsocket client, NetMessage *message);
+ void sendMessage(unsigned int dest, NetMessage *message);
-+ unsigned int getIpAddress(unsigned int destination);
private:
-Only in scorched/src/coms: NetServer.h~
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
--- scorched.orig/src/coms/NetServerProtocol.cpp 2006-02-06 22:37:12.000000000 +0100
-+++ scorched/src/coms/NetServerProtocol.cpp 2006-02-07 20:15:39.000000000 +0100
++++ scorched/src/coms/NetServerProtocol.cpp 2006-02-07 20:41:25.000000000 +0100
@@ -40,7 +40,8 @@
{
}
@@ -364,10 +393,9 @@
netBuffer->getBuffer().reset();
// get the string buffer over the socket
-Only in scorched/src/coms: NetServerProtocol.cpp~
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerProtocol.h scorched/src/coms/NetServerProtocol.h
--- scorched.orig/src/coms/NetServerProtocol.h 2005-06-08 19:29:38.000000000 +0200
-+++ scorched/src/coms/NetServerProtocol.h 2006-02-07 20:14:35.000000000 +0100
++++ scorched/src/coms/NetServerProtocol.h 2006-02-07 20:41:25.000000000 +0100
@@ -29,8 +29,10 @@
NetServerProtocol();
virtual ~NetServerProtocol();
@@ -433,10 +461,9 @@
};
#endif
-Only in scorched/src/coms: NetServerProtocol.h~
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerRead.cpp scorched/src/coms/NetServerRead.cpp
--- scorched.orig/src/coms/NetServerRead.cpp 2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServerRead.cpp 2006-02-07 20:19:01.000000000 +0100
++++ scorched/src/coms/NetServerRead.cpp 2006-02-07 20:41:25.000000000 +0100
@@ -26,11 +26,12 @@
#include <common/Defines.h>
@@ -522,10 +549,9 @@
NetServer::getIpAddress(socket_));
messageHandler_->addMessage(notification);
}
-Only in scorched/src/coms: NetServerRead.cpp~
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerRead.h scorched/src/coms/NetServerRead.h
--- scorched.orig/src/coms/NetServerRead.h 2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServerRead.h 2006-02-07 19:52:32.000000000 +0100
++++ scorched/src/coms/NetServerRead.h 2006-02-07 20:41:25.000000000 +0100
@@ -28,6 +28,7 @@
{
public:
@@ -549,10 +575,9 @@
SDLNet_SocketSet sockSet_;
NetServerProtocol *protocol_;
NetMessageHandler *messageHandler_;
-Only in scorched/src/coms: NetServerRead.h~
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/dialogs/HelpButtonDialog.cpp scorched/src/dialogs/HelpButtonDialog.cpp
--- scorched.orig/src/dialogs/HelpButtonDialog.cpp 2006-02-06 22:37:12.000000000 +0100
-+++ scorched/src/dialogs/HelpButtonDialog.cpp 2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/dialogs/HelpButtonDialog.cpp 2006-02-07 20:41:25.000000000 +0100
@@ -160,7 +160,7 @@
void HelpButtonDialog::itemSelected(GLWSelectorEntry *entry, int position)
@@ -562,10 +587,9 @@
if (data != -1)
{
int volume = int(float(data) * 12.8f);
-Only in scorched/src/dialogs: HelpButtonDialog.cpp.64bit
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/engine/ScorchedCollisionHandler.cpp scorched/src/engine/ScorchedCollisionHandler.cpp
--- scorched.orig/src/engine/ScorchedCollisionHandler.cpp 2005-06-08 19:29:38.000000000 +0200
-+++ scorched/src/engine/ScorchedCollisionHandler.cpp 2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/engine/ScorchedCollisionHandler.cpp 2006-02-07 20:41:25.000000000 +0100
@@ -93,7 +93,7 @@
}
@@ -584,10 +608,9 @@
ShotProjectile *shot = (ShotProjectile *) particleInfo->data;
shot->incLandedCounter();
Vector particlePositionV(
-Only in scorched/src/engine: ScorchedCollisionHandler.cpp.64bit
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/ode/config.h scorched/src/ode/config.h
--- scorched.orig/src/ode/config.h 2004-11-02 10:20:35.000000000 +0100
-+++ scorched/src/ode/config.h 2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/ode/config.h 2006-02-07 20:41:25.000000000 +0100
@@ -81,7 +81,7 @@
/* an integer type that we can safely cast a pointer to and from without
* loss of bits.
@@ -599,7 +622,7 @@
/* if we're compiling on a pentium, we may need to know the clock rate so
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/scorched/SettingsDialog.cpp scorched/src/scorched/SettingsDialog.cpp
--- scorched.orig/src/scorched/SettingsDialog.cpp 2006-02-06 22:37:12.000000000 +0100
-+++ scorched/src/scorched/SettingsDialog.cpp 2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/scorched/SettingsDialog.cpp 2006-02-07 20:41:25.000000000 +0100
@@ -748,44 +748,44 @@
// Env
@@ -668,9 +691,23 @@
SettingsMain::IDC_TEAMBALLANCE_CTRL->GetClientData(
SettingsMain::IDC_TEAMBALLANCE_CTRL->GetSelection()));
context_.setTeams((int) SettingsMain::IDC_TEAMS_CTRL->GetSelection() + 1);
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/server/ServerConnectHandler.cpp scorched/src/server/ServerConnectHandler.cpp
+--- scorched.orig/src/server/ServerConnectHandler.cpp 2005-07-24 21:34:01.000000000 +0200
++++ scorched/src/server/ServerConnectHandler.cpp 2006-02-08 20:17:33.000000000 +0100
+@@ -87,7 +87,9 @@
+ }
+
+ // Get the ip address
+- ipAddress = NetServer::getIpAddress((TCPsocket) destinationId);
++ NetServer *netServer = (NetServer *)
++ ScorchedServer::instance()->getContext().netInterface;
++ ipAddress = netServer->getIpAddress(destinationId);
+ }
+
+ // Decode the connect message
diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
--- scorched.orig/src/tankgraph/GLWTankTip.cpp 2005-06-11 18:53:41.000000000 +0200
-+++ scorched/src/tankgraph/GLWTankTip.cpp 2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/tankgraph/GLWTankTip.cpp 2006-02-07 20:41:25.000000000 +0100
@@ -66,7 +66,7 @@
void TankUndoMenu::itemSelected(GLWSelectorEntry *entry, int position)
- Previous message: fedora-security/audit fc4,1.148,1.149 fc5,1.57,1.58
- Next message: rpms/nautilus-actions/devel .cvsignore, 1.2, 1.3 nautilus-actions.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list