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

156 commits

Author SHA1 Message Date
Enno Rehling
35c6f30511 umlaut substitutions 2019-02-08 11:37:32 +01:00
Enno Rehling
0043690650 Merge branch 'master' into develop 2019-02-02 21:17:23 +01:00
Enno Rehling
af91459fb1 add some variety to familiar selection. 
effskill: use NULL, not 0 for pointer arguments.
 2019-02-02 20:38:02 +01:00
Enno Rehling
45de8535a0 Someone was casting leaveastral with more than 32 arguments recently. 2018-12-16 16:36:09 +01:00
Enno Rehling
7b8bc8af0f more allocation checks. 2018-12-15 20:01:51 +01:00
Enno Rehling
7ea64be314 code analysis scan. 
add checks for malloc results.
reduce stack size.
 2018-12-15 19:38:40 +01:00
Enno Rehling
264822a354 reduce variables scope (cppcheck warnings). 2018-12-11 19:57:27 +01:00
Enno Rehling
089be4bca8 cppcheck style warnings: reduce variable scope 2018-12-09 03:42:57 +01:00
Enno Rehling
3e54d307df replace bsdstring in bufunit 2018-11-24 12:26:52 +01:00
Enno Rehling
73540d733d Bug 2451: fix equip_unit for spells, 
update the familiar-fixing code from bug 2517.
 2018-11-22 22:13:23 +01:00
Enno Rehling
62e6489c7a rename variable. 
print error, not debug message.
 2018-11-21 21:46:59 +01:00
Enno Rehling
3638219e13 fix magic tests that created gray mages. 
also fix mage_change_spellpoints.
 2018-11-18 21:53:45 +01:00
Enno Rehling
4a66b558c5 WIP: refactor struct sc_mage (make it private). 
tests are failing and/or slow.
 2018-11-18 21:47:14 +01:00
Enno Rehling
b6110c5b22 some caster/mage changes issues (transfer aura is hard). 2018-11-17 22:28:55 +01:00
Enno Rehling
d2389fa87b Bug 2517: Vertraute ohne eigene Zauber reparieren 
Trennung von caster und mage in spells.c
 2018-11-17 21:31:05 +01:00
Enno Rehling
b181618b53 BUG 1877: change non-spell familiars. 
1. mages can have actions when familiars cast spells.
2. familiar spells do not increase magician's costs.
3. improve separation of caster and mage.
 2018-11-15 20:51:42 +01:00
Enno Rehling
0fd7906d41 extract contact logic to a module 
add missing tests for contact to units.
add an attribute for contacting a faction.
 2018-11-04 15:53:27 +01:00
Enno Rehling
89b10ee63d bug 2463 fix xmastrees, fix get_key/set_key 2018-11-03 20:30:57 +01:00
Enno Rehling
e5a59af19a Merge branch 'master' into develop 2018-10-21 20:13:19 +02:00
Enno Rehling
820de2ee35 fix cont arguments for new clibs version 2018-10-21 19:30:19 +02:00
Enno Rehling
d3a37179ef add param.[hc], at last. 2018-09-29 19:32:39 +02:00
Enno Rehling
b22d838a57 move gamedata.c to kernel 2018-09-29 13:21:46 +02:00
Enno Rehling
a373807189 move attrib and event modules to kernel 2018-09-29 11:37:17 +02:00
Enno Rehling
0a9f8bf662 merge from develop 2018-05-15 21:59:01 +02:00
Enno Rehling
7e6688552b create a callback mechanism for equipment. 2018-05-11 21:30:26 +02:00
Enno Rehling
371335ab95 spell flag merge conflicts 2018-05-08 21:45:21 +02:00
Enno Rehling
ccf09770e3 rename global target flag, invert logic 2018-05-08 21:43:13 +02:00
Enno Rehling
d45c32f1ac Merge branch 'develop' 2018-05-08 21:32:45 +02:00
Enno Rehling
68de367a98 print an error instead of asserting. 2018-05-06 19:27:22 +02:00
Enno Rehling
cfe21e7e1d re-enable tests, allow more spell arguments. 
a list of ships, units, etc can be long!
 2018-05-06 19:07:20 +02:00
Enno Rehling
14f59e4bfe functional tests for pull_astral spell. 2018-05-06 19:02:47 +02:00
Enno Rehling
5af775ba87 prevent out-of-bounds read. 2018-05-06 16:35:23 +02:00
Enno Rehling
088747ea81 code style 2018-05-06 15:50:44 +02:00
Enno Rehling
cd2624de8a stop reallocation spell parameters. 
fix involuntary tree growth in test, message check.
 2018-05-06 15:49:34 +02:00
Enno Rehling
0e3170a0cb merge 2018-05-05 07:39:25 +02:00
Enno Rehling
d568e79490 spellbooks contain spellref, not spell *. 
for order-independent load from XML.
 2018-05-05 07:38:11 +02:00
Enno Rehling
08663b6eb5 fix last commit. refactoring with the MSVC IDE is prone to errors. 2018-04-28 15:57:51 +02:00
Enno Rehling
6c0f8a81f6 merge from master 2018-02-26 19:51:48 +01:00
Enno Rehling
622c103b00 more cppcheck messages 2018-02-26 19:48:52 +01:00
Enno Rehling
432a8d432d messy merge of cppcheck fixes into develop 2018-02-25 20:41:53 +01:00
Enno Rehling
4181e23d15 FAST_CONNECT is always on. 
fix more cppcheck messages.
 2018-02-25 18:30:20 +01:00
Enno Rehling
398a258658 cppcheck: variable scopes, etc. 2018-02-11 15:57:31 +01:00
Enno Rehling
1035a98fd3 make attrib use a variant, not a custom union. 
change attrib_type methods to take a variant, not the entire attrib.
 2018-02-09 21:20:43 +01:00
Enno Rehling
ec48017520 move spell reporting attributes to a separate module. 2018-02-08 18:33:58 +01:00
Enno Rehling
f98eab56c4 platform.h is only for WIN32 now. 
replace MIN and MAX macros, they are BAD.
 2017-12-29 06:13:28 +01:00
Enno Rehling
f82fe6e963 more frequent use util/macros.h instead of platform.h 2017-12-28 18:55:45 +01:00
Enno Rehling
5b1d27542a reduce dependence on platform.h. 
gradually stop using MAX and MIN (mistakes were made).
 2017-12-28 18:29:40 +01:00
Enno Rehling
79aecf21b5 Merge branch 'develop' 2017-10-18 19:40:00 +02:00
Enno Rehling
e2c7b2c711 merge with master, which was far behind 2017-10-15 20:32:19 +02:00
Enno Rehling
333ef06fef hackish optimization for STUDY orders 2017-10-13 19:33:29 +02:00