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

54 commits

Author SHA1 Message Date
Enno Rehling
527d6c8bf9 Merge branch 'master' of github.com:eressea/core 2012-06-16 09:17:51 -07:00
Enno Rehling
8dee09b088 reduce warnings 2012-06-16 09:17:29 -07:00
Enno Rehling
09800b8387 moving things into laws.c, where a lot of order processing happens now. 2012-06-13 23:25:20 -07:00
Enno Rehling
d38c5f5cfb fix production of items in produce() 
add use, move and study/teach to bindings
 2012-06-12 22:36:29 -07:00
Enno Rehling
6aa08b60fd more process-related bindings and tests 2012-06-10 05:28:19 -07:00
Enno Rehling
dafb2fc2ab adding a lot of test coverage 
extending the binding generation to more processing functions
 2012-06-07 09:47:02 -07:00
Steffen Mecke
9d58f65404 fixed bug #1875: demons use their own peasantblood before other unit's 2012-06-09 00:13:13 +02:00
Enno Rehling
a928c6b45c cmake configuration for gamecode 2012-06-03 13:39:42 -07:00
Enno Rehling
db094810fd removing quicklist, importing it from a submodule 2012-05-30 19:55:17 -07:00
Enno Rehling
347ff0dd77 snprintf is evil and dangerous. 2012-05-29 12:17:25 -07:00
Enno Rehling
36ad727394 avoid duplicate spells in spellbooks (it's a bit hackish) 2012-05-26 15:15:18 -07:00
Enno Rehling
62a91f4558 kill tybied in E3, make common spells the source for random choices 2012-05-26 14:19:35 -07:00
Enno Rehling
2103c1725e Fix accidental parsing of empty strings (Bug 1917) 2012-05-26 12:23:22 -07:00
Enno Rehling
5547893be7 fix create_roi function in E3 2012-05-26 10:16:39 -07:00
Enno Rehling
998549e687 mages have spellbooks now 2012-05-26 08:20:26 -07:00
Enno Rehling
9d1b62d463 updating spell-lists is a thing of the past now 
almost everything uses books, except sc_mage
 2012-05-26 00:33:55 -07:00
Enno Rehling
faa72b66b1 untangle the spaghetti a little bit 
struct spell is now in spell.h where it belongs
some functions have moved as a result
 2012-05-25 22:25:23 -07:00
Enno Rehling
a015d72add unit_add_spell gets a level 
added a test that fails for get_spellfromtoken if spell is not stored with the unit
 2012-05-25 21:07:26 -07:00
Enno Rehling
3514218dba factions have working spellbooks 
update of spellbooks for E3 should be functional
old data file is getting read, and levels guessed?
 2012-05-24 00:56:54 -07:00
Enno Rehling
eea6bdb888 comparison to boolean values is bad form. 2012-05-23 00:09:19 -07:00
Enno Rehling
c9902a1d25 move error handling for use_cmd into a single location 2012-05-19 21:01:25 -07:00
Enno Rehling
bcb01742ae remove yet another fintoken warning from the logs 2012-05-19 20:00:54 -07:00
Enno Rehling
cc9a815eea remove another fintoken warning from the logs 2012-05-19 19:54:14 -07:00
Enno Rehling
0c2531f259 remove UFL_OWNER anywhere but in save.c 2012-05-18 22:34:04 -07:00
Enno Rehling
e501ed5bbd test that we are the owner of the building first. 2012-05-18 21:46:41 -07:00
Enno Rehling
57fbc7809c more strictly define what it means to be the owner of the building, and when it is transferred. 
test coverage is a winderful thing.
UFL_OWNER is probably entirely useless now, must fix
 2012-05-18 21:26:41 -07:00
Enno Rehling
775e8edae1 as much as possible, replace the UFL_OWNER flag with checking the owner the canonical way. 2012-05-17 16:40:50 -07:00
Enno Rehling
7789e0534e implement ship-ownership transfer as a function 
test the reorder_units function
 2012-05-17 12:23:25 -07:00
Enno Rehling
d12fe2dbed begin making shipowner use ship->owner. 
fix a broken test caused by locale_string returning null.
 2012-05-17 00:13:30 -07:00
Enno Rehling
ecbe770fce rename _log_error to log_error and get rid of the cumbersome #define 2012-05-16 16:52:01 -07:00
Enno Rehling
14d62afb0d rename _log_warn to log_warning and get rid of the cumbersome #define 2012-05-16 15:52:37 -07:00
Enno Rehling
7b6a719a62 findparam improvements! 
removed findbuildingtype from findparam
separate isparam() function that I can optimize later
 2012-05-16 12:06:44 -07:00
Enno Rehling
53d35213b6 Merge branch 'master' of gitorious.org:eressea/server 
Clean up all warnings that Visual C++ didn't find

Conflicts:
	shared/src/util/umlaut.c
	shared/src/util/umlaut_test.c
 2012-05-16 09:48:01 +02:00
Enno Rehling
b0959398d8 log library refactoring, first steps 2012-05-16 07:21:59 +02:00
Enno Rehling
116a1ee8ba remove tnode from anywhere, and use a void* instead, in preparation for a new findtoken implementation. this needs to have a good testing. 
lots of warning fixes for high warning levels in visual studio also
 2012-05-15 15:04:23 -07:00
Enno Rehling
c10e2552ad get_spellfromtoken needs a mage, not any unit. 2012-05-09 13:06:16 -07:00
Enno Rehling
5bf42bd8e9 make laws_tests more stand-alone 2011-03-08 21:18:35 -08:00
Enno Rehling
54d05f8544 MSVC warns about unreachable code. 2011-03-07 23:46:56 -08:00
Enno Rehling
b4c5607747 compiling with -pedantic on linux 2011-03-08 08:44:20 +01:00
Enno Rehling
496aa22e65 fixes for -ansi -pedantic 2011-03-07 17:29:19 +01:00
Enno Rehling
9c8779b303 indentation rules, slightly updated 2011-03-07 08:24:52 +01:00
Enno Rehling
fb7a642d47 indentation rules, strictly applied 2011-03-07 08:02:35 +01:00
Enno Rehling
d75ee1a057 Make the code compile on Visual Studio again, fixing type conversion warnings and C99-isms. 
Signed-off-by: Enno Rehling <enno@eressea.de>
 2011-03-06 19:29:20 -08:00
Enno Rehling
cb4f7a03c6 configurable ship damage 2011-03-06 12:43:18 +01:00
Enno Rehling
d3a7d22253 http://bugs.eressea.de/view.php?id=1679 
Applying a patch provided by Solthar: Server will give error when unit is given more than one long order.
I just added a test to this.
 2010-11-11 20:11:19 -08:00
Enno Rehling
279fa623d9 Make sure static data expires. 2010-10-31 19:32:24 -07:00
Enno Rehling
f1f46782f7 * fix some rules to not use static variables across multiple runs 
* add tests for upkeep
* add a config setting to disable upkeep in tests
* add a config setting to disable random factor in studying
 2010-10-08 23:39:16 -07:00
Enno Rehling
db8f2f7d0c do not damage ships with no owner while still in production 2010-09-02 23:25:25 -07:00
Enno Rehling
366035510c fixing building renaming 
http://bugs.eressea.de/view.php?id=1798
foreign/owned was swapped
 2010-08-17 22:32:36 -07:00
Enno Rehling
3d5f7a92b8 http://bugs.eressea.de/view.php?id=1788 
renaming buildings should finally work again.
 2010-08-10 23:33:38 -07:00