mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2024-12-25 14:15:46 +00:00
7ff0caaed8
- Pointer typechecks are now enabled by default. - enabled all script warnings for non-FULL or DEMO builds by default - Added generic obj_* functions that operate on any type of RenderObject. These give quite low-level control about the renderer, and are quite dangerous too. Subsequently, many functions sharing the same code (*_setPosition, for example) could be removed, and simply call the generic functions after a type check. - Added interface function deathNotify(). The original logic of death notifiers was never used, so i thought i'd make use of it. This is useful in scripts to safely drop dangling pointers. - removed sendEntityMessage, entity_setCollideWithAvatar, entity_setTouchDamage, which were essentially no-ops. - Replaced all unnecessary luaReturnNum(0) and luaReturnInt(0), now it does only push a return value on the stack if the function is actually supposed to have a retun value. - Allow variadic calling of entity_msg(). Now any parameters can be passed to the function, and the target entity will receive all of them. Any values returned from the entity's msg() callback will be returned by entity_msg() to the original caller. This allows nice RPC-like entity communication. - fixed possible crash in debugLog, bone_update, entity_debugText - added an override function for loadfile() that is case-insensitive like dofile() - entity_createEntity returns the created entity now - spawnParticleEffect returns the associated RenderObject - Added some text rendering functions - Added beam_setFirer() - removed the underflow check in avatar_decrLeaches() I added earlier - added a panic function for Lua. - added the Lua debug library - fixed a stupid typo in ScriptObject::isType() that made the type checks a lot less accurate - misc stuff I forgot
62 lines
1.5 KiB
C++
62 lines
1.5 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) */ "RenderObject",
|
|
/* (1 << 1) */ "Entity",
|
|
/* (1 << 2) */ "Ingredient",
|
|
/* (1 << 3) */ "CollideEntity",
|
|
/* (1 << 4) */ "ScriptedEntity",
|
|
/* (1 << 5) */ "Beam",
|
|
/* (1 << 6) */ "Shot",
|
|
/* (1 << 7) */ "Web",
|
|
/* (1 << 8) */ "Bone",
|
|
/* (1 << 9) */ "Path/Node",
|
|
/* (1 <<10) */ "Quad",
|
|
/* (1 <<11) */ "Text",
|
|
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();
|
|
}
|
|
|