Richtige Startrunde für Eressea setzen,

kleine Bugfixes
This commit is contained in:
Enno Rehling 2004-04-11 00:01:05 +00:00
parent a53cc0a25c
commit b62023ba59
5 changed files with 9 additions and 3 deletions

View File

@ -7694,6 +7694,7 @@ register_spell(spell * sp)
spell_list * slist = malloc(sizeof(spell_list)); spell_list * slist = malloc(sizeof(spell_list));
slist->next = spells; slist->next = spells;
slist->data = sp; slist->data = sp;
spells = slist;
} }
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
@ -7784,6 +7785,8 @@ find_spellbyid(spellid_t id)
{ {
spell_list * slist; spell_list * slist;
assert(id>=0);
if (id==SPL_NOSPELL) return NULL;
for (slist=spells;slist!=NULL;slist=slist->next) { for (slist=spells;slist!=NULL;slist=slist->next) {
spell* sp = slist->data; spell* sp = slist->data;
if (sp->id == id) return sp; if (sp->id == id) return sp;

View File

@ -60,6 +60,7 @@
/* kernel includes */ /* kernel includes */
#include <kernel/xmlreader.h> #include <kernel/xmlreader.h>
#include <kernel/spell.h>
#include <building.h> #include <building.h>
#include <creport.h> #include <creport.h>
#include <faction.h> #include <faction.h>
@ -174,11 +175,11 @@ game_init(void)
#endif #endif
register_xmlreader(); register_xmlreader();
init_spells();
init_data(xmlfile); init_data(xmlfile);
init_locales(); init_locales();
init_attributes(); init_attributes();
init_spells();
init_races(); init_races();
init_items(); init_items();
init_races(); init_races();

View File

@ -177,13 +177,13 @@ game_init(void)
#endif #endif
register_xmlreader(); register_xmlreader();
init_spells();
init_data(xmlfile); init_data(xmlfile);
init_locales(); init_locales();
/* init_resources(); must be done inside the xml-read, because requirements use items */ /* init_resources(); must be done inside the xml-read, because requirements use items */
init_attributes(); init_attributes();
init_spells();
init_races(); init_races();
init_items(); init_items();
init_economy(); init_economy();

View File

@ -47,6 +47,7 @@
/* kernel includes */ /* kernel includes */
#include <kernel/xmlreader.h> #include <kernel/xmlreader.h>
#include <kernel/spell.h>
#include <item.h> #include <item.h>
#include <faction.h> #include <faction.h>
#include <race.h> #include <race.h>
@ -1720,11 +1721,11 @@ main(int argc, char *argv[])
/* register_dungeon(); */ /* register_dungeon(); */
register_xmlreader(); register_xmlreader();
init_spells();
init_data(xmlfile); init_data(xmlfile);
init_locales(); init_locales();
init_attributes(); init_attributes();
init_spells();
init_resources(); init_resources();
#if NEW_RESOURCEGROWTH #if NEW_RESOURCEGROWTH

View File

@ -22,6 +22,7 @@
<param name="GiveRestriction" value="3"/> <param name="GiveRestriction" value="3"/>
<param name="database.gameid" value="0"/> <param name="database.gameid" value="0"/>
<param name="hunger.long" value="1"/> <param name="hunger.long" value="1"/>
<param name="firsturn" value="184"/>
</game> </game>
<xi:include href="eressea/de/strings.xml"/> <xi:include href="eressea/de/strings.xml"/>
<xi:include href="eressea/en/strings.xml"/> <xi:include href="eressea/en/strings.xml"/>