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

some testing with DEBUG mode, add some stuff

Browse Source 
Conflicts:
	src/cat/TPTScriptInterface.cpp
This commit is contained in:
jacob1 2012-10-21 19:42:06 -04:00 committed by Simon Robertshaw
parent e773abdcc8
commit 69aad4caa2
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cat/TPTScriptInterface.cpp
View File

@ -218,7 +218,12 @@ AnyType TPTScriptInterface::tptS_set(std::deque<std::string> * words)
{
newValue = GetParticleType(((StringType)value).Value());
if (newValue < 0 || newValue >= PT_NUM)
throw GeneralException("Invalid element");
{
if (newString == "GOLD")
throw GeneralException("No, GOLD will not be an element");
else
throw GeneralException("Invalid element");
}
}
else
throw GeneralException("Invalid value for assignment");

41
src/interface/Window.cpp
View File

@ -283,6 +283,47 @@ void Window::DoKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool a
if(key == KEY_RIGHT)
focusedComponent_->Position.X++;
}
if (key == KEY_DELETE)
{
RemoveComponent(focusedComponent_);
halt = false;
}
}
else
{
if(shift)
{
if(key == KEY_UP)
Size.Y--;
if(key == KEY_DOWN)
Size.Y++;
if(key == KEY_LEFT)
Size.X--;
if(key == KEY_RIGHT)
Size.X++;
}
if(ctrl)
{
if(key == KEY_UP)
Size.Y++;
if(key == KEY_DOWN)
Size.Y--;
if(key == KEY_LEFT)
Size.X++;
if(key == KEY_RIGHT)
Size.X--;
}
if(!shift)
{
if(key == KEY_UP)
Position.Y--;
if(key == KEY_DOWN)
Position.Y++;
if(key == KEY_LEFT)
Position.X--;
if(key == KEY_RIGHT)
Position.X++;
}
}
return;
}