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
2e41c4972c
read_spellbook, use gamedata.version
...
github issue #479
2016-02-24 11:48:46 +01:00
Enno Rehling
21aee8ece8
remove global.data_version where gamedata.version is available
...
github issue #479
2016-02-24 11:47:46 +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
3e584245c0
attrib.read gets a gamedata object
...
stop using global.data_version
for 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
775bbe7ea6
refactor another test to not create files.
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
0197ad16cc
Merge branch 'ennorehling-develop' into develop
2016-02-23 11:43:41 +01:00
Enno Rehling
c8018dd095
Merge branch 'develop' of https://github.com/ennorehling/eressea into ennorehling-develop
...
Conflicts:
process/epasswd.py
2016-02-23 11:43:18 +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
1bb215dd52
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/kernel/save.c
src/triggers/createunit.c
2016-02-23 08:35:31 +01:00
Enno Rehling
d6a8d12dbb
Merge pull request #489 from ennorehling/hotfix/fix-faction-references
...
fix writing faction references
2016-02-23 07:30:26 +01:00
Enno Rehling
7807e9e710
fix integration test data file
2016-02-22 21:35:37 +01:00
Enno Rehling
1e4b860a2e
some trivial assertions
2016-02-22 20:48:24 +01:00
Enno Rehling
77ed6f3722
add missing file
2016-02-22 20:48:24 +01:00
Enno Rehling
be99c02a82
fix valgrind report
2016-02-22 20:48:24 +01:00
Enno Rehling
370338736c
gcc is picky, fix gcc warnings
2016-02-22 20:47:06 +01:00
Enno Rehling
4f7e1cb80f
integration test update.
...
- have a faction that quits,
- try to reload the datafile we just wrote.
2016-02-22 20:47:06 +01:00
Enno Rehling
c823a3b036
handle regions that have no owner
2016-02-22 20:47:06 +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
6b1367dff1
fix gcc build
2016-02-22 15:48:43 +01:00
Enno Rehling
4f01d7041f
Merge branch 'upstream-master'
...
Conflicts:
src/kernel/save.test.c
src/kernel/version.h
2016-02-22 08:55:46 +01:00
Enno Rehling
c7ad807396
Merge branch 'master' of https://github.com/ennorehling/eressea
2016-02-21 23:11:21 +01:00
Enno Rehling
7d913d7257
unused variable
2016-02-21 23:07:44 +01:00
Enno Rehling
dc4bdef5b3
fix linux build
...
Conflicts:
src/util/password.test.c
2016-02-21 19:16:55 +01:00
Enno Rehling
ff7dc25c90
fix syntax of suppression files
2016-02-21 17:25:42 +01:00
Enno Rehling
1029ed4c7c
generate suppressions from test_eressea
2016-02-21 17:25:36 +01:00
Enno Rehling
b6433cc4ac
wrong travis suppression
2016-02-21 17:25:17 +01:00
Enno Rehling
6e1b29bd21
additional suppressions for SSE implementations
2016-02-21 17:25:05 +01:00
Enno Rehling
bbe8faee2b
get code to compile, failing Lua tests
2016-02-21 17:24:50 +01:00
Enno Rehling
b09c6974c6
revert back to plaintext passwords, crypting isn't working
2016-02-21 17:22:43 +01:00
Enno Rehling
2c82ddd4d1
rename to password_encode, streamline tests
...
Conflicts:
src/kernel/save.c
2016-02-21 16:03:42 +01:00
Enno Rehling
535a864ffe
bcrypt hashes implementation, not activated yet.
2016-02-21 15:59:39 +01:00
Enno Rehling
a6b39d6fb7
bad merge, forgot the lua files.
2016-02-21 13:18:17 +01:00
Enno Rehling
4bf282bdd7
Merge branch 'release-3.7.11' into upstream-master
...
accidentally added a test that fails for the currently broken passwort-crypting
Conflicts:
scripts/tests/e3/rules.lua
src/attributes/reduceproduction.c
src/building_action.c
src/buildno.h
src/kernel/region.c
src/kernel/save.c
src/kernel/save.test.c
src/kernel/version.h
src/laws.c
src/magic.c
src/magic.h
src/wormhole.c
2016-02-21 11:01:50 +01:00
Enno Rehling
dd94771ed8
test password reading and writing for BADCRYPT_VERSION (requires external file)
2016-02-21 10:25:18 +01:00
Enno Rehling
9ac05666ea
add a test for succesful read/write of password
...
TODO: do this for different datafile versions (BADCRYPT, etc)
2016-02-21 10:10:26 +01:00
Enno Rehling
2094c4964c
Merge branch 'release-3.7.11' of github.com:eressea/server into release-3.7.11
2016-02-21 09:28:34 +01:00
Enno Rehling
1682b3d583
fix off-by-one error
2016-02-20 22:23:19 +01:00
Enno Rehling
ca6bc638ed
release version 3.7.13
2016-02-20 22:12:13 +01:00
Enno Rehling
1b28beeaa1
fix off-by-one error when analyzing passwords.txt (crash E3 and E4
...
today)
2016-02-20 21:43:01 +01:00
Enno Rehling
c8fabecb36
Merge pull request #486 from eressea/hotfix/datafile-read-3.7.11
...
third try: upgrade to 3.7.11, read 3.8 datafiles
2016-02-20 21:08:46 +01:00
Enno Rehling
8054a145cc
hack to read passwords from an external file
2016-02-20 18:21:39 +01:00