The Bears Pit: Stracciatella Project (Platform Independent JA2)

Home » PLAYER'S HQ 1.13 » JA2 Complete Mods & Sequels » Stracciatella Project (Platform Independent JA2) » [Patch] Clothes change

Show: Today's Messages :: Polls :: Message Navigator

Re: [Patch] Clothes change[message #249402]

Fri, 16 April 2010 00:28

mgl

Messages:255
Registered:December 2007
Location: France

It looks like "c:\build\ja2" is the right root of your stracciatella source code tree.

"patch.exe" fails on the first two changes of the ".diff" file and gives up without trying the rest of the file.

If you have the tools to do it, I suggest you try with two separate ".diff" files: one with Carriage Returns/Line Feeds (Windows) and one with Line Feeds only (Unix). If you used a computer on Windows to download the source code of stracciatella from the subversion repository, you should have CR/LF in the code and you should try a ".diff" file with CR/LF first. Try the other LF ".diff" file if it fails.

And I don't like that expression, quoted from your message:Quote:

(stripping trailing CRs from patch)
patching file Build/JAScreens.h

If there are CR/LF in your working copy of stracciatella, "patch.exe" shouldn't try to remove CR/LF from your diff file. See if you have a command line option to prevent "patch.exe" from doing this.
Try to type:

patch.exe -h

and see if it prints some help on the screen.

An other possibility is that the line numbers don't match anymore in the source code between svn revision 7056 (on wich the ".diff" file was done) and rev 7059. I will check that and answer later.

Report message to a moderator

Master Sergeant

[Message index]

		[Patch] Clothes change By: mgl on Sat, 31 October 2009 10:47
		Re: [Patch] Clothes change By: Centurion on Thu, 15 April 2010 00:15
		Re: [Patch] Clothes change By: mgl on Fri, 16 April 2010 00:28
		Re: [Patch] Clothes change By: mgl on Fri, 16 April 2010 13:58
		Re: [Patch] Clothes change By: Centurion on Fri, 16 April 2010 15:45
		Re: [Patch] Clothes change By: mgl on Fri, 16 April 2010 20:17
		Re: [Patch] Clothes change By: Centurion on Fri, 16 April 2010 21:20
		Re: [Patch] Clothes change By: Mythrell on Fri, 16 April 2010 21:52
		Re: [Patch] Clothes change By: Centurion on Sat, 17 April 2010 18:27
		Re: [Patch] Clothes change By: lockie on Sat, 17 April 2010 21:43
		Re: [Patch] Clothes change By: cdudau on Sat, 17 April 2010 22:45
		Re: [Patch] Clothes change By: mgl on Sat, 17 April 2010 23:47
		Re: [Patch] Clothes change By: mgl on Sun, 18 April 2010 10:19
		Re: [Patch] Clothes change By: Centurion on Sun, 18 April 2010 14:38
		Re: [Patch] Clothes change By: mgl on Sun, 18 April 2010 19:35
		Re: [Patch] Clothes change By: mgl on Sun, 25 April 2010 00:10
		Re: [Patch] Clothes change By: Tron on Tue, 04 May 2010 10:52
		Re: [Patch] Clothes change By: mgl on Tue, 04 May 2010 23:24
		Re: [Patch] Clothes change By: Tron on Wed, 05 May 2010 08:26
		Re: [Patch] Clothes change By: mgl on Thu, 06 May 2010 22:20
		Re: [Patch] Clothes change By: Tron on Sun, 16 May 2010 21:43
		Re: [Patch] Clothes change By: mgl on Sun, 16 May 2010 22:52
		Re: [Patch] Clothes change By: Tron on Sun, 16 May 2010 23:05
		Re: [Patch] Clothes change By: mgl on Sun, 16 May 2010 23:38
		Re: [Patch] Clothes change By: Tron on Mon, 17 May 2010 00:03
		Re: [Patch] Clothes change By: mgl on Mon, 17 May 2010 00:44
		Re: [Patch] Clothes change By: Tron on Mon, 17 May 2010 07:16

Previous Topic:	[Patch] Skip militia turns by holding SHIFT
Next Topic:	can ja2 stracciatella support other format music???

Goto Forum:

-=] Back to Top [=-

Current Time: Sat Jan 25 18:45:55 GMT+2 2025

Total time taken to generate the page: 0.01351 seconds