Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,261 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

29 Commits

Author SHA1 Message Date
Enno Rehling 24ff4c301d refactor: separate building_is_active from inside_building 2015-11-02 14:18:50 +01:00
Enno Rehling 6113bc2144 CID 26254: Incorrect expression (DIVIDE_BY_ZERO) 
magic should never be zero, but coverity doesn't know that.
 2015-10-29 16:46:43 +01:00
Enno Rehling 2f35246f8c memory leak: when freeing factions, also free their spellbooks 2015-10-13 21:47:45 +02:00
Enno Rehling 936c201d0b Merge pull request #312 from eressea/master 
pull latest changes from master into develop
 2015-10-11 16:47:29 +02:00
Enno Rehling e8880db447 get the code to compile under vs2015 (disable warnings) 2015-10-11 14:39:43 +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 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 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 c0a760a645 Merge branch 'develop' of github.com:eressea/server into develop 2015-08-06 19:54:51 +02:00
Enno Rehling 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
Enno Rehling 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
Enno Rehling f1b0488a78 missing include 2015-07-12 14:17:35 +02:00
Enno Rehling 0a57933e30 minor optimizations, error checking (static analysis) 2015-07-12 14:17:27 +02:00
Enno Rehling 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
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 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 df325b243a enable stricter conversion checking for gcc < 4.9, fix code 2015-05-15 20:35:36 +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 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
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 6abe180f68 free spellbooks correctly. 2014-12-31 01:38:49 +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 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
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 9c0a7c0e2e Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2014-11-08 22:56: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
Renamed from src/kernel/magic.c (Browse further)