summaryrefslogtreecommitdiff
path: root/net/dgd-lpmud/files/patch-room-yard.c
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2011-08-03 06:30:01 +0000
committerGreg Lewis <glewis@FreeBSD.org>2011-08-03 06:30:01 +0000
commit1cc01e3044fd1abbca0d91a92345731cde14d65c (patch)
tree508b7d9788f7b2e22fc1b5c57d6f16fc1b4797bc /net/dgd-lpmud/files/patch-room-yard.c
parentDeprecate some perl@ ports that disappared from CPAN (diff)
. s/function/funcname/ where function was used as a variable name since
it's potentially a reserved word with newer versions of DGD. . Bump PORTREVISION for this change.
Notes
Notes: svn path=/head/; revision=278846
Diffstat (limited to 'net/dgd-lpmud/files/patch-room-yard.c')
-rw-r--r--net/dgd-lpmud/files/patch-room-yard.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/net/dgd-lpmud/files/patch-room-yard.c b/net/dgd-lpmud/files/patch-room-yard.c
new file mode 100644
index 000000000000..f4b77264435b
--- /dev/null
+++ b/net/dgd-lpmud/files/patch-room-yard.c
@@ -0,0 +1,32 @@
+$FreeBSD$
+
+--- 2.4.5/room/yard.c.orig 2011-08-02 12:15:07.000000000 -0700
++++ 2.4.5/room/yard.c 2011-08-02 12:15:19.000000000 -0700
+@@ -7,7 +7,7 @@
+ /*
+ * Make these arrays global, so they only have to be initialized once.
+ */
+-string chat_str, a_chat_str, function, type, match;
++string chat_str, a_chat_str, funcname, type, match;
+
+ extra_reset() {
+ no_castle_flag = 1;
+@@ -30,14 +30,14 @@
+ "A really filthy looking poor beggar.\n");
+ call_other(beggar, "set_hp", 30);
+ move_object(beggar, this_object());
+- if (!function) {
+- function = allocate(1);
++ if (!funcname) {
++ funcname = allocate(1);
+ type = allocate(1);
+ match = allocate(1);
+- function[0] = "give_beggar";
++ funcname[0] = "give_beggar";
+ type[0] = "gives";
+ }
+- call_other(beggar, "set_match", this_object(), function, type, match);
++ call_other(beggar, "set_match", this_object(), funcname, type, match);
+ if (!chat_str) {
+ chat_str = allocate(3);
+ chat_str[0] =