rpms/scorched3d/devel scorched3d-buf.patch, NONE, 1.1 scorched3d-64bit.patch, 1.3, 1.4 scorched3d-cvs-20050929.patch, 1.1, 1.2 scorched3d-help.patch, 1.1, 1.2 scorched3d.spec, 1.9, 1.10 scorched3d-cvs-20050929-bins.tar.gz, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Thu Feb 9 21:57:32 UTC 2006
- Previous message: rpms/docbook2X/devel docbook2X-vendor_perl.diff, NONE, 1.1 docbook2X.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/naim/devel .cvsignore, 1.4, 1.5 naim.spec, 1.6, 1.7 sources, 1.4, 1.5
- 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-serv28224
Modified Files:
scorched3d-64bit.patch scorched3d-cvs-20050929.patch
scorched3d-help.patch scorched3d.spec
Added Files:
scorched3d-buf.patch
Removed Files:
scorched3d-cvs-20050929-bins.tar.gz
Log Message:
more scorched3d WIP
scorched3d-buf.patch:
--- NEW FILE scorched3d-buf.patch ---
diff -ur scorched.orig/src/GLEXT/GLConsole.cpp scorched/src/GLEXT/GLConsole.cpp
--- scorched.orig/src/GLEXT/GLConsole.cpp 2005-04-05 00:35:23.000000000 +0200
+++ scorched/src/GLEXT/GLConsole.cpp 2006-02-09 20:41:01.000000000 +0100
@@ -53,7 +53,7 @@
void GLConsole::logMessage(LoggerInfo &info)
{
- addLine(false, info.getMessage());
+ addLine(false, "%s", info.getMessage());
}
void GLConsole::keyboardCheck(const unsigned state, float frameTime,
@@ -111,7 +111,7 @@
itor != matches.end();
itor++)
{
- addLine(false, (*itor)->getName());
+ addLine(false, "%s", (*itor)->getName());
}
}
}
@@ -160,7 +160,7 @@
KeyboardKey *key = (*keyItor);
if (key->keyDown(buffer, keyState, false))
{
- addLine(true, key->getName());
+ addLine(true, "%s", key->getName());
}
}
}
@@ -265,7 +265,7 @@
va_list ap;
va_start(ap, fmt);
- vsprintf(text, fmt, ap);
+ vnsprintf(text, TEXT_SIZE, fmt, ap);
va_end(ap);
DIALOG_ASSERT(strlen(text)<TEXT_SIZE);
Only in scorched/src/GLEXT: GLConsole.cpp.buf
Only in scorched/src/GLEXT: GLConsole.cpp~
diff -ur scorched.orig/src/GLEXT/GLConsoleFileReader.cpp scorched/src/GLEXT/GLConsoleFileReader.cpp
--- scorched.orig/src/GLEXT/GLConsoleFileReader.cpp 2005-04-12 19:06:13.000000000 +0200
+++ scorched/src/GLEXT/GLConsoleFileReader.cpp 2006-02-09 20:43:52.000000000 +0100
@@ -45,7 +45,7 @@
XMLNode *currentNode = (*childrenItor);
if (strcmp(currentNode->getName(), "command")==0)
{
- GLConsole::instance()->addLine(true, currentNode->getContent());
+ GLConsole::instance()->addLine(true, "%s", currentNode->getContent());
}
}
return true;
Only in scorched/src/GLEXT: GLConsoleFileReader.cpp~
diff -ur scorched.orig/src/GLEXT/GLStateExtension.cpp scorched/src/GLEXT/GLStateExtension.cpp
--- scorched.orig/src/GLEXT/GLStateExtension.cpp 2004-09-09 20:03:49.000000000 +0200
+++ scorched/src/GLEXT/GLStateExtension.cpp 2006-02-09 22:52:09.000000000 +0100
@@ -122,13 +122,13 @@
// HACK for skin creator
#ifdef dDOUBLE
GLConsole::instance()->addLine(false, "GL_VENDOR:");
- GLConsole::instance()->addLine(false, (const char *) glGetString(GL_VENDOR));
+ GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_VENDOR));
GLConsole::instance()->addLine(false, "GL_RENDERER:");
- GLConsole::instance()->addLine(false, (const char *) glGetString(GL_RENDERER));
+ GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_RENDERER));
GLConsole::instance()->addLine(false, "GL_VERSION:");
- GLConsole::instance()->addLine(false, (const char *) glGetString(GL_VERSION));
+ GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_VERSION));
GLConsole::instance()->addLine(false, "GL_EXTENSIONS:");
- GLConsole::instance()->addLine(false, (const char *) glGetString(GL_EXTENSIONS));
+ GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_EXTENSIONS));
GLConsole::instance()->addLine(false, "TEXTURE_UNITS:");
GLConsole::instance()->addLine(false, "%s (%i units)", ((glActiveTextureARB_==0)?"Off":"On"),textureUnits_);
GLConsole::instance()->addLine(false, "VBO:");
Only in scorched/src/GLEXT: GLStateExtension.cpp~
Only in scorched/src: Makefile
diff -ur scorched.orig/src/client/MessageDisplay.cpp scorched/src/client/MessageDisplay.cpp
--- scorched.orig/src/client/MessageDisplay.cpp 2005-08-16 22:23:59.000000000 +0200
+++ scorched/src/client/MessageDisplay.cpp 2006-02-09 22:53:21.000000000 +0100
@@ -62,7 +62,7 @@
if (currentText_.size())
{
GLConsole::instance()->addLine(
- false, currentText_.c_str());
+ false, "%s", currentText_.c_str());
}
currentText_ = texts_.front();
texts_.pop_front();
diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
--- scorched.orig/src/scorched/MainDialog.cpp 2006-02-09 14:47:28.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp 2006-02-09 20:14:02.000000000 +0100
@@ -131,8 +131,8 @@
#ifdef __DARWIN__
system(formatString("open %s", url));
#else
- system(formatString("mozilla %s", url));
- dialogMessage("Web site location", "%s", url);
+ system(formatString("htmlview %s&", url));
+ // dialogMessage("Web site location", "%s", url);
#endif // __DARWIN__
#endif // _WIN32
}
diff -ur scorched.orig/src/sound/Sound.cpp scorched/src/sound/Sound.cpp
--- scorched.orig/src/sound/Sound.cpp 2006-02-09 14:47:28.000000000 +0100
+++ scorched/src/sound/Sound.cpp 2006-02-09 22:54:05.000000000 +0100
@@ -118,19 +118,19 @@
alDistanceModel(AL_INVERSE_DISTANCE);
GLConsole::instance()->addLine(false, "AL_VENDOR:");
- GLConsole::instance()->addLine(false,
+ GLConsole::instance()->addLine(false, "%s",
checkString((char *) alGetString(AL_VENDOR)));
GLConsole::instance()->addLine(false, "AL_VERSION:");
- GLConsole::instance()->addLine(false,
+ GLConsole::instance()->addLine(false, "%s",
checkString((char *) alGetString(AL_VERSION)));
GLConsole::instance()->addLine(false, "AL_RENDERER:");
- GLConsole::instance()->addLine(false,
+ GLConsole::instance()->addLine(false, "%s",
checkString((char *) alGetString(AL_RENDERER)));
GLConsole::instance()->addLine(false, "AL_EXTENSIONS:");
- GLConsole::instance()->addLine(false,
+ GLConsole::instance()->addLine(false, "%s",
checkString((char *) alGetString(AL_EXTENSIONS)));
GLConsole::instance()->addLine(false, "ALC_DEVICE_SPECIFIER:");
- GLConsole::instance()->addLine(false,
+ GLConsole::instance()->addLine(false, "%s",
checkString((char *) alcGetString(soundDevice, ALC_DEVICE_SPECIFIER)));
// Create all sound channels
Only in scorched/src/sound: Sound.cpp~
diff -ur scorched.orig/src/tankgraph/TankMenus.cpp scorched/src/tankgraph/TankMenus.cpp
--- scorched.orig/src/tankgraph/TankMenus.cpp 2005-07-19 23:45:37.000000000 +0200
+++ scorched/src/tankgraph/TankMenus.cpp 2006-02-09 22:55:19.000000000 +0100
@@ -193,11 +193,11 @@
}
char buffer[1024];
- sprintf(buffer, "%c %8s - \"%10s\" (%s)",
+ snprintf(buffer, 1024, "%c %8s - \"%10s\" (%s)",
currentTank == tank?'>':' ',
description,
tank->getName(), modelId.getModelName());
- GLConsole::instance()->addLine(false, buffer);
+ GLConsole::instance()->addLine(false, "%s", buffer);
}
GLConsole::instance()->addLine(false,
Only in scorched/src/tankgraph: TankMenus.cpp~
Only in scorched: tank2.png
scorched3d-64bit.patch:
Index: scorched3d-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-64bit.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scorched3d-64bit.patch 8 Feb 2006 21:42:04 -0000 1.3
+++ scorched3d-64bit.patch 9 Feb 2006 21:57:31 -0000 1.4
@@ -1,6 +1,7 @@
-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
+Only in scorched/data/globalmods/apoc/data/accessories/weapons: moab.txt.cvs
+diff -ur scorched.orig/src/GLEXT/GLTexture.cpp scorched/src/GLEXT/GLTexture.cpp
+--- scorched.orig/src/GLEXT/GLTexture.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/GLEXT/GLTexture.cpp 2006-02-09 14:47:28.000000000 +0100
@@ -119,7 +119,7 @@
if (height == 1 || width == 1) texType_ = GL_TEXTURE_1D;
else texType_ = GL_TEXTURE_2D;
@@ -10,9 +11,9 @@
{
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
+diff -ur scorched.orig/src/client/ClientConnectionAcceptHandler.cpp scorched/src/client/ClientConnectionAcceptHandler.cpp
+--- scorched.orig/src/client/ClientConnectionAcceptHandler.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/client/ClientConnectionAcceptHandler.cpp 2006-02-09 14:47:28.000000000 +0100
@@ -66,7 +66,9 @@
if (OptionsParam::instance()->getConnectedToServer())
@@ -24,9 +25,9 @@
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-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/client/ServerBrowser.cpp scorched/src/client/ServerBrowser.cpp
+--- scorched.orig/src/client/ServerBrowser.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/client/ServerBrowser.cpp 2006-02-09 14:47:28.000000000 +0100
@@ -50,7 +50,7 @@
int ServerBrowser::threadFunc(void *var)
@@ -36,9 +37,9 @@
bool result = false;
if (lan) result = instance_->serverList_.fetchLANList();
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:41:25.000000000 +0100
+diff -ur scorched.orig/src/coms/NetServer.cpp scorched/src/coms/NetServer.cpp
+--- scorched.orig/src/coms/NetServer.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServer.cpp 2006-02-09 16:48:09.000000000 +0100
@@ -33,6 +33,7 @@
{
sockSet_ = SDLNet_AllocSocketSet(1);
@@ -47,12 +48,13 @@
SDL_CreateThread(NetServer::threadFunc, (void *) this);
}
-@@ -66,7 +67,7 @@
+@@ -66,7 +67,8 @@
{
NetMessage *message = (delayedMessages_.front()).second;
delayedMessages_.pop_front();
- sendMessage((TCPsocket) message->getDestinationId(), message);
-+ sendMessage(message->getDestinationId(), message);
++ sendMessage(getServerRead(message->getDestinationId()),
++ message);
}
}
@@ -89,32 +91,37 @@
}
SDL_UnlockMutex(setMutex_);
return true;
-@@ -212,13 +211,20 @@
+@@ -212,13 +211,25 @@
void NetServer::addClient(TCPsocket client)
{
-+ SDL_LockMutex(setMutex_);
-+ // Find a free ID
-+ unsigned int ID = lastId_ + 1;
+ std::map<unsigned int, NetServerRead *>::iterator itor;
-+ while ((itor = connections_.find(ID)) != connections_.end())
-+ ID++;
-+ lastId_ = ID;
++
++ // Find a free ID
++ SDL_LockMutex(setMutex_);
++ do {
++ lastId_++;
++ /* ID 0 == broadcast so don't use it */
++ if (lastId_ == 0)
++ lastId_++;
++ itor = connections_.find(lastId_);
++ } while (itor != connections_.end());
+
// Create the thread to read this socket
- NetServerRead *serverRead = new NetServerRead(
- client, protocol_, &messageHandler_, &checkDeleted_, sentNotification_);
-+ NetServerRead *serverRead = new NetServerRead(client, ID, protocol_,
-+ &messageHandler_, &checkDeleted_, sentNotification_);
++ NetServerRead *serverRead = new NetServerRead(client, lastId_,
++ protocol_, &messageHandler_, &checkDeleted_,
++ sentNotification_);
// Add this to the collection of sockets (connections)
- SDL_LockMutex(setMutex_);
- connections_[client] = serverRead;
-+ connections_[ID] = serverRead;
++ connections_[lastId_] = serverRead;
firstDestination_ = (*connections_.begin()).first;
SDL_UnlockMutex(setMutex_);
-@@ -228,27 +234,22 @@
+@@ -228,27 +238,23 @@
void NetServer::disconnectAllClients()
{
@@ -137,20 +144,21 @@
- TCPsocket client = (TCPsocket) dest;
- DIALOG_ASSERT(client);
-
++ NetServerRead *serverRead = getServerRead(dest);
NetMessage *message = NetMessagePool::instance()->
getFromPool(NetMessage::DisconnectMessage,
- (unsigned int) client,
- getIpAddress(client));
-+ dest, getIpAddress(dest));
++ dest, getIpAddress(serverRead));
if (delayed)
{
-@@ -258,25 +259,20 @@
+@@ -258,26 +264,22 @@
else
{
// Add the message to the list of out going
- sendMessage(client, message);
-+ sendMessage(dest, message);
++ sendMessage(serverRead, message);
}
}
@@ -160,75 +168,92 @@
+ sendMessage(buffer, firstDestination_);
}
--void NetServer::sendMessage(NetBuffer &buffer, unsigned int dest)
+ void NetServer::sendMessage(NetBuffer &buffer, unsigned int dest)
-
-+void NetServer::sendMessage(NetBuffer &buffer, unsigned int destination)
{
- TCPsocket destination = (TCPsocket) dest;
- DIALOG_ASSERT(destination);
-
++ NetServerRead *serverRead = getServerRead(dest);
// Get a new buffer from the pool
NetMessage *message = NetMessagePool::instance()->
- getFromPool(NetMessage::NoMessage,
- (unsigned int) destination,
-+ getFromPool(NetMessage::NoMessage, destination,
- getIpAddress(destination));
+- getIpAddress(destination));
++ getFromPool(NetMessage::NoMessage, dest,
++ getIpAddress(serverRead));
// Add message to new buffer
-@@ -289,12 +285,12 @@
- sendMessage(destination, message);
+ message->getBuffer().allocate(buffer.getBufferUsed());
+@@ -286,28 +288,37 @@
+ message->getBuffer().setBufferUsed(buffer.getBufferUsed());
+
+ // Send Mesage
+- sendMessage(destination, message);
++ sendMessage(serverRead, message);
}
-void NetServer::sendMessage(TCPsocket client, NetMessage *message)
-+void NetServer::sendMessage(unsigned int dest, NetMessage *message)
++void NetServer::sendMessage(NetServerRead *serverRead, NetMessage *message)
{
- // Find the client
- SDL_LockMutex(setMutex_);
+- // Find the client
+- SDL_LockMutex(setMutex_);
- std::map<TCPsocket, NetServerRead *>::iterator itor =
- connections_.find(client);
-+ std::map<unsigned int, NetServerRead *>::iterator itor =
-+ connections_.find(dest);
- if (itor != connections_.end())
+- if (itor != connections_.end())
++ if (serverRead)
{
// Add the message to the list of out going
-@@ -304,10 +300,31 @@
+- NetServerRead *serverRead = (*itor).second;
+ serverRead->addMessage(message);
+ }
else
- {
+- {
NetMessagePool::instance()->addToPool(message);
- Logger::log( "Unknown sendMessage destination %i",
- (int) client);
-+ Logger::log( "Unknown sendMessage destination %u", dest);
-+ }
-+ SDL_UnlockMutex(setMutex_);
+}
+
-+unsigned int NetServer::getIpAddress(unsigned int destination)
++NetServerRead *NetServer::getServerRead(unsigned int dest)
+{
-+ unsigned int addr = 0;
-+
-+ SDL_LockMutex(setMutex_);
-+ std::map<unsigned int, NetServerRead *>::iterator itor =
-+ connections_.find(destination);
-+ if (itor != connections_.end())
++ NetServerRead *serverRead = 0;
++
++ if (dest)
+ {
-+ NetServerRead *serverRead = (*itor).second;
-+ IPaddress *address = SDLNet_TCP_GetPeerAddress(
-+ serverRead->getSocket());
-+ if (address)
-+ {
-+ addr = SDLNet_Read32(&address->host);
-+ }
++ SDL_LockMutex(setMutex_);
++ std::map<unsigned int, NetServerRead *>::iterator itor =
++ connections_.find(dest);
++ if (itor != connections_.end())
++ serverRead = (*itor).second;
++ else
++ Logger::log( "Unknown destination %u", dest);
++ SDL_UnlockMutex(setMutex_);
}
- SDL_UnlockMutex(setMutex_);
-+
-+ return addr;
+- SDL_UnlockMutex(setMutex_);
++
++ return serverRead;
}
unsigned int NetServer::getIpAddress(TCPsocket destination)
-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-08 20:18:31.000000000 +0100
-@@ -47,27 +47,29 @@
+@@ -324,3 +335,14 @@
+ return addr;
+ }
+
++unsigned int NetServer::getIpAddress(NetServerRead *serverRead)
++{
++ if (serverRead == 0) return 0;
++
++ return getIpAddress(serverRead->getSocket());
++}
++
++unsigned int NetServer::getIpAddress(unsigned int destination)
++{
++ return getIpAddress(getServerRead(destination));
++}
+diff -ur scorched.orig/src/coms/NetServer.h scorched/src/coms/NetServer.h
+--- scorched.orig/src/coms/NetServer.h 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServer.h 2006-02-09 16:48:14.000000000 +0100
+@@ -47,28 +47,32 @@
virtual void sendMessage(NetBuffer &buffer, unsigned int destination);
void setSentNotification() { sentNotification_ = true; }
@@ -257,13 +282,18 @@
bool pollDeleted();
void addClient(TCPsocket client);
- void sendMessage(TCPsocket client, NetMessage *message);
-+ void sendMessage(unsigned int dest, NetMessage *message);
-
+-
++ void sendMessage(NetServerRead *serverRead, NetMessage *message);
++ NetServerRead *getServerRead(unsigned int dest);
++ unsigned int getIpAddress(NetServerRead *serverRead);
++
private:
-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:41:25.000000000 +0100
+ NetServer(const NetServer &);
+Only in scorched/src/coms: NetServer.h~
+diff -ur scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
+--- scorched.orig/src/coms/NetServerProtocol.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServerProtocol.cpp 2006-02-09 14:47:28.000000000 +0100
@@ -40,7 +40,8 @@
{
}
@@ -393,9 +423,9 @@
netBuffer->getBuffer().reset();
// get the string buffer over the socket
-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:41:25.000000000 +0100
+diff -ur scorched.orig/src/coms/NetServerProtocol.h scorched/src/coms/NetServerProtocol.h
+--- scorched.orig/src/coms/NetServerProtocol.h 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServerProtocol.h 2006-02-09 14:47:28.000000000 +0100
@@ -29,8 +29,10 @@
NetServerProtocol();
virtual ~NetServerProtocol();
@@ -461,9 +491,9 @@
};
#endif
-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:41:25.000000000 +0100
+diff -ur scorched.orig/src/coms/NetServerRead.cpp scorched/src/coms/NetServerRead.cpp
+--- scorched.orig/src/coms/NetServerRead.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServerRead.cpp 2006-02-09 14:47:28.000000000 +0100
@@ -26,11 +26,12 @@
#include <common/Defines.h>
@@ -549,9 +579,9 @@
NetServer::getIpAddress(socket_));
messageHandler_->addMessage(notification);
}
-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 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/coms/NetServerRead.h scorched/src/coms/NetServerRead.h
+--- scorched.orig/src/coms/NetServerRead.h 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServerRead.h 2006-02-09 14:47:28.000000000 +0100
@@ -28,6 +28,7 @@
{
public:
@@ -575,9 +605,9 @@
SDLNet_SocketSet sockSet_;
NetServerProtocol *protocol_;
NetMessageHandler *messageHandler_;
-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-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/dialogs/HelpButtonDialog.cpp scorched/src/dialogs/HelpButtonDialog.cpp
+--- scorched.orig/src/dialogs/HelpButtonDialog.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/dialogs/HelpButtonDialog.cpp 2006-02-09 14:47:28.000000000 +0100
@@ -160,7 +160,7 @@
void HelpButtonDialog::itemSelected(GLWSelectorEntry *entry, int position)
@@ -587,9 +617,9 @@
if (data != -1)
{
int volume = int(float(data) * 12.8f);
-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-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/engine/ScorchedCollisionHandler.cpp scorched/src/engine/ScorchedCollisionHandler.cpp
+--- scorched.orig/src/engine/ScorchedCollisionHandler.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/engine/ScorchedCollisionHandler.cpp 2006-02-09 14:47:28.000000000 +0100
@@ -93,7 +93,7 @@
}
@@ -608,9 +638,9 @@
ShotProjectile *shot = (ShotProjectile *) particleInfo->data;
shot->incLandedCounter();
Vector particlePositionV(
-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-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/ode/config.h scorched/src/ode/config.h
+--- scorched.orig/src/ode/config.h 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/ode/config.h 2006-02-09 14:47:28.000000000 +0100
@@ -81,7 +81,7 @@
/* an integer type that we can safely cast a pointer to and from without
* loss of bits.
@@ -620,9 +650,9 @@
/* 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-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/scorched/SettingsDialog.cpp scorched/src/scorched/SettingsDialog.cpp
+--- scorched.orig/src/scorched/SettingsDialog.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/scorched/SettingsDialog.cpp 2006-02-09 14:47:28.000000000 +0100
@@ -748,44 +748,44 @@
// Env
@@ -691,9 +721,9 @@
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
+diff -ur scorched.orig/src/server/ServerConnectHandler.cpp scorched/src/server/ServerConnectHandler.cpp
+--- scorched.orig/src/server/ServerConnectHandler.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/server/ServerConnectHandler.cpp 2006-02-09 14:47:28.000000000 +0100
@@ -87,7 +87,9 @@
}
@@ -705,9 +735,9 @@
}
// 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-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
+--- scorched.orig/src/tankgraph/GLWTankTip.cpp 2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/tankgraph/GLWTankTip.cpp 2006-02-09 14:47:28.000000000 +0100
@@ -66,7 +66,7 @@
void TankUndoMenu::itemSelected(GLWSelectorEntry *entry, int position)
scorched3d-cvs-20050929.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 scorched3d-cvs-20050929.patch
Index: scorched3d-cvs-20050929.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-cvs-20050929.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-cvs-20050929.patch 5 Feb 2006 21:58:44 -0000 1.1
+++ scorched3d-cvs-20050929.patch 9 Feb 2006 21:57:31 -0000 1.2
@@ -1,913 +1,3 @@
-diff -urN --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/Makefile.am scorched-cvs/Makefile.am
---- scorched/Makefile.am 2005-08-30 20:04:22.000000000 +0200
-+++ scorched-cvs/Makefile.am 2005-09-22 17:14:27.000000000 +0200
-@@ -71,13 +71,8 @@
- data/keys.xml \
- data/landscapes.xml \
- data/landscapesdefn.xml \
-- data/landscapesplace.xml \
-- data/landscapessound.xml \
- data/landscapestex.xml \
- data/mysql.xml \
-- data/pgprunetables.sql \
-- data/pgsql.xml \
-- data/pgstatstables.sql \
- data/playernames.txt \
- data/prunetables.sql \
- data/random.no \
-@@ -96,7 +91,12 @@
- data/tanks.xml \
- data/textureset.xml \
- data/tips.txt \
-- data/windows.xml
-+ data/windows.xml \
-+ data/pgprunetables.sql \
-+ data/pgsql.xml \
-+ data/pgstatstables.sql \
-+ data/landscapesplace.xml \
-+ data/landscapessound.xml
- scorcheddataaccessoriesdir = ${datadir}/data/accessories
- scorcheddataaccessories_DATA = data/accessories/clusterbomb.ase \
- data/accessories/clusterbomb2.ase \
-@@ -114,9 +114,6 @@
- data/accessories/barrage/gradient.bmp \
- data/accessories/barrage/white.bmp \
- data/accessories/barrage/yellow.bmp
--scorcheddataaccessoriesbeer_bottledir = ${datadir}/data/accessories/beer_bottle
--scorcheddataaccessoriesbeer_bottle_DATA = data/accessories/beer_bottle/bottle.bmp \
-- data/accessories/beer_bottle/bottle.txt
- scorcheddataaccessoriesbombdir = ${datadir}/data/accessories/bomb
- scorcheddataaccessoriesbomb_DATA = data/accessories/bomb/black.bmp \
- data/accessories/bomb/bomb.txt \
-@@ -142,23 +139,12 @@
- data/accessories/hawkmissile/hawk.txt \
- data/accessories/hawkmissile/white.bmp \
- data/accessories/hawkmissile/yellow.bmp
--scorcheddataaccessoriesherringdir = ${datadir}/data/accessories/herring
--scorcheddataaccessoriesherring_DATA = data/accessories/herring/body.bmp \
-- data/accessories/herring/eyes.bmp \
-- data/accessories/herring/herring.txt
- scorcheddataaccessoriesicbmdir = ${datadir}/data/accessories/icbm
- scorcheddataaccessoriesicbm_DATA = data/accessories/icbm/black.bmp \
- data/accessories/icbm/gradient.bmp \
- data/accessories/icbm/icbm.txt \
- data/accessories/icbm/white.bmp \
- data/accessories/icbm/yellow.bmp
--scorcheddataaccessorieslaserdir = ${datadir}/data/accessories/laser
--scorcheddataaccessorieslaser_DATA = data/accessories/laser/about.txt \
-- data/accessories/laser/alpha2.bmp \
-- data/accessories/laser/blue128.bmp \
-- data/accessories/laser/hlaser.txt \
-- data/accessories/laser/laser.txt \
-- data/accessories/laser/red128.bmp
- scorcheddataaccessorieslittleboydir = ${datadir}/data/accessories/littleboy
- scorcheddataaccessorieslittleboy_DATA = data/accessories/littleboy/black.bmp \
- data/accessories/littleboy/littleboy.txt
-@@ -215,6 +201,26 @@
- data/accessories/smallpine/wintersmallpine.txt \
- data/accessories/smallpine/wintersmallpine2.txt \
- data/accessories/smallpine/wintersmallpine3.txt
-+scorcheddataaccessoriesv2missiledir = ${datadir}/data/accessories/v2missile
-+scorcheddataaccessoriesv2missile_DATA = data/accessories/v2missile/black.bmp \
-+ data/accessories/v2missile/checker.bmp \
-+ data/accessories/v2missile/gradient.bmp \
-+ data/accessories/v2missile/v2missile.txt \
-+ data/accessories/v2missile/yellow.bmp
-+scorcheddataaccessoriesherringdir = ${datadir}/data/accessories/herring
-+scorcheddataaccessoriesherring_DATA = data/accessories/herring/body.bmp \
-+ data/accessories/herring/eyes.bmp \
-+ data/accessories/herring/herring.txt
-+scorcheddataaccessoriesbeer_bottledir = ${datadir}/data/accessories/beer_bottle
-+scorcheddataaccessoriesbeer_bottle_DATA = data/accessories/beer_bottle/bottle.bmp \
-+ data/accessories/beer_bottle/bottle.txt
-+scorcheddataaccessorieslaserdir = ${datadir}/data/accessories/laser
-+scorcheddataaccessorieslaser_DATA = data/accessories/laser/about.txt \
-+ data/accessories/laser/alpha2.bmp \
-+ data/accessories/laser/blue128.bmp \
-+ data/accessories/laser/hlaser.txt \
-+ data/accessories/laser/laser.txt \
-+ data/accessories/laser/red128.bmp
- scorcheddataaccessoriessonicringdir = ${datadir}/data/accessories/sonicring
- scorcheddataaccessoriessonicring_DATA = data/accessories/sonicring/sonicring.bmp \
- data/accessories/sonicring/sonicring.txt
-@@ -222,38 +228,12 @@
- scorcheddataaccessoriesteleport_DATA = data/accessories/teleport/base.bmp \
- data/accessories/teleport/detail.bmp \
- data/accessories/teleport/teleport.txt
--scorcheddataaccessoriesv2missiledir = ${datadir}/data/accessories/v2missile
--scorcheddataaccessoriesv2missile_DATA = data/accessories/v2missile/black.bmp \
-- data/accessories/v2missile/checker.bmp \
-- data/accessories/v2missile/gradient.bmp \
-- data/accessories/v2missile/v2missile.txt \
-- data/accessories/v2missile/yellow.bmp
- scorcheddataacessoriesdir = ${datadir}/data/acessories
- scorcheddataacessories_DATA =
--scorcheddataavatarsdir = ${datadir}/data/avatars
--scorcheddataavatars_DATA = data/avatars/agreement.txt \
-- data/avatars/animal.gif \
-- data/avatars/baby.gif \
-- data/avatars/bavia.gif \
-- data/avatars/computer.gif \
-- data/avatars/daisy.gif \
-- data/avatars/fish.gif \
-- data/avatars/flower.gif \
-- data/avatars/floyd.gif \
-- data/avatars/heart.gif \
-- data/avatars/lips.gif \
-- data/avatars/mxpx.gif \
-- data/avatars/pint.gif \
-- data/avatars/player.gif \
-- data/avatars/prot.gif \
-- data/avatars/termin.gif \
-- data/avatars/vader.gif \
-- data/avatars/web.gif \
-- data/avatars/yoda.gif
- scorcheddatafontsdir = ${datadir}/data/fonts
--scorcheddatafonts_DATA = data/fonts/test.ttf \
-- data/fonts/testout.ttf \
-- data/fonts/veramobd.ttf
-+scorcheddatafonts_DATA = data/fonts/veramobd.ttf \
-+ data/fonts/test.ttf \
-+ data/fonts/testout.ttf
- scorcheddataglobalmodsdir = ${datadir}/data/globalmods
- scorcheddataglobalmods_DATA = data/globalmods/globalmods.txt
- scorcheddataglobalmodsapocdir = ${datadir}/data/globalmods/apoc
-@@ -266,8 +246,6 @@
- data/globalmods/apoc/data/ainames.txt \
- data/globalmods/apoc/data/landscapes.xml \
- data/globalmods/apoc/data/landscapesdefn.xml \
-- data/globalmods/apoc/data/landscapesplace.xml \
-- data/globalmods/apoc/data/landscapessound.xml \
- data/globalmods/apoc/data/landscapestex.xml \
- data/globalmods/apoc/data/server.xml \
- data/globalmods/apoc/data/singleeasy.xml \
-@@ -276,17 +254,71 @@
- data/globalmods/apoc/data/singlenormal.xml \
- data/globalmods/apoc/data/singletarget.xml \
- data/globalmods/apoc/data/tankais.xml \
-- data/globalmods/apoc/data/textureset.xml
-+ data/globalmods/apoc/data/textureset.xml \
-+ data/globalmods/apoc/data/landscapesplace.xml \
-+ data/globalmods/apoc/data/landscapessound.xml
- scorcheddataglobalmodsapocdataaccessoriesdir = ${datadir}/data/globalmods/apoc/data/accessories
- scorcheddataglobalmodsapocdataaccessories_DATA = data/globalmods/apoc/data/accessories/black.bmp \
- data/globalmods/apoc/data/accessories/green.bmp \
- data/globalmods/apoc/data/accessories/molten.bmp
--scorcheddataglobalmodsapocdataaccessories50caldir = ${datadir}/data/globalmods/apoc/data/accessories/50cal
--scorcheddataglobalmodsapocdataaccessories50cal_DATA =
- scorcheddataglobalmodsapocdataaccessoriesbouldersdir = ${datadir}/data/globalmods/apoc/data/accessories/boulders
- scorcheddataglobalmodsapocdataaccessoriesboulders_DATA =
- scorcheddataglobalmodsapocdataaccessoriesbrownbouldersdir = ${datadir}/data/globalmods/apoc/data/accessories/brownboulders
- scorcheddataglobalmodsapocdataaccessoriesbrownboulders_DATA =
-+scorcheddataglobalmodsapocdataaccessoriescactusdir = ${datadir}/data/globalmods/apoc/data/accessories/cactus
-+scorcheddataglobalmodsapocdataaccessoriescactus_DATA =
-+scorcheddataglobalmodsapocdataaccessorieschurch1dir = ${datadir}/data/globalmods/apoc/data/accessories/church1
-+scorcheddataglobalmodsapocdataaccessorieschurch1_DATA =
-+scorcheddataglobalmodsapocdataaccessoriescityofficedir = ${datadir}/data/globalmods/apoc/data/accessories/cityoffice
-+scorcheddataglobalmodsapocdataaccessoriescityoffice_DATA =
-+scorcheddataglobalmodsapocdataaccessoriesdeerdir = ${datadir}/data/globalmods/apoc/data/accessories/deer
-+scorcheddataglobalmodsapocdataaccessoriesdeer_DATA =
-+scorcheddataglobalmodsapocdataaccessoriesfactory1dir = ${datadir}/data/globalmods/apoc/data/accessories/factory1
-+scorcheddataglobalmodsapocdataaccessoriesfactory1_DATA =
-+scorcheddataglobalmodsapocdataaccessoriesfarm1dir = ${datadir}/data/globalmods/apoc/data/accessories/farm1
-+scorcheddataglobalmodsapocdataaccessoriesfarm1_DATA =
-+scorcheddataglobalmodsapocdataaccessoriesfusionbarreldir = ${datadir}/data/globalmods/apoc/data/accessories/fusionbarrel
-+scorcheddataglobalmodsapocdataaccessoriesfusionbarrel_DATA =
-+scorcheddataglobalmodsapocdataaccessoriesgrenadedir = ${datadir}/data/globalmods/apoc/data/accessories/grenade
-+scorcheddataglobalmodsapocdataaccessoriesgrenade_DATA =
-+scorcheddataglobalmodsapocdataaccessorieshouse1dir = ${datadir}/data/globalmods/apoc/data/accessories/house1
-+scorcheddataglobalmodsapocdataaccessorieshouse1_DATA =
-+scorcheddataglobalmodsapocdataaccessorieslogcabin1dir = ${datadir}/data/globalmods/apoc/data/accessories/logcabin1
-+scorcheddataglobalmodsapocdataaccessorieslogcabin1_DATA =
-+scorcheddataglobalmodsapocdataaccessoriesm7a3grenadedir = ${datadir}/data/globalmods/apoc/data/accessories/m7a3grenade
-+scorcheddataglobalmodsapocdataaccessoriesm7a3grenade_DATA =
-+scorcheddataglobalmodsapocdataaccessoriesnapalmdir = ${datadir}/data/globalmods/apoc/data/accessories/napalm
-+scorcheddataglobalmodsapocdataaccessoriesnapalm_DATA =
-+scorcheddataglobalmodsapocdataaccessoriesofficeplaza1dir = ${datadir}/data/globalmods/apoc/data/accessories/officeplaza1
-+scorcheddataglobalmodsapocdataaccessoriesofficeplaza1_DATA =
-+scorcheddataglobalmodsapocdataaccessoriesredhornetdir = ${datadir}/data/globalmods/apoc/data/accessories/redhornet
-+scorcheddataglobalmodsapocdataaccessoriesredhornet_DATA =
-+scorcheddataglobalmodsapocdataaccessoriesremorcebombletdir = ${datadir}/data/globalmods/apoc/data/accessories/remorcebomblet
-+scorcheddataglobalmodsapocdataaccessoriesremorcebomblet_DATA =
[...2222 lines suppressed...]
-- <sound>data/wav/shoot/laser1.wav</sound>
-- </subweapon2>
-- </aimedweapon>
-- </nextaction>
-+ <accessoryaction type='WeaponRedirect'>
-+ <habs>false</habs>
-+ <vabs>true</vabs>
-+ <hredirect>0</hredirect>
-+ <vredirect>180</vredirect>
-+ <nextaction type='WeaponTranslate'>
-+ <translatedist>50</translatedist>
-+ <nextaction type='WeaponRedirect'>
-+ <habs>false</habs>
-+ <vabs>true</vabs>
-+ <hredirect>0</hredirect>
-+ <vredirect>0</vredirect>
-+ <nextaction type='WeaponVelocity'>
-+ <velocitychange>1.25</velocitychange>
-+ <aimedweapon type='WeaponMulti'>
-+ <subweapon1 type='WeaponLaser'>
-+ <totaltime>2</totaltime>
-+ <minimumdistance>200</minimumdistance>
-+ <maximumdistance>200</maximumdistance>
-+ <minimumhurt>40</minimumhurt>
-+ <maximumhurt>40</maximumhurt>
-+ <hurtradius>5</hurtradius>
-+ <color>
-+ <A>1.0</A>
-+ <B>0.0</B>
-+ <C>0.0</C>
-+ </color>
-+ </subweapon1>
-+ <subweapon2 type='WeaponSound'>
-+ <sound>data/wav/shoot/laser1.wav</sound>
-+ </subweapon2>
-+ <subweapon3 type='WeaponExplosion'>
-+ <hurtamount>0</hurtamount>
-+ <deform>down</deform>
-+ <size>3</size>
-+ <deformtexture>data/textures/landscape/defaultscorched.bmp</deformtexture>
-+ <explosionshake>1.0</explosionshake>
-+ <explosiontexture>cloud00</explosiontexture>
-+ <explosionsound>none</explosionsound>
-+ </subweapon3>
-+ <subweapon4 type='WeaponNapalm'>
-+ <allowunderwater>false</allowunderwater>
-+ <napalmtime>4.0</napalmtime>
-+ <napalmheight>5.0</napalmheight>
-+ <steptime>1</steptime>
-+ <hurtsteptime>1.0</hurtsteptime>
-+ <hurtpersecond>0.25</hurtpersecond>
-+ <numberstreams>1</numberstreams>
-+ <effectradius>5</effectradius>
-+ <napalmtexture>flames</napalmtexture>
-+ <napalmsound>none</napalmsound>
-+ </subweapon4>
-+ </aimedweapon>
- </nextaction>
- </nextaction>
-- </subweapon1>
-- <subweapon2 type='WeaponExplosion'>
-- <hurtamount>0</hurtamount>
-- <deform>down</deform>
-- <size>3</size>
-- <deformtexture>data/textures/landscape/defaultscorched.bmp</deformtexture>
-- <explosionshake>1.0</explosionshake>
-- <explosiontexture>cloud00</explosiontexture>
-- <explosionsound>none</explosionsound>
-- </subweapon2>
-- <subweapon3 type='WeaponNapalm'>
-- <allowunderwater>false</allowunderwater>
-- <napalmtime>4.0</napalmtime>
-- <napalmheight>5.0</napalmheight>
-- <steptime>1</steptime>
-- <hurtsteptime>1.0</hurtsteptime>
-- <hurtpersecond>0.25</hurtpersecond>
-- <numberstreams>1</numberstreams>
-- <effectradius>5</effectradius>
-- <napalmtexture>flames</napalmtexture>
-- <napalmsound>none</napalmsound>
-- </subweapon3>
-+ </nextaction>
- </accessoryaction>
- </accessory>
- <accessory>
- <name>SatDigLaser</name>
-- <armslevel>10</armslevel>
-+ <armslevel>2</armslevel>
- <maximumnumber>0</maximumnumber>
- <accessoryaction type='WeaponAimedUnder'>
- <nowarheads>1</nowarheads>
-@@ -7936,7 +8081,7 @@
- </accessory>
- <accessory>
- <name>SatFunkLaser</name>
-- <armslevel>10</armslevel>
-+ <armslevel>2</armslevel>
- <maximumnumber>0</maximumnumber>
- <accessoryaction type='WeaponAimedOver'>
- <nowarheads>1</nowarheads>
-@@ -7961,7 +8106,7 @@
- </accessory>
- <accessory>
- <name>SatTransLaser</name>
-- <armslevel>10</armslevel>
-+ <armslevel>2</armslevel>
- <maximumnumber>0</maximumnumber>
- <accessoryaction type='WeaponAimedOver'>
- <nowarheads>1</nowarheads>
-@@ -7984,14 +8129,14 @@
- </accessory>
- <accessory>
- <name>SatSegment</name>
-- <armslevel>10</armslevel>
-+ <armslevel>2</armslevel>
- <maximumnumber>0</maximumnumber>
- <accessoryaction type='WeaponMulti'>
- <subweapon1 type='WeaponReference'>
- <weapon>SatDigLaser</weapon>
- </subweapon1>
- <subweapon2 type='WeaponReference'>
-- <weapon>SatFunkLaser</weapon>
-+ <weapon>SatTransLaser</weapon>
- </subweapon2>
- <subweapon3 type='WeaponDelay'>
- <delay>0.33</delay>
-@@ -8008,7 +8153,7 @@
- <subweapon5 type='WeaponDelay'>
- <delay>0.66</delay>
- <delayedweapon type='WeaponReference'>
-- <weapon>SatDigLaser</weapon>
-+ <weapon>SatTransLaser</weapon>
- </delayedweapon>
- </subweapon5>
- <subweapon6 type='WeaponDelay'>
-@@ -8025,7 +8170,7 @@
- <description>Fires a projectile which hits the ground, marking
- the target area. Space based laser cannons then assault
- all targets in the area.</description>
-- <icon>hlaser.bmp</icon>
-+ <icon>satellite.bmp</icon>
- <activationsound>shoot/flare.wav</activationsound>
- <bundlesize>1</bundlesize>
- <cost>20000</cost>
-diff -urN --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/data/globalmods/apoc/data/tankais.xml scorched-cvs/data/globalmods/apoc/data/tankais.xml
---- scorched/data/globalmods/apoc/data/tankais.xml 2005-07-26 16:08:29.000000000 +0200
-+++ scorched-cvs/data/globalmods/apoc/data/tankais.xml 2005-08-31 05:04:36.000000000 +0200
-@@ -92,7 +92,7 @@
- <weapon><name>Battery</name><level>20</level><type>defense</type></weapon>
- <weapon><name>Shield</name><level>20</level><type>defense</type></weapon>
- <weapon><name>Auto Defense</name><level>30</level><type>defense</type></weapon>
-- <weapon><name>Mega EMP</name><level>30</level><type>explosionlarge</type></weapon>
-+ <weapon><name>EMP Missile</name><level>30</level><type>explosionlarge</type></weapon>
- <weapon><name>Chain Lightning</name><level>30</level><type>explosionlarge</type></weapon>
- <weapon><name>Baby Missile</name><level>1</level><type>explosionsmall</type></weapon>
- </weaponset>
-Binary files scorched/data/globalmods/apoc/data/textures/explode/smoke-orange.bmp and scorched-cvs/data/globalmods/apoc/data/textures/explode/smoke-orange.bmp differ
-Binary files scorched/data/globalmods/apoc/data/textures/wicons/satellite.bmp and scorched-cvs/data/globalmods/apoc/data/textures/wicons/satellite.bmp differ
-Binary files scorched/data/globalmods/apoc/data/wav/shoot/launch.wav and scorched-cvs/data/globalmods/apoc/data/wav/shoot/launch.wav differ
-diff -urN --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/data/globalmods/apoc/readme.txt scorched-cvs/data/globalmods/apoc/readme.txt
---- scorched/data/globalmods/apoc/readme.txt 2005-08-30 02:52:31.000000000 +0200
-+++ scorched-cvs/data/globalmods/apoc/readme.txt 2005-09-12 00:35:27.000000000 +0200
-@@ -1,5 +1,5 @@
- ----------------------------------------------------
-- Apocalypse v3.1 Information
-+ Apocalypse v3.2 Information
- ----------------------------------------------------
- Apocalypse is a modification for Scorched 3D which adds many new weapons, items, and landscapes
- for use with this awesome game. The mod is the product of work by several people (named in authors.txt).
-@@ -15,11 +15,16 @@
- - Satellite Strike - projectile marks target, then satellite based lasers assault the area
-
- Other Accessory Changes:
-- - New Projectile Model for Mega Mirv/S-Mirv by Shockwave
-+ - New projectile model for Mega Mirv/S-Mirv by Shockwave
-+ - New projectile model for MOAB by Bobirov
-+ - New missile launch sound that replaces default
- - Increased EMP effectiveness against shields slightly and reduced damage to tank
-+ - Turned Mega EMP into a missile weapon instead of grenade, renamed to EMP Missile.
- - Decreased cost of Riot Drill, Wall of Dirt and Ring of Dirt slightly
-- - Removed Disco Bunny
-+ - Adjusted sparking effect in Shockwave
- - Other updates to projectile models/texturing
-+ - Changed roller model to the newer roller model (finally)
-+ - Removed Disco Bunny
-
- Landscapes:
- - Changes to cities:
-@@ -115,7 +120,7 @@
- Riot Drill - 3 heavy riot bombs are shot in rapid succession at the same point
- Sat. Strike - Shoots a projectile which paints the target area. Space based lasers then assault the target.
- Shockwave - Creates a massive energy wave which ripples outwards without destroying the landscape
--Strangelove - The end game weapon
-+Strangelove - The end game weapon, scaled up dmsday device
- Suicide Bomb - Detonates yourself causing a huge, powerful explosion
- The Travolta - Super-sized Funky Bomb
- Wall of Dirt - Raises a small wall of dirt a short distance from your tank in the direction you aim
diff -urN --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/src/3dsparse/MSModelFactory.cpp scorched-cvs/src/3dsparse/MSModelFactory.cpp
--- scorched/src/3dsparse/MSModelFactory.cpp 2005-04-12 00:19:08.000000000 +0200
+++ scorched-cvs/src/3dsparse/MSModelFactory.cpp 2005-09-22 17:14:27.000000000 +0200
scorched3d-help.patch:
Index: scorched3d-help.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-help.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-help.patch 6 Feb 2006 15:01:40 -0000 1.1
+++ scorched3d-help.patch 9 Feb 2006 21:57:31 -0000 1.2
@@ -1,11 +1,31 @@
--- scorched/src/scorched/MainDialog.cpp.help 2006-02-06 12:24:58.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp 2006-02-06 12:25:42.000000000 +0100
-@@ -131,7 +131,7 @@
+@@ -131,8 +131,8 @@
#ifdef __DARWIN__
system(formatString("open %s", url));
#else
- system(formatString("mozilla %s", url));
+- dialogMessage("Web site location", "%s", url);
+ system(formatString("htmlview %s&", url));
- dialogMessage("Web site location", "%s", url);
++ // dialogMessage("Web site location", "%s", url);
#endif // __DARWIN__
#endif // _WIN32
+ }
+--- scorched/src/scorched/HtmlHelpDialog.cpp.help 2006-02-09 19:14:11.000000000 +0100
++++ scorched/src/scorched/HtmlHelpDialog.cpp 2006-02-09 19:14:49.000000000 +0100
+@@ -137,13 +137,13 @@
+ void HelpFrame::onHome(wxCommandEvent &event)
+ {
+ html_->HistoryClear();
+- html_->LoadPage(wxString(getDocFile("documentation/html/index.html"), wxConvUTF8));
++ html_->LoadPage(wxString(getDocFile("html/index.html"), wxConvUTF8));
+ }
+
+ void showHtmlHelpDialog()
+ {
+ // For the moment just show the documentation in the default web browser
+- showURL(getDocFile("documentation/html/index.html"));
++ showURL(getDocFile("html/index.html"));
+
+ //HelpFrame *frame = new HelpFrame();
+ //frame->Show();
Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scorched3d.spec 7 Feb 2006 21:07:38 -0000 1.9
+++ scorched3d.spec 9 Feb 2006 21:57:31 -0000 1.10
@@ -8,7 +8,6 @@
URL: http://www.scorched3d.co.uk/
Source0: http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz
Source1: %{name}.desktop
-Source2: %{name}-cvs-20050929-bins.tar.gz
Patch0: %{name}-cvs-20050929.patch
Patch1: %{name}-syslibs.patch
Patch2: %{name}-aclocal18.patch
@@ -57,8 +56,7 @@
%patch3 -p1 -z .gcc41
%patch4 -p1 -z .64bit
%patch5 -p1 -z .openal
-#%patch6 -p1 -z .help
-tar xvfz %{SOURCE2}
+%patch6 -p1 -z .help
. autogen.sh
@@ -84,7 +82,7 @@
install -Dpm 644 tank2.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/scorched3d.png
-mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version} __docs
+mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version}/documentation __docs
%clean
@@ -100,7 +98,7 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO __docs/documentation/
+%doc AUTHORS COPYING TODO __docs/
%{_bindir}/scorched3d
%{_datadir}/games/scorched3d/
%{_datadir}/applications/*scorched3d.desktop
@@ -108,14 +106,15 @@
%changelog
-* Mon Feb 6 2006 <j.w.r.degoede at hhs.nl> 39.1-2
-- upgrade to CVS snapshot of 20050929, as Debian does, this fixes a few
- internetplay bugs and allows compilation with wxGTK 2.6
+* Thu Feb 9 2006 <j.w.r.degoede at hhs.nl> - 39.1-2
+- upgrade to CVS snapshot of 20050929, as Debian does, but not to
+ the newer apoc version as this causes problems playing online
- fix gcc41 compilation
-- fix 64 bit compilation (courtesy debian-ppc-64)
+- fix 64 bit compilation (bz 158646)
- fix compile with openal-0.9
- use htmlview for helpfile viewing instead of hardcoded mozilla,
run this in background so the game doesn't freeze
+- this release also fixes bz 161694, 173187
* Sat Oct 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 39.1-1
- 39.1.
--- scorched3d-cvs-20050929-bins.tar.gz DELETED ---
- Previous message: rpms/docbook2X/devel docbook2X-vendor_perl.diff, NONE, 1.1 docbook2X.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/naim/devel .cvsignore, 1.4, 1.5 naim.spec, 1.6, 1.7 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list