diff --git a/dat/ship.xml b/dat/ship.xml index fe51cb9..e657d1c 100644 --- a/dat/ship.xml +++ b/dat/ship.xml @@ -1,11 +1,11 @@ - ../gfx/ship.png + ship.png 1 400 - 960 + 360 360 @@ -21,13 +21,13 @@ 7 20 20 - + laser - gfx/enemyship.png + enemyship.png 1 180 @@ -47,7 +47,7 @@ 130 60 40 - + diff --git a/src/main.c b/src/main.c index 796954c..2a08464 100644 --- a/src/main.c +++ b/src/main.c @@ -7,6 +7,7 @@ #include "physics.h" #include "opengl.h" #include "ship.h" +#include "pilot.h" #include "player.h" #include "joystick.h" #include "pilot.h" diff --git a/src/ship.c b/src/ship.c index 197b16e..6475133 100644 --- a/src/ship.c +++ b/src/ship.c @@ -15,7 +15,7 @@ #define XML_SHIP "ship" #define SHIP_DATA "../dat/ship.xml" -#define SHIP_GFX "../gfx/ship/ +#define SHIP_GFX "../gfx/ship/" static Ship* ship_stack = NULL; static int ships; @@ -44,8 +44,9 @@ Ship* ship_parse(xmlNodePtr node) { if(strcmp((char*)node->name, "GFX")==0) { cur = node->children; if(strcmp((char*)cur->name, "text")==0) { - snprintf(str, sizeof(cur->content)+4, "../gfx/%s", (char*)cur->content); - tmp->gfx_ship = gl_newSprite((char*)cur->content, 6, 6); + snprintf(str, strlen((char*)cur->content)+sizeof(SHIP_GFX), + SHIP_GFX"%s", (char*)cur->content); + tmp->gfx_ship = gl_newSprite(str, 6, 6); } } else if(strcmp((char*)node->name, "class")==0) { @@ -106,8 +107,8 @@ int ships_load(void) { xmlNodePtr node; Ship* tmp = NULL; - if((reader == xmlNewTextReaderFilename(DATA)) == NULL) { - WARN("XML error reading " DATA); + if((reader = xmlNewTextReaderFilename(SHIP_DATA)) == NULL) { + WARN("XML error reading " SHIP_DATA); return -1; }