Commit graph

180 commits

Author SHA1 Message Date
Enno Rehling
4c877288d3 remove spellid.h, it represents an outdated way of doing things.
merge the enum into combatspells, and reduce it to the spells actually used here.
2015-08-06 17:57:51 +02:00
Enno Rehling
21a81bd307 cleanup: struct declaration, more static. 2015-07-12 14:24:46 +02:00
Enno Rehling
05f444bab1 Merge branch 'feature/rename-cerddor' into develop 2015-07-08 17:53:09 +02:00
Enno Rehling
efe2185b13 fix build, eliminate unused variables/functions. 2015-07-08 05:17:10 +02:00
Enno Rehling
6abf8f7adb bug 1692: rewrite of magicresistance curse-info, especially for buildings (homestome spell). 2015-07-08 05:12:26 +02:00
Enno Rehling
c8ffe8da7a Bug 2115: fix cerrdor -> cerddor spelling errors. 2015-07-07 20:30:34 +02:00
Enno Rehling
cc3c5580d4 rewrite and unit tests 2015-07-07 20:23:24 +02:00
Enno Rehling
960e0f8024 do not show magic resistance effects to other than the unit's own faction.
https://bugs.eressea.de/view.php?id=1692
2015-07-06 16:13:22 +02:00
Enno Rehling
df325b243a enable stricter conversion checking for gcc < 4.9, fix code 2015-05-15 20:35:36 +02:00
Steffen Mecke
a31898ceb5 fix bug in generic_name, minor improvements
Amusingly, names::generic_name used u->no instead of u->number to determine
singular or plural.
2015-02-11 23:10:27 +01:00
Enno Rehling
83e610ee03 Fixing bug 1802 again, CR contains no Monster names. 2015-02-11 07:57:38 +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
27da082cc6 corrected good dreams message 2015-01-12 18:22:00 +01:00
Steffen Mecke
fdac137c0c magic path warning was wrong way round 2015-01-12 18:21:41 +01:00
Enno Rehling
1ae44db7ca Bugfix: Untote Helden bekamen keine Beute.
https://bugs.eressea.de/view.php?id=1962
2014-12-13 20:16:25 +01:00
Enno Rehling
0967ccaac6 remove even more obsolete datafile version support. 2014-12-12 23:00:30 +01:00
Enno Rehling
d492487a5b remove support for versions prior to turn 572 (INTPAK_VERSION).
reading anything prior stopped working some time ago, let's not kid ourselves.
nobody needs to read those datafiles, they are more than 7 years old.
less code is better.
if access to these files is needed, check out an old version from source control.
2014-12-12 22:52:23 +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
27f94783bc fix gcc build, forward-declare structs in the header.
MSVC allows structs to be declared in a function signature, gcc wants
to know about them earlier.
2014-11-01 13:10:22 +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
932a615837 refactoring: special directions into their own file (vortex.c).
moving spells.c out of spells.
figured that movewhere should be in move.c
2014-08-27 21:30:24 +02:00
Enno Rehling
ecaeba3058 add a test for the vortex special direction before touching that code. 2014-08-27 20:10:17 +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
1342b625cc Merge branch 'master' of github.com:eressea/server 2014-07-24 08:06:27 +02:00
Enno Rehling
955a57273d code review changes 2014-07-24 08:04:30 +02:00
CTD
4670767a3b Bug 1690: [E3] +1 Bonus für Zauber von Elfen im Wald
Es wurden immer 5 und nicht wie im kommentar beschrieben stufe/spellpwer
* 5 Personen von dem Spruch betroffen.
2014-07-23 10:52:39 +02:00
CTD
4cfa1ec7c3 Bug 1755 Beschworene Skelette mit Ausdauerproblemen
Sowohl Beschworenen Untote als auch Monster (Drachen, für Monster-Untote
war es Ok) hatten keine Anpassung ihrer Max-HP nach der Zuweisung von
Skills.
2014-07-18 13:15:18 +02: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
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
2c831230a0 Added a test for expensive skills.
When resetting the game rules, make sure basic resources (money, hp, person) are initialized.
2014-06-22 07:55:14 -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
ceabbebc90 switch remaining flags from unsigned to int. 2014-06-18 20:53:06 -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
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
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
7358c48580 removing some naming conflicts that hapen when trying to re-enable amalgamation builds. 2014-04-11 19:41:17 -07:00
Enno Rehling
0ae8737062 rename MIN/MAX to _min/_max 2014-03-16 05:03:17 +01:00
Enno Rehling
9fc926864e Fixes for Visual C++
snprintf and strncasecmp are not that.
_access needs to be fixed on gcc, next.
2014-03-15 12:35:20 -07:00
Enno Rehling
1a7d892a96 use cmake for autoconf, slim down platform.h 2014-03-15 19:29:11 +01:00
Enno Rehling
03c247c788 I am killing the core/ directory.
Lots of files are moving to a new location in src/
Some intersting CMake changes.
2014-02-18 05:45:00 +01:00
Enno Rehling
b795602b5d const-correctness: fumbles are not allowed to change castorder 2014-02-17 02:26:59 -08:00
Enno Rehling
77ab9133c2 use the storage submodule everywhere.
make most magic use float instead of double.
2013-12-31 01:06:28 -08:00
Enno Rehling
b4b8c49934 use getters/setters to access unit::race 2013-05-02 03:50:24 +02:00
Enno Rehling
f7edcf589a update to latest version of the eressea module
fixes for bool type
fixes for lua 5.2
fixes for some intermittent tests
2012-07-09 02:51:48 +02:00
Enno Rehling
4e7a758a75 making server compile with new github repository layout
todo: fix scripts and config files
2012-06-04 21:45:25 -07:00
Enno Rehling
f2598e8bdc comparisons to boolean constants are dumb. 2012-05-23 22:23:32 -07:00
Enno Rehling
07a75b6660 new gcc spouts more warnings, fix them. 2012-05-18 21:25:21 -07:00
Enno Rehling
3d50745d77 ship and building owners encapsulated in accessors 2012-05-17 15:23:44 -07:00
Enno Rehling
76ba2b9303 begin making shipowner use ship->owner. 2012-05-17 00:14:05 -07:00
Enno Rehling
1f0d5f205e rename _log_error to log_error and get rid of the cumbersome #define 2012-05-16 16:52:12 -07:00
Enno Rehling
5a8a1704e7 disable and remove wisps, because they are so very, very broken. 2012-05-12 12:39:49 -07:00
Enno Rehling
ea7eaf87aa spells that have no function in the xml file get one from an array, cleaning up and simplifying that code. 2012-05-09 23:23:40 -07:00
Enno Rehling
c6b8f4c491 unused variables are unused 2012-05-09 18:37:31 -07:00
Enno Rehling
fda365cd84 Remove some unused variables to make gcc happy. 2012-05-10 03:34:48 +02:00
Enno Rehling
06a4a7051b combat spell functions have the same interface as spells now. 2012-05-09 18:28:03 -07:00
Enno Rehling
360f00d44f cleaning up castorder, unifying access to target region and caster. 2012-05-09 14:16:51 -07:00
Enno Rehling
4f0bdca3ba improved familiar race selection. 2012-05-09 10:42:11 -07:00
Enno Rehling
2c28ea1c41 replace spellid_t with unsigned int 2012-05-09 03:13:49 -07:00
Enno Rehling
03f74f0a47 fix a crash where wolves have not enough firce 2012-04-16 06:58:03 +02:00
Enno Rehling
3c51bc1138 Merge branch 'master' of /home/eressea/repo/eressea 2012-03-05 04:25:26 +01:00
Enno Rehling
d9a41301d4 add missing return, stop a crash 2012-03-05 04:25:23 +01:00
Enno Rehling
71d9f68b3e faction stealth is only selectively enabled in E3
do not show spell messages when no items are given (in seduce)
2012-03-04 19:24:27 -08:00
Enno
d940f29a6c indentation rules, slightly updated 2011-03-07 08:24:48 +01:00
Enno
347a888b67 indentation rules, strictly applied 2011-03-07 08:03:10 +01:00
Enno Rehling
71988d9912 remove cvector.[hc] completely 2011-02-27 20:53:19 -08:00
Enno Rehling
7d4205a3d1 Fix carts in E3.
Store fighters in a quicklist, not a cvector.
2011-02-27 12:04:29 -08:00
Enno
44e4c44a2d Merge branch 'master' of /home/eressea/repo/eressea 2011-02-24 08:27:31 +01:00
Enno Rehling
0ad43a9586 Jamfiles are history. CMake is the future and the present. 2011-02-23 23:26:58 -08:00
Enno
1faca3cca5 fix a crash when skill does not exist 2010-10-16 22:06:27 +02:00
Enno
0f93601454 undo CRLF crazy 2010-08-08 09:40:42 +02:00
Enno Rehling
f8094f77dc use libraries from the external folder, don't depend on any additional installations (VS 2010) 2010-08-07 22:53:41 -07:00
Enno
c03fc6b72c fix crash (but break antimagic visibility again) 2010-06-13 06:24:28 +02:00
Enno Rehling
dc8b38a4c6 http://bugs.eressea.de/view.php?id=1692
cinfo_simple shows spell-effects to other people, cinfo_unit does not.
2010-06-09 23:15:33 -07:00
Enno Rehling
41cf66cee5 http://bugs.eressea.de/view.php?id=1769
- wolves should not be on a ship
2010-05-31 20:12:36 -07:00
Enno Rehling
621430b7f0 http://bugs.eressea.de/view.php?id=1743
- resist magic: do not apply power to quantity. it's already in the quality of the equation.
2010-05-31 00:13:19 -07:00
Enno
d71e9e796f temporary fix for a crash in sp_analyzemagic 2010-03-13 19:18:56 +01:00
Enno Rehling
64fb51c067 more moving around 2010-03-06 14:40:26 -08:00