mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2024-12-25 22:25:46 +00:00
4320b8296b
This commit introduces pointer checks to various functions; so that entity_* will no longer crash or produce weird results if passed a Node pointer, etc. The checks are disabled by default, but can be enabled in ScriptInterface.cpp. Fixed possible crashes in a few more functions due to missing NULL-checks. There was a "feature" in the single Lua state that it would keep globals intact until the game was quit. That made any globals from mods "leak" into the game or other mods. Now it resets the Lua state when a mod is loaded or closed.
60 lines
1.4 KiB
C++
60 lines
1.4 KiB
C++
/*
|
|
Copyright (C) 2007, 2012 - Bit-Blot
|
|
|
|
This file is part of Aquaria.
|
|
|
|
Aquaria is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include <sstream>
|
|
|
|
#include "ScriptObject.h"
|
|
|
|
static const char *scriptObjTypeNames[] =
|
|
{
|
|
/* (1 << 0) */ "Entity",
|
|
/* (1 << 1) */ "Ingredient",
|
|
/* (1 << 2) */ "CollideEntity",
|
|
/* (1 << 3) */ "ScriptedEntity",
|
|
/* (1 << 4) */ "Beam",
|
|
/* (1 << 5) */ "Shot",
|
|
/* (1 << 6) */ "Web",
|
|
/* (1 << 7) */ "Bone",
|
|
/* (1 << 8) */ "Path/Node",
|
|
/* (1 << 9) */ "PauseQuad",
|
|
NULL
|
|
};
|
|
|
|
std::string ScriptObject::getTypeString(unsigned int ty)
|
|
{
|
|
if (ty == SCO_NONE)
|
|
return "NO TYPE";
|
|
|
|
bool more = false;
|
|
std::ostringstream os;
|
|
for (int i = 0; scriptObjTypeNames[i]; ++i)
|
|
{
|
|
if (ty & (1 << i))
|
|
{
|
|
if (more)
|
|
os << ", ";
|
|
os << scriptObjTypeNames[i];
|
|
more = true;
|
|
}
|
|
}
|
|
return os.str();
|
|
}
|
|
|