> For all the patches on the ftp site, how do you patch it in Win95 under
> MSVC4.0??
Here's the copy of a message I pulled off of the circleMUD mailing list
archives.
The message is by: greerga@muohio.edu (I think)
Starting from a simple sample.
diff -Bbup ../stk/act.wizard.c ./act.wizard.c
--- ../stk/act.wizard.c Sat Apr 13 19:59:44 1996
+++ ./act.wizard.c Tue Jun 10 19:53:18 1997
@@ -1048,7 +1048,7 @@ ACMD(do_load)
return;
}
obj = read_object(r_num, REAL);
- obj_to_room(obj, ch->in_room);
+ obj_to_char(obj, ch);
act("$n makes a strange magical gesture.", TRUE, ch, 0, 0, TO_ROOM);
act("$n has created $p!", FALSE, ch, obj, 0, TO_ROOM);
act("You create $p.", FALSE, ch, obj, 0, TO_CHAR);
diff ... is just the line used to create the patch, ignore it.
--- means all -'s are from ../stk/act.wizard.c (the old file)
+++ means all the +'s are new to ./act.wizard.c
@@ -1048,7 +1048,7 @@ ACMD(do_load) -
We're starting at or around line 1048, showing 7 lines from
the source of ACMD(do_load), the function we're changing.
- means remove that line.
+ means add that line.
==========================================================================
That is how I patch (unified), here's a sample of context diff:
diff -N -c ../circle30bpl11/src/Makefile src/Makefile
*** ../circle30bpl11/src/Makefile Tue May 6 18:02:54 1997
--- src/Makefile Tue Mar 25 17:17:48 1997
***************
*** 22,28 ****
castle.o class.o config.o constants.o db.o fight.o graph.o handler.o
\
house.o interpreter.o limits.o magic.o mail.o mobact.o modify.o \
objsave.o olc.o shop.o spec_assign.o spec_procs.o spell_parser.o \
! spells.o utils.o weather.o
default: .accepted
$(MAKE) ../bin/circle
--- 22,28 ----
castle.o class.o config.o constants.o db.o fight.o graph.o handler.o
\
house.o interpreter.o limits.o magic.o mail.o mobact.o modify.o \
objsave.o olc.o shop.o spec_assign.o spec_procs.o spell_parser.o \
! spells.o utils.o weather.o auction.o
default: .accepted
$(MAKE) ../bin/circle
[snip]
*** ../circle30bpl11/src/Makefile
- location of the original file.
--- src/Makefile
- location of the new file.
*** 22,28 ***
- the original block, lines 22 to 28
--- 22,28 ---
- the new block, lines 22 to 28.
! - change the line in the top block to the line at the bottom block.
+ - add the line
- - delete the line
+------------------------------------------------------------+
| Ensure that you have read the CircleMUD Mailing List FAQ: |
| http://democracy.queensu.ca/~fletcher/Circle/list-faq.html |
+------------------------------------------------------------+
This archive was generated by hypermail 2b30 : 12/15/00 PST