mirror of
https://github.com/UOX3DevTeam/UOX3
synced 2026-08-13 12:27:04 -04:00
166d3b0119
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
51 lines
1.7 KiB
C++
51 lines
1.7 KiB
C++
#ifndef __OBJECTFACTORY_H__
|
|
#define __OBJECTFACTORY_H__
|
|
|
|
#include "Prerequisites.h"
|
|
#include "typedefs.h"
|
|
/** This class is responsible for the creation and destruction of ingame
|
|
objects and should mean that we can take chars[] and items[] out of scope
|
|
*/
|
|
#define OBJFUNCTOR( text ) bool (*text)( CBaseObject *, UI32 &, void * )
|
|
|
|
class ObjectFactory
|
|
{
|
|
private:
|
|
typedef std::multimap< SERIAL, CBaseObject *> OBJECTMAP;
|
|
typedef OBJECTMAP::iterator OBJECTMAP_ITERATOR;
|
|
typedef OBJECTMAP::const_iterator OBJECTMAP_CITERATOR;
|
|
|
|
OBJECTMAP chars; // This will split into PCs and NPCs when the object tree expands
|
|
OBJECTMAP multis;
|
|
OBJECTMAP items;
|
|
SERIAL nextPC, nextNPC, nextItem, nextMulti;
|
|
|
|
SERIAL NextFreeSerial( ObjectType toFind );
|
|
// To be a singleton, we make the constructor
|
|
// private, and delete the copy/move constructors
|
|
ObjectFactory();
|
|
~ObjectFactory();
|
|
ObjectFactory(const ObjectFactory&) = delete ;
|
|
ObjectFactory& operator=(const ObjectFactory&) = delete ;
|
|
public:
|
|
|
|
UI32 CountOfObjects( ObjectType toCount );
|
|
size_t SizeOfObjects( ObjectType toCount );
|
|
CBaseObject * CreateObject( ObjectType createType );
|
|
CBaseObject * CreateBlankObject( ObjectType createType );
|
|
CBaseObject * FindObject( SERIAL toFind );
|
|
bool DestroyObject( CBaseObject *toDestroy );
|
|
bool RegisterObject( CBaseObject *toRegister );
|
|
bool RegisterObject( CBaseObject *toRegister, SERIAL toAttach );
|
|
bool UnregisterObject( CBaseObject *toRemove );
|
|
void GarbageCollect( void );
|
|
|
|
UI32 IterateOver( ObjectType toIterOver, UI32 &b, void *extraData, OBJFUNCTOR( text ) );
|
|
|
|
// the way you get the instance
|
|
static ObjectFactory& getSingleton( void );
|
|
|
|
};
|
|
|
|
#endif
|
|
|