matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Spelling

Browse Source 
("gases" seems to be the more popular version of the plural noun)
This commit is contained in:
jacksonmj 2012-05-15 17:57:42 +01:00
parent 66b946d5c6
commit 9a30a580d2
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/interface.h
View File

@ -74,7 +74,7 @@ static menu_section msections[] = //doshow does not do anything currently.
{"\xD6", "Powered Materials", 0, 1}, {"\xD6", "Powered Materials", 0, 1},
{"\xE2", "Force Creating", 0, 1}, {"\xE2", "Force Creating", 0, 1},
{"\xC3", "Explosives", 0, 1}, {"\xC3", "Explosives", 0, 1},
{"\xC5", "Gasses", 0, 1}, {"\xC5", "Gases", 0, 1},
{"\xC4", "Liquids", 0, 1}, {"\xC4", "Liquids", 0, 1},
{"\xD0", "Powders", 0, 1}, {"\xD0", "Powders", 0, 1},
{"\xD1", "Solids", 0, 1}, {"\xD1", "Solids", 0, 1},

12
includes/powder.h
View File

@ -253,7 +253,7 @@
#define TYPE_PART 0x00001 //1 Powders #define TYPE_PART 0x00001 //1 Powders
#define TYPE_LIQUID 0x00002 //2 Liquids #define TYPE_LIQUID 0x00002 //2 Liquids
#define TYPE_SOLID 0x00004 //4 Solids #define TYPE_SOLID 0x00004 //4 Solids
#define TYPE_GAS 0x00008 //8 Gasses (Includes plasma) #define TYPE_GAS 0x00008 //8 Gases (Includes plasma)
#define TYPE_ENERGY 0x00010 //16 Energy (Thunder, Light, Neutrons etc.) #define TYPE_ENERGY 0x00010 //16 Energy (Thunder, Light, Neutrons etc.)
#define PROP_CONDUCTS 0x00020 //32 Conducts electricity #define PROP_CONDUCTS 0x00020 //32 Conducts electricity
#define PROP_BLACK 0x00040 //64 Absorbs Photons (not currently implemented or used, a photwl attribute might be better) #define PROP_BLACK 0x00040 //64 Absorbs Photons (not currently implemented or used, a photwl attribute might be better)
@ -726,17 +726,17 @@ static wall_type wtypes[] =
{PIXPACK(0x808080), PIXPACK(0x000000), 0, "Erases walls."}, {PIXPACK(0x808080), PIXPACK(0x000000), 0, "Erases walls."},
{PIXPACK(0x808080), PIXPACK(0x000000), 3, "Wall. Indestructible. Blocks everything."}, {PIXPACK(0x808080), PIXPACK(0x000000), 3, "Wall. Indestructible. Blocks everything."},
{PIXPACK(0x3C3C3C), PIXPACK(0x000000), 1, "Wall. Indestructible. Blocks particles, allows air"}, {PIXPACK(0x3C3C3C), PIXPACK(0x000000), 1, "Wall. Indestructible. Blocks particles, allows air"},
{PIXPACK(0x575757), PIXPACK(0x000000), 1, "Wall. Indestructible. Blocks liquids and gasses, allows powders"}, {PIXPACK(0x575757), PIXPACK(0x000000), 1, "Wall. Indestructible. Blocks liquids and gases, allows powders"},
{PIXPACK(0xFFFF22), PIXPACK(0x101010), 2, "Conductor, allows particles, conducts electricity"}, {PIXPACK(0xFFFF22), PIXPACK(0x101010), 2, "Conductor, allows particles, conducts electricity"},
{PIXPACK(0x242424), PIXPACK(0x101010), 0, "E-Hole, absorbs particles, release them when powered"}, {PIXPACK(0x242424), PIXPACK(0x101010), 0, "E-Hole, absorbs particles, release them when powered"},
{PIXPACK(0xFFFFFF), PIXPACK(0x000000), -1, "Air, creates airflow and pressure"}, {PIXPACK(0xFFFFFF), PIXPACK(0x000000), -1, "Air, creates airflow and pressure"},
{PIXPACK(0xFFBB00), PIXPACK(0x000000), -1, "Heats the targetted element."}, {PIXPACK(0xFFBB00), PIXPACK(0x000000), -1, "Heats the targeted element."},
{PIXPACK(0x00BBFF), PIXPACK(0x000000), -1, "Cools the targetted element."}, {PIXPACK(0x00BBFF), PIXPACK(0x000000), -1, "Cools the targeted element."},
{PIXPACK(0x303030), PIXPACK(0x000000), -1, "Vacuum, reduces air pressure."}, {PIXPACK(0x303030), PIXPACK(0x000000), -1, "Vacuum, reduces air pressure."},
{PIXPACK(0x579777), PIXPACK(0x000000), 1, "Wall. Indestructible. Blocks liquids and solids, allows gasses"}, {PIXPACK(0x579777), PIXPACK(0x000000), 1, "Wall. Indestructible. Blocks liquids and solids, allows gases"},
{PIXPACK(0x000000), PIXPACK(0x000000), -1, "Drag tool"}, {PIXPACK(0x000000), PIXPACK(0x000000), -1, "Drag tool"},
{PIXPACK(0xFFEE00), PIXPACK(0xAA9900), 4, "Gravity wall"}, {PIXPACK(0xFFEE00), PIXPACK(0xAA9900), 4, "Gravity wall"},
{PIXPACK(0x0000BB), PIXPACK(0x000000), -1, "Postive gravity tool."}, {PIXPACK(0x0000BB), PIXPACK(0x000000), -1, "Positive gravity tool."},
{PIXPACK(0x000099), PIXPACK(0x000000), -1, "Negative gravity tool."}, {PIXPACK(0x000099), PIXPACK(0x000000), -1, "Negative gravity tool."},
{PIXPACK(0xFFAA00), PIXPACK(0xAA5500), 4, "Energy wall, allows only energy type particles to pass"}, {PIXPACK(0xFFAA00), PIXPACK(0xAA5500), 4, "Energy wall, allows only energy type particles to pass"},
{PIXPACK(0xFFAA00), PIXPACK(0xAA5500), -1, "Property edit tool"}, {PIXPACK(0xFFAA00), PIXPACK(0xAA5500), -1, "Property edit tool"},

2
src/main.c
View File

@ -2670,7 +2670,7 @@ int main(int argc, char *argv[])
if (REPLACE_MODE) if (REPLACE_MODE)
strappend(uitext, " [REPLACE MODE]"); strappend(uitext, " [REPLACE MODE]");
if (sdl_mod&(KMOD_CAPS)) if (sdl_mod&(KMOD_CAPS))
strappend(uitext, " [CAP LOCKS]"); strappend(uitext, " [CAPS LOCK]");
if (GRID_MODE) if (GRID_MODE)
{ {
char gridtext[15]; char gridtext[15];

4
src/powder.c
View File

@ -1853,7 +1853,7 @@ void update_particles_i(pixel *vid, int start, int inc)
parts[i].vy += ptypes[t].advection*vy[y/CELL][x/CELL] + pGravY; parts[i].vy += ptypes[t].advection*vy[y/CELL][x/CELL] + pGravY;
if (ptypes[t].diffusion)//the random diffusion that gasses have if (ptypes[t].diffusion)//the random diffusion that gases have
{ {
#ifdef REALISTIC #ifdef REALISTIC
//The magic number controlls diffusion speed //The magic number controlls diffusion speed
@ -2465,7 +2465,7 @@ killed:
} }
else if (ptypes[t].falldown==0) else if (ptypes[t].falldown==0)
{ {
// gasses and solids (but not powders) // gases and solids (but not powders)
if (!do_move(i, x, y, fin_xf, fin_yf)) if (!do_move(i, x, y, fin_xf, fin_yf))
{ {
if (parts[i].type == PT_NONE) if (parts[i].type == PT_NONE)