summaryrefslogtreecommitdiff
path: root/includes/powder.h
diff options
context:
space:
mode:
authorPhilip <philip@philip-linuxlaptop.(none)>2010-11-09 00:59:03 (GMT)
committer Philip <philip@philip-linuxlaptop.(none)>2010-11-09 00:59:03 (GMT)
commit16265e3736d5cf9e5620d423e03ed1df0ede50eb (patch)
treefad9a64e776b22660536d797737c6489af4e4266 /includes/powder.h
parentb8ed9035f7d3af3b1b7e8d404b277abcb53df083 (diff)
downloadpowder-16265e3736d5cf9e5620d423e03ed1df0ede50eb.zip
powder-16265e3736d5cf9e5620d423e03ed1df0ede50eb.tar.gz
made faster
Diffstat (limited to 'includes/powder.h')
-rw-r--r--includes/powder.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/powder.h b/includes/powder.h
index 0b749f7..14f2e91 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -299,7 +299,7 @@ static const part_type ptypes[PT_NUM] =
{"2x2", PIXPACK(0xFFFF00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "2x2! (125/36)", TYPE_SOLID},
{"DANI", PIXPACK(0x00FFFF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Day and Night! (34678/3678)", TYPE_SOLID},
{"AMOE", PIXPACK(0xFF00FF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Amoeba! (1358/357)", TYPE_SOLID},
- {"MOVE", PIXPACK(0xFFFFFF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Move particles! (245/368)", TYPE_SOLID},
+ {"MOVE", PIXPACK(0xFFFFFF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "'Move' particles! Does not move things.. it is a life type(245/368)", TYPE_SOLID},
{"PGOL", PIXPACK(0xE05010), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Pseudo Life! (238/357)", TYPE_SOLID},
{"DMOE", PIXPACK(0x500000), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Diamoeba! (5678/35678)", TYPE_SOLID},
//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
@@ -421,25 +421,25 @@ int try_move(int i, int x, int y, int nx, int ny);
void kill_part(int i);
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
extern _inline int create_part(int p, int x, int y, int t);
#else
extern inline int create_part(int p, int x, int y, int t);
#endif
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
extern _inline void delete_part(int x, int y);
#else
extern inline void delete_part(int x, int y);
#endif
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
extern _inline int is_wire(int x, int y);
#else
extern inline int is_wire(int x, int y);
#endif
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
extern _inline int is_wire_off(int x, int y);
#else
extern inline int is_wire_off(int x, int y);
@@ -447,7 +447,7 @@ extern inline int is_wire_off(int x, int y);
void set_emap(int x, int y);
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
_inline int parts_avg(int ci, int ni);
#else
int parts_avg(int ci, int ni);