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

oldrace young dragon had another space.

Browse source 
updated todo-file
some indentation in battle.c
This commit is contained in:
Enno Rehling 2005-08-22 20:14:42 +00:00
parent a3bef667d1
commit 951ad4a615
3 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/kernel/battle.c
View file

@ -303,12 +303,12 @@ set_enemy(side * as, side * ds, boolean attacking)
{ {
int i; int i;
for (i=0;i!=128;++i) { for (i=0;i!=128;++i) {
if (ds->enemies[i]==NULL) ds->enemies[i]=as; if (ds->enemies[i]==NULL) ds->enemies[i]=as;
if (ds->enemies[i]==as) break; if (ds->enemies[i]==as) break;
} }
for (i=0;i!=128;++i) { for (i=0;i!=128;++i) {
if (as->enemies[i]==NULL) as->enemies[i]=ds; if (as->enemies[i]==NULL) as->enemies[i]=ds;
if (as->enemies[i]==ds) break; if (as->enemies[i]==ds) break;
} }
ds->enemy[as->index] |= E_ENEMY; ds->enemy[as->index] |= E_ENEMY;
as->enemy[ds->index] |= E_ENEMY; as->enemy[ds->index] |= E_ENEMY;

2
src/common/kernel/xmlreader.c
View file

@ -503,7 +503,7 @@ race_compat(void)
const char * oldracenames[MAXRACES] = { const char * oldracenames[MAXRACES] = {
"dwarf", "elf", "orc", "goblin", "human", "troll", "demon", "insect", "dwarf", "elf", "orc", "goblin", "human", "troll", "demon", "insect",
"halfling", "cat", "aquarian", "uruk", "snotling", "undead", "illusion", "halfling", "cat", "aquarian", "uruk", "snotling", "undead", "illusion",
"young dragon", "dragon", "wyrm", "ent", "catdragon", "dracoid", "youngdragon", "dragon", "wyrm", "ent", "catdragon", "dracoid",
"special", "spell", "irongolem", "stonegolem", "shadowdemon", "special", "spell", "irongolem", "stonegolem", "shadowdemon",
"shadowmaster", "mountainguard", "alp", "toad", "braineater", "peasant", "shadowmaster", "mountainguard", "alp", "toad", "braineater", "peasant",
"wolf", "lynx", "tunnelworm", "eagle", "rat", "songdragon", "nymph", "wolf", "lynx", "tunnelworm", "eagle", "rat", "songdragon", "nymph",

18
src/todo.txt
View file

@ -1,5 +1,23 @@
TODO: TODO:
Gletscherauflösung 4./5. welt
make sure every faction has a unique subscription.
curse type should contain effect-type
ITF_NOLOOT für sonnensegel
format=flowed annahme, eressea
eressea (b/g)zip reports?
itemtypes auslagern
readline implementieren
sk_ prefixes entfernen
XUL for Eressea XUL for Eressea
[11:01] <Enno`> am besten wäre, wenn mailit nur die optionen, nicht das ganze script enthielte [11:01] <Enno`> am besten wäre, wenn mailit nur die optionen, nicht das ganze script enthielte