Enno Rehling
|
4052f52472
|
Merge pull request #345 from TurnerSE/bug/#2145
Bug/#2145
|
2015-11-03 13:04:28 +01:00 |
|
Enno Rehling
|
ae28cbd7c3
|
Merge branch 'enhancement/airship_refactoring' of https://github.com/TurnerSE/server into TurnerSE-enhancement/airship_refactoring
Conflicts:
src/spells/shipcurse.c
|
2015-11-03 13:02:42 +01:00 |
|
Philipp Dreher
|
5178bbd674
|
moved application of armor-penetration
halfed armor now includes the effect of natural armor, but not the
effect of magic armor
|
2015-11-03 00:05:55 +01:00 |
|
Philipp Dreher
|
bf42143b11
|
Revert "WIP new test for armor penetration"
This reverts commit dab8bdf7ef .
|
2015-11-03 00:01:10 +01:00 |
|
Philipp Dreher
|
0e83cc69d3
|
missed a spot...
|
2015-11-02 18:27:07 +01:00 |
|
Philipp Dreher
|
c2a8c32be0
|
forgot fwd-declaration of structs...
|
2015-11-02 18:08:35 +01:00 |
|
Philipp Dreher
|
30dce18697
|
small formal corrections
|
2015-11-02 17:58:14 +01:00 |
|
Philipp Dreher
|
96ccb046ab
|
added test-suite for flyingship.c
some general testing of the spells functionality for future maintenance
purposes
|
2015-11-02 17:54:23 +01:00 |
|
Enno Rehling
|
63541dcc5d
|
Merge pull request #338 from TurnerSE/improvement/test_skillpotion
Improvement/test skillpotion
|
2015-11-02 17:38:47 +01:00 |
|
Philipp Dreher
|
29173887b6
|
test_create_castorder can take spelllparameters now too
|
2015-11-02 17:09:16 +01:00 |
|
Enno Rehling
|
01078460bb
|
Merge pull request #343 from ennorehling/feature/bug-2143-monsters-attack-buildings
bug 2143: monsters attack buildings
|
2015-11-02 16:40:32 +01:00 |
|
Philipp Dreher
|
0e8365c802
|
moved convenience function for convenience
the formerly static function test_create_castorder is now available for
general usage via tests.h/.c
|
2015-11-02 16:12:56 +01:00 |
|
Philipp Dreher
|
f550431118
|
small documentation correction
|
2015-11-02 15:59:29 +01:00 |
|
Enno Rehling
|
0b00bfecdf
|
Merge pull request #342 from TurnerSE/bug/CID22449
Bug/cid22449
|
2015-11-02 15:55:44 +01:00 |
|
Philipp Dreher
|
8200fdb6c2
|
moved files for flyingship to subdir "spells"
|
2015-11-02 15:40:26 +01:00 |
|
Enno Rehling
|
f70b385bef
|
clean up plan_monsters and make it a bit more readable
|
2015-11-02 15:27:01 +01:00 |
|
Enno Rehling
|
072bfd3912
|
testin building_is_active
testing multiple units in one building
|
2015-11-02 15:06:30 +01:00 |
|
Enno Rehling
|
4bf2509fb3
|
test inside_building vs. overflow
fix default building capacity (should be 1 per size)
|
2015-11-02 14:56:58 +01:00 |
|
Enno Rehling
|
42ae086def
|
unit is inisde a building also when it was not paid for
|
2015-11-02 14:49:48 +01:00 |
|
Enno Rehling
|
24ff4c301d
|
refactor: separate building_is_active from inside_building
|
2015-11-02 14:18:50 +01:00 |
|
Philipp Dreher
|
098abcc144
|
internal restructuring in flyingship
|
2015-11-02 14:01:38 +01:00 |
|
Philipp Dreher
|
abd6be475f
|
that just slipped in the commit by accident...
|
2015-11-02 13:55:28 +01:00 |
|
Philipp Dreher
|
fe0d038bf3
|
moved more related functionality from shipcurse.c to flyingship.c
|
2015-11-02 13:39:06 +01:00 |
|
Philipp Dreher
|
2fe95f3d61
|
integration of the separate if-conditions and simplification of the loop
|
2015-11-02 13:12:19 +01:00 |
|
Philipp Dreher
|
bf779fc810
|
removed obsolete code
|
2015-11-02 13:06:14 +01:00 |
|
Philipp Dreher
|
d93305b180
|
moved flying ship functionality from move.c to flyingship.c
|
2015-11-02 00:35:32 +01:00 |
|
Philipp Dreher
|
6e7510b7e9
|
moved flying ship functionality from spells.c and shipcurse.c to flyingship.c
|
2015-11-02 00:32:56 +01:00 |
|
Philipp Dreher
|
3fa4c18e87
|
added files for new module "flyingship"
|
2015-11-02 00:26:23 +01:00 |
|
Philipp Dreher
|
91155f509c
|
formatting: tabs --> spaces
|
2015-11-01 17:38:12 +01:00 |
|
Philipp Dreher
|
dab8bdf7ef
|
WIP new test for armor penetration
|
2015-11-01 17:15:11 +01:00 |
|
Philipp Dreher
|
b6443e40ba
|
reanimated dead code
|
2015-11-01 17:14:51 +01:00 |
|
Enno Rehling
|
0b098dede6
|
remove invalid tests. uninitialized locales do not have default words
|
2015-11-01 05:35:10 +01:00 |
|
Philipp Dreher
|
bebc92f82d
|
expansion of the skillpotion-test
test now checks the effect of the potion on the week-counter of
sufficiently high skills
|
2015-10-31 19:03:15 +01:00 |
|
Enno Rehling
|
fbf483fb4e
|
CID 22518: Parse warning (PW.PARAM_SET_BUT_NOT_USED)
|
2015-10-30 15:21:06 +01:00 |
|
Enno Rehling
|
21a2313e2a
|
CID 22517: Parse warning (PW.PARAM_SET_BUT_NOT_USED)
|
2015-10-30 15:20:06 +01:00 |
|
Enno Rehling
|
a91a0f6a53
|
CID 22514: Out-of-bounds read (OVERRUN)
|
2015-10-30 15:17:39 +01:00 |
|
Enno Rehling
|
0da10ea490
|
CID 22513: Out-of-bounds read (OVERRUN)
|
2015-10-30 14:41:52 +01:00 |
|
Enno Rehling
|
674bc2b4c7
|
nope, the ticket is actually required.
|
2015-10-30 12:58:27 +01:00 |
|
Enno Rehling
|
e7ca5345d7
|
CID 22509: Dereference null return value (NULL_RETURNS)
potential problems at the edge of the map.
|
2015-10-30 12:57:07 +01:00 |
|
Enno Rehling
|
8f7f182c91
|
CID 22507: Dereference null return value (NULL_RETURNS)
checking fopen results
|
2015-10-30 12:55:30 +01:00 |
|
Enno Rehling
|
d6bc1c3119
|
CID 22506: Dereference null return value (NULL_RETURNS)
always check fopen success
|
2015-10-30 12:54:07 +01:00 |
|
Enno Rehling
|
204b4d6b93
|
CID 22505: Dereference null return value (NULL_RETURNS)
potential bugs at the edge of the map
|
2015-10-30 12:52:18 +01:00 |
|
Enno Rehling
|
1df0afc58a
|
CID 22550: Dereference before null check (REVERSE_INULL)
|
2015-10-30 12:50:32 +01:00 |
|
Enno Rehling
|
1d204b12f1
|
CID 22549: Dereference before null check (REVERSE_INULL)
|
2015-10-30 12:49:37 +01:00 |
|
Enno Rehling
|
e1eb5098d4
|
CID 22554: Improper use of negative value (REVERSE_NEGATIVE)
I believe this was a false positive, but more asserts can never hurt.
|
2015-10-30 12:40:48 +01:00 |
|
Enno Rehling
|
93b7bacff5
|
CID 22552: Dereference before null check (REVERSE_INULL)
|
2015-10-30 12:37:27 +01:00 |
|
Enno Rehling
|
54304af182
|
allocate space for null terminator
|
2015-10-30 12:08:09 +01:00 |
|
Enno Rehling
|
7fa12ae3af
|
CID 22556: String not null terminated (STRING_NULL)
add missing null-termination
|
2015-10-30 11:59:05 +01:00 |
|
Enno Rehling
|
68f8f0830e
|
CID 22561: Copy into fixed size buffer (STRING_OVERFLOW)
|
2015-10-30 11:45:20 +01:00 |
|
Enno Rehling
|
be0563c1f0
|
CID 22560: Copy into fixed size buffer (STRING_OVERFLOW)
|
2015-10-30 11:43:45 +01:00 |
|