forked from github/server
- Bugfix FOLGE exploit
- Visual Studio .net 2003 project files - SHORTPWD define (disabled)
This commit is contained in:
parent
4151670016
commit
1b84f9d61f
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="attributes"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -55,6 +55,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
|
@ -101,8 +107,16 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Header"
|
||||
|
|
|
@ -874,6 +874,19 @@ cr_find_address(FILE * F, const faction * uf, const faction_list * addresses)
|
|||
fprintf(F, "%d;alliance\n", f->alliance->id);
|
||||
fprintf(F, "\"%s\";alliancename\n", f->alliance->name);
|
||||
}
|
||||
#endif
|
||||
#ifdef SHORTPWDS
|
||||
if (f->shortpwds) {
|
||||
shortpwd * spwd = f->shortpwds;
|
||||
while (spwd) {
|
||||
unsigned int vacation = 0;
|
||||
if (spwd->used) {
|
||||
fprintf(F, "VACATION %u\n", ++vacation);
|
||||
fprintf(F, "\"%s\";email\n", spwd->email);
|
||||
}
|
||||
spwd=spwd->next;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
flist = flist->next;
|
||||
|
|
|
@ -801,7 +801,7 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
|
|||
*/
|
||||
{
|
||||
unit *u2;
|
||||
char *s;
|
||||
const char *s;
|
||||
int i, n;
|
||||
const item_type * itype;
|
||||
int notfound_error = 63;
|
||||
|
@ -961,7 +961,7 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
|
|||
return;
|
||||
}
|
||||
if (findparam(s, u->faction->locale) == P_ANY) { /* Alle Gegenstände übergeben */
|
||||
char * s = getstrtoken();
|
||||
const char * s = getstrtoken();
|
||||
|
||||
if(u2 && !ucontact(u2, u)) {
|
||||
cmistake(u, S->s, 40, MSG_COMMERCE);
|
||||
|
@ -1081,9 +1081,7 @@ void
|
|||
forgetskill(unit * u)
|
||||
{
|
||||
skill_t talent;
|
||||
char *s;
|
||||
|
||||
s = getstrtoken();
|
||||
const char *s = getstrtoken();
|
||||
|
||||
if ((talent = findskill(s, u->faction->locale)) != NOSKILL) {
|
||||
struct message * m = add_message(&u->faction->msgs,
|
||||
|
@ -1908,14 +1906,13 @@ create_item(unit * u, const item_type * itype, int want)
|
|||
static void
|
||||
make(region * r, unit * u)
|
||||
{
|
||||
char *s;
|
||||
const building_type * btype;
|
||||
const ship_type * stype;
|
||||
param_t p;
|
||||
int m;
|
||||
const item_type * itype;
|
||||
const char *s = getstrtoken();
|
||||
|
||||
s = getstrtoken();
|
||||
m = atoi(s);
|
||||
sprintf(buf, "%d", m);
|
||||
if (!strcmp(buf, s)) {
|
||||
|
@ -2375,7 +2372,7 @@ sell(region * r, unit * u, request ** sellorders, const char * cmd)
|
|||
const luxury_type * ltype=NULL;
|
||||
int n;
|
||||
request *o;
|
||||
char *s;
|
||||
const char *s;
|
||||
|
||||
if (u->ship && is_guarded(r, u, GUARD_CREWS)) {
|
||||
cmistake(u, cmd, 69, MSG_INCOME);
|
||||
|
@ -2718,7 +2715,7 @@ void
|
|||
pflanze(region *r, unit *u)
|
||||
{
|
||||
int m;
|
||||
char *s;
|
||||
const char *s;
|
||||
param_t p;
|
||||
const item_type * itype = NULL;
|
||||
|
||||
|
@ -2797,7 +2794,7 @@ void
|
|||
zuechte(region *r, unit *u)
|
||||
{
|
||||
int m;
|
||||
char *s;
|
||||
const char *s;
|
||||
param_t p;
|
||||
|
||||
/* züchte [<anzahl>] <parameter> */
|
||||
|
@ -2853,9 +2850,7 @@ rough_amount(int a, int m)
|
|||
static void
|
||||
research(region *r, unit *u)
|
||||
{
|
||||
char *s;
|
||||
|
||||
s = getstrtoken();
|
||||
const char *s = getstrtoken();
|
||||
|
||||
if (findparam(s, u->faction->locale) == P_HERBS) {
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="gamecode"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -55,6 +55,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Profile|Win32"
|
||||
|
@ -101,6 +107,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
|
@ -147,8 +159,16 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Header"
|
||||
|
|
|
@ -1060,7 +1060,7 @@ quit(void)
|
|||
un = u->next;
|
||||
for (S = u->orders; S; S = S->next) {
|
||||
if (igetkeyword(S->s, u->faction->locale) == K_QUIT) {
|
||||
if (checkpasswd(u->faction, getstrtoken())) {
|
||||
if (checkpasswd(u->faction, getstrtoken(), false)) {
|
||||
#ifdef ENHANCED_QUIT
|
||||
int f2_id = getid();
|
||||
|
||||
|
@ -1098,7 +1098,7 @@ quit(void)
|
|||
factionid(u->faction), S->s);
|
||||
}
|
||||
} else if(igetkeyword(S->s, u->faction->locale) == K_RESTART && u->number > 0) {
|
||||
char *s_race,*s_pass;
|
||||
const char *s_race, *s_pass;
|
||||
|
||||
if (!landregion(rterrain(r))) {
|
||||
cmistake(u, S->s, 242, MSG_EVENT);
|
||||
|
@ -1128,7 +1128,7 @@ quit(void)
|
|||
continue;
|
||||
}
|
||||
|
||||
if (!checkpasswd(u->faction, s_pass)) {
|
||||
if (!checkpasswd(u->faction, s_pass, false)) {
|
||||
cmistake(u, S->s, 86, MSG_EVENT);
|
||||
printf(" Warnung: NEUSTART mit falschem Passwort für Partei %s: %s\n",
|
||||
factionid(u->faction), S->s);
|
||||
|
@ -1222,7 +1222,7 @@ set_ally(unit * u, strlist * S)
|
|||
ally * sf, ** sfp;
|
||||
faction *f;
|
||||
int keyword, not_kw;
|
||||
char *s;
|
||||
const char *s;
|
||||
|
||||
f = getfaction();
|
||||
|
||||
|
@ -1339,7 +1339,8 @@ set_ally(unit * u, strlist * S)
|
|||
static void
|
||||
set_display(region * r, unit * u, strlist * S)
|
||||
{
|
||||
char **s, *s2;
|
||||
char **s;
|
||||
const char *s2;
|
||||
|
||||
s = 0;
|
||||
|
||||
|
@ -1383,7 +1384,7 @@ set_display(region * r, unit * u, strlist * S)
|
|||
|
||||
case P_PRIVAT:
|
||||
{
|
||||
char *d = getstrtoken();
|
||||
const char *d = getstrtoken();
|
||||
if(d == NULL || *d == 0) {
|
||||
usetprivate(u, NULL);
|
||||
} else {
|
||||
|
@ -1418,10 +1419,6 @@ set_display(region * r, unit * u, strlist * S)
|
|||
|
||||
s2 = getstrtoken();
|
||||
|
||||
if (strlen(s2) >= DISPLAYSIZE) {
|
||||
s2[DISPLAYSIZE] = 0;
|
||||
cmistake(u, S->s, 3, MSG_EVENT);
|
||||
}
|
||||
set_string(&(*s), s2);
|
||||
}
|
||||
|
||||
|
@ -1517,14 +1514,15 @@ set_synonym(unit * u, strlist *S)
|
|||
void
|
||||
set_group(unit * u)
|
||||
{
|
||||
char * s = getstrtoken();
|
||||
const char * s = getstrtoken();
|
||||
join_group(u, s);
|
||||
}
|
||||
|
||||
void
|
||||
set_name(region * r, unit * u, strlist * S)
|
||||
{
|
||||
char **s, *s2;
|
||||
char **s;
|
||||
const char *s2;
|
||||
int i;
|
||||
param_t p;
|
||||
boolean foreign = false;
|
||||
|
@ -1794,7 +1792,7 @@ void
|
|||
distributeMail(region * r, unit * u, strlist * S)
|
||||
{
|
||||
unit *u2;
|
||||
char *s;
|
||||
const char *s;
|
||||
int n;
|
||||
|
||||
s = getstrtoken();
|
||||
|
@ -1813,10 +1811,6 @@ distributeMail(region * r, unit * u, strlist * S)
|
|||
cmistake(u, S->s, 30, MSG_MESSAGE);
|
||||
return;
|
||||
} else {
|
||||
if (strlen(s) >= DISPLAYSIZE) {
|
||||
s[DISPLAYSIZE] = 0;
|
||||
cmistake(u, S->s, 111, MSG_MESSAGE);
|
||||
}
|
||||
sprintf(buf, "von %s: '%s'", unitname(u), s);
|
||||
addmessage(r, 0, buf, MSG_MESSAGE, ML_IMPORTANT);
|
||||
return;
|
||||
|
@ -1981,7 +1975,7 @@ set_passw(void)
|
|||
region *r;
|
||||
unit *u;
|
||||
strlist *S;
|
||||
char *s;
|
||||
const char *s;
|
||||
int o, i;
|
||||
magic_t mtyp;
|
||||
|
||||
|
@ -2316,8 +2310,8 @@ instant_orders(void)
|
|||
region *r;
|
||||
unit *u;
|
||||
strlist *S;
|
||||
char *s;
|
||||
char *param;
|
||||
const char *s;
|
||||
const char *param;
|
||||
spell *spell;
|
||||
#ifdef NEW_ITEMS
|
||||
const item_type * itype;
|
||||
|
@ -2897,7 +2891,7 @@ static void
|
|||
renumber(void)
|
||||
{
|
||||
region *r;
|
||||
char *s;
|
||||
const char *s;
|
||||
strlist *S;
|
||||
unit * u;
|
||||
int i;
|
||||
|
@ -2911,7 +2905,6 @@ renumber(void)
|
|||
|
||||
case P_FACTION:
|
||||
s = getstrtoken();
|
||||
if(strlen(s)>4) s[4]=0;
|
||||
if (s && *s) {
|
||||
int i = atoi36(s);
|
||||
attrib * a = a_find(f->attribs, &at_number);
|
||||
|
@ -3110,7 +3103,7 @@ new_units (void)
|
|||
for (S = u->orders; S;) {
|
||||
if ((igetkeyword(S->s, u->faction->locale) == K_MAKE) && (getparam(u->faction->locale) == P_TEMP)) {
|
||||
int g;
|
||||
char * name;
|
||||
const char * name;
|
||||
int alias;
|
||||
int mu = maxunits(u->faction);
|
||||
|
||||
|
@ -3415,7 +3408,7 @@ defaultorders (void)
|
|||
{
|
||||
region *r;
|
||||
unit *u;
|
||||
char * c;
|
||||
const char * c;
|
||||
int i;
|
||||
strlist *s;
|
||||
list_foreach(region, regions, r) {
|
||||
|
|
|
@ -1854,6 +1854,19 @@ list_address(FILE * F, const faction * uf, const faction_list * seenfactions)
|
|||
if (f->no!=MONSTER_FACTION) {
|
||||
sprintf(buf, "%s: %s; %s", factionname(f), f->email, f->banner);
|
||||
rparagraph(F, buf, 4, (char)(ALLIED(uf, f)?'+':'*'));
|
||||
#ifdef SHORTPWDS
|
||||
if (f->shortpwds) {
|
||||
shortpwd * spwd = f->shortpwds;
|
||||
while (spwd) {
|
||||
if (spwd->used) {
|
||||
sprintf(buf, "Vertretung: %s", spwd->email);
|
||||
rparagraph(F, buf, 6, '-');
|
||||
}
|
||||
spwd=spwd->next;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
flist = flist->next;
|
||||
}
|
||||
|
|
|
@ -115,7 +115,7 @@ void
|
|||
setwere(unit *u, strlist *S)
|
||||
{
|
||||
int level = fspecial(u->faction,FS_LYCANTROPE);
|
||||
char *s;
|
||||
const char *s;
|
||||
|
||||
if(!level) {
|
||||
cmistake(u, S->s, 311, MSG_EVENT);
|
||||
|
@ -153,7 +153,7 @@ setwere(unit *u, strlist *S)
|
|||
void
|
||||
setstealth(unit * u, strlist * S)
|
||||
{
|
||||
char *s;
|
||||
const char *s;
|
||||
char level;
|
||||
const race * trace;
|
||||
attrib *a;
|
||||
|
@ -214,7 +214,7 @@ setstealth(unit * u, strlist * S)
|
|||
} else if (findparam(s, u->faction->locale) == P_NOT) {
|
||||
freset(u, FL_PARTEITARNUNG);
|
||||
} else if (findkeyword(s, u->faction->locale) == K_NUMBER) {
|
||||
char *s2 = getstrtoken();
|
||||
const char *s2 = getstrtoken();
|
||||
int nr = -1;
|
||||
|
||||
if(s2) nr = atoi36(s2);
|
||||
|
@ -493,7 +493,7 @@ sink_ship(region * r, ship * sh, const char *name, char spy, unit * saboteur)
|
|||
void
|
||||
sabotage(region * r, unit * u)
|
||||
{
|
||||
char *s;
|
||||
const char *s;
|
||||
int i;
|
||||
ship *sh;
|
||||
unit *u2;
|
||||
|
|
|
@ -243,7 +243,7 @@ teach(region * r, unit * u)
|
|||
static char order[BUFSIZE];
|
||||
int teaching, i, j, count, academy=0;
|
||||
unit *u2;
|
||||
char *s;
|
||||
const char *s;
|
||||
skill_t sk;
|
||||
|
||||
if ((u->race->flags & RCF_NOTEACH) || fval(u, UFL_WERE)) {
|
||||
|
|
|
@ -40,7 +40,7 @@ use_birthday_firework(struct unit * u, const struct item_type * itype, int amoun
|
|||
regionlist *rlist = all_in_range(u->region, FIREWORK_RANGE);
|
||||
regionlist *rl;
|
||||
message *m;
|
||||
char *name;
|
||||
const char *name;
|
||||
|
||||
unused(amount);
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="items"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -54,6 +54,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
|
@ -100,8 +106,16 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Header"
|
||||
|
|
|
@ -323,7 +323,7 @@ destroy(region * r, unit * u, const char * cmd)
|
|||
const construction * con = NULL;
|
||||
int size = 0;
|
||||
#endif
|
||||
char *s;
|
||||
const char *s;
|
||||
int n = INT_MAX;
|
||||
|
||||
if (u->number < 1)
|
||||
|
|
|
@ -1053,7 +1053,7 @@ count_maxmigrants(const faction * f)
|
|||
/* GET STR, I zur Eingabe von Daten liest diese aus dem Buffer, der beim ersten
|
||||
* Aufruf inititialisiert wird? */
|
||||
|
||||
char *
|
||||
const char *
|
||||
igetstrtoken (const char *s1)
|
||||
{
|
||||
int i;
|
||||
|
@ -1087,7 +1087,7 @@ igetstrtoken (const char *s1)
|
|||
return lbuf;
|
||||
}
|
||||
|
||||
char *
|
||||
const char *
|
||||
getstrtoken (void)
|
||||
{
|
||||
return igetstrtoken (0);
|
||||
|
@ -1348,9 +1348,7 @@ read_newunitid (const faction * f, const region * r)
|
|||
int
|
||||
read_unitid (const faction * f, const region * r)
|
||||
{
|
||||
char *s;
|
||||
|
||||
s = getstrtoken ();
|
||||
const char * s = getstrtoken ();
|
||||
|
||||
/* Da s nun nur einen string enthaelt, suchen wir ihn direkt in der
|
||||
* paramliste. machen wir das nicht, dann wird getnewunit in s nach der
|
||||
|
@ -2683,8 +2681,8 @@ fwage(const region *r, const faction *f, boolean img)
|
|||
|
||||
|
||||
|
||||
region *
|
||||
findspecialdirection(const region *r, char *token)
|
||||
static region *
|
||||
findspecialdirection(const region *r, const char *token)
|
||||
{
|
||||
attrib *a;
|
||||
spec_direction *d;
|
||||
|
@ -2705,7 +2703,7 @@ region *
|
|||
movewhere(region * r, const unit *u)
|
||||
{
|
||||
direction_t d;
|
||||
char *token;
|
||||
const char *token;
|
||||
region * r2;
|
||||
|
||||
token = getstrtoken();
|
||||
|
|
|
@ -982,8 +982,8 @@ int geti(void);
|
|||
|
||||
extern int findstr(const char **v, const char *s, unsigned char n);
|
||||
|
||||
extern char *igetstrtoken(const char *s);
|
||||
extern char *getstrtoken(void);
|
||||
extern const char *igetstrtoken(const char *s);
|
||||
extern const char *getstrtoken(void);
|
||||
|
||||
extern skill_t findskill(const char *s, const struct locale * lang);
|
||||
|
||||
|
|
|
@ -145,8 +145,18 @@ addplayer(region *r, const char *email, const char * password,
|
|||
}
|
||||
|
||||
boolean
|
||||
checkpasswd(const faction * f, const char * passwd)
|
||||
checkpasswd(const faction * f, const char * passwd, boolean shortp)
|
||||
{
|
||||
#ifdef SHORTPWDS
|
||||
shortpwd * slist = f->shortpwds;
|
||||
if (shortp) while (slist) {
|
||||
if (strcasecmp(slist->pwd, passwd)==0) {
|
||||
slist->used = true;
|
||||
return true;
|
||||
}
|
||||
slist = slist->next;
|
||||
}
|
||||
#endif
|
||||
if (strcasecmp(f->passw, passwd)==0) return true;
|
||||
if (strcasecmp(f->override, passwd)==0) return true;
|
||||
return false;
|
||||
|
|
|
@ -16,6 +16,15 @@
|
|||
struct player;
|
||||
struct alliance;
|
||||
|
||||
#ifdef SHORTPWDS
|
||||
typedef struct shortpwd {
|
||||
struct shortpwd * next;
|
||||
char * email;
|
||||
char * pwd;
|
||||
boolean used;
|
||||
} shortpwd;
|
||||
#endif
|
||||
|
||||
typedef struct faction {
|
||||
struct faction *next;
|
||||
struct faction *nexthash;
|
||||
|
@ -31,6 +40,9 @@ typedef struct faction {
|
|||
char *email;
|
||||
char *passw;
|
||||
char *override;
|
||||
#ifdef SHORTPWDS
|
||||
struct shortpwd * shortpwds;
|
||||
#endif
|
||||
const struct locale * locale;
|
||||
int lastorders; /* enno: short? */
|
||||
int age; /* enno: short? */
|
||||
|
@ -86,7 +98,7 @@ extern void * resolve_faction(void * data);
|
|||
extern struct unit * addplayer(struct region *r, const char *email,
|
||||
const char* password, const struct race * frace,
|
||||
const struct locale *loc, int subscription);
|
||||
extern boolean checkpasswd(const faction * f, const char * passwd);
|
||||
extern boolean checkpasswd(const faction * f, const char * passwd, boolean shortp);
|
||||
extern void destroyfaction(faction * f);
|
||||
|
||||
#ifdef REGIONOWNERS
|
||||
|
|
|
@ -368,7 +368,7 @@ sacrificings(void)
|
|||
for(u=r->units; u; u=u->next) {
|
||||
if(igetkeyword(u->thisorder, u->faction->locale) == K_SACRIFICE) {
|
||||
int n = 1, karma;
|
||||
char *s = getstrtoken();
|
||||
const char *s = getstrtoken();
|
||||
|
||||
if(s && *s) n = atoi(s);
|
||||
if(n <= 0) {
|
||||
|
@ -432,7 +432,7 @@ prayers(void)
|
|||
int karma_cost;
|
||||
short mult = 1;
|
||||
param_t p;
|
||||
char *s = getstrtoken();
|
||||
const char *s = getstrtoken();
|
||||
|
||||
if(findparam(s, u->faction->locale) == P_FOR) s = getstrtoken();
|
||||
|
||||
|
@ -509,7 +509,7 @@ set_jihad(void)
|
|||
const race * jrace;
|
||||
race_t jrt;
|
||||
attrib *a;
|
||||
char *s;
|
||||
const char *s;
|
||||
|
||||
for(a = a_find(f->attribs, &at_jihad); a; a = a->nexttype) {
|
||||
has += a->data.sa[1];
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="kernel"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -55,6 +55,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
|
@ -101,6 +107,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
|
@ -147,8 +159,16 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Header"
|
||||
|
|
|
@ -590,7 +590,7 @@ get_spellnames(const struct locale * lang, magic_t mtype)
|
|||
}
|
||||
|
||||
spell *
|
||||
find_spellbyname(unit *u, char *name, const struct locale * lang)
|
||||
find_spellbyname(unit *u, const char *name, const struct locale * lang)
|
||||
{
|
||||
spell_ptr *spt;
|
||||
sc_mage * m = get_mage(u);
|
||||
|
@ -2877,7 +2877,7 @@ magic(void)
|
|||
unit *familiar; /* wenn u ein Vertrauter ist */
|
||||
unit *mage; /* derjenige, der den Spruch am Ende zaubert */
|
||||
spell *sp;
|
||||
char *s;
|
||||
const char *s;
|
||||
strlist *so;
|
||||
int spellrank;
|
||||
int level, success;
|
||||
|
|
|
@ -283,7 +283,7 @@ boolean is_familiar(const struct unit *u);
|
|||
/* gibt true, wenn eine Familiar-Relation besteht. */
|
||||
|
||||
/* Sprüche */
|
||||
spell *find_spellbyname(struct unit *u, char *s, const struct locale * lang);
|
||||
spell *find_spellbyname(struct unit *u, const char *s, const struct locale * lang);
|
||||
/* versucht einen Spruch über den Namen zu identifizieren, gibt
|
||||
* ansonsten NULL zurück */
|
||||
spell *find_spellbyid(spellid_t i);
|
||||
|
|
|
@ -753,7 +753,7 @@ cycle_route(unit *u, int gereist)
|
|||
int cm = 0;
|
||||
char tail[1024];
|
||||
char neworder[2048];
|
||||
char *token;
|
||||
const char *token;
|
||||
direction_t d = NODIRECTION;
|
||||
boolean paused = false;
|
||||
boolean pause;
|
||||
|
@ -1766,7 +1766,7 @@ move(region * r, unit * u, boolean move_on_land)
|
|||
while (up) {
|
||||
unit *un = up->next;
|
||||
|
||||
if (fval(up, FL_FOLLOWING) && !fval(up, FL_MOVED)) {
|
||||
if (fval(up, FL_FOLLOWING) && !fval(up, FL_LONGACTION) && !fval(up, FL_MOVED)) {
|
||||
attrib * a = a_find(up->attribs, &at_follow);
|
||||
if (a && a->data.v==u) {
|
||||
/* wir basteln ihm ein NACH */
|
||||
|
@ -1804,7 +1804,7 @@ piracy(unit *u)
|
|||
int aff[MAXDIRECTIONS];
|
||||
int saff = 0;
|
||||
int *il;
|
||||
char *s;
|
||||
const char *s;
|
||||
boolean all = true;
|
||||
attrib *a;
|
||||
|
||||
|
|
|
@ -385,7 +385,7 @@ init_pool(void)
|
|||
&& (urace(u)->ec_flags & GETITEM)) {
|
||||
int count = geti();
|
||||
int use;
|
||||
char *what = getstrtoken();
|
||||
const char *what = getstrtoken();
|
||||
const resource_type * rtype = findresourcetype(what, u->faction->locale);
|
||||
if (rtype == NULL)
|
||||
list_continue(s); /* nur mit resources implementiert */
|
||||
|
|
|
@ -548,7 +548,7 @@ factionorders(void)
|
|||
{
|
||||
char b[16];
|
||||
char * fid = strnzcpy(b, getstrtoken(), 15);
|
||||
char * pass = getstrtoken();
|
||||
const char * pass = getstrtoken();
|
||||
faction *f;
|
||||
|
||||
f = findfaction(atoi36(fid));
|
||||
|
@ -565,7 +565,7 @@ factionorders(void)
|
|||
freestrlist(f->mistakes);
|
||||
f->mistakes = 0;
|
||||
|
||||
if (checkpasswd(f, pass) == false) {
|
||||
if (checkpasswd(f, pass, true) == false) {
|
||||
addstrlist(&f->mistakes, "Das Passwort wurde falsch eingegeben");
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -141,7 +141,7 @@ gm_create(const tnode * tnext, const char * str, void * data, const char * cmd)
|
|||
i = atoi(igetstrtoken(str));
|
||||
|
||||
if (i>0) {
|
||||
char * iname = getstrtoken();
|
||||
const char * iname = getstrtoken();
|
||||
const item_type * itype = finditemtype(iname, u->faction->locale);
|
||||
if (itype==NULL) {
|
||||
mistake(u, cmd, "Unbekannter Gegenstand.\n", 0);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="modules"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -55,6 +55,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
|
@ -100,8 +106,16 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Header"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="races"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -55,6 +55,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
|
@ -100,8 +106,16 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Header"
|
||||
|
|
|
@ -42,6 +42,8 @@
|
|||
#define GIVERESTRICTION 3
|
||||
#define NEWATSROI 0
|
||||
|
||||
#undef SHORTPWDS
|
||||
|
||||
#define ZEROFOKS_QUESTMASTER "eressea@zerofoks.net"
|
||||
|
||||
#define CHECK_OVERLOAD_ON_ENTER
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="spells"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -54,6 +54,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
|
@ -100,8 +106,16 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Header"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="triggers"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -55,6 +55,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
|
@ -100,8 +106,16 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Header"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="util"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -55,6 +55,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Profile|Win32"
|
||||
|
@ -101,6 +107,12 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
|
@ -147,8 +159,16 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Header"
|
||||
|
|
|
@ -1,49 +1,69 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 7.00
|
||||
Microsoft Visual Studio Solution File, Format Version 8.00
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attributes", "common\attributes\attributes.vcproj", "{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea\eressea.vcproj", "{B859D542-781E-4647-BCAB-3FE5ED077366}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
|
||||
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
|
||||
{79659D44-EC28-42B9-9475-6C0D62D0AAE0} = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
|
||||
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
|
||||
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
|
||||
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
|
||||
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
|
||||
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
|
||||
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode\gamecode.vcproj", "{79659D44-EC28-42B9-9475-6C0D62D0AAE0}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "items", "common\items\items.vcproj", "{C14E3D2B-8189-4570-A4E3-9010C873E4FD}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel\kernel.vcproj", "{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapper", "mapper\mapper.vcproj", "{17F83AAB-352D-4F68-ADA6-09F36D86826F}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
|
||||
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
|
||||
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
|
||||
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
|
||||
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
|
||||
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
|
||||
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
|
||||
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modules", "common\modules\modules.vcproj", "{601CF164-F483-4DE7-8014-64BDD30680B5}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "races", "common\races\races.vcproj", "{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spells", "common\spells\spells.vcproj", "{0EE778AB-8445-40DB-8F65-6BE378A91B97}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "triggers", "common\triggers\triggers.vcproj", "{EF495253-2EEC-4F83-B6C0-D651F88B2198}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util\util.vcproj", "{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfiguration) = preSolution
|
||||
ConfigName.0 = Debug
|
||||
ConfigName.1 = Release
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectDependencies) = postSolution
|
||||
{B859D542-781E-4647-BCAB-3FE5ED077366}.0 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
|
||||
{B859D542-781E-4647-BCAB-3FE5ED077366}.1 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
|
||||
{B859D542-781E-4647-BCAB-3FE5ED077366}.2 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
|
||||
{B859D542-781E-4647-BCAB-3FE5ED077366}.3 = {601CF164-F483-4DE7-8014-64BDD30680B5}
|
||||
{B859D542-781E-4647-BCAB-3FE5ED077366}.4 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
|
||||
{B859D542-781E-4647-BCAB-3FE5ED077366}.5 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
|
||||
{B859D542-781E-4647-BCAB-3FE5ED077366}.6 = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
|
||||
{B859D542-781E-4647-BCAB-3FE5ED077366}.7 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
|
||||
{B859D542-781E-4647-BCAB-3FE5ED077366}.8 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
|
||||
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.0 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
|
||||
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.1 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
|
||||
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.2 = {601CF164-F483-4DE7-8014-64BDD30680B5}
|
||||
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.3 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
|
||||
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.4 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
|
||||
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.5 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
|
||||
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.6 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
|
||||
{17F83AAB-352D-4F68-ADA6-09F36D86826F}.7 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
|
||||
Debug = Debug
|
||||
Release = Release
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfiguration) = postSolution
|
||||
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.ActiveCfg = Debug|Win32
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="eressea"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -63,8 +63,14 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Profile|Win32"
|
||||
|
@ -118,8 +124,14 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
|
@ -174,10 +186,18 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Text Files"
|
||||
|
|
|
@ -75,6 +75,7 @@
|
|||
|
||||
/* util includes */
|
||||
#include <rand.h>
|
||||
#include <log.h>
|
||||
#include <sql.h>
|
||||
#include <base36.h>
|
||||
|
||||
|
@ -267,12 +268,46 @@ writepasswd(void)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef SHORTPWDS
|
||||
static void
|
||||
readshortpwds()
|
||||
{
|
||||
FILE * F;
|
||||
char zText[MAX_PATH];
|
||||
sprintf(zText, "%s/%s.%u", basepath(), "shortpwds", turn);
|
||||
|
||||
F = fopen(zText, "r");
|
||||
if (F==NULL) {
|
||||
log_error(("could not open password file %s", zText));
|
||||
} else {
|
||||
while (!feof(F)) {
|
||||
faction * f;
|
||||
char passwd[16], faction[5], email[64];
|
||||
fscanf(F, "%s %s %s\n", faction, passwd, email);
|
||||
f = findfaction(atoi36(faction));
|
||||
if (f!=NULL) {
|
||||
shortpwd * pwd = (shortpwd*)malloc(sizeof(shortpwd));
|
||||
pwd->email = strdup(email);
|
||||
pwd->pwd = strdup(passwd);
|
||||
pwd->used = false;
|
||||
pwd->next = f->shortpwds;
|
||||
f->shortpwds = pwd;
|
||||
}
|
||||
}
|
||||
fclose(F);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static int
|
||||
processturn(char *filename)
|
||||
{
|
||||
struct summary * begin, * end;
|
||||
int i;
|
||||
|
||||
#ifdef SHORTPWDS
|
||||
readshortpwds("passwords");
|
||||
#endif
|
||||
begin = make_summary(false);
|
||||
printf(" - Korrekturen Runde %d\n", turn);
|
||||
korrektur();
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding = "Windows-1252"?>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.00"
|
||||
Version="7.10"
|
||||
Name="mapper"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
|
@ -62,8 +62,14 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
|
@ -120,10 +126,18 @@
|
|||
Culture="1031"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Header"
|
||||
|
|
Loading…
Reference in New Issue