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

Merge branch 'master' of github.com:eressea/server

This commit is contained in:
Enno Rehling 2014-11-01 22:12:11 +01:00
parent 59c1c23324 14bcaf7d71
commit 367307575c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/buildno.h
View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 3 #define VERSION_MINOR 4
#define VERSION_BUILD 687 #define VERSION_BUILD 689

2
src/economy.c
View File

@ -2385,7 +2385,7 @@ static bool sell(unit * u, request ** sellorders, struct order *ord)
} }
} }
else { else {
n = atoi((const char *)s); n = s ? atoi(s) : 0;
if (n == 0) { if (n == 0) {
cmistake(u, ord, 27, MSG_COMMERCE); cmistake(u, ord, 27, MSG_COMMERCE);
return false; return false;

2
src/kernel/faction.c
View File

@ -249,7 +249,7 @@ faction *addfaction(const char *email, const char *password,
char buf[128]; char buf[128];
if (set_email(&f->email, email) != 0) { if (set_email(&f->email, email) != 0) {
log_error("Invalid email address for faction %s: %s\n", itoa36(f->no), email); log_warning("Invalid email address for faction %s: %s\n", itoa36(f->no), email);
} }
faction_setpassword(f, password); faction_setpassword(f, password);

2
src/laws.c
View File

@ -924,7 +924,7 @@ int quit_cmd(unit * u, struct order *ord)
keyword_t kwd; keyword_t kwd;
kwd = init_order(ord); kwd = init_order(ord);
assert(kwd == K_PASSWORD); assert(kwd == K_QUIT);
passwd = getstrtoken(); passwd = getstrtoken();
if (checkpasswd(f, (const char *)passwd, false)) { if (checkpasswd(f, (const char *)passwd, false)) {
if (EnhancedQuit()) { if (EnhancedQuit()) {