diff --git a/src/structs.h b/src/structs.h index 1cdb061..31fde39 100644 --- a/src/structs.h +++ b/src/structs.h @@ -360,6 +360,7 @@ typedef struct { char **mias; char **targets; Tuple keys[MAX_KEY_TYPES]; + Tuple originalKeys[MAX_KEY_TYPES]; Tuple missionStatusHead, *missionStatusTail; } Game; diff --git a/src/world/worldLoader.c b/src/world/worldLoader.c index 6bd00c9..816a801 100644 --- a/src/world/worldLoader.c +++ b/src/world/worldLoader.c @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static void loadEnemyTypes(char *enemyTypes); static void loadTriggers(cJSON *root); -static void loadSprites(cJSON *root); static void loadBob(cJSON *root); static void loadEntities(cJSON *root); static void loadObjectives(cJSON *root); @@ -59,8 +58,6 @@ void loadWorld(char *filename) loadTriggers(cJSON_GetObjectItem(root, "triggers")); - loadSprites(cJSON_GetObjectItem(root, "sprites")); - loadBob(cJSON_GetObjectItem(root, "bob")); loadEntities(cJSON_GetObjectItem(root, "entities")); @@ -126,16 +123,6 @@ static void loadTriggers(cJSON *root) } } -static void loadSprites(cJSON *root) -{ - cJSON *node; - - for (node = root->child ; node != NULL ; node = node->next) - { - loadSprite(node); - } -} - static void loadBob(cJSON *root) { world.bob = (Bob*)createEntity("Bob");