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
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
2aafb841a5 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	scripts/eressea/e3/init.lua
	scripts/eressea/xmas.lua
	scripts/eressea/xmasitems.lua
	src/buildno.h
	src/laws.c
 2015-12-26 14:46:20 +01:00
Enno Rehling
b66b6f7f4c testing christmas items, removing old xmas scripts 2015-12-22 19:33:44 +01:00
Enno Rehling
3fd4884584 putting all of the pieces together for the snow globe, with final use implementation still TBD 
Conflicts:
	scripts/eressea/xmasitems.lua
	src/laws.c
 2015-12-22 18:46:42 +01:00
Enno Rehling
5187788f3c pass the parent of an attribute into a_age and attrib_type::age 2015-12-16 22:18:44 +01:00
Steffen Mecke
ad74c0a25d fix rare bug that created negative peasants 
when a region had non-standard wage, immigration could cause negative peasants
 2015-12-08 17:57:23 +01:00
Enno Rehling
0410581907 Merge branch 'market_tests' of https://github.com/stm2/server into stm2-market_tests 
Conflicts:
	src/move.test.c
	src/study.c
 2015-11-26 18:42:23 +01:00
Enno Rehling
8aa7fec54c config.c cleanup: move attribute registration to attributes.c 2015-11-24 19:32:52 +01:00
Enno Rehling
5b9333f6d9 Merge branch 'release-3.7' into develop 
Conflicts:
	src/buildno.h
	src/monsters.c
 2015-11-23 17:12:48 +01:00
Enno Rehling
b6a947ca0c https://bugs.eressea.de/view.php?id=2165 
Monster bewachten nicht, wenn sie nicht ausreichend bewaffnet waren, weil der nötige Check nicht in can_start_guarding gemacht wurde, sondern in guard_on_cmd.
 2015-11-23 15:35:26 +01:00
Enno Rehling
48c75466b6 kill static caches for floating-point variables 2015-11-22 17:32:35 +01:00
Enno Rehling
2e392b4d7c eliminate even more static variable caches 2015-11-22 16:14:27 +01:00
Enno Rehling
3bd458b5e8 optimization: read configuration once before all battles, not before or during each individual one. 2015-11-22 15:29:43 +01:00
Enno Rehling
a4cb5e2906 replace all get_param_* for global.parameters with config_get_* 2015-11-22 10:44:46 +01:00
Enno Rehling
7e27928d17 eliminate static variables and cache logic from more modules 2015-11-21 12:28:20 +01:00
Steffen Mecke
5326bbd9e4 refactored inside_building/building_is_active/active_building 2015-11-16 02:13:48 +01:00
Enno Rehling
9f94979b0d Merge branch 'bug/#2144' of https://github.com/TurnerSE/server into TurnerSE-bug/#2144 2015-11-07 18:53:19 +01:00
Philipp Dreher
d5f8448d7d changed the handling of an item the unit has no access to 
Since the return of display_item() implies that the item, which is
definitely an item but not a potion at this point, is neither in the
inventory of the unit nor an item in the region or the faction's item
pool, the existing message 36 is now triggered in this case and the
previously conditional break is now done indepent of the outcome of
display_item, which shouldn't be critical (it's  an item so it can't be
a spell or a race).
 2015-11-04 23:48:30 +01:00
Enno Rehling
9d4489972b CID 22447 Calling risky function 
github issue #336
 2015-11-04 12:09:45 +01:00
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
Enno Rehling
fb0eb4dce6 refactoring: moving plagues out of config.c 
cleaning up the code, moving chance into the random event code, it is not used by the plague spell (reduce signature by one argument)
 2014-12-16 14:18:29 +01:00
CTD
cc09e95887 Bauerngrenze angepasst 
Maximum Bauerngrenze bei der noch zusätzlich Bauern hinzukommen können
auf 90 erhöht und auch gleich Konfigurierbar gemacht.
Das sollte immer noch zu wenig sein um ernsthaft missbrauch damit zu
betreiben.
 2014-12-15 13:07:39 +01:00
CTD
7f39763ee1 Konfigurierbar 
Ich habe zumindest mal fix eine eigene Funktion draus gemacht und es mit
einer XML Option versehen. Es ist Default an, da auch in E3 die Bauern
rückläufig sind, und da E4 auf den selben Regeln aufbaut es auch da
sinnvoll wäre "tote" Regionen wiederzubeleben.
 2014-12-15 09:48:43 +01:00
Enno Rehling
b506bed4d9 fix a crash in the parser for USE orders when no item name was given. 2014-12-14 12:56:36 +01:00
Enno Rehling
522633a2de Update wormholes to the module naming convention. 
- register = called before game is loaded
- init = called after game is loaded
- update = called after the turn, before reports are written
 2014-12-13 16:43:35 +01:00
Enno Rehling
5751a9b3a9 Merge pull request #66 from badgerman/getunit-refactor 
refactoring getunit
 2014-12-13 13:26:32 +01:00
Enno Rehling
c4b898e968 remove some inactive #define macros and the code that goes with them. 
mostly rules that were experimental, but have made it into common use (not worth the effort of making them configurable).
 2014-12-13 11:53:16 +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
CTD
1cce4927a0 Bauern in leeren Regionen 
Eine recht einfache Funktion die ein paar zusätzliche Bauern in leeren
Regionen erschafft.
 2014-12-12 15:50:02 +01:00
Enno Rehling
cd70b8684d fix escape_string mmeory corruption error. 
fix a number of small stuff that happens when loading very old data files (like 572).
 2014-12-12 11:28:37 +01:00
Enno Rehling
20c0dfbb47 fix null-pointer crash (EMAIL order without arguments) 2014-12-11 23:23:11 +01:00
Enno Rehling
a16f63fc06 PROMOTE earlier in the turn, after GIVE and before PAY. 
https://bugs.eressea.de/view.php?id=1659
 2014-12-11 09:58:23 +01:00
Enno Rehling
1024dd5c81 Refactoring morale into a separate module. 
Not all of it yet, because it is inconveniently part of kernel/region.
 2014-12-10 19:04:02 +01:00
Enno Rehling
0fead39b41 added a function that sets a monster's name to NULL if it is the name of its race. 
deprecate old rc_name function (renamed to rc_name_s) because it used a static return string.
 2014-12-09 07:20:36 +01:00
Enno Rehling
7d5109329f tests for entering ships (but not yet full coverage) 2014-11-21 17:13:45 +01:00
Enno Rehling
64a2073033 tests for entering buildings. 2014-11-21 16:39:49 +01:00
Enno Rehling
367307575c Merge branch 'master' of github.com:eressea/server 2014-11-01 22:12:11 +01:00
Enno Rehling
14bcaf7d71 Merge branch 'version-3-3' 
Update build number
 2014-11-01 21:58:33 +01:00
Enno Rehling
dc7cbd886c fix the quit command, asserting the wrong keyword (probably copypasta). 2014-11-01 21:57:06 +01:00
Enno Rehling
59c1c23324 refactor config.c, move the find* functions into the modules they belong to. 2014-11-01 18:34:53 +01:00
Enno Rehling
1af315ebf2 move magic out of kernel, into src. 
clean up/remove a ton of includes, especially of types.h (include in header if you need it, not in every .c file).
 2014-11-01 12:57:01 +01:00
Enno Rehling
81bfb598d0 refactoring modules, cleaning out the config.c kitchen sink. 
- cansee_* rules to laws.c
- translations to language.c
- stealth to attributes/,
- rename build.h -> buildno.h
 2014-11-01 12:09:56 +01:00
Enno Rehling
f27a77d288 refactoring: use add_ally instead of manually crating the structure all over the code. 2014-10-31 15:13:05 +01:00
Enno Rehling
526c561b90 some minor cleanup in laws.h 2014-10-29 21:08:16 +01:00
Enno Rehling
6bd52012c0 read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
Enno Rehling
79c8c4a034 fix a crash when testing for the RESHOW ANY command. 
E2 crashed when no parameter was given.
 2014-10-18 21:40:25 +02:00
Enno Rehling
f069df2345 Merge branch 'master' of github.com:eressea/server 2014-10-18 21:37:40 +02:00
Enno Rehling
58547969f8 fix a crash when testing for the RESHOW ANY command. 
E2 crashed when no parameter was given.
 2014-10-18 21:36:46 +02:00
Enno Rehling
c6b6883477 Merge pull request #36 from CTD1/Workingplace 
Arbeitsplätze

It's weird. It worked on this PR, probably because it is based on a revision of master where the .travis.yml file already exists. For older PRs that were created before that file was in master, it doesn't work. We don't have many open ones, so it's not actually worth investigating how to fix that :-)
 2014-10-16 14:05:49 +02:00
Enno Rehling
1c19a6948c kill some dead code. 2014-10-15 18:19:16 +02:00
Enno Rehling
4527ffdda2 refactoring and tests for wormhole module. 2014-09-29 23:19:59 +02:00
Enno Rehling
74582aeb2f fix remaining getstrtoken uses without null-check. 2014-09-21 16:43:17 +02:00
CTD
3484acfa43 Arbeitsplätze 
Regionen haben jetzt immer mindestens 10% ihrer size als freie Freie
Arbeitsplätzt, höchstens jedoch 200.  Das sorgt dafür das die Bäume
nicht alle Bauern umbringen. Diese ernähren sich quasi durch Jagt statt
Ackerbau.
Sinnlose Variable MAXPEASANTS_PER_AREA entfernt.
 2014-09-18 12:10:42 +02:00
Enno Rehling
cf1f3972b6 cleaning out config.c, there is too much code in there. 
rules should be in their own modules. here:
upkeep is a concept all by itself, should have its own tests, etc.
movement code should be in move.c.
cleaning up some superfluous include directives.
 2014-08-31 16:50:37 +02:00
Enno Rehling
a9a0455207 reorganized directory structure. 
flattening the directory structure, moving some modules to the src/ directory.
making stealth a separate file, under test.
more tests for some stuff.
 2014-08-27 06:40:35 +02:00
Enno Rehling
4c00777553 make race::_name a string, not an array of strings. add a test for rc_name. 2014-08-24 23:58:29 +02:00
Enno Rehling
1c069da921 segmentation fault caused by new getstrtoken semantics 2014-08-24 12:40:00 +02:00
Enno Rehling
808f343e34 make getstrtoken() return null at EOL, kill init_tokens. 
init_order all the things!
added a bunch of new assertions to cover for oversights.
added some new tests for order parsing.
 2014-08-23 09:17:58 +02:00
Enno Rehling
ee2363a4d9 use init_order, it is better than the init_tokens+skip_token pattern. 
test for new_units.
additional testing for init_order (renamed from init_command)and init_tokens.
fixed a memory access error when kwd==NOKEYWORD.
 2014-08-23 06:45:20 +02:00
Enno Rehling
beacb850c6 fix MAKE TEMP, for real this time. I hate skip_token and all that stuff. 2014-08-23 00:37:33 +02:00
Enno Rehling
2fd085d1e5 Merge branch 'master' of https://github.com/eressea/server 2014-08-16 11:59:20 +02:00
Enno Rehling
c79dd33bfb smarter processing of MAKE TEMP. 
the order gets its own keyword. parsing is hard - composite commands are an anti-pattern.
this eliminates a lot of unnecessary mallocs for pushing/poping parser state.
 2014-08-16 11:41:19 +02:00
CTD
bdbffba68e Fixing Merge conflict 2014-08-14 02:06:24 +02:00
CTD
6afd8ab586 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/laws.c
 2014-08-14 00:23:41 +02:00
CTD
dfec8d8001 Merge remote-tracking branch 'origin/Verlasse-zu-spät-in-Befehlsreihenfolge' 
Conflicts:
	src/laws.c
 2014-08-14 00:14:51 +02:00
Enno Rehling
04be680bd5 refactoring the pre-release script. 
1. tests are now done in a subdiretory od the live server.
2. usage is easier, with commands.
3. using getopts for command-line parsing is cool.
 2014-08-11 13:41:37 +02:00
Enno Rehling
1918f56990 indentation + whitespace changes 2014-08-08 01:16:35 +02:00
Enno Rehling
1bd78438f2 Merge branch 'Verlasse-zu-spät-in-Befehlsreihenfolge' of github.com:CTD1/eressea-server-bugfixing into CTD1-Verlasse-zu-spät-in-Befehlsreihenfolge 
Conflicts:
	src/laws.c
 2014-08-08 00:34:55 +02:00
Enno Rehling
95dae121de Merge branch 'Bug-1803' of github.com:CTD1/eressea-server-bugfixing into CTD1-Bug-1803 
Conflicts:
	src/laws.c
 2014-08-08 00:25:17 +02:00
Enno Rehling
afd41286b5 config file reading based on game name and install location. 2014-08-03 20:37:05 +02:00
Enno Rehling
64ef71143a Use two-phase RESERVE in regular process_orders 2014-08-01 13:12:18 +02:00
CTD
db6179ddeb Betrete vor dem Kampf 
Damit Besitzer anderer Gebäude in der Region  vor einem Kampf in die
Burg fliehen können, noch ein 4tes mal Betrete.
 2014-07-28 11:16:45 +02:00
CTD
03b69cc37e Verlasse wurde erst nach dem Kampf ausgeführt 
Verlasse wurde erst nach Kämpfe ausgeführt, da die Befehle mit der
selben Prio als LiFo abgearbeitet werden. Das ist vor allem bei
überfüllten Burgen vor dem Kampf schlecht.
 2014-07-28 10:49:19 +02:00
CTD
964c03eb92 Bug 1803 RESERVIERE ALLES tut nichts 
Reserviere Alles implementiert.
Option für rules.reserve.twophase in die Befehlsabarbeitung
implementiert.
 2014-07-28 10:29:35 +02:00
Enno Rehling
d9457a2488 rewrite of the Lua module system. 
At this time, only E2 is working.
Fixing a lot of old code (monster is no longer id 0).
package.paths configured from eressea.ini
install directory configured from eressea.ini
moving building_action into a seaprate module (it's deprecated)
 2014-07-26 22:52:25 +02:00
Enno Rehling
51207167c8 allow reading the configuration from a different directory (-c dir). 2014-07-23 08:10:14 +02:00
Enno Rehling
e44d4aa9b9 implemented a suggested change to RESERVE. 
http://bugs.eressea.de/view.php?id=1675#c5240
new setting "rule.reserve.twophase" reserves from self first, before reserving from others.
fix a crash when trying to flush logs and there is no logfile.
 2014-07-20 06:19:21 +02:00
Enno Rehling
4c4652667c fix code to work with gcc, move init_locales() outside of util. 2014-07-17 15:16:57 +02:00
Enno Rehling
88f9d247bd Revert "use race::flags|RCF_NOGIVE instead of race::ec_flags|GIVEITEM" 
E3 Tests (GIVE) did not pass.

This reverts commit 5ec3f5b83a.
 2014-07-06 00:29:52 -07:00
Enno Rehling
5ec3f5b83a use race::flags|RCF_NOGIVE instead of race::ec_flags|GIVEITEM 
None of this has tests, it'd going to be years before a change like this can be made without fear D-:
 2014-07-05 23:31:34 -07:00
TomBraun
990b6505bf Fix BUG 0001976 
http://bugs.eressea.de/view.php?id=1976
Check that only buling owner set k_pay disable
If other unit inside the building set k_pay disable
it have now no effect, before only fraction was check

Conflicts:
	scripts/tests/eressea.lua
 2014-07-04 22:45:53 -07:00
TomBraun
783df84055 BUG owner of a building can't enter ship 
If owner of a building want to enter a ship or other building,
he must first leave the bulding.
Commands are "leave" and "enter <ship/tower> <ID>".
For buildings was that OK but not for ships.
The building owner was inside the region after that commans
and not in the ship.
 2014-07-04 22:31:09 -07:00
Enno Rehling
c3dfbdea18 eliminate new_race array in favor of a function (TODO: make it fast) 2014-06-29 18:10:02 -07:00
Enno Rehling
6bd2b3be26 add a test for stone golems building castles. 
fix a bug when stone golems use themselves up.
 2014-06-28 23:58:00 -07:00
Enno Rehling
92f43a7b51 eliminate it_find calls, replace it_find with something backed by rt_find 2014-06-24 22:44:05 -07:00
Enno Rehling
d581737744 optimization: caching resource types in get_resourcetype. 
eliminate some it_find calls.
eliminate static variables, they make testing hard.
 2014-06-24 07:42:45 -07:00
Enno Rehling
73da14e305 getting rid of the olditemtypes[] array 
reduce use of statics
reduce use of item_t enum
 2014-06-23 07:28:10 -07:00
Enno Rehling
bff25f3c51 move skill_t into a separate file, give it unit tests. 
name functions the same as we did for keyword/direction earlier.
to do: json configuration and lua test.
 2014-06-20 23:59:04 -07:00
Enno Rehling
3625ba6a95 remove static variables optimizations, they create global state that is bad for testing 2014-06-17 23:10:55 -07:00
Enno Rehling
c8dc6be6f2 rename get_keyword, because something else should have that name. 2014-06-16 07:19:22 -07:00
Enno Rehling
64e0c221ec directions can now be read from json configuration. 
rename a couple of functions for more consistency across modules.
 2014-06-15 22:17:08 -07:00
Enno Rehling
a9f0538d8e keyword_t and direction_t are moving into their own module. 
direction parser gets new initialization function, for use in jsonconf later.
add unit tests for directions.
 2014-06-15 18:34:39 -07:00
Enno Rehling
d503937999 working on making json config understand ships and buildings. 
new tests in progress.
remove giveitem.c attribute, the name clashed with a trigger,
and it was only part of an arena that is gone from the game, I think.
 2014-06-12 22:14:07 -07:00
Enno Rehling
fa98528d72 remove old SQL patch code, we have sqlite now. 
rearrange the SlickEdit projects.
 2014-06-11 22:21:52 -07:00
Enno Rehling
a304b981d5 remove archetypes, they are not used by any existing game. 
make compiling with libxml2 optional (USE_LIBXML2)
disable xml reports
 2014-06-09 19:05:17 -07:00
Enno Rehling
3c4b6b9dd4 rename message.[hc] to messages.[hc] in kernel because of naming conflict with util/ 
begin json config files (WIP)
 2014-06-09 09:56:49 -07:00
Enno Rehling
6f29e4dab5 improve logging information (missing race, log levels) 
do nothing when thre is no peasant blood
 2014-06-01 11:07:22 +02:00
Enno Rehling
7038b021de fix counting of units, making it slower but more correct 2014-05-24 20:25:06 -07:00
Enno Rehling
465f3f7ce9 Merge branch 'master' of github.com:eressea/server 2014-05-05 00:00:10 -07:00