Game Development Community

Patches

by Grant Kessler · in Torque Game Engine · 08/12/2006 (9:27 pm) · 10 replies

Im trying to install the Enviro-Torque system from
www.garagegames.com/index.php?sec=mg&mod=resource&page=view&qid=8848

im using the patch, and it seems it doesnt read some files or something, i get certain parts of the patch skipped, hunks fail, is there anyone that could help me out with what this means? and if anyone knows if TLK is required to install that resource. Ive never done patches before, but, also, if theres a way to do it with vs c++ 2005 express, that would be cool too

#1
08/12/2006 (9:39 pm)
Those resources dont require TLK..
#2
08/12/2006 (10:10 pm)
Would you(or anyone) know why i get failed hunks?
i added the files to the folders theyre supposed to be in, and compiled them in, and then tried to install the patch.

or,
would anyone possibly have the source code that needs to be put in the spots? i read a resource on manually putting this all in, but didnt really seem to grasp it. Im going to keep reading it, but if someone would want to send me the codes and spots to be put in, i wouldnt mind it :)
#3
08/12/2006 (10:42 pm)
Well, patches can be opened in any text editor and you can add or remove that way.
#4
08/12/2006 (11:32 pm)
Right, and i had a look at it. i just dont really understand at all how to implement it.

? out.VC6.RELEASE
? game/fx/Celestial.cc
? game/fx/Celestial.h
? terrain/Fsky.cc
? terrain/Fsky.h
? terrain/Mysky.cc
? terrain/Mysky.h
Index: audio/vorbisStream.cc
===================================================================
RCS file: /export/home/peters34/cvs-main/engine/audio/vorbisStream.cc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vorbisStream.cc
--- audio/vorbisStream.cc 2 Oct 2005 20:37:10 -0000 1.1.1.1
+++ audio/vorbisStream.cc 2 Oct 2005 21:53:46 -0000
@@ -11,7 +11,7 @@
********************************************************************

function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisStream.cc,v 1.1.1.1 2005/10/02 20:37:10 peters34 Exp $
+ last mod: $Id: vorbisStream.cc,v 1.2 2004/05/21 15:27:14 jmk Exp $

********************************************************************/

Index: audio/vorbisStream.h
===================================================================
RCS file: /export/home/peters34/cvs-main/engine/audio/vorbisStream.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vorbisStream.h
--- audio/vorbisStream.h 2 Oct 2005 20:37:10 -0000 1.1.1.1
+++ audio/vorbisStream.h 2 Oct 2005 21:53:46 -0000
@@ -11,7 +11,7 @@
********************************************************************

function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisStream.h,v 1.1.1.1 2005/10/02 20:37:10 peters34 Exp $
+ last mod: $Id: vorbisStream.h,v 1.2 2004/05/21 15:27:14 jmk Exp $

********************************************************************/

Index: console/consoleObject.h
===================================================================
RCS file: /export/home/peters34/cvs-main/engine/console/consoleObject.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 consoleObject.h
--- console/consoleObject.h 2 Oct 2005 20:37:09 -0000 1.1.1.1
+++ console/consoleObject.h 2 Oct 2005 21:53:46 -0000
@@ -328,6 +328,7 @@

/// Wrap constructor.
ConsoleObject* create() const { return new T; }
+
};

//------------------------------------------------------------------------------
Index: console/scan.cc
===================================================================
RCS file: /export/home/peters34/cvs-main/engine/console/scan.cc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 scan.cc
--- console/scan.cc 2 Oct 2005 20:37:09 -0000 1.1.1.1
+++ console/scan.cc 2 Oct 2005 21:53:47 -0000
@@ -354,7 +354,7 @@
* Copyright 1988, 1992 by Mortice Kern Systems Inc. All rights reserved.
* All rights reserved.
*
- * $Header: /export/home/peters34/cvs-main/engine/console/scan.cc,v 1.1.1.1 2005/10/02 20:37:09 peters34 Exp $
+ * $Header: /RAID/corporate/cvs-secure/CVS/lightingPackForTGE/torque_lightingPack/engine/console/scan.cc,v 1.2 2004/05/21 15:27:14 jmk Exp $
*
*/
#include
Index: console/yylex.c
===================================================================
RCS file: /export/home/peters34/cvs-main/engine/console/yylex.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 yylex.c
--- console/yylex.c 2 Oct 2005 20:37:10 -0000 1.1.1.1
+++ console/yylex.c 2 Oct 2005 21:53:47 -0000
@@ -2,7 +2,7 @@
* Copyright 1988, 1992 by Mortice Kern Systems Inc. All rights reserved.
* All rights reserved.
*
- * $Header: /export/home/peters34/cvs-main/engine/console/yylex.c,v 1.1.1.1 2005/10/02 20:37:10 peters34 Exp $
+ * $Header: /RAID/corporate/cvs-secure/CVS/lightingPackForTGE/torque_lightingPack/engine/console/yylex.c,v 1.1.1.1 2004/01/11 21:11:27 jmk Exp $
*
*/
#include
Index: game/game.cc
===================================================================
RCS file: /export/home/peters34/cvs-main/engine/game/game.cc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 game.cc
--- game/game.cc 2 Oct 2005 20:37:07 -0000 1.1.1.1
+++ game/game.cc 2 Oct 2005 21:53:47 -0000
@@ -38,6 +38,10 @@
#include "platform/profiler.h"
#include "game/fx/underLava.h"

+//--- Celestial Patch Changes ---//
+#include "game/fx/Celestial.h"
+//----- End Celestial Patch -----//
+
static void cPanoramaScreenShot(SimObject *, S32, const char ** argv);

void wireCube(F32 size, Point3F pos);
@@ -925,7 +929,19 @@
glDepthMask(GL_FALSE);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4f(.2, .6, .6, .3);
+ //--- Celestial Patch Changes ---//
+ //glColor4f(.2, .6, .6, .3);
+ if(gCelestials) //
+ {
+ F32 i = gCelestials->GetIntensity();
+ glColor4f(.2 * i, .6 * i, .6 * i, .3);
+ }
+ else
+ {
+ glColor4f(.2, .6, .6, .3);
+ }
+ //----- End Celestial Patch -----//
+
glBegin(GL_TRIANGLE_FAN);
glVertex3f(-1, -1, 0);
glVertex3f(-1, 1, 0);
Index: game/fx/fxFoliageReplicator.cc
===================================================================
RCS file: /export/home/peters34/cvs-main/engine/game/fx/fxFoliageReplicator.cc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 fxFoliageReplicator.cc
--- game/fx/fxFoliageReplicator.cc 2 Oct 2005 20:37:08 -0000 1.1.1.1
+++ game/fx/fxFoliageReplicator.cc 2 Oct 2005 21:53:47 -0000
@@ -20,6 +20,10 @@
#include "sceneGraph/sceneGraph.h"
#include "fxFoli



thats just the first part of the patch, and i know the + means add and the - means remove, but im not really understand where or what to exactly add and remove
#5
08/14/2006 (7:02 am)
Has anyone installed this patch?
#6
08/14/2006 (7:44 am)
I just tried installing another patch, and i keep getting all my hunk failed so it must be me doing something wrong. i have unxutils installed, i got to run, do cmd, then go to c:\torque then do
exepathforpatch.exe -p0
am i doing something wrong?>
#7
08/14/2006 (8:09 am)
Yes. You have to go to the engine directory and then apply the patch.

Example:
+++ game/fx/fxFoliageReplicator.cc 2 Oct 2005 21:53:47 -0000

The patcher is looking for game/fx/fxFoliageReplicator.cc which is not in the torque dir, thus the failures.

If it were:
+++ engine/game/fx/fxFoliageReplicator.cc 2 Oct 2005 21:53:47 -0000

then it would work at "c:\torque"
#8
08/14/2006 (8:10 am)
Looks like you are applying this patch from the wrong folder.

examine the path referenced for each file within the patch.
analyze the path referenced within the patch.
compare it to the actual game directory.

research how patch utilizes the -p0 command.
#9
08/14/2006 (9:19 am)
Ok, i got it to try to patch, but then i get this error

it first starts to patch, saying
patching file 'audio/vorbisStream.cc'
Assertion failed: hunk, file patch.c line 321

This application has requested the Runtime to terminate it in an unusual way. Please contact the applications support team for more information.

i have no clue what that means, so if anyone has applied this patch, please, help me out.
#10
08/15/2006 (7:12 pm)
No one?