From 73eb5517bfad946f384037117000b0e47b2c68c2 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Mon, 26 Oct 2015 17:27:43 +0000
Subject: [PATCH] Start of waypoints.

---
 data/missions/test/test.json |  10 +++---
 gfx/entities/waypoint.png    | Bin 0 -> 15204 bytes
 makefile                     |   4 +--
 src/battle/battle.c          |  14 ++++++++
 src/battle/battle.h          |   2 ++
 src/battle/entities.c        |  64 +++++++++++++++++++++++++++++++++++
 src/battle/entities.h        |  28 +++++++++++++++
 src/battle/objectives.h      |   1 -
 src/battle/waypoints.c       |  42 +++++++++++++++++++++++
 src/battle/waypoints.h       |  28 +++++++++++++++
 src/defs.h                   |   5 +++
 src/galaxy/mission.c         |  37 ++++++++++++++++++++
 src/galaxy/mission.h         |   1 +
 src/json/cJSON.c             |   2 +-
 src/json/cJSON.h             |   8 ++---
 src/structs.h                |  23 +++++++++++++
 src/system/lookup.c          |   2 ++
 17 files changed, 258 insertions(+), 13 deletions(-)
 create mode 100644 gfx/entities/waypoint.png
 create mode 100644 src/battle/entities.c
 create mode 100644 src/battle/entities.h
 create mode 100644 src/battle/waypoints.c
 create mode 100644 src/battle/waypoints.h

diff --git a/data/missions/test/test.json b/data/missions/test/test.json
index d09f980..1767e0c 100644
--- a/data/missions/test/test.json
+++ b/data/missions/test/test.json
@@ -8,12 +8,12 @@
 		"type" : "Nymph",
 		"side" : "SIDE_CSN"
 	},
-	"triggers" : [
+	"entities" : [
 		{
-			"type" : "TRIGGER_TIME",
-			"targetName" : "TIME",
-			"targetValue" : 10,
-			"action" : "TA_COMPLETE_MISSION"
+			"name" : "Waypoint",
+			"type" : "ET_WAYPOINT",
+			"x" : 100,
+			"y" : 100
 		}
 	]
 }
diff --git a/gfx/entities/waypoint.png b/gfx/entities/waypoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..e84fa0ecd3d7e30df776e1e485794ba6302c3fc9
GIT binary patch
literal 15204
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
KOE!v|hW-yH8JJ1{

literal 0
HcmV?d00001

diff --git a/makefile b/makefile
index c6e149d..408a707 100644
--- a/makefile
+++ b/makefile
@@ -19,7 +19,7 @@ OBJS += ai.o
 OBJS += battle.o bullets.o
 OBJS += challenges.o cJSON.o
 OBJS += draw.o
-OBJS += effects.o
+OBJS += effects.o entities.o
 OBJS += fighters.o fighterDefs.o
 OBJS += galacticMap.o game.o
 OBJS += hud.o
@@ -32,7 +32,7 @@ OBJS += radar.o
 OBJS += save.o sound.o starfield.o starSystems.o stats.o
 OBJS += testMission.o textures.o text.o title.o transition.o triggers.o
 OBJS += util.o
-OBJS += widgets.o
+OBJS += waypoints.o widgets.o
 
 # top-level rule to create the program.
 all: $(PROG)
diff --git a/src/battle/battle.c b/src/battle/battle.c
index 1d6a0cb..80e4e78 100644
--- a/src/battle/battle.c
+++ b/src/battle/battle.c
@@ -41,6 +41,7 @@ void initBattle(void)
 {
 	memset(&battle, 0, sizeof(Battle));
 	battle.bulletTail = &battle.bulletHead;
+	battle.entityTail = &battle.entityHead;
 	battle.fighterTail = &battle.fighterHead;
 	battle.effectTail = &battle.effectHead;
 	battle.objectiveTail = &battle.objectiveHead;
@@ -119,6 +120,8 @@ static void doBattle(void)
 	
 	doFighters();
 	
+	doEntities();
+	
 	doEffects();
 	
 	doPlayer();
@@ -161,6 +164,8 @@ static void draw(void)
 	
 	drawFighters();
 	
+	drawEntities();
+	
 	drawEffects();
 	
 	drawHud();
@@ -316,6 +321,7 @@ static void postBattle(void)
 void destroyBattle(void)
 {
 	Fighter *f;
+	Entity *ent;
 	Bullet *b;
 	Effect *e;
 	Objective *o;
@@ -329,6 +335,14 @@ void destroyBattle(void)
 	}
 	battle.fighterTail = &battle.fighterHead;
 	
+	while (battle.entityHead.next)
+	{
+		ent = battle.entityHead.next;
+		battle.entityHead.next = ent->next;
+		free(ent);
+	}
+	battle.entityTail = &battle.entityHead;
+	
 	while (battle.bulletHead.next)
 	{
 		b = battle.bulletHead.next;
diff --git a/src/battle/battle.h b/src/battle/battle.h
index a1cbaa8..44bef77 100644
--- a/src/battle/battle.h
+++ b/src/battle/battle.h
@@ -35,6 +35,8 @@ extern void drawBullets(void);
 extern void doStars(float dx, float dy);
 extern void drawStars(void);
 extern void doFighters(void);
+extern void doEntities(void);
+extern void drawEntities(void);
 extern void drawFighters(void);
 extern void initStars(void);
 extern void doPlayer(void);
diff --git a/src/battle/entities.c b/src/battle/entities.c
new file mode 100644
index 0000000..6fea766
--- /dev/null
+++ b/src/battle/entities.c
@@ -0,0 +1,64 @@
+/*
+Copyright (C) 2015 Parallel Realities
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#include "entities.h"
+
+void doEntities(void)
+{
+	Entity *e, *prev;
+	
+	prev = &battle.entityHead;
+	
+	for (e = battle.entityHead.next ; e != NULL ; e = e->next)
+	{
+		e->x += e->dx;
+		e->y += e->dy;
+		
+		e->x -= battle.ssx;
+		e->y -= battle.ssy;
+		
+		if (e->action != NULL)
+		{
+			if (--e->thinkTime <= 0)
+			{
+				e->action();
+			}
+		}
+		
+		if (e->health <= 0)
+		{
+			prev->next = e->next;
+			free(e);
+			e = prev;
+		}
+		
+		prev = e;
+	}
+}
+
+void drawEntities(void)
+{
+	Entity *e;
+	
+	for (e = battle.entityHead.next ; e != NULL ; e = e->next)
+	{
+		blitRotated(e->texture, e->x, e->y, e->angle);
+	}
+}
diff --git a/src/battle/entities.h b/src/battle/entities.h
new file mode 100644
index 0000000..518d828
--- /dev/null
+++ b/src/battle/entities.h
@@ -0,0 +1,28 @@
+/*
+Copyright (C) 2015 Parallel Realities
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#include "SDL2/SDL.h"
+
+#include "../defs.h"
+#include "../structs.h"
+
+extern void blitRotated(SDL_Texture *t, int x, int y, int angle);
+
+extern Battle battle;
diff --git a/src/battle/objectives.h b/src/battle/objectives.h
index 4688adf..f18dfc5 100644
--- a/src/battle/objectives.h
+++ b/src/battle/objectives.h
@@ -30,4 +30,3 @@ extern void failMission(void);
 
 extern Battle battle;
 extern Colors colors;
-extern Game game;
diff --git a/src/battle/waypoints.c b/src/battle/waypoints.c
new file mode 100644
index 0000000..3a69da0
--- /dev/null
+++ b/src/battle/waypoints.c
@@ -0,0 +1,42 @@
+/*
+Copyright (C) 2015 Parallel Realities
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#include "waypoints.h"
+
+static void rotate(void);
+
+Entity *spawnWaypoint(void)
+{
+	Entity *waypoint = malloc(sizeof(Entity));
+	memset(waypoint, 0, sizeof(Entity));
+	battle.entityTail->next = waypoint;
+	battle.entityTail = waypoint;
+	
+	waypoint->health = waypoint->maxHealth = FPS;
+	waypoint->texture = getTexture("gfx/entities/waypoint.png");
+	waypoint->action = rotate;
+	
+	return waypoint;
+}
+
+static void rotate(void)
+{
+	
+}
diff --git a/src/battle/waypoints.h b/src/battle/waypoints.h
new file mode 100644
index 0000000..588a06a
--- /dev/null
+++ b/src/battle/waypoints.h
@@ -0,0 +1,28 @@
+/*
+Copyright (C) 2015 Parallel Realities
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#include "SDL2/SDL.h"
+
+#include "../defs.h"
+#include "../structs.h"
+
+extern Battle battle;
+
+extern SDL_Texture *getTexture(char *filename);
diff --git a/src/defs.h b/src/defs.h
index 8a285cd..9a05eb1 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -57,6 +57,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define FF_IMMORTAL			(2 << 2)
 #define FF_MISSION_TARGET	(2 << 3)
 
+enum
+{
+	ET_WAYPOINT
+};
+
 enum
 {
 	TA_LEFT,
diff --git a/src/galaxy/mission.c b/src/galaxy/mission.c
index 53f7fdb..6496c22 100644
--- a/src/galaxy/mission.c
+++ b/src/galaxy/mission.c
@@ -25,6 +25,7 @@ static void loadTriggers(cJSON *node);
 static void loadPlayer(cJSON *node);
 static void loadFighters(cJSON *node);
 static void loadFighterGroups(cJSON *node);
+static void loadEntities(cJSON *node);
 static unsigned long hashcode(const char *str);
 static char **toFighterTypeArray(char *types, int *numTypes);
 
@@ -58,6 +59,8 @@ void loadMission(char *filename)
 	
 	loadFighterGroups(cJSON_GetObjectItem(root, "fighterGroups"));
 	
+	loadEntities(cJSON_GetObjectItem(root, "entities"));
+	
 	STRNCPY(music, cJSON_GetObjectItem(root, "music")->valuestring, MAX_NAME_LENGTH);
 	
 	cJSON_Delete(root);
@@ -246,6 +249,40 @@ static void loadFighterGroups(cJSON *node)
 	}
 }
 
+static void loadEntities(cJSON *node)
+{
+	Entity *e;
+	int type;
+	
+	if (node)
+	{
+		node = node->child;
+		
+		while (node)
+		{
+			type = lookup(cJSON_GetObjectItem(node, "type")->valuestring);
+			
+			switch (type)
+			{
+				case ET_WAYPOINT:
+					e = spawnWaypoint();
+					break;
+			}
+					
+			STRNCPY(e->name, cJSON_GetObjectItem(node, "name")->valuestring, MAX_NAME_LENGTH);
+			e->x = cJSON_GetObjectItem(node, "x")->valueint;
+			e->y = cJSON_GetObjectItem(node, "y")->valueint;
+			
+			if (cJSON_GetObjectItem(node, "flags"))
+			{
+				e->flags = flagsToLong(cJSON_GetObjectItem(node, "flags")->valuestring);
+			}
+		
+			node = node->next;
+		}
+	}
+}
+
 static char **toFighterTypeArray(char *types, int *numTypes)
 {
 	int i;
diff --git a/src/galaxy/mission.h b/src/galaxy/mission.h
index b1e1282..9ba9e15 100644
--- a/src/galaxy/mission.h
+++ b/src/galaxy/mission.h
@@ -35,6 +35,7 @@ extern void playMusic(char *filename);
 extern void stopMusic(void);
 extern void initPlayer(void);
 extern long flagsToLong(char *flags);
+extern Entity *spawnWaypoint(void);
 
 extern Battle battle;
 extern Fighter *player;
diff --git a/src/json/cJSON.c b/src/json/cJSON.c
index 46cbf72..a330f69 100644
--- a/src/json/cJSON.c
+++ b/src/json/cJSON.c
@@ -338,7 +338,7 @@ cJSON *cJSON_ParseWithOpts(const char *value,const char **return_parse_end,int r
 /* Default options for cJSON_Parse */
 cJSON *cJSON_Parse(const char *value) {return cJSON_ParseWithOpts(value,0,0);}
 
-/* Render a cJSON item/Fighter/structure to text. */
+/* Render a cJSON item/entity/structure to text. */
 char *cJSON_Print(cJSON *item)				{return print_value(item,0,1,0);}
 char *cJSON_PrintUnformatted(cJSON *item)	{return print_value(item,0,0,0);}
 
diff --git a/src/json/cJSON.h b/src/json/cJSON.h
index ce38cf2..466d10d 100644
--- a/src/json/cJSON.h
+++ b/src/json/cJSON.h
@@ -65,13 +65,13 @@ extern void cJSON_InitHooks(cJSON_Hooks* hooks);
 
 /* Supply a block of JSON, and this returns a cJSON object you can interrogate. Call cJSON_Delete when finished. */
 extern cJSON *cJSON_Parse(const char *value);
-/* Render a cJSON Fighter to text for transfer/storage. Free the char* when finished. */
+/* Render a cJSON entity to text for transfer/storage. Free the char* when finished. */
 extern char  *cJSON_Print(cJSON *item);
-/* Render a cJSON Fighter to text for transfer/storage without any formatting. Free the char* when finished. */
+/* Render a cJSON entity to text for transfer/storage without any formatting. Free the char* when finished. */
 extern char  *cJSON_PrintUnformatted(cJSON *item);
-/* Render a cJSON Fighter to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
+/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
 extern char *cJSON_PrintBuffered(cJSON *item,int prebuffer,int fmt);
-/* Delete a cJSON Fighter and all subentities. */
+/* Delete a cJSON entity and all subentities. */
 extern void   cJSON_Delete(cJSON *c);
 
 /* Returns the number of items in an array (or object). */
diff --git a/src/structs.h b/src/structs.h
index 88b6fc5..3d1d523 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -23,6 +23,7 @@ typedef struct Texture Texture;
 typedef struct Lookup Lookup;
 typedef struct Weapon Weapon;
 typedef struct Fighter Fighter;
+typedef struct Entity Entity;
 typedef struct Bullet Bullet;
 typedef struct Effect Effect;
 typedef struct Objective Objective;
@@ -68,6 +69,27 @@ struct Weapon {
 	int y;
 };
 
+struct Entity {
+	int type;
+	char name[MAX_NAME_LENGTH];
+	int side;
+	float x;
+	float y;
+	float dx;
+	float dy;
+	int angle;
+	int health;
+	int maxHealth;
+	int shield;
+	int thinkTime;
+	long flags;
+	void (*action)(void);
+	void (*defaultAction)(void);
+	void (*die)(void);
+	SDL_Texture *texture;
+	Entity *next;
+};
+
 struct Fighter {
 	char name[MAX_NAME_LENGTH];
 	int active;
@@ -223,6 +245,7 @@ typedef struct {
 	SDL_Texture *background, *planetTexture;
 	PointF planet;
 	Fighter fighterHead, *fighterTail;
+	Entity entityHead, *entityTail;
 	Bullet bulletHead, *bulletTail;
 	Effect effectHead, *effectTail;
 	Objective objectiveHead, *objectiveTail;
diff --git a/src/system/lookup.c b/src/system/lookup.c
index 2be68e3..c9f28c7 100644
--- a/src/system/lookup.c
+++ b/src/system/lookup.c
@@ -30,6 +30,8 @@ void initLookups(void)
 	memset(&head, 0, sizeof(Lookup));
 	tail = &head;
 	
+	addLookup("ET_WAYPOINT", ET_WAYPOINT);
+	
 	addLookup("FF_NO_KILL", FF_NO_KILL);
 	addLookup("FF_DISABLE", FF_DISABLE);
 	addLookup("FF_IMMORTAL", FF_IMMORTAL);