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

View File

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

View File

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

View File

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

View File

@ -21,6 +21,7 @@ struct border_type;
struct attrib_type; struct attrib_type;
struct curse_type; struct curse_type;
struct castorder; struct castorder;
struct curse;
/* Sprüche. Neue NUR hinten anfügen, oder das Datenfile geht kaputt */ /* Sprüche. Neue NUR hinten anfügen, oder das Datenfile geht kaputt */
enum { enum {
@ -208,7 +209,7 @@ enum {
/* Prototypen */ /* 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_power(struct region * r, struct unit * u);
int use_item_regeneration(struct region * r, struct unit * u); int use_item_regeneration(struct region * r, struct unit * u);
void showspells(struct region *r, struct unit *u); void showspells(struct region *r, struct unit *u);

View File

@ -1196,6 +1196,16 @@
</locale> </locale>
</message> </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"> <message name="error65">
<type> <type>
<arg name="unit" type="unit"></arg> <arg name="unit" type="unit"></arg>