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

Merge branch 'version-3-3' 

Conflicts:
	src/build.h
This commit is contained in:
Enno Rehling 2014-11-08 22:56:53 +01:00
parent 8912a59ac4 1556c07787
commit 9c0a7c0e2e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buildno.h
View File

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

2
src/magic.c
View File

@ -2580,7 +2580,7 @@ static castorder *cast_cmd(unit * u, order * ord)
}
s = getstrtoken();
}
if (!s[0] || strlen(s) == 0) {
if (!s || !s[0] || strlen(s) == 0) {
/* Fehler "Es wurde kein Zauber angegeben" */
cmistake(u, ord, 172, MSG_MAGIC);
return 0;