projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d4d8a44
)
renamed "kettles" to "cauldrons"
author
Holger Schemel
<info@artsoft.org>
Mon, 28 Nov 2022 22:02:36 +0000
(23:02 +0100)
committer
Holger Schemel
<info@artsoft.org>
Mon, 28 Nov 2022 22:04:38 +0000
(23:04 +0100)
docs/elements/mm_exit.txt
patch
|
blob
|
history
docs/elements/mm_kettle.txt
patch
|
blob
|
history
docs/elements/mm_mcduffin.txt
patch
|
blob
|
history
docs/elements/mm_pacman.txt
patch
|
blob
|
history
src/main.c
patch
|
blob
|
history
diff --git
a/docs/elements/mm_exit.txt
b/docs/elements/mm_exit.txt
index ef11ee09cac9896c6d0053888edd939f645f5f29..0f362b4b312741394dfa57484e5b6ce8fd7a3617 100644
(file)
--- a/
docs/elements/mm_exit.txt
+++ b/
docs/elements/mm_exit.txt
@@
-1,2
+1,2
@@
-This magic exit door opens once all magic
kettle
s have been collected.
+This magic exit door opens once all magic
cauldron
s have been collected.
Redirect the magic ray of light into the exit door to finish the game.
Redirect the magic ray of light into the exit door to finish the game.
diff --git
a/docs/elements/mm_kettle.txt
b/docs/elements/mm_kettle.txt
index ee2ffa606a1fd8bf5d5e96073a71ef2c1c206a58..3f9b844ac0c4ff4e5d2094a62096bb046364ef17 100644
(file)
--- a/
docs/elements/mm_kettle.txt
+++ b/
docs/elements/mm_kettle.txt
@@
-1,2
+1,2
@@
-Magic
kettle
s contain ingredients for Gregor MacDuffin's magic spells and must
+Magic
cauldron
s contain ingredients for Gregor MacDuffin's magic spells and must
all be collected before the magic exit door opens to finish the level.
all be collected before the magic exit door opens to finish the level.
diff --git
a/docs/elements/mm_mcduffin.txt
b/docs/elements/mm_mcduffin.txt
index 8c248dabc50c36e797e81f6297f4d3fe845f3150..cb1cef29d07bdcfc16d30130d657271690b94190 100644
(file)
--- a/
docs/elements/mm_mcduffin.txt
+++ b/
docs/elements/mm_mcduffin.txt
@@
-1,3
+1,3
@@
This is our hero and magician Gregor McDuffin, who casts spells in the form
This is our hero and magician Gregor McDuffin, who casts spells in the form
-of magic rays of light to collect all magic
kettle
s (containing magic spell
+of magic rays of light to collect all magic
cauldron
s (containing magic spell
ingredients).
ingredients).
diff --git
a/docs/elements/mm_pacman.txt
b/docs/elements/mm_pacman.txt
index 4d40566d9d7e6f2f6f1ba8f3fdb4db8e051eaf87..b6bf1044b5b05a3f212a54a69203c26f6ab3dbdb 100644
(file)
--- a/
docs/elements/mm_pacman.txt
+++ b/
docs/elements/mm_pacman.txt
@@
-1
+1
@@
-The pacmen move around, trying to eat all
kettle
s and all amoeba walls.
+The pacmen move around, trying to eat all
cauldron
s and all amoeba walls.
diff --git
a/src/main.c
b/src/main.c
index e03681c799198310d4c85d8cfc148deafb5311b7..b4369b74127571d7d943ddb08dda6deccbd1d058 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-4664,7
+4664,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"mm_kettle",
"mm_kettle",
{
"mm_kettle",
"mm_kettle",
- "magic
kettle
"
+ "magic
cauldron
"
},
{
"mm_bomb",
},
{
"mm_bomb",