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_NOTIMEOUT (1<<29) /* ignore MaxAge() */
#define FFL_GM (1<<30) /* eine Partei mit Sonderrechten */ #define FFL_GM (1<<30) /* eine Partei mit Sonderrechten */
#define FFL_SAVEMASK (FFL_GM|FFL_NOTIMEOUT|FFL_DBENTRY|FFL_NOTIMEOUT)
typedef struct faction { typedef struct faction {
struct faction *next; struct faction *next;
struct faction *nexthash; struct faction *nexthash;

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

@ -1539,7 +1539,6 @@ readfaction(FILE * F)
#endif /* KARMA_MODULE */ #endif /* KARMA_MODULE */
f->flags = ri(F); f->flags = ri(F);
freset(f, FFL_OVERRIDE);
a_read(F, &f->attribs); a_read(F, &f->attribs);
if (global.data_version>=CLAIM_VERSION) { if (global.data_version>=CLAIM_VERSION) {
@ -1635,15 +1634,15 @@ writefaction(FILE * F, const faction * f)
wi(F, 0); wi(F, 0);
#endif /* KARMA_MODULE */ #endif /* KARMA_MODULE */
wi(F, f->flags); wi(F, f->flags&FFL_SAVEMASK);
a_write(F, f->attribs); a_write(F, f->attribs);
wnl(F); wnl(F);
#if RELEASE_VERSION>=CLAIM_VERSION #if RELEASE_VERSION>=CLAIM_VERSION
write_items(F, f->items); write_items(F, f->items);
wnl(F); wnl(F);
#endif #endif
fputs("end ", F); fputs("end ", F);
wnl(F); wnl(F);
wi(F, listlen(f->ursprung)); wi(F, listlen(f->ursprung));
for(ur = f->ursprung;ur;ur=ur->next) { for(ur = f->ursprung;ur;ur=ur->next) {
wi(F, ur->id); wi(F, ur->id);

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

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

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

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

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

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