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

Load / save functions for weapon pickups.

This commit is contained in:
Steve 2018-02-24 16:00:48 +00:00
parent 234f8fe73c
commit db9cddb7e8
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/entities/items/weaponPickup.c
View File

@ -24,6 +24,8 @@ static void (*superTick)(void);
static void init(void); static void init(void);
static void tick(void); static void tick(void);
static void touch(Entity *other); static void touch(Entity *other);
static void load(cJSON *root);
static void save(cJSON *root);
Entity *initWeaponPickup(void) Entity *initWeaponPickup(void)
{ {
@ -38,6 +40,8 @@ Entity *initWeaponPickup(void)
i->init = init; i->init = init;
i->tick = tick; i->tick = tick;
i->touch = touch; i->touch = touch;
i->load = load;
i->save = save;
return (Entity*)i; return (Entity*)i;
} }
@ -100,3 +104,18 @@ static void touch(Entity *other)
game.stats[STAT_WEAPONS_PICKED_UP]++; game.stats[STAT_WEAPONS_PICKED_UP]++;
} }
} }
static void load(cJSON *root)
{
Item *i;
i = (Item*)self;
i->weaponType = lookup(cJSON_GetObjectItem(root, "weaponType")->valuestring);
i->provided = cJSON_GetObjectItem(root, "provided")->valueint;
}
static void save(cJSON *root)
{
/* boss missions, only - not going to worry about saving these */
}

2
src/entities/items/weaponPickup.h
View File

@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../../common.h" #include "../../common.h"
#include "../../json/cJSON.h"
extern void playSound(int snd, int ch); extern void playSound(int snd, int ch);
extern void setGameplayMessage(int type, char *format, ...); extern void setGameplayMessage(int type, char *format, ...);
@ -27,6 +28,7 @@ extern void pickupItem(void);
extern int touchedPlayer(Entity *e); extern int touchedPlayer(Entity *e);
extern const char *getWeaponName(int i); extern const char *getWeaponName(int i);
extern Entity *initConsumable(void); extern Entity *initConsumable(void);
extern int lookup(char *name);
extern Entity *self; extern Entity *self;
extern Game game; extern Game game;

3
src/system/lookup.c
View File

@ -39,6 +39,9 @@ void initLookups(void)
addLookup("DOOR_OPEN", DOOR_OPEN); addLookup("DOOR_OPEN", DOOR_OPEN);
addLookup("DOOR_CLOSED", DOOR_CLOSED); addLookup("DOOR_CLOSED", DOOR_CLOSED);
addLookup("WPN_PLASMA", WPN_PLASMA);
addLookup("WPN_SPREAD", WPN_SPREAD);
addLookup("CONTROL_LEFT", CONTROL_LEFT); addLookup("CONTROL_LEFT", CONTROL_LEFT);
addLookup("CONTROL_RIGHT", CONTROL_RIGHT); addLookup("CONTROL_RIGHT", CONTROL_RIGHT);
addLookup("CONTROL_UP", CONTROL_UP); addLookup("CONTROL_UP", CONTROL_UP);