mirror of
https://github.com/UOX3DevTeam/UOX3
synced 2026-08-13 12:27:04 -04:00
ef296a7997
-Fixed a potentially very serious bugs with how containers were being set upon loading the world -Fixed possible re-adding of weight to containers and characters at load -Fixed a bug causing equipped items that were not weapons to take damage in combat -Minor cleanups / warning fixes / Linux compatability issues (punt) -Changed CItem::Get/SetLayer() to a UI08 -Fixed a bug in speech causing you to see your own text twice -Fixed a nasty crash bug caused by changing an items layer -Fixed a bug causing NPC's to always be the first attacker -Armor DEF system overhauled to match OSI system -Updated Hash Table Remove() calls to remove unrefrenced parameter "index" -Changed cSocket::Get/SetDWord() to a UI32 to fix problems checking it against INVALIDSERIAL and storing large serial numbers -Changed cSocket::AddID() to a UI32 for the same reason as above -Changed cSocket:::Get/SetWord() to a UI16 to fix possible problems storing ID's -Fixed up calcStealDiff() to match new weight system -Minor updates to CPStatsWindow to match the new Armor DEF system and Weight system -Fixed calls to getTileName() so the names container was set with MAX_NAME -Fixed up getFieldDir() using direction typedefs -Changed Get/SetMagic() to Get/SetMovable() -Cleaned up some unrefrenced params -Changed some int's to UI16's in books.cpp -WorldSave Changes: -XYZ and worldnum to Location=x,y,z,worldnum -HiDamage and LoDamage into Damage=hidamage,lodamage -Strength,st2,Dexterity,dx2,Intelligence,in2 changed to Strength=str,st2, Intelligence=int,in2, Dexterity=dex,dx2 -DWord0-3 changed to DWords=0,1,2,3 -FX1,FY1,FX2,FY2,FZ1 changed to WanderArea=FX1,FY1,FX2,FY2,FZ1 -MoreX,MoreY,MoreZ changed to MoreXYZ=morex,morey,morez -More,More2 changed to More=more,more2 -Type,Type2 changed to Type=type,type2 -Light,Rain,Heat,Cold,Snow,Lightning changed to RaceDamage=Light,Rain,Heat,Cold,Snow,Lightning -Fame,Karma,Kills changed to Reputation=fame,karma,kills -Complete rewrite to the Weight system -Weight is more permanent, removed need to recalc it constantly -Packs now show the weight of themselves and all their contents -Packs now have a weight limit (currently hardcapped to 400, should make it based on type of container and possibly scriptable) -All items use the weight value given to them in the scripts unless the entry is 0 in which case they pull weight from the MUL's -Better handling of overloaded for teleport / recall / walking -Weight will max out at 65535 stones and can not go lower than 0 stones -Items container is now set as a cBaseObject -Fixed up itemsfx() and renamed it to itemSound(), now better handles Gold sfx and where an item was dropped (ie in a pack or on the ground) -Cleaned up goldsfx() and renamed it to goldSound() -Many fixes to get/drop/wear/packItem functions -Minor fixes/cleanups in movement.cpp -Fixed a worldsave crash with tamed creatures -Pressing 0 in console reloads items as well as everything else -Made dagger usable for carve again -Fixed a horse mounting distance check -Noted (and in some cases fixed) unrefrenced variables throughout the code -Converted inscribe.gmp to inscribe.dfn and used NewMakeMenu() in favor of the old make menu system -Updated GetMagic() == 3 calls to IsLockedDown() calls (as that is all it should be used for) -Fixed up all IsLockedDown() calls, resources that are LockedDown can NOT be used, even by GM, until released -Also note, items that should be usable if locked: Skill items (looms, training dummies, etc, Recall runes) -Moved the two functions from newbie.cpp to pcmanage.cpp and removed newbie.cpp from the project -Moved action() and impaction() to effects.cpp -Moved isHuman() to npcs.cpp -Where possible made functions that were part of classes private -Made use of cCombat::getWeaponTyp
70 lines
1.4 KiB
C++
70 lines
1.4 KiB
C++
// cHTMLSystem.h: Schnittstelle für die Klasse cHTMLSystem.
|
|
//
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef __CHTMLSYSTEM_H__
|
|
#define __CHTMLSYSTEM_H__
|
|
|
|
#if defined(_MSC_VER)
|
|
#if _MSC_VER > 1000
|
|
#pragma once
|
|
#endif // _MSC_VER > 1000
|
|
#endif
|
|
|
|
#include "uox3.h"
|
|
#include "ssection.h"
|
|
|
|
enum ETemplateType {
|
|
ETT_PERIODIC = 1,
|
|
ETT_OFFLINE,
|
|
ETT_GUILD,
|
|
ETT_PLAYER
|
|
};
|
|
|
|
class cHTMLTemplate
|
|
{
|
|
protected:
|
|
UI32 UpdateTimer;
|
|
char InputFile[MAX_PATH];
|
|
bool Loaded;
|
|
UI08 Type;
|
|
std::string Content;
|
|
char OutputFile[MAX_PATH];
|
|
std::string Name;
|
|
UI32 ScheduledUpdate;
|
|
|
|
public:
|
|
cHTMLTemplate();
|
|
virtual ~cHTMLTemplate();
|
|
void Process( void );
|
|
void Poll( bool Force = false );
|
|
void LoadTemplate( void );
|
|
void UnloadTemplate( void );
|
|
void Load( ScriptSection *found );
|
|
|
|
// Some Getters
|
|
std::string GetName( void );
|
|
std::string GetOutput( void );
|
|
std::string GetInput( void );
|
|
UI08 GetTemplateType( void );
|
|
UI32 GetScheduledUpdate( void );
|
|
UI32 GetUpdateTimer( void );
|
|
};
|
|
|
|
class cHTMLTemplates
|
|
{
|
|
protected:
|
|
std::vector < cHTMLTemplate* > Templates;
|
|
|
|
public:
|
|
cHTMLTemplates();
|
|
virtual ~cHTMLTemplates();
|
|
|
|
void Load( void );
|
|
void Unload( void );
|
|
void Poll( UI08 TemplateType );
|
|
bool Refresh( UI32 TemplateID );
|
|
void TemplateInfoGump( cSocket *mySocket );
|
|
};
|
|
|
|
#endif // !defined(AFX_CHTMLSYSTEM_H__5B019431_A3D8_4968_8527_0789FDDB5A1D__INCLUDED_)
|