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
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
c0a760a645
Merge branch 'develop' of github.com:eressea/server into develop
2015-08-06 19:54:51 +02:00
6c8300a47e
Merge branch 'feature/bug-1588-magicpower-limit' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-1588-magicpower-limit
...
Conflicts:
scripts/tests/e2/init.lua
src/battle.c
src/bind_unit.c
src/kernel/spellid.h
src/magic.c
src/magic.h
2015-08-06 19:53:24 +02:00
420574c7e4
add unit-test for casting spells, fix spell-casting (was looking for thisorder), all E3 tests pass again
2015-08-05 10:25:25 +02:00
f1b0488a78
missing include
2015-07-12 14:17:35 +02:00
0a57933e30
minor optimizations, error checking (static analysis)
2015-07-12 14:17:27 +02:00
7087c0e0ab
Update to latest submodules, fix iniparser and critbit.
...
I did this before, must have lost it in the merge. Crazy.
2015-07-12 10:38:01 +02:00
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
05ec74f9ec
annotate with finds from PVS Studio trial static analysis
2015-07-06 21:31:27 +02:00
d0f8825240
use the syntax_error function where appropriate.
...
fix bug w. releasing message too soon.
2015-05-18 11:34:52 +02:00
df325b243a
enable stricter conversion checking for gcc < 4.9, fix code
2015-05-15 20:35:36 +02:00
dd8449783a
converting float->double in a lot of the code to prevent -Wconversion messages
2015-05-15 19:08:44 +02:00
b00d7b6d5a
increase magic power for low levels in E3 (instead of divide by 2 sometimes giving powers of < 1.0, cap it below at 1)
...
several spells have now had problems with powers lower than they were ever designed for, including shapeshift
also added a test and some framework for shapeshift spell (in E2).
https://bugs.eressea.de/view.php?id=1588
2015-04-30 15:59:52 +02:00
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
6abe180f68
free spellbooks correctly.
2014-12-31 01:38:49 +01:00
c8b9044f78
rename to gettoken, use more widely, add a basic test.
2014-12-22 16:28:17 +01:00
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
42d75c334d
WIP: Familiars check for combat spells in the magician's list of spells, too.
...
https://bugs.eressea.de/view.php?id=1660
This does not work, because set_combatspell later uses knowsspell to make sure the spell is one the familiar has.
2014-12-14 12:57:09 +01:00
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
9c0a7c0e2e
Merge branch 'version-3-3'
...
Conflicts:
src/build.h
2014-11-08 22:56:53 +01:00
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
Enno Rehling