Hey all, I've just recently downloaded the assemblies.patch.gz file
from the Circlemud site, and when I attempt to patch it in, this is what I
get.. Any ideas as to why and are those binaries supposed to be there?
I don't use patches, I usually hard code.. So much for trying to make life
a little easier.. *chuckle*
---Below is the patch being attempted, below that will be the patch---
patch < assemblies.patch
patching file `Makefile.in'
Hunk #1 FAILED at 29.
Hunk #2 FAILED at 38.
2 out of 2 hunks FAILED -- saving rejects to Makefile.in.rej
patching file `act.item.c'
patch: **** malformed patch at line 35: extern room_rnum donation_room_1;
[1] Exit 2 patch < assemblies.patch
------And here's the patch (some of it)-------
diff -uNB src-15olc/Makefile.in src1/Makefile.in
--- src-15olc/Makefile.in Fri Nov 19 21:14:16 1999
+++ src1/Makefile.in Sat Nov 20 14:30:19 1999
@@ -29,7 +29,8 @@
genolc.o genshp.o genwld.o genzon.o graph.o handler.o house.o
improved-edit.$ interpreter.o limits.o magic.o mail.o medit.o mobact.o
modify.o oasis.o \
objsave.o oedit.o olc.o random.o redit.o sedit.o shop.o spec_assign.o \
- spec_procs.o spell_parser.o spells.o tedit.o utils.o weather.o zedit.o
+ spec_procs.o spell_parser.o spells.o tedit.o utils.o weather.o zedit.o
\
+ assemblies.o assedit.o
CXREF_FILES = act.comm.c act.informative.c act.item.c act.movement.c \
act.offensive.c act.other.c act.social.c act.wizard.c alias.c ban.c
boards.c$@@ -37,7 +38,8 @@
genolc.c genshp.c genwld.c genzon.c graph.c handler.c house.c
improved-edit.$ interpreter.c limits.c magic.c mail.c medit.c mobact.c
modify.c oasis.c \
objsave.c oedit.c olc.c random.c redit.c sedit.c shop.c spec_assign.c \
- spec_procs.c spell_parser.c spells.c tedit.c utils.c weather.c zedit.c
+ spec_procs.c spell_parser.c spells.c tedit.c utils.c weather.c zedit.c
\
+ assemblies.c assedit.c
default: all
diff -uNB src-15olc/act.item.c src1/act.item.c
--- src-15olc/act.item.c Fri Nov 19 21:14:16 1999
+++ src1/act.item.c Sat Nov 20 14:30:19 1999
@@ -19,6 +19,8 @@
#include "handler.h"
#include "db.h"
#include "spells.h"
#include "constants.h"
+#include "assemblies.h"
/* extern variables */
extern room_rnum donation_room_1;
@@ -53,6 +51,7 @@
int find_eq_pos(struct char_data * ch, struct obj_data * obj, char *arg);
void perform_get_from_container(struct char_data * ch, struct obj_data *
obj, $ void perform_remove(struct char_data * ch, int pos);
+ACMD(do_assemble);
+------------------------------------------------------------+
| Ensure that you have read the CircleMUD Mailing List FAQ: |
| http://qsilver.queensu.ca/~fletchra/Circle/list-faq.html |
+------------------------------------------------------------+
This archive was generated by hypermail 2b30 : 04/10/01 PDT