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

315 commits

Author SHA1 Message Date
Enno Rehling
7d874f1606 fix clang builds 2016-11-18 13:24:50 +01:00
Enno Rehling
a08563e846 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-17 22:10:53 +01:00
Enno Rehling
dc2452e2c1 config.h globals cleanup. 2016-11-17 22:10:41 +01:00
Enno Rehling
6c9e1fb345 more config.h removal. 
freset/fset/fval must die!
 2016-11-17 17:06:31 +01:00
Enno Rehling
d5218b99b8 do not include config.h from util (also, wasn't needed) 
also remove it from monsters.
 2016-11-17 10:55:23 +01:00
Enno Rehling
49e5b5b67e gcc missing include 2016-11-14 23:19:28 +01:00
Enno Rehling
b48b80a1e9 verify errno in test_atoip 2016-11-14 22:21:32 +01:00
Enno Rehling
c512d180f8 prevent atoip setting errno on mac. 
only call atoi when string starts with a digit
 2016-11-14 22:15:52 +01:00
Enno Rehling
d28d3f4690 move read/write_items to item.c. 
fix bad memset in attrib.test.c.
 2016-11-14 01:00:48 +01:00
Enno Rehling
3cc719ba93 fix gcc build 2016-11-13 19:51:41 +01:00
Enno Rehling
0eaa750ef4 move read/write_attribs to attrib.h, too 2016-11-13 19:47:36 +01:00
Enno Rehling
11b122048b reduce dependency on save.h 
moving a_write* functions to attrib.h, which was most of the reason everyone and their mom include save.h
 2016-11-13 19:40:38 +01:00
Enno Rehling
f63baddd51 use memmove, not memcpy. 
fix unicode_trim for windows.
remove unused unicode_mkname.
 2016-11-13 15:49:26 +01:00
Enno Rehling
e0add2275f also remove trailing spaces. 2016-11-11 01:34:59 +01:00
Enno Rehling
97e91fd8eb fix bad names. 
trim leading whitespace and non-printable characters from existing
unit, region and faction names/descriptions.
 2016-11-11 00:30:49 +01:00
Enno Rehling
7b412399b7 delete leading spaces from names. 2016-11-09 22:03:46 +01:00
Enno Rehling
f03e8f3b62 return an error code if the string had any characters removed. 2016-11-09 14:58:51 +01:00
Enno Rehling
7d79822aa4 fix missing nul-terminator. 2016-11-09 11:54:34 +01:00
Enno Rehling
f68fcf40a6 custom function to make "valid" names. 
remove any non-printable characters from a string.
TODO: test with utf-8 values.
TODO: remove leading/trainling whitespace.
 2016-11-08 22:54:47 +01:00
Enno Rehling
75422e1ba6 fix gcc conversion warnings 2016-10-09 10:07:05 +02:00
Enno Rehling
fadf591a32 gcc appeasement (overflow in constant conversion). 2016-10-02 13:19:39 +02:00
Enno Rehling
693f1be6d1 fix endless loop in cp1252 search (wrong sort) 
fix indentation
additional testing
 2016-10-02 13:12:47 +02:00
Enno Rehling
8728fccaec fix an endless loop in unicode_utf8_to_cp437 for characters not in the table. 2016-10-02 12:46:07 +02:00
Enno Rehling
9baba00087 use mtype->key instead of repeated hashstring calls. 2016-09-11 21:29:42 +02:00
Enno Rehling
c352ab9f8e move game-version information fom version.h to gamedata.h 2016-09-10 17:21:17 +02:00
Enno Rehling
d84ed1f89d move static variable cleanup to kernel_done. 
clean up some more.
 2016-09-07 21:22:05 +02:00
Enno Rehling
dda845e2f4 free configuration data (valgrind calls it still-reachable leaks). 2016-09-07 20:46:41 +02:00
Enno Rehling
a5ce809f41 fix memory leak in umlaut.c with reference counting (sad). 2016-09-06 19:57:07 +01:00
Enno Rehling
b62fa64d8c closer leak debugging 2016-09-05 20:05:36 +02:00
Enno Rehling
c525553c49 unused variable 2016-09-05 17:48:54 +01:00
Enno Rehling
fa6a3e377d relocate the addtoken leak "test" to umlaut.test.c 2016-09-05 18:46:02 +02:00
Enno Rehling
19d490ce71 test_create_locale leaks memory. 
adding a simple test that shows this (under valgrind).
 2016-09-04 22:07:52 +02:00
Enno Rehling
a5b3fad67a skeleton of a language test, try to find init_direction memory leak. 2016-09-04 20:27:36 +01:00
Enno Rehling
e7b93adb75 rearranging deckchairs on the HMS Random Numbers. 2016-09-04 17:04:41 +01:00
Enno Rehling
2ccd2c0c16 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-09-04 10:47:40 +02:00
Enno Rehling
00c4c337ff remove crypto submodule, stea mtrand from it 2016-09-04 10:47:21 +02:00
Enno Rehling
b5298f60bf Merge pull request #552 from ennorehling/issue-551-description 
issue #551 and some other tests
 2016-09-02 15:43:08 +01:00
Enno Rehling
3a719226a2 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-09-01 21:55:52 +02:00
Enno Rehling
3c1704e691 Merge remote-tracking branch 'upstream/develop' into develop 2016-08-31 18:51:29 +01:00
Enno Rehling
a08ad52809 Merge branch 'develop' 
Conflicts:
	src/util/log.c
 2016-08-31 18:15:07 +02:00
Enno Rehling
24c877d974 reduce failing test to less code 2016-08-31 17:38:33 +02:00
Enno Rehling
8aec1c3e7f narrowing down the memory leak in jsonconf.test.c, by adding a similar 
test to umlaut.test.c that exhibits the same behavior in a simpler
setting.
 2016-08-31 17:37:07 +02:00
Enno Rehling
afeea58999 fix include order 2016-08-30 21:22:32 +02:00
Enno Rehling
a1d56acfe6 missing include, I believe 2016-08-30 20:15:28 +01:00
Enno Rehling
2d1a13a811 death to static caches! 2016-08-30 07:51:05 +01:00
Enno Rehling
ef44a4534e add a test for copying resources message arguments. 
my plan is to add a new argument type for arrays of resources with fewer allocations.
 2016-08-29 17:31:09 +01:00
Enno Rehling
2c5063095d fixed: tests that try to create duplicate spells do not spam stderr. 2016-08-29 14:49:31 +01:00
Enno Rehling
2eb9b5c5ea delete dead code (dbrace) 2016-08-29 13:49:39 +01:00
Enno Rehling
fd273848ae add an assert_alloc macro for allocations that cannot fail. 2016-08-29 09:26:49 +01:00
Enno Rehling
3e47f02fc2 coverity CID 141509 Unchecked return value from library 
Conflicts:
	src/util/log.c
 2016-08-13 10:18:42 +02:00
Enno Rehling
1735ec9eee coverity CID 141509 Unchecked return value from library 2016-08-09 18:28:15 +02:00
Enno Rehling
238a0e22f2 Merge branch 'test-alliance' of https://github.com/ennorehling/eressea into ennorehling-test-alliance 
Conflicts:
	src/util/CMakeLists.txt
 2016-08-08 08:46:09 +02:00
Enno Rehling
731238dfb1 support different editor codepages 2016-08-07 19:19:35 +02:00
Enno Rehling
5dcbb8a3f4 add a very simple tst for unicode comparisons 2016-08-07 10:28:09 +02:00
Enno Rehling
03a8b7383c fix log_rotate warnings (#529) 
* ignore file-not-found errors when trying to rotate logs.
I suspect this is faster and safer than testing existence.

* block rename warnings, part deux
 2016-08-05 20:15:05 +02:00
Enno Rehling
36e1060fc7 turn maxsize assert into an error 
fix log rotation on windows
 2016-07-31 18:48:27 +02:00
Enno Rehling
eebdcf5d93 control log level from command line (with -l, like -v) 
make newplayer.lua use the autoseed module, eliminate duplication
seeding new players is broken

Conflicts:
	src/gmtool.c
	src/main.c
	src/util/log.c
	src/util/log.h
 2016-07-30 22:46:57 +02:00
Enno Rehling
87eafaeb99 remove all password hashing code 2016-07-13 19:10:22 +02:00
Enno Rehling
61acd40424 Merge pull request #512 from stm2/dragon_growl 
Dragon growl
 2016-06-11 23:16:23 +02:00
Steffen Mecke
c5014fd766 integrated Ennos suggestions for dragon growls 
Dragons now growl 20% more elegantly!
 2016-06-11 13:47:38 +02:00
Enno Rehling
394621956d missing include, gcc fix 2016-06-07 21:51:56 +02:00
Enno Rehling
4414d7ef57 fix parse_token buffer overrun. 
missing tests for parse_token.
this fixes http://bugs.eressea.de/view.php?id=2206
 2016-06-07 21:47:09 +02:00
Enno Rehling
5535beed61 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/save.c
 2016-05-29 11:13:19 +02:00
Enno Rehling
72d9f8adf0 For NMR purposes, count cursed factions like NPCs (i.e. not). 
fix warnings in log tests
log whitespace cleanup
 2016-05-29 10:58:49 +02:00
Enno Rehling
6148273d97 http://bugs.eressea.de/view.php?id=2210 
fix deprecated attributes (at_key) yet again.
 2016-05-28 20:26:59 +02:00
Enno Rehling
cdd7606f02 fixing the password saving test. 2016-05-20 22:38:18 +02:00
Enno Rehling
80716d0787 fix key-upgrade function (coverity CID 102076) 
fix MSVC warning (strncpy)
 2016-05-02 19:22:57 +02:00
Enno Rehling
c4d31d368e Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/util/log.c
	src/util/log.h
 2016-05-01 13:47:30 +02:00
Enno Rehling
f24b1c1cdc fix multi-logging 2016-05-01 13:40:01 +02:00
Enno Rehling
41277ed5ee prove that logging is broken (new test segfaults) 2016-05-01 13:39:25 +02:00
Enno Rehling
1fa1693119 test multiple loggers 2016-05-01 13:36:00 +02:00
Enno Rehling
354e609929 catalog missing test files in CMakeLists.txt 2016-04-10 13:22:51 +02:00
Enno Rehling
ae7d86dae0 just a little bit of refactoring 2016-03-11 21:36:10 +01:00
Enno Rehling
cdf6d3992e memory leak: gamedata store was not released 2016-03-11 10:31:21 +01:00
Enno Rehling
10e67e2107 always free gamedata (this test uses two) 2016-03-11 09:45:39 +01:00
Enno Rehling
0f792e038f memory leaks 
- must free gamedata after close
- clear spellbook and free it
 2016-03-11 09:43:16 +01:00
Enno Rehling
7e98384542 fix some memory leaks 
- t_free does not free
- free_factions frees the wrong list
- cleanup after attrib test
 2016-03-10 13:27:08 +01:00
Enno Rehling
5fd4d5f30b Merge pull request #491 from ennorehling/feature/data_version 
eliminate global.data_version
 2016-02-25 16:01:44 +01:00
Enno Rehling
e766b78345 Merge branch 'master' into develop 2016-02-25 11:06:15 +01:00
Enno Rehling
bb03517619 disable most password formats 2016-02-25 10:46:46 +01:00
Enno Rehling
98856a8e4b CID 65491 double free 2016-02-24 11:54:24 +01:00
Enno Rehling
d48d9a25e0 forward-declare struct gamedata 2016-02-24 11:54:23 +01:00
Enno Rehling
8a9d617aa3 read_referernce takes a gamedata object. 
with all the trimmings that requires,
this is for github issue $479
 2016-02-24 11:53:22 +01:00
Enno Rehling
2d30d4cce6 trigger_type.read gets a gamedata object 
github issue #479
 2016-02-24 11:46:54 +01:00
Enno Rehling
73a6b96bc7 remove global.data_version from border.read 
remove global.encoding
github issue #479
 2016-02-24 11:44:19 +01:00
Enno Rehling
7f6ced99b9 attrib.read gets a gamedata object (remove dependency on global.data_version) 2016-02-24 11:44:18 +01:00
Enno Rehling
d1fdd9a89c fix failing storage test 2016-02-24 11:39:27 +01:00
Enno Rehling
45d09622cb missing include errno.h 2016-02-24 11:39:24 +01:00
Enno Rehling
ec3839fb9f rewrite intermittent test to use memory stream. 2016-02-24 11:39:23 +01:00
Enno Rehling
6ca81646eb extract gamedata into a separate file. 2016-02-24 11:38:09 +01:00
Enno Rehling
e6f3dc8b85 Merge branch 'master' into develop 
Conflicts:
	scripts/run-turn.lua
	src/buildno.h
	src/kernel/group.c
	src/kernel/save.c
	src/kernel/save.test.c
	src/kernel/version.h
	src/util/password.c
	src/util/password.test.c
	tests/run-turn.sh
 2016-02-23 10:47:33 +01:00
Enno Rehling
1e4b860a2e some trivial assertions 2016-02-22 20:48:24 +01:00
Enno Rehling
7fe07439f5 fix write_faction_reference, check for f->alive in other places 
TODO:
1. I added some new TODOs
2. What happens to morale when region owners die?
3. Needs tests
 2016-02-22 20:47:06 +01:00
Enno Rehling
9c10cc6b16 fix linux build 2016-02-13 13:56:49 +01:00
Enno Rehling
40530f2066 rename to password_encode, streamline tests 2016-02-12 08:33:08 +01:00
Enno Rehling
c0c6d19be2 bcrypt hashes implementation, not activated yet. 2016-02-12 07:16:45 +01:00
Enno Rehling
652136ee46 unused variable, kill 2016-02-09 16:32:01 +01:00
Enno Rehling
0189111876 update key attribute api 
prepare to replace at_key. do not return the internals. add basic test.
 2016-02-09 06:43:19 +01:00
Enno Rehling
abc3caa6d1 optimized storage of attribs. 
save the hash instead of the name and save a few bytes.
 2016-02-09 00:28:23 +01:00
Enno Rehling
32d43820c2 Merge remote-tracking branch 'upstream/develop' into develop 2016-02-06 23:23:26 +01:00