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

strcmp() bugfixes

This commit is contained in:
Enno Rehling 2007-04-15 08:01:12 +00:00
parent 6283910959
commit 72d0596bec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/gamecode/laws.c
View File

@ -2128,7 +2128,7 @@ display_item(faction *f, unit *u, const item_type * itype)
key = mkname("iteminfo", name); key = mkname("iteminfo", name);
info = locale_getstring(f->locale, key); info = locale_getstring(f->locale, key);
if (info==key || strcmp(info, key)==0) { if (info==NULL || info==key || strcmp(info, key)==0) {
info = locale_string(f->locale, mkname("iteminfo", "no_info")); info = locale_string(f->locale, mkname("iteminfo", "no_info"));
} }
ADDMSG(&f->msgs, msg_message("displayitem", "weight item description", ADDMSG(&f->msgs, msg_message("displayitem", "weight item description",
@ -2179,7 +2179,7 @@ display_race(faction *f, unit *u, const race * rc)
key = mkname("raceinfo", rc->_name[0]); key = mkname("raceinfo", rc->_name[0]);
info = locale_getstring(f->locale, key); info = locale_getstring(f->locale, key);
if (info==key || strcmp(info, key)==0) { if (info==NULL || info==key || strcmp(info, key)==0) {
info = locale_string(f->locale, mkname("raceinfo", "no_info")); info = locale_string(f->locale, mkname("raceinfo", "no_info"));
} }

2
src/scripts/eressea/xmas2006.lua
View File

@ -16,7 +16,7 @@ function update_xmas2006()
for r in regions() do for r in regions() do
if r:get_key("xm06") then if r:get_key("xm06") then
trees = r:get_resource("tree") trees = r:get_resource("tree")
if trees*0.1>1 then if trees*0.1>=1 then
r:set_resource("tree", trees * 1.1) r:set_resource("tree", trees * 1.1)
msg:send_region(r) msg:send_region(r)
end end