Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
10358 commits 10 branches 0 tags 41 MiB
Commit graph

4240 commits

Author SHA1 Message Date
Enno Rehling
ca7f3fbf88 reduce variables scope (cppcheck warnings). 2019-03-03 09:41:15 +01:00
Enno Rehling
230a2d8fba do not use macros for va_copy, which is available from C99 on and with gcc >= 3.0. 
this somehow eliminates bogus cppcheck warnings
 2019-03-03 09:41:15 +01:00
Enno Rehling
6bf33f9fc2 stop coverity warning (realloc). 2019-03-03 09:41:15 +01:00
Enno Rehling
07d2278741 re-enable intermittent test, supplement unit test. 
Untote reservieren nichts von anderen Einheiten.
 2019-03-03 09:41:15 +01:00
Enno Rehling
230f7ca11f BUG 2535: Anzeige von Kampfzaubern. 
use sbs_printf where possible.
 2019-03-03 09:40:54 +01:00
Enno Rehling
d0577a5d6a cppcheck style warnings: reduce variable scope 2019-03-03 09:40:22 +01:00
Enno Rehling
11c21d035a fix dupe declaration merge snafu 2019-03-03 09:39:52 +01:00
Enno Rehling
45c44a03fb some static analysis warnings (cppcheck and msvc). 2019-03-03 09:39:52 +01:00
Enno Rehling
83556f8010 cppcheck style 2019-03-03 09:39:52 +01:00
Enno Rehling
933914a301 re-enable disabled test. 2019-03-03 09:39:52 +01:00
Enno Rehling
11316a4992 remove jsreport. 
fix some cppcheck warnings.
 2019-03-03 09:39:52 +01:00
Enno Rehling
781acdbf6b start adding legacy tests for paragraph 2019-03-03 09:39:52 +01:00
Enno Rehling
2e79c51d00 fix overly long lines in NR. 2019-03-03 09:39:52 +01:00
Enno Rehling
3f9331cd09 fix string unit tests after strcpy was removed 2019-03-03 09:39:52 +01:00
Enno Rehling
d162c2dee1 excise bsdstring from the project 2019-03-03 09:39:52 +01:00
Enno Rehling
5d99dc7014 add a printf function to sbstring (about time) 2019-03-03 09:39:52 +01:00
Enno Rehling
2766ed8de4 Bug 2521: Übersetzung von at_racename für Geister 2019-03-03 09:39:52 +01:00
Enno Rehling
fbb7a6c418 convert report_template to sbstring 2019-03-03 09:39:52 +01:00
Enno Rehling
08cf00e700 more sbstring conversions 2019-03-03 09:39:52 +01:00
Enno Rehling
892b07c64c oops. broke test again with another case of too many periods. 2019-03-03 09:39:52 +01:00
Enno Rehling
97af710e97 fix display of luxury prices, period at end of description. 2019-03-03 09:39:52 +01:00
Enno Rehling
3291dcbe5b more sbstring use in reports. 
fix paragraph lines with very long words, indirectly test through region report.
 2019-03-03 09:39:52 +01:00
Enno Rehling
847361fef2 split region reporting into more and smaller functions. 2019-03-03 09:39:52 +01:00
Enno Rehling
5d80f99552 add a str_adopt constructor for sbstring. 2019-03-03 09:39:52 +01:00
Enno Rehling
164baecbd8 print spells with sbstring 2019-03-03 09:39:52 +01:00
Enno Rehling
32519e1683 version number increment 2019-03-03 09:39:52 +01:00
Enno Rehling
6c24956da7 unsigned/signed comparison 2019-03-03 09:39:52 +01:00
Enno Rehling
2483232537 unfuck str_strlcpy again. 2019-03-03 09:39:52 +01:00
Enno Rehling
5520372dfa define SIZE_MAX if needed. 2019-03-03 09:39:52 +01:00
Enno Rehling
d4d7394e29 replace sbs_cut with more powerful sbs_substr 2019-03-03 09:39:52 +01:00
Enno Rehling
3be5211a53 fix a previously undetected bug in str_strlcpy. 2019-03-03 09:39:51 +01:00
Enno Rehling
a597d06484 some factions have very long names, breaking my buffer. 
use sbstring with care.
fix hackish utf8 space detection.
 2019-03-03 09:39:27 +01:00
Enno Rehling
84871cc6c4 coverity 189780, realloc result check 2019-03-03 09:39:27 +01:00
Enno Rehling
56251ffdaf reduce big arrays on the stack, report allies with new pump_paragraph function (WIP) 2019-03-03 09:39:27 +01:00
Enno Rehling
c200199569 fix the new password test 2019-03-03 09:37:16 +01:00
Enno Rehling
d642ff0fe7 new players should have lastorders = 0, get password. 2019-03-03 09:32:24 +01:00
Enno Rehling
d56eee9687 BUG 2504: skeletons can learn. 
There was a mixup between the AI feature and the race capability, so I cleared up the code a little bit.
It's annoying that these flags are in the same int.
 2019-02-16 20:14:34 +01:00
Enno Rehling
f744cebe66 fix coverity errors 2019-02-15 10:07:55 +01:00
Enno Rehling
717fe4a803 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2019-02-09 20:50:56 +01:00
Enno Rehling
7490a827d9 Mantis 2552: rewrite goblin stealing to be more readable. 2019-02-09 20:50:47 +01:00
Enno Rehling
a84a89dc51 asciification 2019-02-09 13:39:28 +01:00
Enno Rehling
5868316537 asciification 2019-02-09 12:50:12 +01:00
Enno Rehling
642d043e7c asciify more files 2019-02-09 11:49:09 +01:00
Enno Rehling
35c6f30511 umlaut substitutions 2019-02-08 11:37:32 +01:00
Enno Rehling
2ecc710122 kaputte umlaute ersetzt, ascii 4 lyfe 2019-02-07 14:48:51 +01:00
Enno Rehling
793a666969 remove UTF-8 BOM from sources 2019-02-06 22:29:09 +01:00
Enno Rehling
e2607a3e7c fix merge error 2019-02-03 04:17:11 +01:00
Enno Rehling
818b309ebf eliminate warnings from cppcheck 2019-02-02 21:20:23 +01:00
Enno Rehling
88dd9203dd Merge remote-tracking branch 'upstream/develop' into develop 2019-02-02 21:18:59 +01:00
Enno Rehling
0043690650 Merge branch 'master' into develop 2019-02-02 21:17:23 +01:00
Enno Rehling
97a78ad6b0 Merge branch 'master' of https://github.com/ennorehling/eressea 2019-02-02 20:38:11 +01:00
Enno Rehling
af91459fb1 add some variety to familiar selection. 
effskill: use NULL, not 0 for pointer arguments.
 2019-02-02 20:38:02 +01:00
Enno Rehling
20e0e8400b eliminate MAX/MIN macros completely 2019-01-24 17:51:26 +01:00
Enno Rehling
9b113c050e eliminate MIN and MAX macros 2019-01-24 16:34:07 +01:00
Enno Rehling
5a01ea14b6 reserve memory for backtrace before it runs out 2019-01-24 16:18:58 +01:00
Enno Rehling
5b167077a9 review some flawfinder warnings 2019-01-24 14:26:11 +01:00
Enno Rehling
a4873d7a12 re-undo splint warning fizes 2019-01-24 14:26:11 +01:00
Enno Rehling
2defef021f fix some weak splint warnings 2019-01-24 14:26:11 +01:00
Enno Rehling
fbdd3c2fee Merge branch 'master' into develop 2019-01-21 11:10:12 +01:00
Enno Rehling
148146d94e BUG 2540: Vertraute ohne Auraim CR repariert 2019-01-21 11:00:31 +01:00
Enno Rehling
172387e6bc BUG 2549 promote after recruit 
calculating max units before PROMOTE requires that all recruitment has finished.
 2019-01-20 16:51:04 +01:00
Enno Rehling
5943047745 MSVC debugger gets confused when two structs have the same name 2019-01-18 22:26:55 +01:00
Enno Rehling
291f2d7113 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2019-01-13 19:19:06 +01:00
Enno Rehling
5648830b4d Vereinfachte Statistik für Durchreiseregionen anzeigen. 2019-01-13 19:17:31 +01:00
Enno Rehling
10783a05e3 newline after travelthru message 2019-01-13 09:49:55 +01:00
Enno Rehling
f96e88e3e0 write a warning in the template about password replacement. 
for new factions, put the generated password into the template.
normalize and secure password generation.
 2019-01-12 21:26:48 +01:00
Enno Rehling
2477349092 missing newline 2019-01-12 08:05:05 +01:00
Enno Rehling
d5e5993cb0 Some tests for WORK and wages. 2019-01-08 19:51:42 +01:00
Enno Rehling
946690a805 Check that groups are cleared when units are transferred. 2019-01-05 14:13:52 +01:00
Enno Rehling
162f927e5a New tests for give_unit and migrants. 2019-01-04 21:34:37 +01:00
Enno Rehling
c214535591 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-12-18 16:39:51 +01:00
Enno Rehling
a848a1b2ee fix source encodings, break umlauts, ASCII everywhere 2018-12-17 12:07:51 +01:00
Enno Rehling
45de8535a0 Someone was casting leaveastral with more than 32 arguments recently. 2018-12-16 16:36:09 +01:00
Enno Rehling
4fee151f35 fix compilation 2018-12-16 09:48:39 +01:00
Enno Rehling
3fec7eb4e3 starting to see diminishing returns. 2018-12-15 20:13:44 +01:00
Enno Rehling
7b8bc8af0f more allocation checks. 2018-12-15 20:01:51 +01:00
Enno Rehling
7ea64be314 code analysis scan. 
add checks for malloc results.
reduce stack size.
 2018-12-15 19:38:40 +01:00
Enno Rehling
933bf2c596 include what you use 2018-12-15 18:42:31 +01:00
Enno Rehling
48dc5057b3 remove unused function 2018-12-15 18:17:06 +01:00
Enno Rehling
6bf9bf7f35 readorders was deprecated and is now gone. 2018-12-15 18:15:39 +01:00
Enno Rehling
e7b6bff827 order atoi36 conditions by likeliness. 2018-12-15 18:14:36 +01:00
Enno Rehling
264822a354 reduce variables scope (cppcheck warnings). 2018-12-11 19:57:27 +01:00
Enno Rehling
dd7ffb5987 comment copypasta 2018-12-11 19:37:34 +01:00
Enno Rehling
6d5ab44411 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-12-11 19:36:14 +01:00
Enno Rehling
bb5fb78a46 comment copypasta 2018-12-11 19:36:07 +01:00
Enno Rehling
4e9b4a35c3 do not use macros for va_copy, which is available from C99 on and with gcc >= 3.0. 
this somehow eliminates bogus cppcheck warnings
 2018-12-11 19:34:28 +01:00
Enno Rehling
494e2054bf Merge branch 'master' into develop 2018-12-09 20:06:12 +01:00
Enno Rehling
f0a1fe6134 BUG 2536 fix broken familiar spellbooks 2018-12-09 20:05:44 +01:00
Enno Rehling
14444915df stop coverity warning (realloc). 2018-12-09 18:56:04 +01:00
Enno Rehling
1ca1c7cfea re-enable intermittent test, supplement unit test. 
Untote reservieren nichts von anderen Einheiten.
 2018-12-09 14:41:14 +01:00
Enno Rehling
c867120772 BUG 2535: Anzeige von Kampfzaubern. 
use sbs_printf where possible.
 2018-12-09 10:30:33 +01:00
Enno Rehling
c815916fda Merge branch 'master' into develop 2018-12-09 10:27:53 +01:00
Enno Rehling
9ae603803f Bug 2533 fix weapon selection 
disable undead_reserve test in master, because it is intermittent.
 2018-12-09 10:21:58 +01:00
Enno Rehling
e47da17cc6 Merge branch 'master' into develop 2018-12-09 03:48:29 +01:00
Enno Rehling
089be4bca8 cppcheck style warnings: reduce variable scope 2018-12-09 03:42:57 +01:00
Enno Rehling
e03f3c95a3 BUG 2531: new factions get a fresh password every turn until they send their first orders, which is shown in the report. 2018-12-06 20:04:45 +01:00
Enno Rehling
1a07b3bf66 fix dupe declaration merge snafu 2018-12-04 21:16:47 +01:00
Enno Rehling
c2eaf704d1 Merge branch 'master' into develop 2018-12-04 21:14:48 +01:00
Enno Rehling
95498171d7 cppcheck: bug in defense weapon selection 2018-12-04 21:12:39 +01:00
Enno Rehling
bf61a2284e Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-12-04 21:11:50 +01:00
Enno Rehling
2ac6a6826d some static analysis warnings (cppcheck and msvc). 2018-12-04 21:11:40 +01:00
Enno Rehling
0895ccd5d9 Bug 2527: PASSWORD command handling of bad passwords. 2018-12-03 19:19:06 +01:00
Enno Rehling
7d9280b463 fix problems with passwords > 15 characters 2018-12-03 10:09:03 +01:00
Enno Rehling
76ec564f78 Merge branch 'master' into develop 2018-12-02 21:41:23 +01:00
Enno Rehling
ae0415cf8d fixing itoa on unix 2018-12-02 20:33:11 +01:00
Enno Rehling
ba3c63160d fixing itoa on unix 2018-12-02 20:32:34 +01:00
Enno Rehling
c203ffce08 Bug 2526: Fehlende Leerzeichen bei Items. 2018-12-02 17:13:55 +01:00
Enno Rehling
3057031077 Merge branch 'master' of https://github.com/ennorehling/eressea 2018-12-02 16:33:41 +01:00
Enno Rehling
ac9db0c87b Bug 2525: fix default oder preservation. 2018-12-02 15:55:01 +01:00
Enno Rehling
c856228d5e variable scope reduction 2018-12-02 15:52:16 +01:00
Enno Rehling
a9f3592228 Bug 2525: failing test for default orders. 2018-12-02 15:51:35 +01:00
Enno Rehling
15a6d9217b cppcheck style 2018-12-02 11:13:58 +01:00
Enno Rehling
dd7b0e4db3 re-enable disabled test. 2018-12-02 05:10:39 +01:00
Enno Rehling
01b7538ffd remove jsreport. 
fix some cppcheck warnings.
 2018-12-02 05:04:58 +01:00
Enno Rehling
025cf18ab2 start adding legacy tests for paragraph 2018-12-01 21:56:21 +01:00
Enno Rehling
924ce441dd fix overly long lines in NR. 2018-12-01 21:51:52 +01:00
Enno Rehling
3193c74fe2 Merge remote-tracking branch 'upstream/develop' into develop 2018-12-01 21:24:41 +01:00
Enno Rehling
22ed6b6c25 Durchreisemeldung Komma 2018-12-01 21:08:32 +01:00
Enno Rehling
dba687974b fix string unit tests after strcpy was removed 2018-12-01 20:39:39 +01:00
Enno Rehling
06ccc7df42 excise bsdstring from the project 2018-12-01 20:25:06 +01:00
Enno Rehling
c5acb2f351 add a printf function to sbstring (about time) 2018-12-01 19:54:07 +01:00
Enno Rehling
2071121346 Bug 2521: Übersetzung von at_racename für Geister 2018-12-01 12:27:11 +01:00
Enno Rehling
5d7eb1d0a3 BUG 2520: LERNE AUTO multi-teacher assignment 2018-12-01 11:09:31 +01:00
Enno Rehling
b74e8c0ebd simpler hack, um den brypt workfactor einzustellen (oder passwort-checks abzuschalten), weil man manchmal halt keine Zeit hat. 2018-12-01 10:30:15 +01:00
Enno Rehling
fc23926559 BUG 2520: LERNE AUTO multi-teacher assignment 2018-12-01 10:29:48 +01:00
Enno Rehling
f9ee13b435 convert report_template to sbstring 2018-11-30 10:52:32 +01:00
Enno Rehling
2de63536f7 more sbstring conversions 2018-11-30 10:26:49 +01:00
Enno Rehling
3c703653aa oops. broke test again with another case of too many periods. 2018-11-29 06:46:08 +01:00
Enno Rehling
88792e1d09 fix display of luxury prices, period at end of description. 2018-11-28 20:57:17 +01:00
Enno Rehling
d3713be6bd more sbstring use in reports. 
fix paragraph lines with very long words, indirectly test through region report.
 2018-11-28 20:18:22 +01:00
Enno Rehling
2fe5c0e0f7 split region reporting into more and smaller functions. 2018-11-28 18:30:50 +01:00
Enno Rehling
0590fc09ab add a str_adopt constructor for sbstring. 2018-11-28 17:56:49 +01:00
Enno Rehling
9d0c7b900a Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-11-28 17:17:50 +01:00
Enno Rehling
56f54a62e8 print spells with sbstring 2018-11-28 12:45:48 +01:00
Enno Rehling
c0c06f0613 version number increment 2018-11-27 22:20:30 +01:00
Enno Rehling
b8206d0448 missed a space in the faction items list. 2018-11-27 21:54:41 +01:00
Enno Rehling
6f45c0df86 unsigned/signed comparison 2018-11-27 21:31:17 +01:00
Enno Rehling
28cd26f0d9 unfuck str_strlcpy again. 2018-11-27 21:30:08 +01:00
Enno Rehling
308c9f642f define SIZE_MAX if needed. 2018-11-27 21:06:30 +01:00
Enno Rehling
cd0ba434b0 replace sbs_cut with more powerful sbs_substr 2018-11-27 20:50:58 +01:00
Enno Rehling
413a83c1ec simpler hack, um den brypt workfactor einzustellen (oder passwort-checks abzuschalten), weil man manchmal halt keine Zeit hat. 2018-11-27 20:16:27 +01:00
Enno Rehling
4c19dfecf8 fix a previously undetected bug in str_strlcpy. 2018-11-27 20:01:47 +01:00
Enno Rehling
be3f63416d some factions have very long names, breaking my buffer. 
use sbstring with care.
fix hackish utf8 space detection.
 2018-11-27 04:17:16 +01:00
Enno Rehling
8584b46dc0 coverity 189780, realloc result check 2018-11-26 22:07:55 +01:00
Enno Rehling
304bebf291 reduce big arrays on the stack, report allies with new pump_paragraph function (WIP) 2018-11-26 22:01:18 +01:00
Enno Rehling
8c02d14f13 undo the period-at-end fix for region info, a test breaks 2018-11-25 09:38:58 +01:00
Enno Rehling
4c58127ce1 fix renumber parser crash 2018-11-25 09:26:24 +01:00
Enno Rehling
8855574938 report.c is the last user of bsdstring 2018-11-24 21:47:27 +01:00
Enno Rehling
c757f83a71 eliminate bsdstring from reports.c 
add missing period at end of region info.
 2018-11-24 21:25:46 +01:00
Enno Rehling
26205094dd remove unused function 2018-11-24 19:27:31 +01:00
Enno Rehling
0fb6b51e5d deprecated function removed 2018-11-24 12:47:52 +01:00
Enno Rehling
1d71e76ad6 more sbstring stuff 2018-11-24 12:46:28 +01:00
Enno Rehling
3e54d307df replace bsdstring in bufunit 2018-11-24 12:26:52 +01:00
Enno Rehling
6c5597b054 Oops, had some incomplete tests with NULL strings. 2018-11-23 22:28:40 +01:00
Enno Rehling
e155f1ef29 Fix MSVC static analysis warnings in laws.c 2018-11-23 22:16:44 +01:00
Enno Rehling
bb11026321 more sbstring conversions in reporting functions. 2018-11-23 22:00:37 +01:00
Enno Rehling
4b64de0db9 When available, use MSVC built-in itoa function. 2018-11-23 14:03:02 +01:00
Enno Rehling
af72febebc str_itoa for platforms that do not have itoa. 
remove more static string buffer warning code (bsdstring) from reports.
 2018-11-23 13:05:38 +01:00
Enno Rehling
73540d733d Bug 2451: fix equip_unit for spells, 
update the familiar-fixing code from bug 2517.
 2018-11-22 22:13:23 +01:00
Enno Rehling
62e6489c7a rename variable. 
print error, not debug message.
 2018-11-21 21:46:59 +01:00
Enno Rehling
3638219e13 fix magic tests that created gray mages. 
also fix mage_change_spellpoints.
 2018-11-18 21:53:45 +01:00
Enno Rehling
4a66b558c5 WIP: refactor struct sc_mage (make it private). 
tests are failing and/or slow.
 2018-11-18 21:47:14 +01:00
Enno Rehling
6f26898822 fix accidental redefinition 2018-11-18 11:32:59 +01:00
Enno Rehling
e1ebf15d31 coverity thinks I need to check for NULL 2018-11-18 11:16:20 +01:00
Enno Rehling
b6110c5b22 some caster/mage changes issues (transfer aura is hard). 2018-11-17 22:28:55 +01:00
Enno Rehling
270646d9c3 iwyu 2018-11-17 22:16:27 +01:00
Enno Rehling
4403552b61 F*ck this MSVC message: 
warning C6001: Using uninitialized memory
It is confused, and I screwed up trying to work around it.
 2018-11-17 22:12:34 +01:00
Enno Rehling
aa466f3cc8 avoid code analysis warnings 2018-11-17 22:01:23 +01:00
Enno Rehling
d2389fa87b Bug 2517: Vertraute ohne eigene Zauber reparieren 
Trennung von caster und mage in spells.c
 2018-11-17 21:31:05 +01:00
Enno Rehling
b181618b53 BUG 1877: change non-spell familiars. 
1. mages can have actions when familiars cast spells.
2. familiar spells do not increase magician's costs.
3. improve separation of caster and mage.
 2018-11-15 20:51:42 +01:00
Enno Rehling
83b6db41fe remove legacy msg_level struct (unused). 2018-11-13 17:24:22 +01:00
Enno Rehling
e570300dbe Merge branch 'master' into develop 2018-11-06 19:33:46 +01:00
Enno Rehling
ed17b10287 Bug 2514: units giving LERNE AUTO with certain incomplete teacher/student matchups did not study anything. 2018-11-06 19:28:14 +01:00
Enno Rehling
c48371387c New Syntax: CONTACT [UNIT|FACTION] ... 
Move everything to contact module, add tests.
 2018-11-04 18:07:42 +01:00
Enno Rehling
0fd7906d41 extract contact logic to a module 
add missing tests for contact to units.
add an attribute for contacting a faction.
 2018-11-04 15:53:27 +01:00
Enno Rehling
bf04d95651 fix iwyu warnings. 2018-11-04 12:16:02 +01:00
Enno Rehling
ab710ea41d fix gmtool compilation 2018-11-04 09:14:36 +01:00
Enno Rehling
dac6ef660d Merge branch 'master' into develop 2018-11-04 09:10:54 +01:00
Enno Rehling
1a10c0271d Bug 2511: LERNE AUTO fixed, student limit increased 2018-11-04 09:08:50 +01:00
Enno Rehling
89b10ee63d bug 2463 fix xmastrees, fix get_key/set_key 2018-11-03 20:30:57 +01:00
Enno Rehling
d9f800f444 Bug 2482: Untote können ihre eigenen Gegenstände reservieren. 2018-11-03 18:25:22 +01:00
Enno Rehling
8bcdb5c381 Bug 2509 contd: new_region still creating duplicates 2018-11-03 15:48:35 +01:00
Enno Rehling
6c11e740ff bug 2510 duplicate region after datafile read 2018-11-03 14:28:32 +01:00
Enno Rehling
c981bfb766 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-11-02 22:31:48 +01:00
Enno Rehling
272588cb0f BUG 2509: fix travelthru faction reporting 2018-11-02 22:31:20 +01:00
Enno Rehling
a2fe396b68 do not delayed-resolve regions 2018-11-01 21:20:11 +01:00
Enno Rehling
25b5f797e9 add building_create, too 2018-11-01 21:18:24 +01:00
Enno Rehling
fc4f32f8e0 read_building_reference does not need a callback 2018-11-01 21:13:05 +01:00
Enno Rehling
ba9af6d765 1. region_create(uid) 
2. read_region_reference never gets a callback, so save it.
 2018-11-01 21:08:59 +01:00
Enno Rehling
85fe80d858 unit_create function instead of wild calloc calls. 2018-11-01 10:16:49 +01:00
Enno Rehling
d9167b8a59 do not use late resolution for factions, ever 2018-11-01 09:53:23 +01:00
Enno Rehling
923c895382 Merge branch 'allies' into develop 2018-10-31 19:10:51 +01:00
Enno Rehling
b0485ec57f eliminate struct ally, use struct allies 2018-10-31 17:54:40 +01:00
Enno Rehling
b5b39024f2 BUG 2506: starting regions have bad resource levels. 
add some one-off custom code to fix the resource levels of selected regions
 2018-10-30 21:01:16 +01:00
Enno Rehling
a8ff6d2a99 gmtool can now select and highlight islands. 2018-10-30 20:11:35 +01:00
Enno Rehling
54307d3b50 can read and write struct allies. 2018-10-30 18:45:13 +01:00
Enno Rehling
a26438c175 Merge branch 'develop' into allies 2018-10-30 18:40:15 +01:00
Enno Rehling
bf9c50cfc5 gcc flag to prevent use of VLA 2018-10-30 06:31:30 +01:00
Enno Rehling
253849416a create referenced factions early instead of read_faction_reference. 2018-10-30 06:30:32 +01:00
Enno Rehling
ed6a6b4cf2 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-10-30 06:28:09 +01:00
Enno Rehling
00718424cf missing limits include 2018-10-30 06:02:55 +01:00
Enno Rehling
da9d3d3573 Merge branch 'master' into develop 2018-10-29 20:10:51 +01:00
Enno Rehling
c54ab6a3df fix CID 189401 and 189402 2018-10-29 20:06:18 +01:00
Enno Rehling
e8ca81bc1a BUG 2505: make build code more comlpicated, and fix multi-stage buildings. 2018-10-29 19:35:49 +01:00
Enno Rehling
f8040e2d9f unit test to also prove bug 2505 2018-10-29 18:54:23 +01:00
Enno Rehling
89d752bc1f BUG 2508: wipe edges with 0 2018-10-29 16:19:29 +01:00
Enno Rehling
dce5f7857b unused variable 2018-10-28 21:31:58 +01:00
Enno Rehling
be84c13a72 remove test_inject_messagetypes(), make that the default behavior in tests. 2018-10-28 21:28:05 +01:00
Enno Rehling
113a6e68c7 BUG 2507: LERNE AUTO with invalid skill. 2018-10-28 21:27:24 +01:00
Enno Rehling
558390a4a6 separate ally_ api from allies_ api, 
delete unallied factions,
start worrying about serialization.
 2018-10-28 13:45:36 +01:00
Enno Rehling
1364750687 update copyright date 2018-10-26 22:24:04 +02:00
Enno Rehling
84947a7d07 unused variable 2018-10-26 22:21:38 +02:00
Enno Rehling
7537f8c8ed unused function 2018-10-26 22:18:06 +02:00
Enno Rehling
2e076aab1e ally_add is now module-private 2018-10-26 22:16:34 +02:00
Enno Rehling
1e8c7224a4 make consistent use of get_group. 2018-10-26 22:12:43 +02:00
Enno Rehling
d7a8a9b406 fix that catastrophic merge, make struct ally module-private 2018-10-26 21:49:58 +02:00
Enno Rehling
56ccb18fb1 oh my god, please no. 2018-10-26 20:57:59 +02:00
Enno Rehling
ac3a4d91c9 simplicate the use of ally.c 2018-10-26 19:47:50 +02:00
Enno Rehling
557c624200 contant name conflict resolved 2018-10-26 16:08:55 +02:00
Enno Rehling
d1b4a47e1f Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-10-26 16:08:26 +02:00
Enno Rehling
b3361e3ccb Merge branch 'develop' into allies 2018-10-26 14:13:28 +02:00
Enno Rehling
c3d9e9dbaf report allies without bsdstring 2018-10-26 14:13:00 +02:00
Enno Rehling
6007628096 report.c is next 2018-10-26 14:00:48 +02:00
Enno Rehling
0ac3dc5ead WIP: refactor allies api 2018-10-26 10:54:09 +02:00
Enno Rehling
1be7daf516 Merge branch 'dbstring' into develop 2018-10-25 16:31:01 +02:00
Enno Rehling
be0c0161da use swap database for unit descriptions. 2018-10-24 20:21:21 +02:00
Enno Rehling
53e123b36a do not use unit.display directly, use getter/setter instead. 2018-10-24 20:16:17 +02:00
Enno Rehling
516a53c0c7 swap faction.banner to database 2018-10-24 19:54:07 +02:00
Enno Rehling
da3270517a fix type conversion and incomplete database test. 2018-10-24 19:39:30 +02:00
Enno Rehling
32009b7043 store passwords in swapdb 2018-10-24 09:27:48 +02:00
Enno Rehling
83959c375f kill orderdb.[hc] files 2018-10-24 09:02:19 +02:00
Enno Rehling
6738962d73 missing files 2018-10-24 07:00:26 +02:00
Enno Rehling
b8ee5b3c76 begin the work to swap strings to database 2018-10-23 22:31:42 +02:00
Enno Rehling
6a615ab0cd disable ASM implementation of bcrypt 2018-10-23 17:43:11 +02:00
Enno Rehling
35ed981cd5 help the VS heap profiler understand the code. 
reorder calloc arguments.
rename ursprung -> origin.
 2018-10-22 21:51:11 +02:00
Enno Rehling
0bc1eb5a2b Merge branch 'master' into develop 2018-10-22 20:00:03 +02:00
Enno Rehling
1305edb744 BUG 2503: fix undead spawn rate 2018-10-22 19:59:28 +02:00
Enno Rehling
297312ddb3 Hirntoeter auch zaehlen. 2018-10-21 19:56:46 +02:00
Enno Rehling
820de2ee35 fix cont arguments for new clibs version 2018-10-21 19:30:19 +02:00
Enno Rehling
38c1dfe26f BUG 2503: statistics API, logging monster creation 2018-10-21 19:22:30 +02:00
Enno Rehling
4056f08afa Switching to VS2017 compiler has found a bug in pofile.c 2018-10-21 19:10:31 +02:00
Enno Rehling
9ecf87188f remove gprof options 2018-10-20 20:31:21 +02:00
Enno Rehling
b8c49914e9 missing include 2018-10-20 20:28:16 +02:00
Enno Rehling
57be0f2e6a Ich habe mich geirrt, was das Verhalten von atoi in Windows angeht. Alles zurueck. 2018-10-20 20:10:11 +02:00
Enno Rehling
01edb1e204 move that errno-preserving atoi to strings.c 2018-10-20 19:56:38 +02:00
Enno Rehling
c2570b1e58 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-10-20 10:09:37 +02:00
Enno Rehling
c7c306b0e5 implement atoi so it doesn't change errno (for now) 2018-10-20 09:58:50 +02:00
Enno Rehling
eddcefed77 reduce number of allocations in report_region (edges). 
remove the swap database file for orders (when not using memory).
 2018-10-19 20:49:58 +02:00
Enno Rehling
5aa3b1161f prefer unit_addorder over addlist where possible. 2018-10-14 16:26:36 +02:00
Enno Rehling
f247224844 Switching to VS2017 compiler has found a bug in pofile.c 2018-10-14 14:45:05 +02:00