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

- gcc-4.0 festgeschrieben, luabind will nicht mit 4.1 

- Bergwaechter kann in jede Region gesetzt werden
This commit is contained in:
Christian Schlittchen 2006-07-02 21:22:34 +00:00
parent 0b891b5a00
commit d9f541f59e
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Jamrules
View File

@ -1,9 +1,9 @@
#C++ = g++-3.3 ; #C++ = g++-3.3 ;
#CC = gcc-3.3 ; #CC = gcc-3.3 ;
#LINK = gcc-3.3 ; #LINK = gcc-3.3 ;
C++ = g++ ; C++ = g++-4.0 ;
CC = gcc ; CC = gcc-4.0 ;
LINK = gcc ; LINK = gcc-4.0 ;
# ECHO $(JAMUNAME) ; # ECHO $(JAMUNAME) ;
# LINKFLAGS += -rdynamic ; # LINKFLAGS += -rdynamic ;

2
src/common/spells/combatspells.c
View File

@ -823,7 +823,7 @@ sp_shadowknights(fighter * fi, int level, double power, spell * sp)
region *r = b->region; region *r = b->region;
unit *mage = fi->unit; unit *mage = fi->unit;
attrib *a; attrib *a;
int force = (int)get_force(power, 3); int force = max(1, (int)get_force(power, 3));
unused(sp); unused(sp);

4
src/common/spells/spells.c
View File

@ -2206,10 +2206,14 @@ sp_ironkeeper(castorder *co)
unit *mage = co->magician.u; unit *mage = co->magician.u;
int cast_level = co->level; int cast_level = co->level;
/* this does not make sense anymore, iron and laen can appear
* in any region */
/*
if (rterrain(r) != T_MOUNTAIN && rterrain(r) != T_GLACIER) { if (rterrain(r) != T_MOUNTAIN && rterrain(r) != T_GLACIER) {
report_failure(mage, co->order); report_failure(mage, co->order);
return 0; return 0;
} }
*/
keeper = create_unit(r, mage->faction, 1, new_race[RC_IRONKEEPER], 0, "Bergwächter", mage); keeper = create_unit(r, mage->faction, 1, new_race[RC_IRONKEEPER], 0, "Bergwächter", mage);

2
src/res/vinyambar/wdw-races.xml
View File

@ -260,7 +260,7 @@
<attack type="6" spell="aura_of_fear"/> <attack type="6" spell="aura_of_fear"/>
<precombatspell spell="shadowcall"/> <precombatspell spell="shadowcall"/>
</race> </race>
<race name="mummy" magres="0.600000" maxaura="1.000000" regaura="1.000000" recruitcost="5" weight="1000" capacity="540" speed="1.000000" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" teach="no" noheal="yes" undead="yes" equipment="yes" nogive="yes"> <race name="mummy" magres="0.600000" maxaura="1.000000" regaura="1.000000" recruitcost="5" weight="1000" capacity="540" speed="1.000000" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" teach="no" noheal="yes" undead="yes" equipment="yes" giveitem="yes" getitem="yes">
<ai splitsize="10000" moverandom="yes"/> <ai splitsize="10000" moverandom="yes"/>
<skill name="melee" modifier="1"/> <skill name="melee" modifier="1"/>
<skill name="polearm" modifier="1"/> <skill name="polearm" modifier="1"/>