walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Don't load custom sprites.

This commit is contained in:
Steve 2018-02-10 17:25:43 +00:00
parent db64944700
commit 1b7f2255b1
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/structs.h
View File

@ -360,6 +360,7 @@ typedef struct {
char **mias; char **mias;
char **targets; char **targets;
Tuple keys[MAX_KEY_TYPES]; Tuple keys[MAX_KEY_TYPES];
Tuple originalKeys[MAX_KEY_TYPES];
Tuple missionStatusHead, *missionStatusTail; Tuple missionStatusHead, *missionStatusTail;
} Game; } Game;

13
src/world/worldLoader.c
View File

@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
static void loadEnemyTypes(char *enemyTypes); static void loadEnemyTypes(char *enemyTypes);
static void loadTriggers(cJSON *root); static void loadTriggers(cJSON *root);
static void loadSprites(cJSON *root);
static void loadBob(cJSON *root); static void loadBob(cJSON *root);
static void loadEntities(cJSON *root); static void loadEntities(cJSON *root);
static void loadObjectives(cJSON *root); static void loadObjectives(cJSON *root);
@ -59,8 +58,6 @@ void loadWorld(char *filename)
loadTriggers(cJSON_GetObjectItem(root, "triggers")); loadTriggers(cJSON_GetObjectItem(root, "triggers"));
loadSprites(cJSON_GetObjectItem(root, "sprites"));
loadBob(cJSON_GetObjectItem(root, "bob")); loadBob(cJSON_GetObjectItem(root, "bob"));
loadEntities(cJSON_GetObjectItem(root, "entities")); 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) static void loadBob(cJSON *root)
{ {
world.bob = (Bob*)createEntity("Bob"); world.bob = (Bob*)createEntity("Bob");