summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2010-12-04 17:24:54 (GMT)
committer Cracker64 <cracker642@gmail.com>2010-12-04 17:24:54 (GMT)
commitd56684312dd9429da8be8666206ad1656d3185a9 (patch)
treed8db260b8b24c1e193bc6a76700cb1de374ed7ef /includes
parent01a2dcaf419b207702d959a5016107674c636325 (diff)
downloadpowder-d56684312dd9429da8be8666206ad1656d3185a9.zip
powder-d56684312dd9429da8be8666206ad1656d3185a9.tar.gz
WIFI, a wireless SPRK transmitter, has 25 'channels' controlled by temp. starting at 0C, every 100 degrees is a different channel, they are colored as well. Heat-gradient display, colors of elements is slightly changed based on temp. maybe some other fixes.
Diffstat (limited to 'includes')
-rw-r--r--includes/defines.h1
-rw-r--r--includes/powder.h9
2 files changed, 8 insertions, 2 deletions
diff --git a/includes/defines.h b/includes/defines.h
index b2e1cca..a0db95d 100644
--- a/includes/defines.h
+++ b/includes/defines.h
@@ -124,6 +124,7 @@ int ISGOL;
int ISLOVE;
int ISLOLZ;
int ISGRAV;
+int ISWIRE;
int GSPEED;
int love[XRES/9][YRES/9];
int lolz[XRES/9][YRES/9];
diff --git a/includes/powder.h b/includes/powder.h
index 1442e63..a06249f 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -5,7 +5,8 @@
#include "defines.h"
#include "interface.h"
-#define CM_COUNT 9
+#define CM_COUNT 10
+#define CM_GRAD 9
#define CM_CRACK 8
#define CM_NOTHING 7
#define CM_FANCY 6
@@ -170,7 +171,8 @@
#define PT_SHLD3 121
#define PT_SHLD4 122
#define PT_LOLZ 123
-#define PT_NUM 124
+#define PT_WIFI 124
+#define PT_NUM 125
#define R_TEMP 22
#define MAX_TEMP 9999
@@ -385,6 +387,7 @@ static const part_type ptypes[PT_NUM] =
{"SHD3", PIXPACK(0x444444), 0.0f, 0.00f * CFDS, 1.00f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 1, 0, 100, SC_CRACKER, R_TEMP+0.0f +273.15f, 0, "Shield lvl 3", 0},
{"SHD4", PIXPACK(0x212121), 0.0f, 0.00f * CFDS, 1.00f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 1, 0, 100, SC_CRACKER, R_TEMP+0.0f +273.15f, 0, "Shield lvl 4", 0},
{"LOLZ", PIXPACK(0x569212), 0.0f, 0.00f * CFDS, 0.00f, 0.00f, 0.0f, 0.0f, 0.0f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 373.0f, 40, "Lolz", TYPE_SOLID},
+ {"WIFI", PIXPACK(0x40A060), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 1, 100, SC_CRACKER, R_TEMP+0.0f +273.15f, 0, "Wireless transmitter, color coded.", TYPE_SOLID|PROP_CONDUCTS},
//Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins(real world, by triclops200) Description
};
@@ -516,6 +519,7 @@ static part_state pstates[PT_NUM] =
/* SHLD3*/ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
/* SHLD4*/ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
/* LOlZ */ {ST_GAS, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
+ /* WIFI */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
};
static int grule[NGOL][9] =
@@ -560,6 +564,7 @@ static int lolzrule[9][9] =
{0,1,0,0,0,0,0,1,0},
};
int portal[8][8];
+int wireless[25];
extern int isplayer;
extern float player[27];