Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2021-05-01 22:03:31 +02:00
parent 15e789737c 69cf298b6a
commit 13a4388b9c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,6 +1,6 @@
sudo: false sudo: false
language: c language: c
dist: focal dist: bionic
compiler: compiler:
- gcc - gcc
- clang - clang

2
src/magic.c
View File

@ -1037,7 +1037,7 @@ variant magic_resistance(const unit * target)
c = (curse *)a->data.v; c = (curse *)a->data.v;
mage = c->magician; mage = c->magician;
if (mage != NULL) { if (mage != NULL && mage->number > 0) {
if (good_resist && c->type == &ct_goodmagicresistancezone) { if (good_resist && c->type == &ct_goodmagicresistancezone) {
if (alliedunit(mage, target->faction, HELP_GUARD)) { if (alliedunit(mage, target->faction, HELP_GUARD)) {
/* TODO: legacy. magicresistance-effect is an integer-percentage stored in a double */ /* TODO: legacy. magicresistance-effect is an integer-percentage stored in a double */