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

359 commits

Author SHA1 Message Date
Enno Rehling
290a07e763 Merge branch 'develop' 2017-11-15 20:39:20 +01:00
Enno Rehling
54b016a735 Merge remote-tracking branch 'upstream/develop' into develop 2017-11-15 20:37:46 +01:00
Steffen Mecke
0aa5a64c63 allow empty faction email 2017-11-15 12:12:42 +01:00
Enno Rehling
3b6d7a4055 Merge branch 'develop' 2017-11-12 22:15:47 +01:00
Enno Rehling
2703b01ade units can rename the ship they are on if their faction owns it. 
this fixes bug 2384.
 2017-11-12 15:01:58 +01:00
Enno Rehling
34808a25c5 Merge branch 'develop' 2017-11-09 18:04:41 +01:00
Enno Rehling
eccf6bef7a consistent naming of module configurations (singular). 
add module switch for volcano.
 2017-11-06 21:04:30 +01:00
Enno Rehling
7196f799e6 add a terrain_changed function for use with static terrain variables. 2017-11-06 20:29:26 +01:00
Enno Rehling
79aecf21b5 Merge branch 'develop' 2017-10-18 19:40:00 +02:00
Enno Rehling
e2c7b2c711 merge with master, which was far behind 2017-10-15 20:32:19 +02:00
Enno Rehling
333ef06fef hackish optimization for STUDY orders 2017-10-13 19:33:29 +02:00
Enno Rehling
34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling
ca6cbe5906 fixing commit 1b53128e1a and adding a test for cansee. 2017-10-13 19:07:57 +02:00
Enno Rehling
1b53128e1a BUG 2366: Fix cansee for seen_spell regions. 2017-10-10 20:24:20 +02:00
Enno Rehling
f594a908df deprecate old get_mage implementation. 
fix test_familiar_equip with new get_mage.
 2017-10-06 21:53:07 +02:00
Enno Rehling
02cfde0a49 fix create_unit default order memory leak 2017-10-01 17:08:05 +02:00
Enno Rehling
0f10b58167 add tests and rewrite MAKE TEMP 2017-10-01 15:08:26 +02:00
Enno Rehling
423fe65377 move region display to land_region struct, oceans do not have descriptions. 2017-09-16 07:58:57 +02:00
Enno Rehling
2dd159841e Merge branch 'master' into develop 2017-08-24 16:47:24 +02:00
Enno Rehling
fc4bde47f6 kill the old curses enum and oldcursename. 2017-08-21 20:48:00 +02:00
Enno Rehling
7985ebe511 replace ct_find calls with constants. 
reorder a lot of includes.
 2017-08-21 20:18:19 +02:00
Enno Rehling
54b5b09e15 Merge branch 'master' into develop 
Conflicts:
	src/gmtool.c
	src/modules/autoseed.c
 2017-08-18 20:31:14 +02:00
Enno Rehling
c8b2ce7900 BUG 2356: fix curse read/write 
rename curse::flags to curse::mask, use c_flags.
fix some curse_type having CURSE_ISNEW fixed.
 2017-08-18 19:39:33 +02:00
Enno Rehling
eb1dc731cb consistently rename ec_flags constants (ECF_*) 2017-07-17 12:33:55 +02:00
Enno Rehling
f934e4d5e3 remove unused ECF_KEEP_ITEM flag. 2017-07-17 12:31:47 +02:00
Enno Rehling
153039fdef fix gcc compilation, unused variable 2017-05-24 08:58:46 +02:00
Enno Rehling
18daa9db2f entirely remove RC_SPELL 2017-05-24 08:52:19 +02:00
Enno Rehling
c8e777c6d4 Merge branch 'bug2211_addendum' of https://github.com/stm2/server into stm2-bug2211_addendum 2017-05-21 14:51:13 +02:00
Enno Rehling
d9fca4dcb3 refactor stray fptr variable into callbacks module. 2017-05-08 22:44:18 +02:00
Enno Rehling
bf935f5bb7 gamedate: no negative turns allowed. 
feed the beast assert.
 2017-05-07 16:12:10 +02:00
Enno Rehling
3b9a6e45a1 turns out: btype->age is never used. 2017-04-29 13:53:28 +02:00
Enno Rehling
51c2df62ca fixing new coverity scan defects 
167039 Dereference after null check
167038 Unchecked return value
 2017-04-16 15:52:34 +02:00
Enno Rehling
d99090ac67 remove additional unused macro constants 2017-03-31 21:29:37 +02:00
Enno Rehling
03653a7338 fix two live warnings (unicode trim and fleechance registration) 2017-03-27 18:07:44 +02:00
Enno Rehling
4c21ff5d63 BUG 2311: enforce all unit limits. 2017-03-11 20:30:17 +01:00
Enno Rehling
21e260907c BUG 2311: unit limits were not enforced by GIVE. 2017-03-11 20:03:49 +01:00
Enno Rehling
d633c2a9fb BUG 2310: counting units and people. 
reduce number of count_all loops made,
make f->num_units and f->num_people be correct.
 2017-03-11 19:36:26 +01:00
Enno Rehling
0f2744fcf3 BUG 2285: remove factions' wealthfrom statistics. 2017-03-11 18:10:23 +01:00
Enno Rehling
858074501e additional comments 2017-03-11 16:37:54 +01:00
Enno Rehling
4d07782e7d Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
 2017-03-06 06:27:31 +01:00
Enno Rehling
a265bc9cdb test giving stuff to 0. 2017-03-03 18:03:34 +01:00
Enno Rehling
45854851ae bug 2292: allow packice to be guarded again. 
https://bugs.eressea.de/view.php?id=2292
 2017-03-02 18:08:58 +01:00
Enno Rehling
3cb24299fa bug 2292: only land regions can be guarded. 
https://bugs.eressea.de/view.php?id=2292
Also adding tests for every other failure reason.
 2017-03-02 12:39:21 +01:00
Enno Rehling
9d09574d5e enable process_orders to be done in steps. 
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
 2017-02-27 19:35:14 +01:00
Enno Rehling
44c3838d79 WIP: itype->use elimination. 2017-02-27 04:22:28 +01:00
Enno Rehling
b8ffc20d87 remove item_useonother callbacks (use is fine). 
add a test for foolpotion.
 2017-02-26 19:54:58 +01:00
Enno Rehling
bfb5a9b692 set age_unit and name_unit funpointers in rc_create. 
no more <function/> in XML races.
rename juju-zombie => juju.
 2017-02-20 22:07:36 +01:00
Enno Rehling
4e5f1d05ce Be very strict about C standards. 
Compile with -std=c89 in gcc.
remove all // comments (they are nice, but unnecessary).
variables only declared at start of block.
various pedantery.
backwards compatible va_copy for pre-C99 gcc.
 2017-02-18 21:15:14 +01:00
Enno Rehling
fd9583df3d fix healing for elves in a forest. 
rename _magres back to magres.
rc->parameters is not linked to config_changed invalidation.
add tests.
 2017-02-03 17:43:40 +01:00
Enno Rehling
21514f3bfe BESCHREIBE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-26 18:06:49 +01:00
Enno Rehling
2a1ead6506 BENENNE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-26 18:06:49 +01:00
Enno Rehling
c0692986b2 make runtests.bat not crash. 
disable auto-load of config.lua (sob).
free messages and config in config.reset().
 2017-01-26 18:06:48 +01:00
Enno Rehling
48ae12b629 emit a password message for newbie factions 2017-01-26 18:06:16 +01:00
Enno Rehling
d94cde67a4 kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
Enno Rehling
f297d89958 merge monster.c and monsters.c 
move RCF_DESERT handling to monsters.c
 2017-01-26 17:57:21 +01:00
Enno Rehling
a4badc0a75 remove quicklist shim, use selist everywhere 2017-01-26 17:41:21 +01:00
Enno Rehling
7f9313f1a7 static analysis warnings. 
PVS-Studio warnings reduced or suppressed.
 2016-11-23 18:56:40 +01:00
Enno Rehling
ec4060cb9a fix curse-vigour calculation math. 
also fix a ton of small other niggles from pvs-studio.
 2016-11-20 19:08:39 +01:00
Enno Rehling
303eb86399 factionid and curseid are also boring. 2016-11-17 21:29:15 +01:00
Enno Rehling
a88bfa7a9a decluttering config.c (rules go into laws.c) 2016-11-16 22:46:01 +01:00
Enno Rehling
17365edff7 move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
Enno Rehling
772bc427aa Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-15 20:44:02 +01:00
Enno Rehling
c1f468ceb0 begin to declutter config.c 2016-11-15 20:43:36 +01:00
Enno Rehling
ce4a3c14b3 convert from atoi to atoip. 
most numbers in commands cannot be negative.
 2016-11-14 22:27:44 +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
ff09defa69 prevent badly naming units/factions/regions. 2016-11-11 01:59:43 +01:00
Enno Rehling
03d90c5680 remove BOM from UTF-8 files, replace Umlauts 2016-11-01 17:25:52 +01:00
Enno Rehling
754ad78db7 WIP: remove GUARD_* flags. 
TODO: does not compile
TODO: write new guard.test.c tests
 2016-10-31 07:45:06 +01:00
Enno Rehling
1ea8c80845 test that is_guard changes when armedmen does. 2016-10-29 19:19:11 +02:00
Enno Rehling
8f802c11e1 off-by-one error for early break from loop. 2016-10-25 00:12:18 +02:00
Enno Rehling
f12eda8bdf remove cfindhash, again. 
curse and unit ids can collide, there is no reason why they should be from the same pool.
 2016-10-23 10:03:33 +02:00
Enno Rehling
63f60a2465 cache some more get_race calls, especially for RC_SPELL. 2016-10-03 20:36:46 +02:00
Enno Rehling
e45dc3d68a initizlize rc_elf 2016-09-22 09:37:54 +02:00
Enno Rehling
ff83d5108a remove old_race call form heal_factor 2016-09-22 09:08:02 +02:00
Enno Rehling
a3ad9a0222 I am now calling get_race far too often. Fix this a bit. 2016-09-20 20:27:41 +02:00
Enno Rehling
aceb880826 add some TODO and reduce old_race usage. 2016-09-19 18:45:16 +02:00
Enno Rehling
86ef225ccb add some more local caching. 2016-09-11 12:48:00 +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
d9e541843b further reduce number of bt_find calls. 2016-08-30 09:36:09 +01:00
Enno Rehling
1a1ec3f363 cleanup: remove static curse_type variables. 2016-08-29 20:12:31 +01:00
Enno Rehling
43090e1492 remove any reference to old two-stage maintenance. 
getting rid of a lot of dead code.
 2016-08-21 20:02:20 +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
Steffen Mecke
00ca412634 show item and race if possible 2016-06-11 23:57:01 +02:00
Enno Rehling
c79ecc1a78 fix bug 2211, ignore a match for items we don't have. 2016-06-06 23:24:33 +02: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
40530f2066 rename to password_encode, streamline tests 2016-02-12 08:33:08 +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
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
ba39fc9284 I'm really bad at reading. Fixed! 2016-01-31 22:17:55 +01:00
Enno Rehling
ca81dadedb missed a spot! 2016-01-31 22:12:08 +01:00
Enno Rehling
7ebfdb0747 manually smooth out a merge of two commits trying to do the same thing. 
prevent negative parents
https://bugs.eressea.de/view.php?id=2183
 2016-01-31 22:10:37 +01:00
Enno Rehling
1ec20aed16 fix crash when aging stone circles without an astral plane 2016-01-31 13:47:18 +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
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
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