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

- http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000032 

Reduzierung von doppelten Messages beim merge von CRs.

  Wyrm-Funkction wird nict auf älteren Datenfiles ausgeführt
This commit is contained in:
Enno Rehling 2004-04-13 21:58:46 +00:00
parent db8340648c
commit d1cb08df6e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,7 +455,7 @@ render_messages(FILE * F, faction * f, message_list *msgs)
char nrbuffer[1024*32]; char nrbuffer[1024*32];
nrbuffer[0] = '\0'; nrbuffer[0] = '\0';
if (nr_render(m->msg, f->locale, nrbuffer, sizeof(nrbuffer), f)==0 && nrbuffer[0]) { if (nr_render(m->msg, f->locale, nrbuffer, sizeof(nrbuffer), f)==0 && nrbuffer[0]) {
fprintf(F, "MESSAGE %d\n", ++msgno); fprintf(F, "MESSAGE %u\n", (unsigned int)m->msg);/*++msgno); */
fprintf(F, "%d;type\n", hash); fprintf(F, "%d;type\n", hash);
fputs("\"", F); fputs("\"", F);
fputs(nrbuffer, F); fputs(nrbuffer, F);
@ -465,7 +465,7 @@ render_messages(FILE * F, faction * f, message_list *msgs)
#endif #endif
crbuffer[0] = '\0'; crbuffer[0] = '\0';
if (cr_render(m->msg, crbuffer, (const void*)f)==0) { if (cr_render(m->msg, crbuffer, (const void*)f)==0) {
if (!printed) fprintf(F, "MESSAGE %d\n", ++msgno); if (!printed) fprintf(F, "MESSAGE %u\n", (unsigned int)m->msg);/*++msgno); */
if (crbuffer[0]) fputs(crbuffer, F); if (crbuffer[0]) fputs(crbuffer, F);
} else { } else {
log_error(("could not render cr-message %p: %s\n", m->msg, m->msg->type->name)); log_error(("could not render cr-message %p: %s\n", m->msg, m->msg->type->name));

6
src/scripts/default.lua
View File

@ -6,7 +6,7 @@ function teleport_all(map, grave)
local u local u
for u in r.units do for u in r.units do
u.region = grave u.region = grave
print (" .teleported " .. u) print (" .teleported " .. u.name)
grave:add_notice("Ein Portal öffnet sich, und " .. u.name .. " erscheint in " .. grave.name) grave:add_notice("Ein Portal öffnet sich, und " .. u.name .. " erscheint in " .. grave.name)
end end
end end
@ -97,7 +97,9 @@ function process(orders)
process_orders() process_orders()
-- igjarjuk special -- igjarjuk special
wyrm() if get_turn() > 374 then
wyrm()
end
write_passwords() write_passwords()
write_reports() write_reports()