Enno Rehling
783c042d50
Merge branch 'develop' into kill-seen-region
...
Conflicts:
src/reports.c
2016-09-16 19:11:05 +02:00
Enno Rehling
acfa2cfbe5
remove view functions for special planes (Regatta).
2016-09-16 18:59:24 +02:00
Enno Rehling
d449ce4a8c
re-enable report writing, fix report.c to work without seen_region
2016-09-16 18:03:28 +02:00
Enno Rehling
6fed596c36
Merge branch 'develop' into kill-seen-region
2016-09-16 17:12:40 +02:00
Enno Rehling
1dac556d09
Fix MSVC compilation (always include platform-specific hacks).
2016-09-16 17:11:33 +02:00
Enno Rehling
ad4377c0e7
Merge branch 'develop' into kill-seen-region
...
Conflicts:
src/kernel/version.c
src/kernel/version.h
2016-09-16 17:08:03 +02:00
Enno Rehling
55df24ffb8
all code review nitpicks fixed.
2016-09-16 16:54:41 +02:00
Enno Rehling
b0799bd152
fix travis build by not depending on CMake 2.8.8
2016-09-16 16:30:56 +02:00
Enno Rehling
47526dd36b
smarter version.c build that avoids full rebuilds.
2016-09-16 16:30:43 +02:00
Enno Rehling
10916bb0a1
use add_definitions instead of CMAKE_C_FLAGS, define ERESSEA_VERSION only on version.c
2016-09-16 16:30:30 +02:00
Enno Rehling
318cf68e1b
move version string into a single object file
2016-09-16 16:30:17 +02:00
Enno Rehling
bf59b1adf9
fix travis build by not depending on CMake 2.8.8
2016-09-16 10:55:38 +02:00
Enno Rehling
dbde14fdff
smarter version.c build that avoids full rebuilds.
2016-09-16 09:39:59 +02:00
Enno Rehling
77e39fc64b
use add_definitions instead of CMAKE_C_FLAGS, define ERESSEA_VERSION only on version.c
2016-09-15 20:14:17 +02:00
Enno Rehling
d8d3cd4cc4
move version string into a single object file
2016-09-15 20:11:38 +02:00
Enno Rehling
4e4b4e482e
split off report.test from reports.test
...
move some tests around
2016-09-13 20:13:26 +02:00
Enno Rehling
a67950433d
WIP: prepare_seen vs lastregion/firstregion.
...
lighthouses and travelthru are handled by both, should only be in prepare_seen?
2016-09-12 22:03:16 +02:00
Enno Rehling
f946d50001
alternative implementation for dfindhash that doesn't use as much memory.
...
do not set u->faction = NULL for deleted units.
2016-09-11 20:09:48 +02:00
Enno Rehling
3e2c630c3f
testing that remove_unit takes unit out of the world properly.
...
there is more to it than this, but I'd be happy with the dfindhash check for now.
2016-09-11 19:39:35 +02:00
Enno Rehling
f07c79e5cf
CID 146892: null-pointer check should be an assert.
2016-09-11 19:09:23 +02:00
Enno Rehling
95481211e5
expect remove and unlink to set errno when file doesn't exist, reduce misleading spam.
2016-09-11 17:19:27 +02:00
Enno Rehling
402c19d8fc
dn't warn new player about NMR.
...
newbie info text was no longer valid.
2016-09-11 16:35:55 +02:00
Enno Rehling
49ccb3825f
test and cache all the rules!
2016-09-11 15:54:03 +02:00
Enno Rehling
86ef225ccb
add some more local caching.
2016-09-11 12:48:00 +02:00
Enno Rehling
f75be76ee1
created a new configuration caching API (config_changed).
...
applied this to some rules.
2016-09-11 12:15:53 +02:00
Enno Rehling
d45798b798
fix leaking errno from save.test call to remove
2016-09-11 11:06:58 +02:00
Enno Rehling
a41f3dbe27
fix memory leak, not cleaning up deadhash
2016-09-10 21:01:22 +02:00
Enno Rehling
5f915948f5
add a test for the deadhash feature (mathes units to dead factions)
2016-09-10 20:56:13 +02:00
Enno Rehling
7807f83830
fix compilation (buildno.h is gone)
2016-09-10 17:43:06 +02:00
Enno Rehling
e200952e87
new version numbering in version.h
...
eliminate buildno.h
TODO: update build scripts
2016-09-10 17:41:44 +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
cb381123ff
fix some calendar-related leaks and issues
2016-09-09 18:39:38 +02:00
Enno Rehling
053f8a6e09
clean up the dead faction hashtable between tests.
2016-09-08 21:15:29 +02:00
Enno Rehling
87328a0e92
eliminate memory leak in a test.
2016-09-08 21:01:58 +02:00
Enno Rehling
51c1ddc98b
save.test is still lekaing units.
...
calling test_setup and test_cleanup, doesn't fix everything.
2016-09-08 20:44:03 +02:00
Enno Rehling
93a1fe5059
Merge branch 'develop' of github.com:ennorehling/eressea into develop
2016-09-08 20:10:58 +02:00
Enno Rehling
ab876431de
reset turn to 0 before and after each test.
...
save tests that depend on the global turn variable would fail when being run out of order.
this cause issue #560
2016-09-08 19:48:36 +02:00
Enno Rehling
d5261ab1da
fix group.test leaks
2016-09-08 17:40:17 +02:00
Enno Rehling
a281ace21b
always create test units inside a region (so they can get destroyed in free_gamedata)
2016-09-08 09:11:17 +02:00
Enno Rehling
22586aa45f
fix seen.test creating a unit without a region
2016-09-08 09:06:02 +02:00
Enno Rehling
993af3a7f9
memory leak in equipment.skills
2016-09-08 06:56:16 +02:00
Enno Rehling
cb706c2cf2
equipment.test is down to two leaks and one TODO
2016-09-07 21:29:54 +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
144fcbef58
Merge branch 'develop' of github.com:ennorehling/eressea into develop
2016-09-07 20:48:16 +02:00
Enno Rehling
dda845e2f4
free configuration data (valgrind calls it still-reachable leaks).
2016-09-07 20:46:41 +02:00
Enno Rehling
c8283060f9
test_setup/cleanup for equipment.test
2016-09-07 19:04:42 +02:00
Enno Rehling
282cc129d7
spellbook_clear crash fix
2016-09-07 19:02:03 +02:00
Enno Rehling
dd2f146e27
fix equipment static memory leak
2016-09-07 17:09:37 +01:00
Enno Rehling
af310d48d6
remove unused function after refactoring
2016-09-07 17:52:12 +02:00
Enno Rehling
4115bff79b
eliminate leak from alliance.test
2016-09-07 17:50:51 +02:00
Enno Rehling
9499919387
fix uninitialized member
2016-09-07 17:48:27 +02:00
Enno Rehling
632f25d429
try to eliminate memory leak in command.test
2016-09-07 16:39:54 +01:00
Enno Rehling
1ad2775f51
simplify add_command
2016-09-07 15:43:04 +02:00
Enno Rehling
eed6e1d88d
add_command has an unused argument
2016-09-07 15:36:48 +02:00
Enno Rehling
d962dd110a
correct type.
2016-09-07 15:29:40 +02:00
Enno Rehling
133bef1041
fix compilation.
...
eliminate the last order-related memory leak.
2016-09-06 22:21:06 +02:00
Enno Rehling
270c12b6d8
these config tests were leaking orders.
...
convert them to test_setup use, too.
2016-09-06 21:04:25 +01:00
Enno Rehling
00804344fd
fix order-related memory leaks
2016-09-06 21:07:23 +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
b725e9676a
simple test for basic unit descriptions
2016-09-02 09:29:52 +02:00
Enno Rehling
b321918cd1
check and fix destroy_cmd syntax error handling
2016-08-31 20:38:20 +02:00
Enno Rehling
87fed5b7d2
Merge pull request #548 from ennorehling/refactor-volcano
...
new tests, TODOs removed, remove code duplication
2016-08-31 17:19:29 +01:00
Enno Rehling
8a157de36c
only name monsters that have a naming function. test is bad, failing.
2016-08-31 16:43:02 +02:00
Enno Rehling
cd46bac132
fix mac build with clang 7.3
2016-08-31 09:42:36 +02:00
Enno Rehling
d9e541843b
further reduce number of bt_find calls.
2016-08-30 09:36:09 +01:00
Enno Rehling
5bb9a10a46
is_building_type should be a quicker way to test for a building type than bt_find.
2016-08-30 09:13:59 +01:00
Enno Rehling
2d1a13a811
death to static caches!
2016-08-30 07:51:05 +01:00
Enno Rehling
257d5c18bb
remove unused FASTER_SKILLMOD optimization
2016-08-30 07:39:57 +01:00
Enno Rehling
873e6f8086
remove more static curse_type variables
2016-08-29 20:34:30 +01:00
Enno Rehling
f47113e9bd
eliminate static curse variables (gbdream & more)
2016-08-29 20:31:18 +01:00
Enno Rehling
b43ac6ab27
remove static initialization code
2016-08-29 19:52:43 +01:00
Enno Rehling
40d9ebfa94
reduce code duplication: itemcloak code was copied between NR and CR.
2016-08-29 19:37:47 +01:00
Enno Rehling
4bc8817056
remove a TODO that was ill-advised. The reason that "resources" is a list is that it's built incrementally.
2016-08-29 18:15:20 +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
fb2b6495e5
promote spell.test error logging to a tests.c API, use it for item.test
2016-08-29 15:19:17 +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
c032091b39
new rule: call test_setup to begin test, test_cleanup at end.
2016-08-29 14:21:28 +01:00
Enno Rehling
1c5fcded9f
allow control over stderr logging from tests.
...
separate test_cleanup from test_setup.
2016-08-29 14:09:47 +01:00
Enno Rehling
2eb9b5c5ea
delete dead code (dbrace)
2016-08-29 13:49:39 +01:00
Enno Rehling
1f3413a9b4
annotations
2016-08-29 08:55:59 +01:00
Enno Rehling
0d609f2115
test magicwalls and strongwalls effects on buildings.
2016-08-29 08:53:09 +01:00
Enno Rehling
33701ab891
make describe_braineater more generic (describe_race).
2016-08-28 20:44:45 +01:00
Enno Rehling
e3b0dfedc9
race naming functions do more work than before.
2016-08-28 20:27:40 +01:00
Enno Rehling
514565d66b
move race_name_func registrations into race.c
2016-08-28 20:02:45 +01:00
Enno Rehling
0f3de70ced
refactor to push back the const-ness of generated names.
2016-08-28 19:06:14 +01:00
Enno Rehling
0ac30c65a1
refactoring prior to removing static variable
2016-08-28 18:15:00 +01:00
Enno Rehling
534708d83e
add a test for DESTROY <limit> ROAD
2016-08-28 16:51:16 +01:00
Enno Rehling
a451d61f23
simplify destroy_cmd parsing.
2016-08-28 16:48:06 +01:00
Enno Rehling
808d51429e
test destroy_road message arguments.
2016-08-28 16:44:14 +01:00
Enno Rehling
b0400a797d
when not skilled enough to destroy a road, don't get a destroy_road message.
...
test destroy_road message.
2016-08-28 16:31:29 +01:00
Enno Rehling
1cdeab5e06
test destroy_road skill scaling and person scaling.
2016-08-28 16:13:26 +01:00
Enno Rehling
1e04e20671
testing destroy_road by way of destroy_cmd.
...
two simple cases only.
2016-08-28 14:31:25 +01:00
Enno Rehling
a42bd9c3bf
remove the BLD_WORKING flag.
...
it's all about BLD_MAINTAINED now.
fix region.blocked (Lua property).
2016-08-21 20:12:28 +02:00
Enno Rehling
901cf97cb2
refactoring the "nocostbuilding" curse.
...
- remove C_NOCOST constant and other baggage
- refactor maintenance a bit
2016-08-21 20:02:19 +02:00
Enno Rehling
b2e79dc5e9
building maintenance unit tests.
...
backfilling some very basic test coverage.
2016-08-21 20:01:30 +02:00
Enno Rehling
b5ed9e96dd
re-enable disabled test (it passes, so what gives?)
2016-08-21 06:59:43 +02:00
Enno Rehling
3be627d6ef
fix compilation
2016-08-18 19:13:31 +02:00
Enno Rehling
ecffed0577
verify data after deleting planes, do not delete plane 50 (yet)
2016-08-18 19:11:26 +02:00
Enno Rehling
e5f5dc6aa4
fail when there are borders that can't be read because their endpoints are missing
2016-08-18 19:11:10 +02:00
Enno Rehling
abd6600cfe
when reading alliances, duplicate ids are impossible.
...
makealliance does too much work, new_alliance is simpler.
2016-08-18 19:09:43 +02:00
Enno Rehling
a3ff8781c4
setting herbs will warn if they are the wrong herbs.
...
planes can be erased.
add a script that erases unused planes from E2.
2016-08-18 19:04:48 +02:00
Enno Rehling
0c6defad91
extract read_planes into a separate function.
2016-08-18 18:59:30 +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
4f5bd43dcf
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
2016-08-07 00:47:50 +02:00
Enno Rehling
44b6a87649
death by NMR was broken, because I can't write loops good.
2016-08-07 00:40:10 +02:00
Enno Rehling
257ae38749
fix spellbook leak
2016-08-06 15:15:11 +02:00
Enno Rehling
fef2852c5e
Reparatur Irrlichter
...
https://bugs.eressea.de/view.php?id=2227
2016-08-06 14:36:54 +02:00
Enno Rehling
e2808eeea9
reqsize defaults to 1.
...
remove default values from xml to make it smaller and simpler.
2016-08-06 13:53:07 +02:00
Enno Rehling
db5b90e80b
clarify building_type.maxsize and add error logging for bug 2221.
...
https://bugs.eressea.de/view.php?id=2221
2016-08-06 13:52:29 +02:00
Enno Rehling
50860ea0ef
fix reading data from very old files
2016-08-05 21:58:06 +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
51ffce6b24
fix merge conflicts
2016-07-30 23:19:27 +02:00
Enno Rehling
f2c02232cd
http://bugs.eressea.de/view.php?id=2207
...
check that there are any regions that we can seed new factions into
don't run into endless loop
2016-07-30 22:01:10 +02:00
Enno Rehling
c31f543718
Merge pull request #522 from ennorehling/feature/bug-2221
...
logging and fixing of live data for bug 2221
2016-07-30 21:24:44 +02:00
Enno Rehling
31feeecbd8
logging and fixing of live data for bug 2221
...
additional lua test that failed to find the issue
https://bugs.eressea.de/view.php?id=2221
2016-07-30 21:13:42 +02:00
Enno Rehling
9f836e2f4b
Merge pull request #519 from CTD1/master
...
Fix VS Warning about bool - int convertion
2016-07-15 11:10:12 +02:00
CTD
f324408b6f
Fix bool - int conversion the other way
2016-07-15 10:48:37 +02:00
CTD
65eab060a0
fix vs bool - int conversion warning
2016-07-12 13:24:17 +02:00
Enno Rehling
78fa6d3a47
remove the SAIL_INTO flag
2016-06-10 20:55:27 +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
c1b0395a6c
Merge branch 'master' into develop
...
Conflicts:
src/kernel/save.test.c
src/kernel/version.h
2016-05-20 23:07:18 +02:00
Enno Rehling
cdd7606f02
fixing the password saving test.
2016-05-20 22:38:18 +02:00
Enno Rehling
01035a7325
password reading from external file is active, but broken. yikes
2016-05-20 20:49:47 +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
8d6fba258f
kill some obsolete FIXME comments.
2016-04-09 19:10:51 +02:00
Enno Rehling
a834c486d9
fix a FIXME: setting default order through config, making test better.
...
this feature is not in use, so all this work is really pointless.
2016-04-09 19:05:28 +02:00
Enno Rehling
11ae7dd55e
add a test for default_order, so I can change it.
2016-04-09 18:49:25 +02:00
Enno Rehling
01ecc72f2d
fix a FIXME: include gamedata.h directly, not through save.h
2016-04-09 18:22:20 +02:00
Enno Rehling
4dc9b737de
mark missing test files in CMakeLists.txt
...
kill some dead code prototypes
2016-04-09 18:19:30 +02:00
Enno Rehling
c0acfddb71
test some simple facts about planes
2016-04-09 14:26:10 +02:00
Enno Rehling
45d16ef18f
test: ALLIANCE transfer leadership
2016-04-09 11:52:26 +02:00
Enno Rehling
8971ba99fe
additional tests: ALLIANCE kick/leave commands
2016-04-09 11:49:41 +02:00
Enno Rehling
4b6445dbf3
test: cannot join an alliance if not invited
2016-04-09 11:43:47 +02:00
Enno Rehling
8801d88554
only create the syntax tree if there actually was an ALLIANCE command
2016-04-09 11:41:32 +02:00
Enno Rehling
8965edfacb
add some flavor, make sure the correct command is executed when there's more than one.
2016-04-08 21:46:08 +02:00
Enno Rehling
3937cbc7b5
add missing file, test that command.c does what it's meant to do.
2016-04-08 21:44:06 +02:00
Enno Rehling
3368ad51bd
test for alliance join/invite happy case
2016-04-08 21:33:18 +02:00
Enno Rehling
80b14048be
remove some unused code from alliances
...
start writing test coverage
2016-04-08 19:45:27 +02:00
Enno Rehling
b2e8c75c02
add a test that should have crashed before my fix.
2016-04-03 12:37:26 +02:00
Enno Rehling
30b3cff657
fix a crash in write_game caused by remove_empty_factions
...
https://bugs.eressea.de/view.php?id=2201
2016-04-03 12:23:51 +02:00
Enno Rehling
be89aaeb83
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
2016-03-26 22:28:14 +01:00
Enno Rehling
bc8c39f4bb
fix message-crash https://bugs.eressea.de/view.php?id=2199
...
release version 3.8.7
2016-03-26 22:09:21 +01:00
Enno Rehling
108b4404d2
Merge pull request #502 from ennorehling/feature/refactor-study
...
refactor study.c
2016-03-26 14:53:26 +01:00
Enno Rehling
98a3b31953
cfindhash is gone
2016-03-25 21:51:49 +01:00
Enno Rehling
87b09cd3c6
refactor tests to use test locale where possible
2016-03-24 13:01:47 +01:00
Enno Rehling
aba0be505e
refactor many tests to use the test locale instead of building their own
2016-03-24 13:01:47 +01:00
Enno Rehling
f97b6c9821
bug: learn_skill was not learning the right skill
...
refactor: further reduce learn_skill_depr usage
2016-03-24 13:01:42 +01:00
Enno Rehling
0464fb629a
remove some dead declarations
2016-03-24 13:01:41 +01:00
Enno Rehling
c91da12883
refactor demon_skillchange to use learn_skill
...
Also extracting it into the study module. No idea yet how I am going to sense this for a test, so the test currently does nothing.
2016-03-24 12:59:50 +01:00
Enno Rehling
cae966f4fe
nextborder wurde nicht gelesen, wird aber gebraucht
2016-03-13 09:49:04 +01:00
Enno Rehling
637054bc22
memory leak: clean up mstream after test
2016-03-11 11:33:45 +01:00
Enno Rehling
b81f9db074
memory leak: free race->parameters
2016-03-11 11:31:05 +01:00
Enno Rehling
c9e524d161
memory leak: test_group_readwrite leaks an attrib
...
- groups were not clearing attribs when they were destroyed.
- new critbit module fixes leak in cb_erase
2016-03-10 22:30:19 +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
d43265f937
a new test for the happy case of a working academy
...
dependency injection for learn_skill
memory leak fixes (triggers, armor)
2016-03-09 23:20:05 +01:00
Enno Rehling
02cfacd7f8
refactorings
...
- learn_skill from unit.c to study.c
- add academy.c module
2016-03-09 14:52:50 +01:00
Enno Rehling
3d5c7ba8fb
refactoring: move produceexp from unit.c to study.c
2016-03-09 14:50:54 +01:00
Enno Rehling
2b62747718
fix datafile reading problems for versions 350 and 351
2016-03-09 14:50:03 +01:00
Enno Rehling
197241df0d
fix datafile reading problems for versions 350 and 351
2016-02-29 16:18:14 +01:00
Enno Rehling
fcc846da95
all of the easy external file tests are eliminated
2016-02-26 20:07:51 +01:00
Enno Rehling
5f923295e6
remove datafiles from save.test.c
...
this should fix intermittent tests on windows.
2016-02-26 19:49:58 +01:00
Enno Rehling
63408501b9
convert another test to read_/write_game
2016-02-26 19:01:28 +01:00
Enno Rehling
3c272fd53f
fix reading and writing curses from test (crash)
...
fix read_game/write_game incomaptibility.
2016-02-26 17:54:25 +01:00
Enno Rehling
ce867af34f
this is a static variable, and it is bad
2016-02-25 23:11:44 +01:00
Enno Rehling
81a2dd9d21
extract read_game and write_game (take a gamedata argument, not filenames)
2016-02-25 19:12:38 +01:00
Enno Rehling
5fed36903c
some drmemory fixes
...
some tests leaked.
current test_eressea reports:
41 unique, 41 total, 3778 byte(s) of leak(s)
120 unique, 270 total, 5615 byte(s) of possible leak(s)
2016-02-25 10:16:50 +01:00
Enno Rehling
db852a05fd
eliminate global.data_version completely
2016-02-24 11:58:05 +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
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
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
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
1e4b860a2e
some trivial assertions
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
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
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
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
1682b3d583
fix off-by-one error
2016-02-20 22:23:19 +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
8054a145cc
hack to read passwords from an external file
2016-02-20 18:21:39 +01:00
Enno Rehling
fc86de85f1
resolve a TODO, make attribute (and data) a little bit smaller.
2016-02-20 16:50:11 +01:00
Enno Rehling
33d1521bfd
pass the parent of an attribute into a_age and attrib_type::age
2016-02-20 16:50:04 +01:00
Steffen Mecke
22367249db
fix morale change when region owner changes
...
http://bugs.eressea.de/view.php?id=2139
Conflicts:
scripts/tests/e3/castles.lua
2016-02-20 16:42:18 +01:00
Enno Rehling
29c9e719da
eliminate plane.watchers feature
...
. we don't use them anywhere
. they have no tests
. they crash readgame when watchers have died
2016-02-18 08:48:54 +01:00
Enno Rehling
57085ea47b
gcc fix, disable test properly
...
TBD:plane.watchers
2016-02-18 08:11:39 +01:00
Enno Rehling
9f62e74a37
add a test to check that destroyfaction updates the alliance leader.
...
clean up save.test.c a bit.
disable failing test temporarily.
2016-02-17 14:06:59 +01:00
Enno Rehling
a6fe697c7a
tests for read/write of triggers that reference factions, with bugfixes.
2016-02-17 13:55:48 +01:00
Enno Rehling
325a0ccbf1
write a test that proves the bug in turn 966
2016-02-17 09:24:19 +01:00
Enno Rehling
4050f994a4
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-16 07:30:26 +01:00
Enno Rehling
54e4b7a508
E2 turn 966 desaster: code was writing a bad datafile
2016-02-13 22:07:51 +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
87aa7c887e
fix build
2016-02-09 14:08:36 +01:00
Enno Rehling
1201a6b739
unused variable, bad version check
2016-02-09 07:06:07 +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
7b4b879cc1
quick addition to a_removeall
...
additional testing for attributes
2016-02-06 10:56:08 +01:00
Enno Rehling
8a3bb35987
eliminate global log_flags, revert the mode arguments for fopen.
...
turns out that text is default, and windows hates it if I open a binary file without 'b'
standardize on using join_path to create filenames
(use backslash on windows, even though fopen doesn't seem to care).
2016-02-05 23:10:05 +01:00
Enno Rehling
d0f8723ffb
refactoring: eliminate a_findc, and too much const-fuckery
2016-02-01 17:31:03 +01:00
Enno Rehling
b3db14465e
fix logic error in json_buildings
2016-02-01 13:59:35 +01:00
Enno Rehling
85010e5358
seems like there is a problem opening files with the optional 'b' mode, so remove it everywhere?
2016-02-01 12:29:41 +01:00
Enno Rehling
2f2bbb16ab
remove wild mkdir calls all over the code, catch EEXIST errors
...
use join_path more consistently
fix a test that's intermittent on windows because fopen(..., "wb") fails, why?
2016-02-01 09:26:24 +01:00
Enno Rehling
09ae3d8993
Merge branch 'feature/issue-462-log-test-errors' of https://github.com/ennorehling/eressea into ennorehling-feature/issue-462-log-test-errors
...
Conflicts:
src/magic.test.c
2016-01-31 21:58:16 +01:00
Enno Rehling
c08235693d
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
src/kernel/item.c
src/kernel/region.c
src/laws.c
2016-01-30 23:09:02 +01:00
Enno Rehling
c557778731
fix https://bugs.eressea.de/view.php?id=2183
2016-01-30 23:04:41 +01:00
Enno Rehling
73f16d5bb6
adding a join_path function to try and narrow down misbehavior.
2016-01-29 19:11:48 +01:00
Enno Rehling
9bf1059d8a
trying to make tests not throw out so many ERROR log mesages, commenting on some of them.
2016-01-29 17:49:27 +01:00
Enno Rehling
729c4ceea1
increase error-logging from unit tests.
...
suppress some unrelated errors.
2016-01-28 16:00:36 +01:00
Enno Rehling
91f894b290
teleport.c is the astral space implementation, and it is not one of the core concepts, so move it out of the kernel/ directory
2016-01-28 12:25:16 +01:00
Enno Rehling
fa130d9ce5
make all the rset-asserts look the same
2016-01-24 14:57:36 +01:00
Enno Rehling
cc4367f1b7
borken merge fix
2016-01-24 14:55:43 +01:00
Enno Rehling
a66e81e90d
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
src/kernel/region.c
2016-01-24 14:55:05 +01:00
Enno Rehling
a6b15813ed
relax strict assertion (should be allowed to set ocean to 0 peasants)
2016-01-24 14:45:46 +01:00
Enno Rehling
023686fab2
add a liberal sprinkling of assertions to catch negative peasants bug 2182
2016-01-24 14:35:46 +01:00
Enno Rehling
3d7b22fa21
avoid crashing because of bug 2182
2016-01-24 14:31:24 +01:00
Enno Rehling
76475b9bf7
add a little extra randomness to the seed salt (still bad).
...
remove dead prototype code from faction.c
2016-01-15 08:01:12 +01:00
Enno Rehling
8d05f4cc25
implement MD5 crypted passwords as default
2016-01-14 15:49:09 +01:00
Enno Rehling
c3da0cd42d
as long as we use no encryption, all tests pass.
2016-01-13 16:16:02 +01:00
Enno Rehling
799514bf40
implement md5 password hashing (untested)
...
disable test for case-insensitive password test
fix faction/checkpasswd test
2016-01-13 14:41:09 +01:00
Enno Rehling
54d25e91dd
add a new password module
...
start adding password hashing logic (WIP)
does not yet pass all tests
2016-01-12 23:52:30 +01:00
Enno Rehling
b6d44410b7
make the password pseudo-private to faction.c
2016-01-12 06:46:51 +01:00
Enno Rehling
dc6cc41d2d
additional warnings
2016-01-12 02:27:22 +01:00
Enno Rehling
19390dd8e2
log a warning when passwords would fail for being case-sensitive.
...
add a test to enforce the status quo, for now.
2016-01-12 00:52:42 +01:00
Enno Rehling
fadc92ee52
do not leak memory for factions that have died.
2016-01-11 18:17:24 +01:00
Enno Rehling
20063e0e0e
fix errors in the order of cleanup
2016-01-11 18:03:53 +01:00
Enno Rehling
04e2fb73c7
fix test of allies status after destroying a faction
2016-01-11 15:08:36 +01:00
Enno Rehling
50eba2d308
I don't really believe that this is going to work, but let's see where it fails.
2016-01-11 14:59:25 +01:00
Enno Rehling
04624179ce
make destroyfaction not have to loop over all factions to clear HELP status.
2016-01-11 14:42:36 +01:00
Enno Rehling
8742317979
hack: do not free faction when we destroy it (issue #451 )
2016-01-11 14:01:55 +01:00
Enno Rehling
ca500a499e
adding a much-needed getter function for faction_alive
2016-01-11 12:25:23 +01:00
Enno Rehling
b4389c91fe
fix compilation (what was I thinking?), remove uses of f.alive where they should not be needed.
2016-01-11 11:54:45 +01:00
Enno Rehling
de512be1ba
make destroyfaction remove the faction from the list (slightly scary change)
2016-01-11 09:55:47 +01:00
Enno Rehling
7d426dc3ed
call destroyfaction instead of free as a quick fix
2016-01-10 12:07:00 +01:00
Enno Rehling
810ad094af
suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels
2015-12-18 15:13:15 +01:00
Enno Rehling
18c0c235db
Merge pull request #440 from ennorehling/feature/bug-2176-reduceproduction
...
bug 2176, reduceproduction message im CR
2015-12-17 13:17:00 +01:00