Index | FAQ | Search | Memberlist | Usergroups | Profile | Log in to check your private messages | Log in | Register

Adding CSQC Support to a Quake Engine. Goto page Previous 1, 2, 3, 4 Next

| Inside3d Forums Forum Index -> Engine Programming

View previous topic :: View next topic
Author | Message
--- | ---
Spike Joined: 05 Nov 2004 Posts: 944 Location: UK |

Posted: Fri Jun 26, 2009 7:58 pm Post subject: |

ignore pr_csqc.c - that file is entirely new and should be, for the most part, a drop in addition. It does interact with the rest of the engine a bit, but hopefully not too drastically. If you get gnu diff/patch you can do: diff csqcwinquake vanillawinquake -r -u > moo.diff
cd myengine
patch -p 1 < ../moo.diff
hurrah for commandlines.
You need the apps to be in your path.
Any conflicts will need to be merged by hand. They'll be marked with <<<<< blah ==== blah >>>>> type characters so your compiler will complain nice and loud if it there is a conflict in there.
Be sure to back up your current engine version first.
_________________
What's a signature?

Back to top |

Team Xlink Joined: 25 Jun 2009 Posts: 320 |

Posted: Fri Jun 26, 2009 8:45 pm Post subject: |

I just noticed I already have cygwin installed. So how would I go about using creating a diff file with Cygwin? These are the path names to the sources. E:\QuakeEngine\Kurok E:\QuakeEngine\WinQuakeCSQC\WinQuake Cygwin is on the E drive as well.
_________________

Anonymous wrote:
if it works, it works. if it doesn't, HAHAHA!

Back to top |

Spirit Joined: 20 Nov 2004 Posts: 476 |

Posted: Fri Jun 26, 2009 8:59 pm Post subject: |

Sorry if I curb the enthusiam but is there really a remote chance that merging such patch with a Fitzquake-derivate (unless Kurok changed its engine) will lead to an easy CSQC implementation? _________________ Quake Maps

Back to top |

Team Xlink Joined: 25 Jun 2009 Posts: 320 |

Posted: Fri Jun 26, 2009 9:12 pm Post subject: |

Ok In Cygwin This is what I got. I was in UserName@PCName /cygdrive/e/Engine I typed in diff Kurok WinQuake -r -u > CSQC.diff
It said bash: diff: command not found
Then in the E/QuakeEngine directory it created a
0 KB DIFF File named CSQC.diff
It doesn't do anything tho.
_________________

Anonymous wrote:
if it works, it works. if it doesn't, HAHAHA!

Back to top |

Team Xlink Joined: 25 Jun 2009 Posts: 320 |

Posted: Fri Jun 26, 2009 9:19 pm Post subject: |

Is there one with a user interface? Or even one that will just copy the Functions I get when I searched Spike and CSQC in the proper place in the other files? _________________

Anonymous wrote:
if it works, it works. if it doesn't, HAHAHA!

Back to top |

Downsider Joined: 16 Sep 2008 Posts: 478 |

Posted: Fri Jun 26, 2009 10:05 pm Post subject: |

Holy shit this makes my life a thousand times easier. I was considering porting directly from FTE or DarkPlaces into GLQuake, but that link you posted, r00k, is excellent.

Back to top |

Team Xlink Joined: 25 Jun 2009 Posts: 320 |

Posted: Fri Jun 26, 2009 10:44 pm Post subject: |

Downsider? I am wondering what you are going to use to make all of the changes? It would be nice if you could post or pm me please? I can't get the diff to work, Maybe you could help me with it? _________________

Anonymous wrote:
if it works, it works. if it doesn't, HAHAHA!

Back to top |

Downsider Joined: 16 Sep 2008 Posts: 478 |

Posted: Fri Jun 26, 2009 11:34 pm Post subject: |

I'll be porting by hand.. Mainly because Kurok, not to mention the PSP itself, is going to prompt some changes..

Back to top |

MeTcHsteekle Joined: 15 May 2008 Posts: 397 Location: its a secret |

Posted: Sat Jun 27, 2009 12:37 am Post subject: |

hmm i think winmerge might be something you want, i think its a comparison maker-delio-thing... http://winmerge.org/ i think i used it before :O _________________ bah

Back to top |

Team Xlink Joined: 25 Jun 2009 Posts: 320 |

Posted: Sat Jun 27, 2009 1:06 am Post subject: |

So I should do it by hand, or use winmerge? _________________

Anonymous wrote:
if it works, it works. if it doesn't, HAHAHA!

Back to top |

Team Xlink Joined: 25 Jun 2009 Posts: 320 |

Posted: Sat Jun 27, 2009 1:13 am Post subject: |

I got the cygwin diff to work. It turns out I didn't have the correct packages installed. I know have the patch file and have to apply it so I can test it out. should I try using normal Quake source as a base file and choose the psp one as the other one and the CSQC one as the new one?
_________________

Anonymous wrote:
if it works, it works. if it doesn't, HAHAHA!

Back to top |

Dr. Shadowborg Inside3D Staff Joined: 16 Oct 2004 Posts: 726 |

Posted: Sat Jun 27, 2009 3:13 pm Post subject: |

r00k wrote:
http://www.quakeone.com/qrack/csqcWinQuake.zip Here is a winquake implementation of CSQC written by Spike i believe.

Awesome.
I might actually start messing around with CSQC now that this is available.
_________________
"Roboto suggests Plasma Bazooka."

Back to top |

Team Xlink Joined: 25 Jun 2009 Posts: 320 |

Posted: Sat Jun 27, 2009 3:53 pm Post subject: |

I guess I will do this by hand. Thankyou rook for the link. Thankyou Spike for the Help. I hope it all works well. Thankyou!
Also, So If I am going to do this by hand, then does that mean I will only copy the functions that are teh results of the search for Spike and CSQC?
_________________

Anonymous wrote:
if it works, it works. if it doesn't, HAHAHA!

Back to top |

r00k Joined: 13 Nov 2004 Posts: 483 |

Posted: Sat Jun 27, 2009 4:11 pm Post subject: |

Well I use ExamDIFF Pro, which is for windows and has a nice interface. The window shows side by side line by line with colored highlights over the changes. This also helps me backtrack the next morning after a late night coding to see what i messed up!

Back to top |

Team Xlink Joined: 25 Jun 2009 Posts: 320 |

Posted: Sat Jun 27, 2009 4:18 pm Post subject: |

Does it work good? Will it make the changes to the code? _________________

Anonymous wrote:
if it works, it works. if it doesn't, HAHAHA!

Back to top |

Display posts from previous:

| Inside3d Forums Forum Index -> Engine Programming | All times are GMT Goto page Previous 1, 2, 3, 4 Next
Page 2 of 4

Jump to:

You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum

Powered by phpBB © 2004 phpBB Group