Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,415 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

59 Commits

Author SHA1 Message Date
Enno Rehling d45f16982d https://bugs.eressea.de/view.php?id=2164 
ships no longer receive damage from drifting. eliminating the code for this, instead of just the configuration parameters, since all active games now agree on this rule.
 2015-11-23 18:41:11 +01:00
Enno Rehling 64e8d4b094 CID 22484 Explicit null dereferenced 2015-11-05 08:50:01 +01:00
Enno Rehling c68829029b 22485 Dereference after null check 2015-11-05 08:35:03 +01:00
Enno Rehling ae28cbd7c3 Merge branch 'enhancement/airship_refactoring' of https://github.com/TurnerSE/server into TurnerSE-enhancement/airship_refactoring 
Conflicts:
	src/spells/shipcurse.c
 2015-11-03 13:02:42 +01:00
Philipp Dreher 8200fdb6c2 moved files for flyingship to subdir "spells" 2015-11-02 15:40:26 +01:00
Philipp Dreher d93305b180 moved flying ship functionality from move.c to flyingship.c 2015-11-02 00:35:32 +01:00
Enno Rehling 2f82cccea1 CID 22571: Copy into fixed size buffer (STRING_OVERFLOW) 
replace strcat with strlcat
 2015-10-30 10:55:06 +01:00
Enno Rehling 9d9994811a CID 26258: (NULL_RETURNS) 
deal with bad connection data, static analysis doen't knwo that we never have that.
 2015-10-29 16:38:29 +01:00
Enno Rehling 7e2364c296 test for actual piracy ship movement 
refactor storm check, run less code when disabled
fix ship creation in tests
 2015-10-12 19:40:20 +02:00
Enno Rehling 4c028bceac the early beginnings of a test for piracy 
extract validation message from piracy_cmd
fix a SAIL/SWIM check inconsistency
 2015-10-12 16:30:56 +02:00
Enno Rehling 521519805d refactor piracy code into a module, separate from move. 2015-10-11 21:19:38 +02:00
Enno Rehling f07802bab5 add a test to check that move_ship creates a trail when given a route 
Conflicts:
	src/move.test.c
 2015-09-25 14:09:22 +02:00
Enno Rehling f018016feb rename hunt to follow_ship, because why was it ever called anything else? 2015-09-25 14:06:18 +02:00
Enno Rehling 84a92124bd Merge branch 'feature/bug-2053-attack-monsters' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-2053-attack-monsters 
Conflicts:
	conf/e3/config.xml
 2015-09-19 13:35:53 +02:00
Enno Rehling 9bdc811582 produceexp uses a json-configurable constant 
make get_param_flt return a double, floats are for wimps.
 2015-09-12 16:38:51 +02:00
Enno Rehling 09efd9c2a9 fix anything that uses the calendar module. opps. 2015-09-12 12:54:49 +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 a9ecd1f55e replace all at_travelunit code with travelthru_map calls. 
welcome to callback hell.
this should stop the buffer for travelthru from running over.
tests for this should be hell, and I still owe writing them.
 2015-08-19 14:37:51 +02:00
Enno Rehling ebe365fd6e move travelthru logic to a separate module. todo: split off the report writing from the collection of units. 2015-08-18 18:57:04 +02:00
Enno Rehling c8cbeea660 STRLCPY macro redefinition and fixes for gcc. work for monkeys. 2015-08-17 22:48:21 +02:00
Enno Rehling e621b97465 Easy pratfall: Visual Studio includes limits.h through stdlib.h, but gcc/clang do not. 2015-08-17 20:22:02 +02:00
Enno Rehling 1042c94fd9 quickly fix gcc conversion warnings. lots of DRY. 2015-08-17 20:17:02 +02:00
Enno Rehling b999e3c963 replace strlcpy/wrptr pairs with new STRLCPY macro. 2015-08-17 19:37:02 +02:00
Enno Rehling b50c1720cf several monster_attack fixes. 
1. do not try to attack other monsters.
2. monsters outside of a building can attack units outside of buildings.
3. dragons can guard without weapons.
 2015-08-16 16:18:59 +02:00
Enno Rehling b72f48c044 enhanced ship speed for selected ships (currently none). 2015-08-07 12:51:20 +02:00
Enno Rehling b3a8a95a24 cherry-picking ship tests from range_max code 2015-08-07 11:48:46 +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 17f15b69ee fix some of the unicode replacement symbol bullshit in comments 2015-08-02 21:37:12 +02:00
Enno Rehling f9130fcb38 some more easy tests for sabotage. 2015-07-07 13:38:14 +02:00
Enno Rehling ef4052b0f6 the outcome of a casual static analysis session. 2015-07-06 19:53:09 +02:00
Enno Rehling 15e9c5962c merge feature/test-cleanup 
removing old test files
merging old tests into current system
fixing some internal bugs (i.e. adjust_coordinates)
 2015-07-01 21:24:44 +02:00
Enno Rehling 0ee76ea8dd Bug 2113: player-owned dragons did not get movement bonuses. 
https://bugs.eressea.de/view.php?id=2113
 2015-06-26 20:12:01 +02:00
Enno Rehling fe29e29c31 fix -Wconversion for move.c 2015-05-15 06:43:47 +02:00
Enno Rehling d2fbdec831 re-enable disabled tests for E2, add test for FOLLOW. 2015-04-20 15:07:10 +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 ae9fb399f3 unit tests walkingcapacity, configurable trollbelt effect 2015-04-14 02:32:01 +02:00
Enno Rehling b9a41bc39f fixing the trollbelt multiplier. 
it was multiplying the weight of the unit, too, leading to far too big bonuses.
https://bugs.eressea.de/view.php?id=1510
 2015-04-09 15:59:00 +02:00
CTD a78cabd5a0 Guard chance repaired 
Das muss auch in den master damit es in der nächsten Auswertung wieder
richtig ist!
 2015-02-13 16:22:52 +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 4bb65873da shipspeed should be in ship.c, not in config.c 2014-12-25 18:16:24 +01:00
Enno Rehling c8b9044f78 rename to gettoken, use more widely, add a basic test. 2014-12-22 16:28:17 +01:00
Enno Rehling 5cdc85f6bf start to get rid of getstrtoken(), which uses an internal static buffer and causes horrible bugs when called multiple times. 2014-12-22 14:21:24 +01:00
Enno Rehling 2966e1ea3d remove igetstrtoken, a confusing helper function that was hardly used at all. 2014-12-18 17:47:49 +01:00
Enno Rehling 8971f59ecc move more things out of config.c. 
- lighthouses into their own module.
- lastregion/firstregion into reports.c.
 2014-12-17 17:22:26 +01:00
Enno Rehling 98994f233d remove the deprecated getunit function. 
fix the build, missing return value from give_control_cmd.
 2014-12-12 21:06:47 +01:00
Enno Rehling 481275aef1 refactor: eliminate the getunitpeasants global variable. 
bugfix: it was possible to uncover stealth units with GIVE CONTROL.
 2014-12-12 20:53:39 +01:00
Enno Rehling 2fe40f00f5 Merge branch 'master' of github.com:eressea/server 2014-11-16 13:08:17 +01:00
Enno Rehling 5b9eb9080f refactoring: move all monster-related code into monster.c 
make some features depend on being NPCs, not monster faction.
 2014-11-11 16:53:56 +01:00
CTD f3cce58be5 smal fixes for Linux 2014-11-11 10:53:29 +01:00
CTD 9d3b2f3da9 Flieger und Bewache 
Flieger können nur noch durch andere Flieger aufgehalten werden.
Damit können Drachen auch in Bewachten Regionen plündern.
 2014-11-11 10:17:55 +01:00