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

239 commits

Author SHA1 Message Date
Enno Rehling
24ff4c301d refactor: separate building_is_active from inside_building 2015-11-02 14:18:50 +01:00
Enno Rehling
d6bc1c3119 CID 22506: Dereference null return value (NULL_RETURNS) 
always check fopen success
 2015-10-30 12:54:07 +01:00
Enno Rehling
ca7d25858e CID 22563: Copy into fixed size buffer (STRING_OVERFLOW) 
bsdstring to the rescue, once again
 2015-10-30 11:16:09 +01:00
Enno Rehling
96be12218e test rename with missing name (not crashing, error message) 2015-10-13 14:27:42 +02:00
Enno Rehling
177f8f5288 re-enable a test that supposedly breaks on travis (find out why) 
fix a potential null-pointer crash in rename_cmd
 2015-10-13 13:32:27 +02:00
Enno Rehling
9e49e10d11 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/unit.test.c
 2015-10-10 22:55:29 +02:00
Enno Rehling
99c385412a fix crash in mail_cmd when order is missing a message 2015-10-10 22:50:15 +02:00
Enno Rehling
3055f517dc move guard implementation into a module (WIP) 2015-09-12 22:53:54 +02:00
Enno Rehling
8fa3234159 Merge branch 'master' into develop 
Conflicts:
	tests/runtests.bat
 2015-09-12 21:00:28 +02:00
Enno Rehling
a027139057 remove global variable verbosity in favor of static in main.c (use log_* functions everywhere) 2015-09-12 20:58:09 +02:00
Enno Rehling
06a04d0e20 fix logging for sp_igjarjuk, temporarily set log-levels for the game to error|warn|info 
remove some code that accesses `verbosity` variable (todo: hide it more, fix logging)
 2015-09-12 19:48:03 +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
9563aa712f eliminate junk function 2015-09-12 14:16:18 +02:00
Enno Rehling
42f1030251 separate test script for E4: 
even though it has mostly the same rules, it does not have xmastrees, and loads a different config
remove dead `inactivefaction` function, we have no use for the file it creates.
 2015-09-12 14:10:08 +02:00
Enno Rehling
09efd9c2a9 fix anything that uses the calendar module. opps. 2015-09-12 12:54:49 +02:00
Enno Rehling
f0e255924f add a unit test for add/free prefixes. fix bad free_prefixes call site. 2015-09-12 12:41:04 +02:00
Enno Rehling
f1476c2167 refactoring: split out a module for race prefixes 2015-09-12 12:24:10 +02:00
Enno Rehling
cf08cdf3fb configuration type-fixes: int to bool where appropriate (possibly incomplete) 
rename some rules to make it more obvious that they are flags or other integer values.
 2015-09-11 10:04:08 +02:00
Enno Rehling
564a041b0d eliminate invalid assertions, remove unnecessary arguments (plant/breed/trees) 2015-08-27 16:53:36 +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
4c32fe19ee eliminate some dead code that was still marked with TODO. 2015-08-21 10:54:09 +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
ff38d8bf4c I don't think it's good to call update_spells before the turn. 
one should only have the spells that are in the previous week's report.
a few comments wouldn't hurt.
 2015-08-20 12:12:17 +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
1042c94fd9 quickly fix gcc conversion warnings. lots of DRY. 2015-08-17 20:17:02 +02:00
Enno Rehling
47dccc667b Add a message that contains the password in the first report, so Magellan can pick it up. 
Fix a bad type conversion when setting skills.
 2015-08-15 20:25:36 +02:00
Enno Rehling
b3a8a95a24 cherry-picking ship tests from range_max code 2015-08-07 11:48:46 +02:00
Enno Rehling
b8a2b9d0b7 Merge pull request #7 from ennorehling/feature/bug-2101-study-teach-testing 
bug 2101: increase max printed length of orders
 2015-08-06 17:05:32 +02:00
Enno Rehling
8dc4e93e90 fix missing units from CR, add a test, partially convert from FILE* to stream 2015-08-05 14:45:46 +02:00
Enno Rehling
8efc874952 backfill missing tests for ally_cmd 2015-08-05 12:19:17 +02:00
Enno Rehling
928b9966d0 fix broken test (select DESTROY over MOVE), start writing unit tests for update_long_order 2015-08-04 23:04:00 +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
17f15b69ee fix some of the unicode replacement symbol bullshit in comments 2015-08-02 21:37:12 +02:00
Enno Rehling
27835dc4e1 unit tests for STUDY and TEACH commands. 2015-07-09 13:24:21 +02:00
Enno Rehling
76a9dd6741 Merge remote-tracking branch 'upstream/develop' into develop 2015-07-07 15:34:42 +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
4e67c4ac3f do not remove new players for missing their first turn. 2015-07-05 15:24:46 +02:00
Enno Rehling
6df1e3eeb0 Merge pull request #250 from badgerman/feature/newplayer-fixes 
some fixes for new players
 2015-07-05 15:21:54 +02:00
Enno Rehling
ae8c448698 do not remove new players for missing their first turn. 2015-07-05 14:07:59 +02:00
Enno Rehling
979f3460d6 Bug 1805: re-enable NMR warnings 
https://bugs.eressea.de/view.php?id=1805
move warnings to the top of the list of errors in the NR
 2015-07-03 15:31:57 +02:00
Enno Rehling
a2376290d8 Bug 1950: fleeing units can guard the same turn. 
checking for UFL_FLEEING in can_start_guarding should make that impossible now.
https://bugs.eressea.de/view.php?id=1950
 2015-07-02 17:52:22 +02:00
Enno Rehling
31ca0ce052 fix a parser crash in the USE command. 2015-07-02 13:42:15 +02:00
Enno Rehling
3ba2b3d4d7 indentation fixes (tab->spaces) 2015-06-26 14:31:21 +02:00
Enno Rehling
659aa6c973 after combat, eject enemies only 2015-06-20 14:28:16 +02:00
Enno Rehling
9b7a4e813b functional test for forced leave configuration. 
functional test for forced leave after combat.
functional test for MAKE TEMP.
error handling for Lua function building.create().
reduce some errors to warnings.
initialize race.battle_flags correctly (when not created through XML).
re-initialize processor in case config has changed.
handle missing translation of combat status, with error message.
 2015-06-19 13:17:01 +02:00
Enno Rehling
e7bffb7533 implement post-combat forced leave from ship/building 2015-06-19 07:53:11 +02:00
Enno Rehling
59400b1e27 Merge branch 'release-3-5' into develop 
Conflicts:
	s/runtests
	src/buildno.h
 2015-05-24 14:10:42 +02:00
Enno Rehling
6f50027088 use_item can return positive values now 2015-05-24 07:43:11 +02:00
Enno Rehling
e99db198eb bugfix use_item (use_skillpotion did not use pool). 
from here on, all use_* functions return the number of items used, and
use_item handles removing them from the unit (or the pool).
 2015-05-24 07:17:23 +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
Enno Rehling
d0f8825240 use the syntax_error function where appropriate. 
fix bug w. releasing message too soon.
 2015-05-18 11:34:52 +02:00
Enno Rehling
820cdccf32 prettier syntax: C does not require taking an address (&) of a function. 2015-05-18 08:42:35 +02:00
Enno Rehling
dd8449783a converting float->double in a lot of the code to prevent -Wconversion messages 2015-05-15 19:08:44 +02:00
Enno Rehling
7f1ee527d9 Merge pull request #186 from badgerman/develop 
newplayer script updates, small gmtool fixes
 2015-05-10 14:05:39 -07:00
Steffen Mecke
2d27442681 apply possible number of racial attacks consequently 2015-05-08 13:02:54 +02: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
f06e3371a0 Bug 2089 again. rename giveitem flag to keepitem, because races should default to not holding on to their stuff. 2015-04-19 12:49:39 +02:00
Enno Rehling
d2eac946f1 ALLY command crashes when incomplete. 2015-04-09 17:16:34 +02:00
Enno Rehling
ad0a753c52 CLAIM command did not like that tokens could be NULL. 2015-04-09 12:33:23 +02:00
Steffen Mecke
d416a8eef1 fix NAME FOREIGN UNIT 
RENAME FOREIGN UNIT used a somewhat naive approach to check if a
unit still had its generic name. Fixed that.
 2015-02-11 23:10:43 +01:00
Enno Rehling
83e610ee03 Fixing bug 1802 again, CR contains no Monster names. 2015-02-11 07:57:38 +01:00
Enno Rehling
f9bced467d fix a crash in rename_cmd 2015-02-08 10:33:45 +01:00
Steffen Mecke
d288c74aaf fix stork message (mantis 2027), add tests 2015-02-02 21:32:29 +01:00
Enno Rehling
0955dd7f05 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2015-02-02 18:49:00 +01:00
Enno Rehling
01b46b143b add a configuration switch to disable force_leave (bug 2059) for now. 2015-02-01 12:57:54 +01:00
Enno Rehling
3fc434e1b9 bug 2072: make peasant growth not spam messages. 2015-02-01 10:27:00 +01:00
Enno Rehling
02f92f7932 Merge branch 'stm2-peasantgrowth_acceleration' 2015-01-30 22:25:21 +01:00
Enno Rehling
df5ab02689 Merge branch 'peasantgrowth_acceleration' of https://github.com/stm2/server into stm2-peasantgrowth_acceleration 2015-01-30 22:11:10 +01:00
Enno Rehling
a97a7bbf1d Merge branch 'master' of github.com:eressea/server 
Conflicts:
	src/kernel/item.test.c
 2015-01-30 20:44:42 +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
Steffen Mecke
a97b211e70 bit of testing, code improvements, formatting 2015-01-30 18:25:56 +01:00
Steffen Mecke
4c391ae6f6 implemented Enno's suggestions for peasant growth 2015-01-29 23:55:02 +01:00
Enno Rehling
c3ed521d4f Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4 
Conflicts:
	src/laws.c
 2015-01-29 18:03:21 +01:00
Enno Rehling
c7b28e7b39 disable ORIGIN at the source, prevent gcc warnings. 2015-01-29 16:46:03 +01:00
Enno Rehling
2260a19d50 disable ORIGIN command because of E4 crash 2015-01-26 07:24:18 +01:00
Steffen Mecke
531ab0e7a2 add configuration parameters for peasant growth and peasant luck effect 2015-01-15 13:34:50 +01:00
Steffen Mecke
ec6560a281 adding a nice region message 2015-01-15 03:48:19 +01:00
Steffen Mecke
863901d482 putting faster version into effect and removing pseudo-test 2015-01-15 02:53:15 +01:00
Steffen Mecke
51d52aaf7f implementing a much faster version of peasant growth calculation 2015-01-15 02:53:15 +01:00
Steffen Mecke
dff34f8e92 increase speed of peasant growth calculation 2015-01-14 01:55:04 +01:00
Enno Rehling
73e1632dee Merge branch 'bug-2059-force-leave' of github.com:badgerman/eressea into bug-2059-force-leave 
Conflicts:
	src/laws.c
	src/laws.test.c
 2015-01-13 07:48:46 +01:00
Enno Rehling
4f2d9260d1 add a message to the unit that gets kicked, with tests 2015-01-13 07:43:30 +01:00
Enno Rehling
f52e00d574 do not eject units from a ship when on the ocean. 2015-01-13 07:32:24 +01:00
Enno Rehling
698aa5e99a Bug 2059: building owners kick out anyone they don't HELP GUARD. 2015-01-13 07:32:23 +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
d968aa2ed5 do not eject units from a ship when on the ocean. 2015-01-05 22:09:08 +01:00
Enno Rehling
73da256461 Bug 2059: building owners kick out anyone they don't HELP GUARD. 2015-01-05 18:14:55 +01:00
Enno Rehling
4f962ae999 remove dead code 2014-12-25 00:45:52 +01:00
Enno Rehling
3e4973db25 kill the unused EnhancedQuit feature, reducing the potential use of at_object by one more situation. 2014-12-24 16:33:21 +01:00
Enno Rehling
b27491eccd move atoip out of config (small helper) and test it. 
remove some unnecessary variables from laws.c
 2014-12-23 09:23:37 +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
870d8001ef more getstrtoken() removal. 
remove obsolete argument to checkpasswd().
 2014-12-22 14:34:14 +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
4097e43ce6 DESCRIBE would crash if not given a description. 
Added a test for DESCRIBE UNIT.
 2014-12-20 22:18:38 +01:00
Enno Rehling
d67ecdb8cf Merge pull request #64 from CTD1/Bauern 
Bauern in leeren Regionen
 2014-12-19 20:08:42 +01:00
Enno Rehling
d7899a392a Merge pull request #81 from CTD1/BEZAHLE_NICHT_ID 
BEZAHLE NICHT ID
 2014-12-17 20:18:08 +01:00
CTD
aa536a943d BEZAHLE NICHT ID 
Man kann jetzt eine Gebäudenummer hinter Bezahle nicht angeben.
Wenn man keine angibt bleibt alles wie es war, sonst wird überprüft ob
man der Besitzer dieses Gebäudes ist, und wenn ja wird für diese Gebäude
der Unterhalt abgeschaltet. Wenn für ein Gebäude die Option das der
Regionsbesitzer  es Bezahlen kann an ist (und es leer ist) ist der
Regionsbesitzer auch automatisch Gebäudebesitzer.
Wenn man ein BEZAHLE NICHT für die Burg des Regionsbesitzers (E2 die
größte Burg) absetzt (implizit oder explizit) werden alle Gebäude in der
Region abgeschaltet, die vom Regionsbesitzer verwaltet werden.
 2014-12-17 17:22:26 +01:00