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

exception bluescreens print what the exception was, some (probably unnecessary) fixes to fusion that were never merged in, and probably a compiling fix

Browse Source
This commit is contained in:
jacob1 2013-12-03 22:05:20 -05:00
parent ce587a3ae3
commit 138cb4d757
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Misc.cpp
View File

@ -657,7 +657,7 @@ int splitsign(const char* str, char * type)
return 0;
}
void* millisleep(long int t)
void millisleep(long int t)
{
#ifdef WIN
Sleep(t);

2
src/Misc.h
View File

@ -88,7 +88,7 @@ void membwand(void * dest, void * src, size_t destsize, size_t srcsize);
int splitsign(const char* str, char * type = NULL);
void* millisleep(long int t);
void millisleep(long int t);
// a b
// c d

22
src/PowderToySDL.cpp
View File

@ -851,7 +851,7 @@ int main(int argc, char * argv[])
#endif
GameController * gameController = NULL;
#ifndef DEBUG
#if !defined(DEBUG) && !defined(_DEBUG)
try {
#endif
@ -860,9 +860,9 @@ int main(int argc, char * argv[])
if(arguments["open"].length())
{
#ifdef DEBUG
#ifdef DEBUG
std::cout << "Loading " << arguments["open"] << std::endl;
#endif
#endif
if(Client::Ref().FileExists(arguments["open"]))
{
try
@ -899,14 +899,14 @@ int main(int argc, char * argv[])
engine->g->drawrect((engine->GetWidth()/2)-100, (engine->GetHeight()/2)-25, 200, 50, 255, 255, 255, 180);
engine->g->drawtext((engine->GetWidth()/2)-(Graphics::textwidth("Loading save...")/2), (engine->GetHeight()/2)-5, "Loading save...", style::Colour::InformationTitle.Red, style::Colour::InformationTitle.Green, style::Colour::InformationTitle.Blue, 255);
#ifdef OGLI
#ifdef OGLI
blit();
#else
#else
if(engine->Scale==2)
blit2(engine->g->vid, engine->Scale);
else
blit(engine->g->vid);
#endif
#endif
std::string ptsaveArg = arguments["ptsave"];
try
{
@ -925,9 +925,9 @@ int main(int argc, char * argv[])
}
if(saveIdPart.length())
{
#ifdef DEBUG
#ifdef DEBUG
std::cout << "Got Ptsave: id: " << saveIdPart << std::endl;
#endif
#endif
saveId = format::StringToNumber<int>(saveIdPart);
if(!saveId)
throw std::runtime_error("Invalid Save ID");
@ -959,11 +959,11 @@ int main(int argc, char * argv[])
SaveWindowPosition();
#endif
#ifndef DEBUG
#if !defined(DEBUG) && !defined(_DEBUG)
}
catch(...)
catch(exception& e)
{
BlueScreen("Unhandled exception");
BlueScreen(e.what());
}
#endif

4
src/simulation/elements/SPRK.cpp
View File

@ -96,7 +96,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
}
break;
case PT_NBLE:
if (parts[i].life<=1&&parts[i].tmp!=1)
if (parts[i].life<=1 && parts[i].temp<5273.15f)
{
parts[i].life = rand()%150+50;
sim->part_change_type(i,x,y,PT_PLSM);
@ -302,7 +302,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
goto conduct;
continue;
case PT_NBLE:
if (parts[r>>8].tmp != 1)
if (parts[i].temp < 5273.15f)
goto conduct;
continue;
case PT_PSCN: