mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +00:00
Code Issues Releases Wiki Activity

Remove unused stuff

Browse source 
- entity group IDs
- entity node groups (?!)
- WaterFont.[cpp|h]
This commit is contained in:
fgenesis 2012-12-13 19:57:30 +01:00
parent 8b67ece907
commit 0f13f08357
8 changed files with 21 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Aquaria/SceneEditor.cpp
View file

@ -643,9 +643,6 @@ void SceneEditor::init()
addAction(MakeFunctionEvent(SceneEditor, mouseButtonLeftUp), MOUSE_BUTTON_LEFT, 0);
addAction(MakeFunctionEvent(SceneEditor, mouseButtonRightUp), MOUSE_BUTTON_RIGHT, 0);
// removed in fc3
//addAction(MakeFunctionEvent(SceneEditor, bindNodeToEntity), KEY_B, 0);
addAction(MakeFunctionEvent(SceneEditor, alignHorz), KEY_C, 1);
addAction(MakeFunctionEvent(SceneEditor, alignVert), KEY_V, 1);
@ -879,38 +876,6 @@ void SceneEditor::createAquarian()
inCreateAqurian = false;
}
void SceneEditor::bindNodeToEntity()
{
if (editType == ET_PATHS)
{
Path *p = getSelectedPath();
if (p)
{
std::istringstream is(dsq->getUserInputString("Enter group number"));
int group = 0;
is >> group;
Entity *e = getEntityAtCursor();
if (e)
{
e->removeNodeFromAllNodeGroups(p);
e->addNodeToNodeGroup(group, p);
}
else
{
debugLog("no entity at cursor");
}
}
}
}
void SceneEditor::addSpringPlant()
{
/*
SpringPlant *s = new SpringPlant(dsq->getGameCursorPosition());
dsq->game->addRenderObject(s, LR_ENTITIES);
*/
}
Path *SceneEditor::getSelectedPath()
{
if (selectedIdx >= 0 && selectedIdx < dsq->game->getNumPaths())
@ -1472,7 +1437,6 @@ void SceneEditor::updateEntitySaveData(Entity *editingEntity)
os << "idx2: " << editingEntity->entityTypeIdx << " ";
os << "name: " << editingEntity->name;
//os << "state: " << editingEntity->getState();
os << "groupID: " << editingEntity->getGroupID();
debugLog(os.str());
//debugLog("changing entity save data");
d->x = editingEntity->position.x;
@ -1484,7 +1448,6 @@ void SceneEditor::updateEntitySaveData(Entity *editingEntity)
debugLog(os2.str());
*/
d->rot = editingEntity->rotation.z;
d->group = editingEntity->getGroupID();
}
else
{
@ -1636,25 +1599,6 @@ void SceneEditor::toggleElementHurt()
}
}
void SceneEditor::setGroup()
{
if (editingEntity)
{
std::ostringstream os;
os << editingEntity->getGroupID();
Entity *backup = editingEntity;
std::string value = dsq->getUserInputString("Enter Group", os.str());
int group = 0;
if (!value.empty())
{
std::istringstream is(value);
is >> group;
}
backup->setGroupID(group);
updateEntitySaveData(backup);
}
}
void SceneEditor::toggleElementRepeat()
{
if (editingElement)
@ -3135,9 +3079,9 @@ void SceneEditor::placeElement()
else if (editType == ET_ENTITIES)
{
if (!selectedEntity.nameBased)
dsq->game->createEntity(selectedEntity.index, 0, dsq->getGameCursorPosition(), 0, true, "", ET_ENEMY, 0, 0, true);
dsq->game->createEntity(selectedEntity.index, 0, dsq->getGameCursorPosition(), 0, true, "", ET_ENEMY, true);
else
dsq->game->createEntity(selectedEntity.name, 0, dsq->getGameCursorPosition(), 0, true, "", ET_ENEMY, 0, 0, true);
dsq->game->createEntity(selectedEntity.name, 0, dsq->getGameCursorPosition(), 0, true, "", ET_ENEMY, true);
}
else if (editType == ET_PATHS)
{