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

193 commits

Author SHA1 Message Date
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
01035a7325 password reading from external file is active, but broken. yikes 2016-05-20 20:49:47 +02:00
Enno Rehling
cae966f4fe nextborder wurde nicht gelesen, wird aber gebraucht 2016-03-13 09:49:04 +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
81a2dd9d21 extract read_game and write_game (take a gamedata argument, not filenames) 2016-02-25 19:12:38 +01:00
Enno Rehling
db852a05fd eliminate global.data_version completely 2016-02-24 11:58:05 +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
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
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
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
2c82ddd4d1 rename to password_encode, streamline tests 
Conflicts:
	src/kernel/save.c
 2016-02-21 16:03:42 +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
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
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
a6fe697c7a tests for read/write of triggers that reference factions, with bugfixes. 2016-02-17 13:55:48 +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
1201a6b739 unused variable, bad version check 2016-02-09 07:06:07 +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
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
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
a66e81e90d Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/region.c
 2016-01-24 14:55:05 +01:00
Enno Rehling
3d7b22fa21 avoid crashing because of bug 2182 2016-01-24 14:31:24 +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
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
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
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
c66d6c7457 Address MS Visual Studio 2015 update 1 breaking changes 2015-12-16 17:01:47 +01:00
Enno Rehling
24f559b4ad Address MS Visual Studio 2015 update 1 breaking changes 2015-12-16 16:55:52 +01:00
Steffen Mecke
1f4c521ac8 encapsulate r->land->peasants, money, horses, herbs, morale 2015-12-08 17:57:23 +01:00
Enno Rehling
3e048e2a84 Merge branch 'bug_2139' of https://github.com/stm2/server into stm2-bug_2139 
Conflicts:
	scripts/tests/e3/castles.lua
	scripts/tests/e3/rules.lua
 2015-12-03 11:06:55 +01:00
Enno Rehling
35e7a0bc79 eliminate global.cookie and the cache-invalidation which it enabled 2015-11-22 12:50:10 +01:00
Steffen Mecke
e2b56cd04a fix morale change when region owner changes 
http://bugs.eressea.de/view.php?id=2139
 2015-11-12 16:09:26 +01:00
Enno Rehling
972b8cee40 CID 22436 Ignoring number of bytes read 
github issue #333
 2015-11-11 15:55:39 +01:00
Enno Rehling
4790950daf spells are allowed to have 0 hp 
https://bugs.eressea.de/view.php?id=2150
 2015-11-09 16:39:30 +01:00
Enno Rehling
ee02721c21 fix and tests for otherfaction attributes in E2 
https://bugs.eressea.de/view.php?id=2152
 2015-11-09 13:36:52 +01:00
Enno Rehling
bf8cc4cb08 trying to trace down an intermittently failing test on windows 2015-11-08 10:34:43 +01:00
Enno Rehling
8a057f183f CID 22580 Time of check time of use 
no need to check this first
 2015-11-05 13:22:51 +01:00
Enno Rehling
8ab4784e3f Merge branch 'coverity-scan' of https://github.com/ennorehling/eressea into ennorehling-coverity-scan 
Conflicts:
	src/kernel/jsonconf.c
	src/kernel/save.h
	src/names.c
 2015-11-04 12:44:45 +01:00
Enno Rehling
47f678d2a3 CID 22436 Ignoring number of bytes read, github issue #333 2015-11-04 11:51:19 +01:00
Enno Rehling
731dac3363 CID 22437 Unchecked return value from library 
github issue #332
 2015-11-04 11:45:13 +01:00
Enno Rehling
024e4c45ca fix a bug introduced by f78fe842 (CID 22443) 2015-11-04 10:40:53 +01:00
Enno Rehling
c57668e6ee failing test for newly discovered storage problems 2015-11-04 09:48:51 +01:00
Enno Rehling
307c5ec85b CID 22435 Unchecked return value from library 2015-11-03 22:56:05 +01:00
Enno Rehling
7e81b98fa4 Merge pull request #339 from TurnerSE/improvement/CID22481 
Improvement/cid22481
 2015-11-03 13:08:03 +01:00
Philipp Dreher
07fd3dc970 formal correction 2015-11-02 18:06:19 +01:00
Philipp Dreher
b107ddadf5 added assert to check the faction-pointer 2015-11-01 21:43:18 +01:00
Philipp Dreher
491e5faed9 Revert "general check for sf->faction's validity" 
This reverts commit f18b5ea7d2.
 2015-11-01 21:40:06 +01:00
Philipp Dreher
f18b5ea7d2 general check for sf->faction's validity 
The handling of an ally without a valid faction-pointer is now skipped
in favor of a logged error.
 2015-11-01 18:54:29 +01:00
Enno Rehling
976b6aaea1 coverity CID 22593: write to pointer after free 
github issue #324
use free_land where we need it.
 2015-10-29 11:17:31 +01:00
Enno Rehling
3eead446d0 reduce cron log spam 2015-09-26 22:42:22 +02:00
Enno Rehling
de808bf146 change effskill signature to take a region, change eff_skill to work on a skill * to avoid multiple lookups. 2015-08-27 16:16:55 +02:00
Enno Rehling
f12454870f fix segfault, disable intermittent test 2015-08-20 16:17:19 +02:00
Enno Rehling
dfb0bcaccf Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/save.c
	src/laws.c
 2015-08-20 15:49:36 +02:00
Enno Rehling
1641e6ef89 remove spellbook repair code, we are done 2015-08-20 15:09:38 +02:00
Enno Rehling
8716e5fdc5 repair spellbooks that broke in E3 and E4 (temporary measure, remember to remove this code). 2015-08-20 12:13:09 +02:00
Enno Rehling
e6eb53c864 save the faction.max_spelllevel in the data file, do not recalculate it each time. 
when recalculating it, include spellbook to determine max-level (dead mages may have pushed the level up).
 2015-08-19 19:43:47 +02:00
Enno Rehling
4d061d8592 repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080 2015-08-04 22:47:55 +02:00
Enno Rehling
2288b8fb27 Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	.travis.yml
	s/build
	s/cmake-init
	s/runtests
	src/buildno.h
	src/kernel/config.c
	src/kernel/save.c
	src/kernel/unit.c
	src/laws.c
	src/move.c
 2015-08-03 19:43:26 +02:00
Enno Rehling
b5ed7c562d wait until curse->magician has been resolve()'s before calling effskill() to find f->max_spelllevel. 2015-08-02 22:08:35 +02:00
Enno Rehling
17f15b69ee fix some of the unicode replacement symbol bullshit in comments 2015-08-02 21:37:12 +02:00
Enno Rehling
e25d3c8ed1 Fix a bug reporting DETROY messages to the correct unit. 
Add missing not-null assertions before accessing function parameters.
Eliminate all of the PVS-Studio warnings.
 2015-07-07 00:49:12 +02:00
Enno Rehling
05ec74f9ec annotate with finds from PVS Studio trial static analysis 2015-07-06 21:31:27 +02:00
Enno Rehling
ef4052b0f6 the outcome of a casual static analysis session. 2015-07-06 19:53:09 +02:00
Enno Rehling
a975073c0d fix an issue when reading pre-spellbook datafiles for E3. 2015-07-02 14:39:13 +02:00
Enno Rehling
272653f8ba fixing sea serpents with empty names, again. https://bugs.eressea.de/view.php?id=2057 2015-06-12 18:05:56 +02:00
Enno Rehling
2ddabc1477 Merge branch 'cursefix2' of https://github.com/stm2/server into stm2-cursefix2 2015-05-22 17:27:51 +02:00
Enno Rehling
3a03579a65 rename set_origin/get_origin into faction.c, remove argument from adjust_coordinates. add test for bug 2070. 2015-05-19 08:27:16 +02:00
Steffen Mecke
ab1376d212 trying to test curse_write/read 2015-05-13 12:05:45 +02:00
Enno Rehling
9b9e038438 press F3 to save game in editor. 2015-05-12 17:18:51 -07:00
Enno Rehling
03084a7ee7 set_origin: renaming German function name to English, add a simple test for it. 2015-05-05 09:47:44 -07:00
Enno Rehling
88d370a7b8 fixing sea serpent names 
https://bugs.eressea.de/view.php?id=2057
 2015-04-21 12:35:39 +02:00
Enno Rehling
6e9fca5e2f allow version.h to declare a future version that is compatible with the current code as MAX_VERSION that save.c will accept. 2015-04-19 08:36:15 +02:00
Enno Rehling
9664f2b191 Implement an optional JSON report writer. Currently writes readable maps for Tiled. 2015-03-29 14:03:56 +02:00
Enno Rehling
83e610ee03 Fixing bug 1802 again, CR contains no Monster names. 2015-02-11 07:57:38 +01:00
Enno Rehling
c54cbfd472 fix copyright notice 2015-01-30 22:10:29 +01:00
Enno Rehling
abca25d1d5 fix indentation in every file 
fix copyright date
remove vi ts=2 code
remove a couple of superfluous extern declarations
 2015-01-30 20:37:14 +01:00
Enno Rehling
23b8f2bc8a call init_locales after parse_json from Lua, downgrade missing string warnings during that to DEBUG (because it's quite common not to have them). 
also, these int to bool conversion warnings made a good point, even if I could not reproduce them.
 2015-01-08 20:55:29 +01:00
Enno Rehling
3db403d7fd functional test for GROW/BREED horses (Bug 1886) 2015-01-04 15:42:36 +01:00
Enno Rehling
335f37a9ec clarify some parsing code that valgrind complains about. 2014-12-28 22:07:53 +01:00
Enno Rehling
108a909131 kill gc_add and gc_done, they were terrible ideas. 2014-12-25 22:38:01 +01:00