Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

String fixes #918

Open
wants to merge 36 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
a6f00c6
fix NOTLOST items lost in battle
stm2 Sep 12, 2018
889b111
fix tests for parsing single-letter keywords.
ennorehling Jun 16, 2020
bc66965
remove legacy filereader code
ennorehling Jun 7, 2020
11c489e
Bug 2670 trim   and others from strings.
ennorehling Jun 7, 2020
8666ab9
bug 2673 ignore commands that have fewer than 2 characters.
ennorehling Jun 15, 2020
ceb4560
update default version number
ennorehling Jun 15, 2020
d271efc
install lunitx only once
ennorehling Jun 26, 2020
00f2182
Durch GIB "leer" gewordene Schiffe können nicht sinken.
ennorehling Jun 27, 2020
ec5dcda
bug 2674 send message to player, not monsters
ennorehling Jun 27, 2020
90837b3
bug 2674 fix null-ptr deref
ennorehling Jun 27, 2020
656248c
Lighthouse shows roads in both CR and NR.
ennorehling Jun 27, 2020
c2823e1
accept some selected changes from stm2's script rewrite.
ennorehling Jun 27, 2020
0c87bc9
delete obsolete scripts, shellcheck the rest
ennorehling Jun 27, 2020
8b1ecf9
make coverity understand that there is no buffer overflow here.
ennorehling Jun 27, 2020
0037a26
stop showing unhandled keycodes in status
ennorehling Jun 27, 2020
cf84a95
bug 2678: fix trade_needs_castle
ennorehling Jul 4, 2020
4ea08e5
Merge pull request #915 from eressea/bug-2678
ennorehling Jul 4, 2020
aecbe41
Merge branch 'develop' of github.com:eressea/server into develop
ennorehling Jul 4, 2020
9a72403
Bug 2679: Nur Bergwächter bewachen Eisen.
ennorehling Jul 5, 2020
4052487
Merge pull request #916 from eressea/bug-2679
ennorehling Jul 5, 2020
300f46a
Bug 2680: shapeshift spell cannot be cast twice.
ennorehling Jul 7, 2020
d173d48
Merge pull request #917 from eressea/bug-2680
ennorehling Jul 9, 2020
885037d
empty convoys cannot be built on.
ennorehling Jul 12, 2020
a946037
Merge branch 'develop' of github.com:eressea/server into develop
ennorehling Jul 12, 2020
25e9498
Bug 2683: fix buildings with size 0
ennorehling Jul 16, 2020
69d6e27
Bug 2668 Spruchstärke Ritual der Aufnahme
ennorehling Jul 16, 2020
23e5738
make it impossible to create buildings with size 0
ennorehling Jul 17, 2020
a58831d
fake wormhole in test had negative size
ennorehling Jul 17, 2020
ed2d83c
Allow alternative names for some spells.
ennorehling Jul 17, 2020
b8738ed
Finish spell renaming, remove wdw leftovers.
ennorehling Jul 18, 2020
e5e9a9d
reviewed all strings
stm2 Jul 16, 2020
1af5456
edited strings that affect the user
stm2 Jul 16, 2020
dd49c05
edited a few spells
stm2 Jul 16, 2020
6250eb9
amend edit spell
stm2 Jul 18, 2020
c1b1205
reviewed all messages
stm2 Jul 17, 2020
0e62db8
odds and ends
stm2 Jul 18, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Lighthouse shows roads in both CR and NR.
This closes bug 2669.
  • Loading branch information
ennorehling committed Jun 27, 2020
commit 656248c9c753d60ffc371f52b08fa070fe1e821d
4 changes: 0 additions & 4 deletions src/creport.c
Original file line number Diff line number Diff line change
@@ -1134,10 +1134,6 @@ cr_borders(const region * r, const faction * f, seen_mode mode, FILE * F)
const connection *b;
if (!r2)
continue;
if (mode == seen_neighbour) {
if (r2->seen.mode <= seen_neighbour)
continue;
}
b = get_borders(r, r2);
while (b) {
bool cs = b->type->fvisible(b, f, r);
2 changes: 1 addition & 1 deletion src/report.c
Original file line number Diff line number Diff line change
@@ -1155,7 +1155,7 @@ void report_region(struct stream *out, const region * r, faction * f)
if (r->seen.mode >= seen_unit) {
report_region_schemes(out, r, f);
}
if (r->seen.mode >= seen_lighthouse) {
if (r->seen.mode >= seen_lighthouse_land) {
report_region_edges(out, r, f, edges, ne);
}
}