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

4007 commits

Author SHA1 Message Date
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
Enno Rehling
a7b9f6dc3e Do not use 0 to mean NULL pointers. 2018-10-14 11:49:48 +02:00
Enno Rehling
0cc8adeeef BUG 2209: Monster, die attackieren, sollen sich in der selben Runde nicht auch noch bewegen. 2018-10-14 11:47:59 +02:00
Enno Rehling
7b682c6a74 rename defence->defense (prefer US spelling). 2018-10-13 20:30:28 +02:00
Enno Rehling
92c6fb9bac
Merge branch 'develop' into bug2480 2018-10-13 20:25:13 +02:00
Enno Rehling
d1461e6622 Merge branch 'master' into develop 2018-10-07 08:31:44 +02:00
Enno Rehling
0398a1b705 Bug 2497: LERNE AUTO was subtly broken. 2018-10-07 08:22:56 +02:00
Enno Rehling
5964d551e3 PATH_MAX is just a stupid constant 2018-10-06 20:53:26 +02:00
Enno Rehling
4f8dd4cb0f checker is going to use locales, fix them up, too. 2018-10-06 20:47:23 +02:00
Enno Rehling
9a1bdf4444 fix checker build and arg parsing 2018-10-04 10:49:53 +02:00
Enno Rehling
6b983079b7 remember to set faction.lastorders (NMR count was off). 
checker just removes comments now.
 2018-10-04 04:47:20 +02:00
Enno Rehling
bbd57b6ae9 remove debug stuff, use new parser for the game. 2018-10-03 20:33:53 +02:00
Enno Rehling
730b94fa4a reuse the internal buffer when we don't have to malloc. 2018-10-03 20:29:45 +02:00
Enno Rehling
fbce8f326a fix error in multi-line comments at stream border. 2018-10-03 19:47:32 +02:00
Enno Rehling
854decc4f1 comments split by a backslash are not handled right. 2018-10-03 10:37:34 +02:00
Enno Rehling
6c1d266c12 fix comment parsing at end of input 2018-10-02 21:40:14 +02:00
Enno Rehling
b439e48a22 some failing tests 2018-10-02 19:02:22 +02:00
Enno Rehling
e6b93ce79a reset state when we meet the NEXT command. 2018-10-02 19:02:01 +02:00
Enno Rehling
eed3ab3acf finish new order parser, maybe? 2018-10-01 21:32:59 +02:00
Enno Rehling
90b80aba89 fix some more issues with buffer ending before decisions are finished. 2018-10-01 02:26:31 +02:00
Enno Rehling
b1cd9bcfef Pretty good progress on the OrderParser implementaiton. 
Still finding bugs by unit-testing, though.
 2018-09-30 19:47:34 +02:00
Enno Rehling
0c4d1ec2b2 fix libbsd linking (MSVC) 2018-09-30 16:18:06 +02:00
Enno Rehling
a4f6c6f005 fix libbsd linking 2018-09-30 16:16:32 +02:00
Enno Rehling
fb8507e0d2 support for non-utf8 encodings has rotted, kill it. 2018-09-30 15:02:03 +02:00
Enno Rehling
0c6ec47598 fix compilation 2018-09-30 13:45:19 +02:00
Enno Rehling
4a69573786 change database selection, fix in-memory db 2018-09-30 13:36:34 +02:00
Enno Rehling
965c8ce990 start putting the new parser into the server. 2018-09-29 21:21:14 +02:00
Enno Rehling
b03da543b6 make findparam_ex part of laws, where building names are known. 2018-09-29 20:06:58 +02:00
Enno Rehling
d3a37179ef add param.[hc], at last. 2018-09-29 19:32:39 +02:00
Enno Rehling
bc5f2ea6d1 move keyword.[hc] to util 2018-09-29 18:13:32 +02:00
Enno Rehling
991fe8fd8d enable checker build. 
remove getid aliases from parser.h
 2018-09-29 13:35:49 +02:00
Enno Rehling
b22d838a57 move gamedata.c to kernel 2018-09-29 13:21:46 +02:00
Enno Rehling
a373807189 move attrib and event modules to kernel 2018-09-29 11:37:17 +02:00
Enno Rehling
5dcb9075ac we have a library that contains the parser 2018-09-29 11:19:59 +02:00