Start of radar map.

common.mk

@@ -46,6 +46,7 @@ _OBJS += machineGunBlob.o machineGunDroid.o main.o map.o maths.o mia.o missile.o
 _OBJS += objectives.o
 _OBJS += particles.o player.o plasmaBlob.o plasmaDroid.o pistolBlob.o pistolDroid.o powerPoint.o powerPool.o pressurePlate.o pushBlock.o
 _OBJS += quadtree.o
+_OBJS += radar.o
 _OBJS += shotgunBlob.o shotgunDroid.o sound.o spreadGunBlob.o spreadGunDroid.o sprites.o structures.o
 _OBJS += tankCommander.o tankTrack.o teeka.o teleporter.o text.o textures.o title.o triggers.o
 _OBJS += unit.o util.o

src/entities/items/keycard.h

@@ -24,5 +24,4 @@ extern Entity *createItem(void);
 extern void updateObjective(char *targetName);
 extern void teekaExitMission(void);
 
-extern Entity *self;
 extern World world;

src/test/atlasTest.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 void initAtlasTest(void)
 {
-	dev.cheatStatic = 1;
+	dev.cheatStatic = 0;
 	dev.cheatBlind = 0;
 	dev.cheatNoEnemies = 0;
 	dev.cheatKeys = 1;
@@ -33,11 +33,13 @@ void initAtlasTest(void)
 	
 	initHub();
 	
-	loadWorld("beachFront4");
+	loadWorld("beachApproach");
 	
 	initWorld();
 	
 	initMap();
 	
 	initEntities();
+	
+	initRadar();
 }

src/test/atlasTest.h

@@ -25,6 +25,7 @@ extern void initMap(void);
 extern void initHub(void);
 extern void initGame(void);
 extern void initEntities(void);
+extern void initRadar(void);
 extern void loadWorld(char *id);
 
 extern Dev dev;

src/world/radar.c

@@ -1,22 +1,44 @@
-#define RADAR_TILE_SIZE 32
+/*
-#define OFFSET_X ((SCREEN_WIDTH - (RADAR_TILE_SIZE * RADAR_TILE_SIZE)) / 2)
+Copyright (C) 2018 Parallel Realities
-#define OFFSET_Y ((SCREEN_HEIGHT - (RADAR_TILE_SIZE * RADAR_TILE_SIZE)) / 2)
+
+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 "radar.h"
 
 static void logic(void);
 static void draw(void);
+static void getMapTileColor(int i, SDL_Color *c);
 static void drawMap(void);
+static void drawEntities(void);
+static int isValidBlip(Entity *e);
+static void getBlipColor(Entity *e, SDL_Color *c);
 
 static SDL_Rect viewRect;
 
 void initRadar(void)
 {
 	app.delegate.logic = logic;
-	app.delegate.logic = draw;
+	app.delegate.draw = draw;
 	
-	viewRect.x = (world.bob->x / MAP_TILE_SIZE) - (RADAR_TILE_SIZE / 2);
+	viewRect.x = (world.bob->x / MAP_TILE_SIZE) - (VIEW_SIZE / 2);
-	viewRect.y = (world.bob->y / MAP_TILE_SIZE) - (RADAR_TILE_SIZE / 2);
+	viewRect.y = (world.bob->y / MAP_TILE_SIZE) - (VIEW_SIZE / 2);
-	viewRect.w = RADAR_TILE_SIZE;
+	viewRect.w = VIEW_SIZE;
-	viewRect.h = RADAR_TILE_SIZE;
+	viewRect.h = VIEW_SIZE;
 }
 
 static void logic(void)
@@ -27,11 +49,14 @@ static void logic(void)
 static void draw(void)
 {
 	drawMap();
+	
+	drawEntities();
 }
 
 static void drawMap(void)
 {
 	int x, y, mx, my;
+	SDL_Color c;
 	
 	for (x = 0 ; x < viewRect.w ; x++)
 	{
@@ -40,27 +65,121 @@ static void drawMap(void)
 			mx = viewRect.x + x;
 			my = viewRect.y + y;
 			
-			if (withinMap(mx, my))
+			if (isWithinMap(mx, my))
 			{
-				drawRect(OFFSET_X + (x * RADAR_TILE_SIZE), OFFSET_Y + (y * RADAR_TILE_SIZE), RADAR_TILE_SIZE - 1, RADAR_TILE_SIZE - 1, 0, 200, 0, 255);
+				if (world.map.data[mx][my] > MAP_TILE_AIR)
+				{
+					getMapTileColor(world.map.data[mx][my], &c);
+					
+					drawRect(OFFSET_X + (x * RADAR_TILE_SIZE), OFFSET_Y + (y * RADAR_TILE_SIZE), RADAR_TILE_SIZE - 1, RADAR_TILE_SIZE - 1, c.r, c.g, c.b, 255);
 				}
 			}
 		}	
 	}
+}
+
+static void getMapTileColor(int i, SDL_Color *c)
+{
+	c->r = c->g = c->b = 0;
+	
+	switch (i)
+	{
+		case MAP_TILE_WATER:
+			c->r = c->g = c->b = 128;
+			c->b = 255;
+			break;
+			
+		case MAP_TILE_SLIME:
+			c->r = c->g = c->b = 128;
+			c->g = 255;
+			break;
+			
+		case MAP_TILE_LAVA:
+			c->r = c->g = c->b = 128;
+			c->r = 255;
+			break;
+			
+		default:
+			if (i < MAP_TILE_NON_SOLID)
+			{
+				c->r = c->g = c->b = 168;
+			}
+			break;
+	}
+
+}
 
 static void drawEntities(void)
 {
 	Entity *e;
 	Entity **candidates;
 	int i, x, y;
+	SDL_Color c;
 
 	candidates = getAllEntsWithin(viewRect.x * MAP_TILE_SIZE, viewRect.y * MAP_TILE_SIZE, viewRect.w * MAP_TILE_SIZE, viewRect.h * MAP_TILE_SIZE, NULL);
 	
 	for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
 	{
-		x = viewRect.x + (e->x / RADAR_TILE_SIZE);
+		if (isValidBlip(e))
-		y = viewRect.y + (e->y / RADAR_TILE_SIZE);
+		{
+			x = (e->x / MAP_TILE_SIZE) - viewRect.x;
+			y = (e->y / MAP_TILE_SIZE) - viewRect.y;
 			
-		drawRect(OFFSET_X + (x * RADAR_TILE_SIZE), OFFSET_Y + (y * RADAR_TILE_SIZE), RADAR_TILE_SIZE - 1, RADAR_TILE_SIZE - 1, 200, 0, 0, 255);
+			getBlipColor(e, &c);
+
+			drawRect(OFFSET_X + (x * RADAR_TILE_SIZE), OFFSET_Y + (y * RADAR_TILE_SIZE), RADAR_TILE_SIZE - 1, RADAR_TILE_SIZE - 1, c.r, c.g, c.b, 255);
+		}
+	}
+}
+
+static int isValidBlip(Entity *e)
+{
+	switch (e->type)
+	{
+		case ET_BOB:
+			return 1;
+			
+		case ET_ENEMY:
+		case ET_TEEKA:
+		case ET_BOSS:
+		case ET_HEART_CELL:
+		case ET_KEY:
+		case ET_ITEM:
+		case ET_MIA:
+		case ET_DESTRUCTABLE:
+			return 1;
+			
+		default:
+			return 0;
+	}
+	
+	return 0;
+}
+
+static void getBlipColor(Entity *e, SDL_Color *c)
+{
+	c->r = c->g = c->b = 0;
+	
+	switch (e->type)
+	{
+		case ET_BOB:
+			break;
+			
+		case ET_ENEMY:
+			c->r = 255;
+			break;
+			
+		case ET_TEEKA:
+		case ET_BOSS:
+		case ET_HEART_CELL:
+		case ET_KEY:
+		case ET_ITEM:
+		case ET_MIA:
+		case ET_DESTRUCTABLE:
+			c->r = c->b = 255;
+			break;
+			
+		default:
+			break;
 	}
 }

src/world/radar.h

@@ -0,0 +1,33 @@
+/*
+Copyright (C) 2018 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.
+
+*/
+
+#define RADAR_TILE_SIZE 	16
+#define VIEW_SIZE			60
+#define OFFSET_X 			((SCREEN_WIDTH - (RADAR_TILE_SIZE * VIEW_SIZE)) / 2)
+#define OFFSET_Y			((SCREEN_HEIGHT - (RADAR_TILE_SIZE * VIEW_SIZE)) / 2)
+
+#include "../common.h"
+
+extern int isWithinMap(int x, int y);
+extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
+extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a);
+
+extern App app;
+extern World world;