Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

warnings raus, dämonenauge funktioniert nicht in plane

This commit is contained in:
Enno Rehling 2002-04-07 08:56:28 +00:00
parent 98d96dcc15
commit 2d986dd5d7
5 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/gamecode/randenc.c
View File

@ -1063,8 +1063,6 @@ randomevents(void)
/* Orkische vermehren sich */
for (r = regions; r; r = r->next) {
plane * p = rplane(r);
for (u = r->units; u; u = u->next) {
if (is_cursed(u->attribs, C_ORC, 0)
&& !has_skill(u, SK_MAGIC) && !has_skill(u, SK_ALCHEMY)) {

15
src/common/items/demonseye.c
View File

@ -17,7 +17,12 @@
#include "demonseye.h"
/* kernel includes */
#include <faction.h>
#include <item.h>
#include <message.h>
#include <plane.h>
#include <region.h>
#include <unit.h>
/* util includes */
#include <functions.h>
@ -28,12 +33,16 @@
static int
summon_igjarjuk(struct unit * u, const struct item_type * itype, int amount, const char * cmd)
{
unused(u);
struct plane * p = rplane(u->region);
unused(amount);
unused(itype);
unused(cmd);
if (p!=NULL) {
ADDMSG(&u->faction->msgs, msg_error(u, cmd, "use_realworld_only", ""));
return EUNUSABLE;
} else {
assert(!"not implemented");
return -1;
return EUNUSABLE;
}
}
static resource_type rt_demonseye = {

6
src/common/kernel/spell.c
View File

@ -123,7 +123,7 @@ report_failure(unit * mage, const char * sa) {
/* ------------------------------------------------------------- */
void
do_shock(unit *u, char *reason)
do_shock(unit *u, const char *reason)
{
#if SKILLPOINTS
skill_t sk;
@ -156,8 +156,8 @@ do_shock(unit *u, char *reason)
remove_familiar(u);
}
add_message(&u->faction->msgs, new_message(u->faction,
"shock%u:mage%s:reason", u, strdup(reason)));
ADDMSG(&u->faction->msgs, msg_message("shock",
"mage reason", u, strdup(reason)));
}
/* ------------------------------------------------------------- */

3
src/common/kernel/spell.h
View File

@ -21,6 +21,7 @@ struct border_type;
struct attrib_type;
struct curse_type;
struct castorder;
struct curse;
/* Sprüche. Neue NUR hinten anfügen, oder das Datenfile geht kaputt */
enum {
@ -208,7 +209,7 @@ enum {
/* Prototypen */
void do_shock(struct unit *u, char *reason);
void do_shock(struct unit *u, const char *reason);
int use_item_power(struct region * r, struct unit * u);
int use_item_regeneration(struct region * r, struct unit * u);
void showspells(struct region *r, struct unit *u);

10
src/res/de/messages.xml
View File

@ -1196,6 +1196,16 @@
</locale>
</message>
<message name="use_realworld_only" section="errors">
<type>
<arg name="unit" type="unit"></arg>
<arg name="region" type="region"></arg>
<arg name="command" type="string"></arg>
</type>
<text locale="de">"$unit($unit) in $region($region): '$command' - Dieser Gegenstand kann nur in der realen Welt benutzt werden."</text>
<text locale="en">"$unit($unit) in $region($region): '$command' - This object can only be used in the real world."</text>
</message>
<message name="error65">
<type>
<arg name="unit" type="unit"></arg>