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

179 commits

Author SHA1 Message Date
Enno Rehling
cc227fb707 merge monster.c and monsters.c 
move RCF_DESERT handling to monsters.c
 2016-12-23 18:05:38 +01:00
Enno Rehling
925d65c206 move entertainmoney to economy 2016-11-22 12:22:07 +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
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
29d072a186 remove the old ORCIFICATION code. 2016-11-13 17:13:59 +01:00
Enno Rehling
fec9945458 Fixing Bugs 2246 & 2251 
parse error message for bad orders:
https://bugs.eressea.de/view.php?id=2251
report when TEMP-Units cannot recuit:
https://bugs.eressea.de/view.php?id=2246
 2016-11-05 18:20:56 +01:00
Enno Rehling
467ffe2db0 include guard.h directly, not through laws.h 2016-11-01 22:11:10 +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
eb7199450d fix Linux compilation. 2016-10-30 09:47:18 +01:00
Enno Rehling
2c0f708d1b WIP: remove at_guard, GUARD_TREES and GUARD_MINING 
TODO: fix tests
TODO: write new guard coverage
 2016-10-30 09:18:19 +01:00
Enno Rehling
9287d0c1b4 unused function 2016-10-07 22:06:47 +02:00
Enno Rehling
38721e2046 remove all mention of centaurs from the code and configuration 2016-10-07 19:33:50 +02:00
Enno Rehling
d3efc265c3 calculating income for dragons is no longer hard-coded 2016-10-04 09:14:49 +02:00
Enno Rehling
cbd1e8c457 Fixing https://bugs.eressea.de/view.php?id=2234 
remove the MTF_VITAL materials flag.
remove remaining BLD_MAINTAINED vs BLD_WORKING code.
 2016-10-01 18:34:38 +02:00
Enno Rehling
2c0f0bfc1e reduce get_race calls by a few more 2016-09-22 15:51:11 +02:00
Enno Rehling
7d88dddcc3 Merge pull request #578 from ennorehling/cache-buiding-type 
add an API for caching the results of bt_find
 2016-09-19 20:14:27 +02:00
Enno Rehling
a7fbe4901b eliminate old_race. make the catdragon act like a dragon. 2016-09-19 18:42:14 +02:00
Enno Rehling
d139ee08d1 caching building_type in economy code 2016-09-19 04:15:26 +02:00
Enno Rehling
b3c31856aa add (failing) test for recruiting into existing units. 2016-09-18 11:34:54 +02:00
Enno Rehling
3a438ffd4f I have questions about this 2016-09-10 21:12:19 +02: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
a42bd9c3bf remove the BLD_WORKING flag. 
it's all about BLD_MAINTAINED now.
fix region.blocked (Lua property).
 2016-08-21 20:12:28 +02: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
901cf97cb2 refactoring the "nocostbuilding" curse. 
- remove C_NOCOST constant and other baggage
- refactor maintenance a bit
 2016-08-21 20:02:19 +02:00
Enno Rehling
3d5c7ba8fb refactoring: move produceexp from unit.c to study.c 2016-03-09 14:50:54 +01:00
Steffen Mecke
1f4c521ac8 encapsulate r->land->peasants, money, horses, herbs, morale 2015-12-08 17:57:23 +01:00
Enno Rehling
950bf91850 fix merge conflict in PR #397 (config changes) 2015-11-26 18:48:21 +01:00
Enno Rehling
6ad5db8e22 Merge pull request #397 from stm2/taxing_message 
taxing without skill does not fail silently any more
 2015-11-26 18:43:57 +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
64b84481b2 refactoring: move parsing and allies code out of config.c 2015-11-24 18:52:09 +01:00
Enno Rehling
2e392b4d7c eliminate even more static variable caches 2015-11-22 16:14:27 +01:00
Enno Rehling
edcd79d044 add a config_token function to look for a token inside a list 2015-11-22 12:20:33 +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
990fda6234 clean up config.c, remove static configuration caching 2015-11-21 18:13:16 +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
Steffen Mecke
493b45c832 taxing without skill does not fail silently any more 
http://bugs.eressea.de/view.php?id=2158
added configuration parameter for tax per level
 2015-11-14 15:36:14 +01:00
Enno Rehling
34c9958368 CID 22584 Result is not floating-point 
github issue #326
chance of morale loss is 20-100 percent depending on loss of silver
 2015-11-10 10:44:17 +01:00
Enno Rehling
edb862a8fc CID 22461 Division or modulo by zero 
partial fix github issue #326
also fewer calls to rmoney
 2015-11-09 20:10:02 +01:00
Enno Rehling
24ff4c301d refactor: separate building_is_active from inside_building 2015-11-02 14:18:50 +01:00
Enno Rehling
20c9fb60dc release additional reference to recruit order 2015-10-14 11:58:54 +02:00
Enno Rehling
09efd9c2a9 fix anything that uses the calendar module. opps. 2015-09-12 12:54:49 +02:00
Enno Rehling
d29d38f710 refactor donations into a seaprate code module, add a basic test 2015-09-09 15:45:20 +02:00
Enno Rehling
60111282b3 make findunitr be O(1) instead of O(#r->units) 2015-09-09 13:29:58 +02:00
Enno Rehling
e4026e0f6b eliminate more non-critical arguments. 2015-08-27 16:59:39 +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
6889cb0c80 remove superfluous argument from herbsearch 
use effskill, not eff_skill
 2015-08-27 14:46:08 +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
fc2b8f3471 bug 2080: long actions after DESTROY 
https://bugs.eressea.de/view.php?id=2080
we forgot to set the flags. also added a test for the future.
 2015-07-02 11:42:18 +02:00
Enno Rehling
c4d1482250 signed/unsigned comparisons (VC warning only) 2015-05-15 20:56:43 +02:00
Enno Rehling
eac4ef7ddc reduce conversion warning to float only 2015-05-15 13:32:22 +02:00
Steffen Mecke
b5f8be8a95 fix heroes must not recruit 2015-02-10 18:17:58 +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
90dd700487 BREED/PLANT/GROW are technically the same command, merge them. 
The new parser makes this easy.
 2015-01-04 15:11:49 +01:00
Enno Rehling
108a909131 kill gc_add and gc_done, they were terrible ideas. 2014-12-25 22:38:01 +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
27b1d55350 enhancement: buildings without an owner report their lack of upkeep to the entire region. 
https://bugs.eressea.de/view.php?id=1713
 2014-12-14 11:48:15 +01:00
Enno Rehling
3a1e4ab7f5 fix crash when a GIVE order has no arguments. 2014-12-13 18:40:15 +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
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
2fe40f00f5 Merge branch 'master' of github.com:eressea/server 2014-11-16 13:08:17 +01:00
Enno Rehling
a5f14e7f02 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2014-11-16 12:55:58 +01:00
Enno Rehling
13b443ebb3 fix crash (null pointer in make_cmd) 2014-11-16 12:49:39 +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
Enno Rehling
b2140f54fd refactor, move give_cmd into give.c 2014-11-03 08:44:26 +01:00
Enno Rehling
38a0a02565 refactor tests for giving, add test for GIVE HERBS. 2014-11-03 08:33:07 +01:00
Enno Rehling
0b96cc7d13 fix previous commit 2014-11-02 12:54:49 +01:00
Enno Rehling
59075b7194 fixing the gcc build (switch warning) 2014-11-02 12:45:20 +01:00
Enno Rehling
ecc3b1b441 Dragons re using the new LOOT command. 
Fixing the income message (missing ")").
 2014-11-02 11:10:26 +01:00
Enno Rehling
2b596b40f6 Merge branch 'master' of github.com:eressea/server 2014-11-02 10:40:49 +01:00
Enno Rehling
bbd4e31cf9 Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot 
Conflicts:
	res/core/de/strings.xml
 2014-11-02 10:02:30 +01:00
Enno Rehling
367307575c Merge branch 'master' of github.com:eressea/server 2014-11-01 22:12:11 +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
b67d42b45e Merge branch 'version-3-3' 2014-10-26 21:19:16 +01:00
Enno Rehling
f3e54e103a fix a crash when selling nothing. 
build 687
 2014-10-25 23:54:01 +02:00
CTD
3d6c499431 Fixeing GCC 
Das es nicht gut ist wenn max als int in der Funktion definiert ist und
gleichzeitig global als Funktion existiert ist OK, aber warum Travis
chance() nicht kennt verstehe ich nicht, das ist in der rand.h als
extern definiert, sollte also kein Problem sein. Jetzt halt mit
rng_int().
 2014-10-17 11:23:49 +02:00
CTD
1c7075573b Plündern 
Neues Kommando Plündern für die Monster (kann über XML-Option auch für
Spieler freigeschaltet werden)
 2014-10-16 14:45:21 +02:00
CTD
88b9d3c583 Fix für Leere Gebäude 
Der check war sinnlos, denn u->building wobei u der Besitzer ist, gibt
ja im Fall das er der "Besitzer der größten Burg in der Region" ist eben
diese Burg zurück.

So geht das dann auch in E2.
 2014-10-16 14:40:22 +02:00
Enno Rehling
7df47fd25c remove bad configuration caching (TODO: cache inside get_param). 
move remove_empty_* functions out of config.c
add basic tests for remove_empty_units (no special units yet).
 2014-10-16 07:41:49 +02:00
Enno Rehling
74582aeb2f fix remaining getstrtoken uses without null-check. 2014-09-21 16:43:17 +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
a1a810a094 segmentation fault 2014-08-24 12:41:39 +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
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
Enno Rehling
444971542c fix missing curly brace, indentation. hope I got this right. 2014-08-13 19:55:10 +02:00
Enno Rehling
b6f627a5d8 Merge branch 'Feature-1865' of github.com:CTD1/eressea-server-bugfixing into CTD1-Feature-1865 
Conflicts:
	src/economy.c
 2014-08-13 19:44:57 +02:00
CTD
53a5314463 Fix für E2 
Die Abfrage der Option war ohne Default, so das sie hier immer an war.
In E2 führ das dann wegen cmp_taxes zur assertion.

Das wars, jetzt sollte alles rund sein.
 2014-08-08 17:27:13 +02:00
Enno Rehling
1918f56990 indentation + whitespace changes 2014-08-08 01:16:35 +02:00
Enno Rehling
75e98ae0cb Merge pull request #20 from CTD1/Bug-1664 
Bug 1664: Obwohl kein Holz vorhanden ist, kommt die Meldung, daß der Unt...
 2014-08-08 00:48:52 +02:00
Enno Rehling
b90b744287 removing unused RECRUIT_CLASSIC option. Dead code is dead. 2014-08-04 19:53:16 +02:00
CTD
51356b061c Feature 1865 leere unterhaltspflichtige Gebäude 
Gebäude ohne Besitzer werden automatisch vom Regionsbesitzer übernommen
(Die Einheit wird sozusagen der neue Gebäudebesitzer). Betreten dann nur
noch wenn Helfe Bewache vom Regionsbesitzer.
Wichtig:
<param name="rules.region_owners" value="1"/>, ist Voraussetzung,  es
geht also nicht in E2.
Es kann für beliebige Gebäude eingeschaltet werden.
Example config :
<param name="rules.region_owner_pay_building" value="market harbour
lighthouse"/>
 2014-08-01 16:13:35 +02:00