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

- summondragon parameter list 

- number of new players.
This commit is contained in:
Enno Rehling 2006-04-09 09:31:16 +00:00
parent 71ed9ee27a
commit c33cd598b5
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/kernel/faction.h
View File

@ -46,6 +46,8 @@ typedef struct shortpwd {
#define FFL_NOTIMEOUT (1<<29) /* ignore MaxAge() */
#define FFL_GM (1<<30) /* eine Partei mit Sonderrechten */
#define FFL_SAVEMASK (FFL_GM|FFL_NOTIMEOUT|FFL_DBENTRY|FFL_NOTIMEOUT)
typedef struct faction {
struct faction *next;
struct faction *nexthash;

3
src/common/kernel/save.c
View File

@ -1539,7 +1539,6 @@ readfaction(FILE * F)
#endif /* KARMA_MODULE */
f->flags = ri(F);
freset(f, FFL_OVERRIDE);
a_read(F, &f->attribs);
if (global.data_version>=CLAIM_VERSION) {
@ -1635,7 +1634,7 @@ writefaction(FILE * F, const faction * f)
wi(F, 0);
#endif /* KARMA_MODULE */
wi(F, f->flags);
wi(F, f->flags&FFL_SAVEMASK);
a_write(F, f->attribs);
wnl(F);
#if RELEASE_VERSION>=CLAIM_VERSION

3
src/common/modules/modules.vcproj
View File

@ -317,9 +317,6 @@
<File
RelativePath=".\infocmd.c">
</File>
<File
RelativePath=".\museum.c">
</File>
<File
RelativePath=".\score.c">
</File>

3
src/common/races/races.vcproj
View File

@ -287,6 +287,9 @@
<File
RelativePath=".\illusion.c">
</File>
<File
RelativePath="..\modules\museum.c">
</File>
<File
RelativePath=".\zombies.c">
</File>

4
src/common/spells/spells.c
View File

@ -2703,7 +2703,7 @@ sp_summondragon(castorder *co)
}
ADDMSG(&mage->faction->msgs, msg_message(
"summondragon", "unit region command region",
"summondragon", "unit region command target",
mage, mage->region, co->order, co->rt));
free_regionlist(rl);
@ -4882,7 +4882,7 @@ sp_dragonsong(castorder *co)
}
ADDMSG(&mage->faction->msgs, msg_message(
"summondragon", "unit region command region",
"summondragon", "unit region command target",
mage, mage->region, co->order, co->rt));
free_regionlist(rl);