Follow-up Comment #6, bug #13419 (project freeciv):
tried to apply patch to 2.1.9 after already applying:
https://gna.org/bugs/download.php?file_id=5677
and
https://gna.org/bugs/download.php?file_id=5695
in that order.
Result:
m...@thinkcentre:~/freeciv-2.1.9$ patch -p1 < ./StartTurnScorelog_13419.diff
patching file server/report.c
Hunk #1 succeeded at 883 (offset -41 lines).
Hunk #2 succeeded at 938 with fuzz 2 (offset -39 lines).
Hunk #3 succeeded at 1071 (offset -39 lines).
patching file server/report.h
patching file server/srv_main.c
Hunk #1 succeeded at 631 (offset -13 lines).
Hunk #2 FAILED at 2072.
1 out of 2 hunks FAILED -- saving rejects to file server/srv_main.c.rej
server/srv_main.c.rej:
***************
*** 2071,2076 ****
calc_civ_score(pplayer);
} players_iterate_end;
report_final_scores();
show_map_to_all();
notify_player(NULL, NULL, E_GAME_END, _("The game is over..."));
--- 2072,2079 ----
calc_civ_score(pplayer);
} players_iterate_end;
+ log_civ_score();
+
report_final_scores();
show_map_to_all();
notify_player(NULL, NULL, E_GAME_END, _("The game is over..."));
should I unapply the other two?
_______________________________________________________
Reply to this item at:
<http://gna.org/bugs/?13419>
_______________________________________________
Message sent via/by Gna!
http://gna.org/
_______________________________________________
Freeciv-dev mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-dev
