mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-29 19:00:33 +02:00
Code Issues Projects Releases Wiki Activity

fix PSCN BRAY (tmp = 2) not stopping normal BRAY from going through

Browse Source 
also some other random things
This commit is contained in:
jacob1
2013-05-08 10:29:10 -04:00
parent 77102f4bba
commit c0b4592839
6 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@@ -16,7 +16,7 @@
#endif #endif
#ifndef MINOR_VERSION #ifndef MINOR_VERSION
#define MINOR_VERSION 1 #define MINOR_VERSION 2
#endif #endif
#ifndef BUILD_NUM #ifndef BUILD_NUM

2
src/cat/LuaScriptInterface.cpp
View File

@@ -2135,7 +2135,7 @@ int LuaScriptInterface::Command(std::string command)
} }
else else
{ {
int level = lua_gettop(l), ret; int level = lua_gettop(l), ret = -1;
std::string text = ""; std::string text = "";
lastError = ""; lastError = "";
currentCommand = true; currentCommand = true;

23
src/simulation/elements/ARAY.cpp
View File

@@ -78,20 +78,17 @@ int Element_ARAY::update(UPDATE_FUNC_ARGS)
parts[nr].temp = parts[i].temp; parts[nr].temp = parts[i].temp;
} }
} else if (!destroy) { } else if (!destroy) {
if ((r&0xFF)==PT_BRAY) { if ((r&0xFF)==PT_BRAY&&parts[r>>8].tmp==0) {//if it hits another BRAY that isn't red
if (parts[r>>8].tmp==0){//if it hits another BRAY that isn't red if (nyy!=0 || nxx!=0) {
if (nyy!=0 || nxx!=0) { parts[r>>8].life = 1020;//makes it last a while
parts[r>>8].life = 1020;//makes it last a while parts[r>>8].tmp = 1;
parts[r>>8].tmp = 1; if (!parts[r>>8].ctype)//and colors it if it isn't already
if (!parts[r>>8].ctype)//and colors it if it isn't already parts[r>>8].ctype = colored;
parts[r>>8].ctype = colored;
}
docontinue = 0;//then stop it
}
else if (parts[r>>8].tmp==1) {//if it hits one that already was a long life, reset it
parts[r>>8].life = 1020;
//docontinue = 1;
} }
docontinue = 0;//then stop it
} else if ((r&0xFF)==PT_BRAY&&parts[r>>8].tmp==1) {//if it hits one that already was a long life, reset it
parts[r>>8].life = 1020;
//docontinue = 1;
} else if ((r&0xFF)==PT_FILT) {//get color if passed through FILT } else if ((r&0xFF)==PT_FILT) {//get color if passed through FILT
colored = parts[r>>8].ctype; colored = parts[r>>8].ctype;
//this if prevents BRAY from stopping on certain materials //this if prevents BRAY from stopping on certain materials

2
src/simulation/elements/BTRY.cpp
View File

@@ -28,7 +28,7 @@ Element_BTRY::Element_BTRY()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251; HeatConduct = 251;
Description = "Solid. Generates infinite electricity."; Description = "Generates infinite electricity.";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID; Properties = TYPE_SOLID;

2
src/simulation/elements/GOLD.cpp
View File

@@ -29,7 +29,7 @@ Element_GOLD::Element_GOLD()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251; HeatConduct = 251;
Description = "Corrosion resistant metal, will reverse corrosion of iron"; Description = "Corrosion resistant metal, will reverse corrosion of iron.";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_HOT_GLOW|PROP_LIFE_DEC|PROP_NEUTPASS; Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_HOT_GLOW|PROP_LIFE_DEC|PROP_NEUTPASS;

2
src/simulation/elements/TUGN.cpp
View File

@@ -29,7 +29,7 @@ Element_TUGN::Element_TUGN()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251; HeatConduct = 251;
Description = "Brittle metal with a very high melting point"; Description = "Brittle metal with a very high melting point.";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC; Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;