Changeset 171

Timestamp:

12/15/09 16:06:58 (9 months ago)

Author:

sausage

Message:

Pointer-only containers for easier script use and less generated code,
AngelScript? support for new containers,
Reference counted objects,
More script registrations,
Removed a stupid check in stupid_hash,
Stop sending the "deadly" and "globalpk" to the SLN flags if they're not set,
Removed pointless Server template (uses polymorphic Client now),
$objects admin command (shows number of shared object allocated),
Stop deposit of 0x items in chests and lockers,
Can safely use different MapDirs?,
Fix config typo: ProctectPlayerDrop? -> ProtectPlayerDrop?

Location:

eoserv/trunk

Files:

• Makefile.all (modified) (3 diffs)
• admin.ini (modified) (1 diff)
• config.ini (modified) (1 diff)
• project/mingw.cbp (modified) (7 diffs)
• src/arena.cpp (modified) (8 diffs)
• src/arena.hpp (modified) (4 diffs)
• src/character.cpp (modified) (30 diffs)
• src/character.hpp (modified) (10 diffs)
• src/config.hpp (modified) (1 diff)
• src/console.cpp (modified) (1 diff)
• src/console.hpp (modified) (2 diffs)
• src/container (added)
• src/container/algorithm.hpp (added)
• src/container/container.hpp (added)
• src/container/iterator.hpp (added)
• src/container/ptr_list.cpp (added)
• src/container/ptr_list.hpp (added)
• src/container/ptr_vector.cpp (added)
• src/container/ptr_vector.hpp (added)
• src/database.cpp (modified) (8 diffs)
• src/database.hpp (modified) (1 diff)
• src/eoclient.cpp (modified) (2 diffs)
• src/eoclient.hpp (modified) (3 diffs)
• src/eoconst.hpp (modified) (1 diff)
• src/eodata.cpp (modified) (11 diffs)
• src/eodata.hpp (modified) (12 diffs)
• src/eoserver.cpp (modified) (4 diffs)
• src/eoserver.hpp (modified) (4 diffs)
• src/fwd/console.hpp (added)
• src/fwd/hook.hpp (deleted)
• src/fwd/script.hpp (deleted)
• src/fwd/socket.hpp (modified) (1 diff)
• src/fwd/timer.hpp (modified) (1 diff)
• src/guild.hpp (modified) (1 diff)
• src/handlers/Account.cpp (modified) (4 diffs)
• src/handlers/Bank.cpp (modified) (1 diff)
• src/handlers/Board.cpp (modified) (3 diffs)
• src/handlers/Chair.cpp (modified) (1 diff)
• src/handlers/Character.cpp (modified) (5 diffs)
• src/handlers/Chest.cpp (modified) (5 diffs)
• src/handlers/Init.cpp (modified) (1 diff)
• src/handlers/Internal.cpp (modified) (1 diff)
• src/handlers/Item.cpp (modified) (4 diffs)
• src/handlers/Locker.cpp (modified) (8 diffs)
• src/handlers/Login.cpp (modified) (4 diffs)
• src/handlers/Paperdoll.cpp (modified) (3 diffs)
• src/handlers/Party.cpp (modified) (6 diffs)
• src/handlers/Players.cpp (modified) (1 diff)
• src/handlers/Shop.cpp (modified) (6 diffs)
• src/handlers/Talk.cpp (modified) (7 diffs)
• src/handlers/Trade.cpp (modified) (5 diffs)
• src/handlers/Walk.cpp (modified) (1 diff)
• src/handlers/Warp.cpp (modified) (5 diffs)
• src/handlers/Welcome.cpp (modified) (7 diffs)
• src/hook.cpp (modified) (2 diffs)
• src/hook.hpp (modified) (3 diffs)
• src/main.cpp (modified) (11 diffs)
• src/map.cpp (modified) (65 diffs)
• src/map.hpp (modified) (15 diffs)
• src/nanohttp.cpp (modified) (2 diffs)
• src/nanohttp.hpp (modified) (1 diff)
• src/npc.cpp (modified) (25 diffs)
• src/npc.hpp (modified) (9 diffs)
• src/party.cpp (modified) (10 diffs)
• src/party.hpp (modified) (3 diffs)
• src/player.cpp (modified) (5 diffs)
• src/player.hpp (modified) (3 diffs)
• src/script.cpp (modified) (5 diffs)
• src/script.hpp (modified) (7 diffs)
• src/scriptlibc.cpp (modified) (2 diffs)
• src/scriptreg.cpp (modified) (1 diff)
• src/scriptstl.h (deleted)
• src/shared.cpp (added)
• src/shared.hpp (added)
• src/sln.cpp (modified) (5 diffs)
• src/sln.hpp (modified) (1 diff)
• src/socket.cpp (modified) (4 diffs)
• src/socket.hpp (modified) (14 diffs)
• src/stdafx.h (modified) (3 diffs)
• src/timer.cpp (modified) (2 diffs)
• src/timer.hpp (modified) (4 diffs)
• src/util.cpp (modified) (3 diffs)
• src/util.hpp (modified) (2 diffs)
• src/world.cpp (modified) (17 diffs)
• src/world.hpp (modified) (5 diffs)

eoserv/trunk/Makefile.all

@@ -49 +49 @@
        $(OBJDIR)/script.o \
        $(OBJDIR)/scriptlibc.o \
+       $(OBJDIR)/scriptreg.o \
        $(OBJDIR)/sha256.o \
+       $(OBJDIR)/shared.o \
        $(OBJDIR)/sln.o \
        $(OBJDIR)/socket.o \
@@ -55 +57 @@
        $(OBJDIR)/util.o \
        $(OBJDIR)/world.o \
+       $(OBJDIR)/container/ptr_list.o \
+       $(OBJDIR)/container/ptr_vector.o \
        $(OBJDIR)/handlers/Account.o \
        $(OBJDIR)/handlers/AdminInteract.o \
@@ -119 +123 @@
 create-build-dirs:
         -@mkdir $(OBJDIR)
+        -@mkdir $(OBJDIR)/container
         -@mkdir $(OBJDIR)/extra
         -@mkdir $(OBJDIR)/handlers
 
 $(OBJDIR)/%.o: $(SRCDIR)/%.c
-        $(CC) -I./$(SRCDIR)/ -I./$(SRCDIR)/extra/ -I./$(SRCDIR)/handlers/ -c $< -o $@ $(CFLAGS)
+        $(CC) -I./$(SRCDIR)/ -I./$(SRCDIR)/container/ -I./$(SRCDIR)/extra/ -I./$(SRCDIR)/handlers/ -c $< -o $@ $(CFLAGS)
 
 $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
-        $(CXX) -I./$(SRCDIR)/ -I./$(SRCDIR)/extra/ -I./$(SRCDIR)/handlers/ -c $< -o $@ $(CXXFLAGS)
+        $(CXX) -I./$(SRCDIR)/ -I./$(SRCDIR)/container/ -I./$(SRCDIR)/extra/ -I./$(SRCDIR)/handlers/ -c $< -o $@ $(CXXFLAGS)
 
 eoserv: create-build-dirs $(OBJ)

eoserv/trunk/admin.ini

@@ -30 +30 @@
 # $info character
 info = 1
+
+# Shows the server uptime
+# $uptime
+uptime = 1
+
+# Shows the number of allocated shared objects
+# $objects
+objects = 4
 
 

eoserv/trunk/config.ini

@@ -363 +363 @@
 # Protect drops from players
 # Shouldn't be lowered unless using a custom client which supports it
-ProctectPlayerDrop = 5s
+ProtectPlayerDrop = 5s
 
 ## ProtectNPCDrop (number)

eoserv/trunk/project/mingw.cbp

@@ -16 +16 @@
                                 <Compiler>
                                         <Add option="-g" />
+                                        <Add option="-D_GLIBCXX_DEBUG" />
+                                        <Add option="-D_GLIBCXX_DEBUG_PEDANTIC" />
                                         <Add option="-DDEBUG" />
                                         <Add option="-DDATABASE_DEBUG" />
@@ -114 +116 @@
                         <Add directory="..\src\extra\" />
                         <Add directory="..\src\handlers\" />
+                        <Add directory="..\src\container\" />
                 </Compiler>
                 <Linker>
@@ -135 +138 @@
                 <Unit filename="..\src\console.cpp" />
                 <Unit filename="..\src\console.hpp" />
+                <Unit filename="..\src\container\algorithm.hpp" />
+                <Unit filename="..\src\container\container.hpp" />
+                <Unit filename="..\src\container\iterator.hpp" />
+                <Unit filename="..\src\container\ptr_list.cpp" />
+                <Unit filename="..\src\container\ptr_list.hpp" />
+                <Unit filename="..\src\container\ptr_vector.cpp" />
+                <Unit filename="..\src\container\ptr_vector.hpp" />
                 <Unit filename="..\src\database.cpp" />
                 <Unit filename="..\src\database.hpp" />
@@ -149 +159 @@
                 <Unit filename="..\src\fwd\character.hpp" />
                 <Unit filename="..\src\fwd\config.hpp" />
+                <Unit filename="..\src\fwd\console.hpp" />
                 <Unit filename="..\src\fwd\database.hpp" />
                 <Unit filename="..\src\fwd\eoclient.hpp" />
@@ -154 +165 @@
                 <Unit filename="..\src\fwd\eoserver.hpp" />
                 <Unit filename="..\src\fwd\guild.hpp" />
-                <Unit filename="..\src\fwd\hook.hpp" />
                 <Unit filename="..\src\fwd\map.hpp" />
                 <Unit filename="..\src\fwd\nanohttp.hpp" />
@@ -161 +171 @@
                 <Unit filename="..\src\fwd\party.hpp" />
                 <Unit filename="..\src\fwd\player.hpp" />
-                <Unit filename="..\src\fwd\script.hpp" />
                 <Unit filename="..\src\fwd\sln.hpp" />
                 <Unit filename="..\src\fwd\socket.hpp" />
@@ -230 +239 @@
                 <Unit filename="..\src\scriptreg.cpp" />
                 <Unit filename="..\src\scriptreg.hpp" />
-                <Unit filename="..\src\scriptstl.h" />
                 <Unit filename="..\src\sha256.c">
                         <Option compilerVar="CC" />
                 </Unit>
                 <Unit filename="..\src\sha256.h" />
+                <Unit filename="..\src\shared.cpp" />
+                <Unit filename="..\src\shared.hpp" />
                 <Unit filename="..\src\sln.cpp" />
                 <Unit filename="..\src\sln.hpp" />

eoserv/trunk/src/arena.cpp

@@ -37 +37 @@
         int newplayers = 0;
 
-        UTIL_VECTOR_FOREACH_ALL(this->spawns, Arena_Spawn, spawn)
+        UTIL_PTR_VECTOR_FOREACH(this->spawns, Arena_Spawn, spawn)
         {
-                UTIL_LIST_FOREACH_ALL(this->map->characters, Character *, character)
+                UTIL_PTR_LIST_FOREACH(this->map->characters, Character, character)
                 {
-                        if (character->x == spawn.sx && character->y == spawn.sy)
+                        if (character->x == spawn->sx && character->y == spawn->sy)
                         {
                                 ++newplayers;
@@ -57 +57 @@
                 PacketBuilder builder(PACKET_ARENA, PACKET_DROP);
 
-                UTIL_LIST_FOREACH_ALL(this->map->characters, Character *, character)
+                UTIL_PTR_LIST_FOREACH(this->map->characters, Character, character)
                 {
                         character->player->client->SendBuilder(builder);
@@ -65 +65 @@
         }
 
-        UTIL_VECTOR_FOREACH_ALL(this->spawns, Arena_Spawn, spawn)
+        UTIL_PTR_VECTOR_FOREACH(this->spawns, Arena_Spawn, spawn)
         {
-                UTIL_LIST_FOREACH_ALL(this->map->characters, Character *, character)
+                UTIL_PTR_LIST_FOREACH(this->map->characters, Character, character)
                 {
-                        if (character->x == spawn.sx && character->y == spawn.sy)
+                        if (character->x == spawn->sx && character->y == spawn->sy)
                         {
                                 character->next_arena = this;
                                 character->arena_kills = 0;
-                                character->Warp(this->map->id, spawn.dx, spawn.dy);
+                                character->Warp(this->map->id, spawn->dx, spawn->dy);
                                 break;
                         }
@@ -82 +82 @@
         builder.AddChar(newplayers);
 
-        UTIL_LIST_FOREACH_ALL(this->map->characters, Character *, character)
+        UTIL_PTR_LIST_FOREACH(this->map->characters, Character, character)
         {
                 character->player->client->SendBuilder(builder);
@@ -112 +112 @@
         }
 
-        UTIL_LIST_FOREACH_ALL(this->map->characters, Character *, character)
+        UTIL_PTR_LIST_FOREACH(this->map->characters, Character, character)
         {
-                if (character->arena == this && character->x == target_x && character->y == target_y)
+                Character *character_ptr = *character;
+                character_ptr->AddRef();
+
+                if (character_ptr->arena == this && character_ptr->x == target_x && character_ptr->y == target_y)
                 {
                         ++from->arena_kills;
-                        character->Warp(this->map->id, this->map->relog_x, this->map->relog_y);
+                        character_ptr->Warp(this->map->id, this->map->relog_x, this->map->relog_y);
 
                         PacketBuilder builder(PACKET_ARENA, PACKET_SPEC);
@@ -128 +131 @@
                         builder.AddByte(255);
                         builder.AddBreakString(from->name);
-                        builder.AddBreakString(character->name);
+                        builder.AddBreakString(character_ptr->name);
 
-                        UTIL_LIST_FOREACH_ALL(this->map->characters, Character *, character)
+                        UTIL_PTR_LIST_FOREACH(this->map->characters, Character, character)
                         {
                                 character->player->client->SendBuilder(builder);
@@ -143 +146 @@
                                 builder.AddBreakString(from->name);
 
-                                UTIL_LIST_FOREACH_ALL(this->map->characters, Character *, character)
+                                UTIL_PTR_LIST_FOREACH(this->map->characters, Character, character)
                                 {
                                         character->player->client->SendBuilder(builder);
@@ -149 +152 @@
                         }
 
+                        character_ptr->Release();
                         break;
                 }
+
+                character_ptr->Release();
         }
 }

eoserv/trunk/src/arena.hpp

@@ -10 +10 @@
 #include "stdafx.h"
 
-struct Arena_Spawn
+struct Arena_Spawn : public Shared
 {
         unsigned char sx;
@@ -16 +16 @@
         unsigned char dx;
         unsigned char dy;
+
+        SCRIPT_REGISTER_REF_DF(Arena_Spawn)
+                SCRIPT_REGISTER_VARIABLE("uint8", "sx", sx);
+                SCRIPT_REGISTER_VARIABLE("uint8", "sy", sy);
+                SCRIPT_REGISTER_VARIABLE("uint8", "dx", dx);
+                SCRIPT_REGISTER_VARIABLE("uint8", "dy", sy);
+        SCRIPT_REGISTER_END()
 };
 
-class Arena
+class Arena : public Shared
 {
         public:
@@ -27 +34 @@
                 Timer *spawn_timer;
                 Map *map;
-                std::vector<Arena_Spawn> spawns;
+                PtrVector<Arena_Spawn> spawns;
 
                 Arena(Map *map, int time, int block);
@@ -34 +41 @@
 
                 void Attack(Character *from, Direction);
+
+        SCRIPT_REGISTER_REF(Arena)
+                SCRIPT_REGISTER_VARIABLE("int", "occupants", occupants);
+                SCRIPT_REGISTER_VARIABLE("int", "time", time);
+                SCRIPT_REGISTER_VARIABLE("int", "block", block);
+                SCRIPT_REGISTER_VARIABLE("Timer @", "spawn_timer", block);
+                SCRIPT_REGISTER_VARIABLE("Map @", "map", map);
+                SCRIPT_REGISTER_VARIABLE("PtrVector<Arena_Spawn>", "spawns", spawns);
+                SCRIPT_REGISTER_FUNCTION("void Spawn(bool force)", Spawn);
+                SCRIPT_REGISTER_FUNCTION("void Attack(Character @from, Direction)", Spawn);
+        SCRIPT_REGISTER_END()
 };
 

eoserv/trunk/src/character.cpp

@@ -20 +20 @@
 
 // TODO: Clean up these functions
-std::string ItemSerialize(std::list<Character_Item> list)
+std::string ItemSerialize(const PtrList<Character_Item> &list)
 {
         std::string serialized;
-        serialized.reserve(list.size()*10); // Reserve some space to stop some mass-reallocations
-
-        UTIL_LIST_FOREACH_ALL(list, Character_Item, item)
-        {
-                serialized.append(util::to_string(item.id));
+
+        for (PtrList<Character_Item>::ConstIterator it(list); it; ++it)
+        {
+                serialized.append(util::to_string(it->id));
                 serialized.append(",");
-                serialized.append(util::to_string(item.amount));
+                serialized.append(util::to_string(it->amount));
                 serialized.append(";");
         }
 
-        serialized.reserve(0); // Clean up the reserve to save memory
         return serialized;
 }
 
-std::list<Character_Item> ItemUnserialize(std::string serialized)
-{
-        std::list<Character_Item> list;
+PtrList<Character_Item> ItemUnserialize(std::string serialized)
+{
+        PtrList<Character_Item> list;
         std::size_t p = 0;
         std::size_t lastp = std::numeric_limits<std::size_t>::max();
-        Character_Item newitem;
 
         if (!serialized.empty() && *(serialized.end()-1) != ';')
@@ -54 +51 @@
                 std::size_t pp = 0;
                 pp = part.find_first_of(',', 0);
+
                 if (pp == std::string::npos)
                 {
                         continue;
                 }
-                newitem.id = util::to_int(part.substr(0, pp));
-                newitem.amount = util::to_int(part.substr(pp+1));
+
+                Character_Item *newitem = new Character_Item;
+                newitem->id = util::to_int(part.substr(0, pp));
+                newitem->amount = util::to_int(part.substr(pp+1));
 
                 list.push_back(newitem);
+                newitem->Release();
 
                 lastp = p;
@@ -72 +73 @@
 {
         std::string serialized;
-
-        serialized.reserve(15*5); // Reserve some space to stop some mass-reallocations
 
         UTIL_ARRAY_FOREACH_ALL(list, int, 15, item)
@@ -80 +79 @@
                 serialized.append(",");
         }
-
-        serialized.reserve(0); // Clean up the reserve to save memory
 
         return serialized;
@@ -252 +249 @@
 }
 
+void Character::ServerMsg(std::string message)
+{
+        PacketBuilder builder;
+
+        builder.SetID(PACKET_TALK, PACKET_SERVER);
+        builder.AddString(message);
+        this->player->client->SendBuilder(builder);
+}
+
 bool Character::Walk(Direction direction)
 {
@@ -284 +290 @@
 int Character::HasItem(short item)
 {
-        UTIL_LIST_FOREACH_ALL(this->inventory, Character_Item, it)
-        {
-                if (it.id == item)
+        UTIL_PTR_LIST_FOREACH(this->inventory, Character_Item, it)
+        {
+                if (it->id == item)
                 {
                         if (this->trading)
                         {
-                                UTIL_LIST_FOREACH_ALL(this->trade_inventory, Character_Item, tit)
+                                UTIL_PTR_LIST_FOREACH(this->trade_inventory, Character_Item, tit)
                                 {
-                                        if (tit.id == item)
+                                        if (tit->id == item)
                                         {
-                                                return std::max(it.amount - tit.amount, 0);
+                                                return std::max(it->amount - tit->amount, 0);
                                         }
                                 }
 
-                                return it.amount;
+                                return it->amount;
                         }
                         else
                         {
-                                return it.amount;
+                                return it->amount;
                         }
                 }
@@ -312 +318 @@
 bool Character::AddItem(short item, int amount)
 {
-        Character_Item newitem;
-
         if (amount <= 0)
         {
@@ -324 +328 @@
         }
 
-        UTIL_LIST_IFOREACH_ALL(this->inventory, Character_Item, it)
+        UTIL_PTR_LIST_FOREACH(this->inventory, Character_Item, it)
         {
                 if (it->id == item)
@@ -341 +345 @@
         }
 
-        newitem.id = item;
-        newitem.amount = amount;
+        Character_Item *newitem = new Character_Item;
+        newitem->id = item;
+        newitem->amount = amount;
 
         this->inventory.push_back(newitem);
+        newitem->Release();
         this->CalculateStats();
         return true;
@@ -356 +362 @@
         }
 
-        UTIL_LIST_IFOREACH_ALL(this->inventory, Character_Item, it)
+        UTIL_PTR_LIST_FOREACH(this->inventory, Character_Item, it)
         {
                 if (it->id == item)
@@ -377 +383 @@
 }
 
+void Character::DelItem(PtrList<Character_Item>::Iterator &it, int amount)
+{
+        if (amount <= 0)
+        {
+                return;
+        }
+
+        if (it->amount < 0 || it->amount - amount <= 0)
+        {
+                this->inventory.erase(it);
+        }
+        else
+        {
+                it->amount -= amount;
+        }
+
+        this->CalculateStats();
+}
+
 bool Character::AddTradeItem(short item, int amount)
 {
-        Character_Item newitem;
-
         if (amount <= 0)
         {
@@ -398 +421 @@
         }
 
-        UTIL_LIST_IFOREACH_ALL(this->trade_inventory, Character_Item, it)
+        UTIL_PTR_LIST_FOREACH(this->trade_inventory, Character_Item, it)
         {
                 if (it->id == item)
@@ -407 +430 @@
         }
 
-        newitem.id = item;
-        newitem.amount = amount;
+        Character_Item *newitem = new Character_Item;
+        newitem->id = item;
+        newitem->amount = amount;
 
         this->trade_inventory.push_back(newitem);
+        newitem->Release();
         return true;
 }
@@ -416 +441 @@
 bool Character::DelTradeItem(short item)
 {
-        UTIL_LIST_IFOREACH_ALL(this->trade_inventory, Character_Item, it)
+        for (PtrList<Character_Item>::Iterator it(this->trade_inventory); it; ++it)
         {
                 if (it->id == item)
@@ -426 +451 @@
 
         return false;
+
 }
 
@@ -441 +467 @@
                         if (((i == Character::Ring2 || i == Character::Armlet2 || i == Character::Bracer2) ? 1 : 0) == subloc)
                         {
+
                                 this->paperdoll[i] = 0;
                                 this->AddItem(item, 1);
@@ -646 +673 @@
 }
 
-bool Character::InRange(Map_Item other)
+bool Character::InRange(Map_Item *other)
 {
         if (this->nowhere)
@@ -653 +680 @@
         }
 
-        return this->InRange(other.x, other.y);
+        return this->InRange(other->x, other->y);
 }
 
@@ -732 +759 @@
         PacketBuilder builder;
 
-        std::vector<Character *> updatecharacters;
-        std::vector<NPC *> updatenpcs;
-        std::vector<Map_Item> updateitems;
-
-        UTIL_LIST_FOREACH_ALL(this->map->characters, Character *, character)
-        {
-                if (this->InRange(character))
-                {
-                        updatecharacters.push_back(character);
-                }
-        }
-
-        UTIL_VECTOR_FOREACH_ALL(this->map->npcs, NPC *, npc)
-        {
-                if (this->InRange(npc))
-                {
-                        updatenpcs.push_back(npc);
-                }
-        }
-
-        UTIL_LIST_FOREACH_ALL(this->map->items, Map_Item, item)
-        {
-                if (this->InRange(item))
-                {
-                        updateitems.push_back(item);
+        PtrVector<Character> updatecharacters;
+        PtrVector<NPC> updatenpcs;
+        PtrVector<Map_Item> updateitems;
+
+        UTIL_PTR_LIST_FOREACH(this->map->characters, Character, character)
+        {
+                if (this->InRange(*character))
+                {
+                        updatecharacters.push_back(*character);
+                }
+        }
+
+        UTIL_PTR_VECTOR_FOREACH(this->map->npcs, NPC, npc)
+        {
+                if (this->InRange(*npc))
+                {
+                        updatenpcs.push_back(*npc);
+                }
+        }
+
+        UTIL_PTR_LIST_FOREACH(this->map->items, Map_Item, item)
+        {
+                if (this->InRange(*item))
+                {
+                        updateitems.push_back(*item);
                 }
         }
@@ -764 +791 @@
         builder.AddByte(255);
 
-        UTIL_VECTOR_FOREACH_ALL(updatecharacters, Character *, character)
+        UTIL_PTR_VECTOR_FOREACH(updatecharacters, Character, character)
         {
                 builder.AddBreakString(character->name);
@@ -798 +825 @@
         }
 
-        UTIL_VECTOR_FOREACH_ALL(updatenpcs, NPC *, npc)
+        UTIL_PTR_VECTOR_FOREACH(updatenpcs, NPC, npc)
         {
                 if (npc->alive)
@@ -812 +839 @@
         builder.AddByte(255);
 
-        UTIL_VECTOR_FOREACH_ALL(updateitems, Map_Item, item)
-        {
-                builder.AddShort(item.uid);
-                builder.AddShort(item.id);
-                builder.AddChar(item.x);
-                builder.AddChar(item.y);
-                builder.AddThree(item.amount);
+        UTIL_PTR_VECTOR_FOREACH(updateitems, Map_Item, item)
+        {
+                builder.AddShort(item->uid);
+                builder.AddShort(item->id);
+                builder.AddChar(item->x);
+                builder.AddChar(item->y);
+                builder.AddThree(item->amount);
         }
 
@@ -838 +865 @@
         int recent_post_count = 0;
 
-        UTIL_LIST_FOREACH_ALL(this->world->boards[boardid]->posts, Board_Post *, post)
+        UTIL_PTR_LIST_FOREACH(this->world->boards[boardid]->posts, Board_Post, post)
         {
                 if (post->author == this->player->character->name)
@@ -853 +880 @@
         int posts_remaining = std::min(static_cast<int>(this->world->config["BoardMaxUserPosts"]) - post_count, static_cast<int>(this->world->config["BoardMaxUserRecentPosts"]) - recent_post_count);
 
-        UTIL_LIST_FOREACH_ALL(this->world->boards[boardid]->posts, Board_Post *, post)
+        UTIL_PTR_LIST_FOREACH(this->world->boards[boardid]->posts, Board_Post, post)
         {
                 builder.AddShort(post->id);
@@ -935 +962 @@
         this->armor = 0;
         this->maxsp = 0;
-        UTIL_LIST_FOREACH_ALL(this->inventory, Character_Item, item)
-        {
-                this->weight += this->world->eif->Get(item.id)->weight * item.amount;
-        }
+
+        UTIL_PTR_LIST_FOREACH(this->inventory, Character_Item, item)
+        {
+                this->weight += this->world->eif->Get(item->id)->weight * item->amount;
+        }
+
         UTIL_ARRAY_FOREACH_ALL(this->paperdoll, int, 15, i)
         {
@@ -978 +1007 @@
 {
         // TODO: This could be more efficient
-        restart_loop:
-        UTIL_LIST_FOREACH_ALL(this->inventory, Character_Item, item)
-        {
-                if (this->world->eif->Get(item.id)->special == EIF::Lore)
+        UTIL_PTR_LIST_FOREACH(this->inventory, Character_Item, item)
+        {
+                if (this->world->eif->Get(item->id)->special == EIF::Lore)
                 {
                         continue;
                 }
 
-                Map_Item *map_item = this->player->character->map->AddItem(item.id, item.amount, this->x, this->y, 0);
-                this->DelItem(item.id, item.amount);
+                Map_Item *map_item = this->player->character->map->AddItem(item->id, item->amount, this->x, this->y, 0);
 
                 if (map_item)
@@ -999 +1026 @@
                         {
                                 map_item->owner = this->player->id;
+                                Console::Dbg("ProtectDeathDrop = %g\n", static_cast<double>(this->world->config["ProtectDeathDrop"]));
                                 map_item->unprotecttime = Timer::GetTime() + static_cast<double>(this->world->config["ProtectDeathDrop"]);
                         }
 
                         PacketBuilder builder(PACKET_ITEM, PACKET_DROP);
-                        builder.AddShort(item.id);
-                        builder.AddThree(item.amount);
+                        builder.AddShort(item->id);
+                        builder.AddThree(item->amount);
                         builder.AddInt(0);
                         builder.AddShort(map_item->uid);
@@ -1014 +1042 @@
                 }
 
-                goto restart_loop;
+                this->DelItem(item, item->amount);
         }
 
@@ -1095 +1123 @@
 }
 
+void Character::Logout()
+{
+        if (!this->online)
+        {
+                return;
+        }
+
+        if (this->trading)
+        {
+                PacketBuilder builder(PACKET_TRADE, PACKET_CLOSE);
+                builder.AddShort(this->id);
+                this->trade_partner->player->client->SendBuilder(builder);
+
+                this->player->client->state = EOClient::Playing;
+                this->trading = false;
+                this->trade_inventory.clear();
+                this->trade_agree = false;
+
+                this->trade_partner->player->client->state = EOClient::Playing;
+                this->trade_partner->trading = false;
+                this->trade_partner->trade_inventory.clear();
+                this->trade_agree = false;
+
+                this->trade_partner->trade_partner = 0;
+                this->trade_partner = 0;
+        }
+
+        if (this->party)
+        {
+                this->party->Leave(this);
+        }
+
+        if (this->arena)
+        {
+                --this->arena->occupants;
+        }
+
+        UTIL_PTR_LIST_FOREACH(this->unregister_npc, NPC, npc)
+        {
+                UTIL_PTR_LIST_FOREACH(npc->damagelist, NPC_Opponent, checkopp)
+                {
+                        if (checkopp->attacker == this)
+                        {
+                                npc->totaldamage -= checkopp->damage;
+                                npc->damagelist.erase(checkopp);
+                                break;
+                        }
+                }
+        }
+
+        this->world->Logout(this);
+
+        this->Save();
+
+        this->online = false;
+}
+
 void Character::Save()
 {
-
 #ifdef DEBUG
         Console::Dbg("Saving character '%s' (session lasted %i minutes)", this->name.c_str(), int(std::time(0) - this->login_time) / 60);
@@ -1115 +1199 @@
 Character::~Character()
 {
-        if (!this->online)
-        {
-                return;
-        }
-
-        if (this->trading)
-        {
-                PacketBuilder builder(PACKET_TRADE, PACKET_CLOSE);
-                builder.AddShort(this->id);
-                this->trade_partner->player->client->SendBuilder(builder);
-
-                this->player->client->state = EOClient::Playing;
-                this->trading = false;
-                this->trade_inventory.clear();
-                this->trade_agree = false;
-
-                this->trade_partner->player->client->state = EOClient::Playing;
-                this->trade_partner->trading = false;
-                this->trade_partner->trade_inventory.clear();
-                this->trade_agree = false;
-
-                this->trade_partner->trade_partner = 0;
-                this->trade_partner = 0;
-        }
-
-        if (this->party)
-        {
-                this->party->Leave(this);
-        }
-
-        if (this->arena)
-        {
-                --this->arena->occupants;
-        }
-
-        UTIL_LIST_FOREACH_ALL(this->unregister_npc, NPC *, npc)
-        {
-                UTIL_LIST_IFOREACH_ALL(npc->damagelist, NPC_Opponent, checkopp)
-                {
-                        if (checkopp->attacker == this)
-                        {
-                                npc->totaldamage -= checkopp->damage;
-                                npc->damagelist.erase(checkopp);
-                                break;
-                        }
-                }
-        }
-
-        this->world->Logout(this);
-
-        this->Save();
-}
+        this->Logout();
+}

eoserv/trunk/src/character.hpp

@@ -9 +9 @@
 
 #include "stdafx.h"
+#include "guild.hpp"
+#include "script.hpp"
 
 /**
  * Serialize a list of items in to a text format that can be restored with ItemUnserialize
  */
-std::string ItemSerialize(std::list<Character_Item> list);
+std::string ItemSerialize(const PtrList<Character_Item> &list);
 
 /**
  * Convert a string generated by ItemSerialze back to a list of items
  */
-std::list<Character_Item> ItemUnserialize(std::string serialized);
+PtrList<Character_Item> ItemUnserialize(std::string serialized);
 
 /**
@@ -33 +35 @@
  * One type of item in a Characters inventory
  */
-struct Character_Item
+struct Character_Item : public Shared
 {
         short id;
         int amount;
+
+        SCRIPT_REGISTER_REF_DF(Character_Item)
+
+        SCRIPT_REGISTER_END()
 };
 
@@ -42 +48 @@
  * One spell that a Character knows
  */
-struct Character_Spell
+struct Character_Spell : public Shared
 {
         short id;
         unsigned char level;
+
+        SCRIPT_REGISTER_REF_DF(Character_Spell)
+
+        SCRIPT_REGISTER_END()
 };
 
-class Character
+class Character : public Shared
 {
         public:
@@ -93 +103 @@
                 Character *trade_partner;
                 bool trade_agree;
-                std::list<Character_Item> trade_inventory;
+                PtrList<Character_Item> trade_inventory;
 
                 Character *party_trust_send;
@@ -123 +133 @@
                 };
 
-                std::list<Character_Item> inventory;
-                std::list<Character_Item> bank;
+                PtrList<Character_Item> inventory;
+                PtrList<Character_Item> bank;
                 util::array<int, 15> paperdoll;
-                std::list<Character_Spell> spells;
-                std::list<NPC *> unregister_npc;
+                PtrList<Character_Spell> spells;
+                PtrList<NPC> unregister_npc;
 
                 Character(std::string name, World *);
@@ -134 +144 @@
 
                 void Msg(Character *from, std::string message);
+                void ServerMsg(std::string message);
                 bool Walk(Direction direction);
                 bool AdminWalk(Direction direction);
@@ -143 +154 @@
                 bool AddItem(short item, int amount);
                 bool DelItem(short item, int amount);
+                void DelItem(PtrList<Character_Item>::Iterator &, int amount);
                 bool AddTradeItem(short item, int amount);
                 bool DelTradeItem(short item);
@@ -150 +162 @@
                 bool InRange(Character *);
                 bool InRange(NPC *);
-                bool InRange(Map_Item);
+                bool InRange(Map_Item *);
                 void Warp(short map, unsigned char x, unsigned char y, WarpAnimation animation = WARP_ANIMATION_NONE);
                 void Refresh();
@@ -159 +171 @@
                 void DropAll(Character *killer);
 
+                void Logout();
                 void Save();
 
@@ -170 +183 @@
                 Party *party;
                 Map *map;
+
+                static Character *ScriptFactory(std::string name, World *world) { return new Character(name, world); }
+
+        SCRIPT_REGISTER_REF(Character)
+                SCRIPT_REGISTER_FACTORY("Character @f(string name, World @)", ScriptFactory);
+
+                SCRIPT_REGISTER_VARIABLE("int", "login_time", login_time);
+                SCRIPT_REGISTER_VARIABLE("bool", "online", online);
+                SCRIPT_REGISTER_VARIABLE("bool", "nowhere", nowhere);
+                SCRIPT_REGISTER_VARIABLE("uint", "id", id);
+                SCRIPT_REGISTER_VARIABLE("AdminLevel", "admin", admin);
+                SCRIPT_REGISTER_VARIABLE("string", "name", name);
+                SCRIPT_REGISTER_VARIABLE("string", "title", title);
+                SCRIPT_REGISTER_VARIABLE("string", "home", home);
+                SCRIPT_REGISTER_VARIABLE("string", "partner", partner);
+                SCRIPT_REGISTER_VARIABLE("uint8", "clas", clas);
+                SCRIPT_REGISTER_VARIABLE("Gender", "gender", gender);
+                SCRIPT_REGISTER_VARIABLE("Skin", "race", race);
+                SCRIPT_REGISTER_VARIABLE("uint8", "hairstyle", hairstyle);
+                SCRIPT_REGISTER_VARIABLE("uint8", "haircolor", haircolor);
+                SCRIPT_REGISTER_VARIABLE("int16", "mapid", mapid);
+                SCRIPT_REGISTER_VARIABLE("uint8", "x", x);
+                SCRIPT_REGISTER_VARIABLE("uint8", "y", y);
+                SCRIPT_REGISTER_VARIABLE("uint8", "direction", direction);
+                SCRIPT_REGISTER_VARIABLE("int16", "spawnmap", spawnmap);
+                SCRIPT_REGISTER_VARIABLE("uint8", "spawnx", spawnx);
+                SCRIPT_REGISTER_VARIABLE("uint8", "spawny", spawny);
+                SCRIPT_REGISTER_VARIABLE("uint8", "level", level);
+                SCRIPT_REGISTER_VARIABLE("int", "exp", exp);
+                SCRIPT_REGISTER_VARIABLE("int16", "hp", hp);
+                SCRIPT_REGISTER_VARIABLE("int16", "tp", tp);
+                SCRIPT_REGISTER_VARIABLE("int16", "str", str);
+                SCRIPT_REGISTER_VARIABLE("int16", "intl", intl);
+                SCRIPT_REGISTER_VARIABLE("int16", "wis", wis);
+                SCRIPT_REGISTER_VARIABLE("int16", "agi", agi);
+                SCRIPT_REGISTER_VARIABLE("int16", "con", con);
+                SCRIPT_REGISTER_VARIABLE("int16", "cha", cha);
+                SCRIPT_REGISTER_VARIABLE("int16", "statpoints", statpoints);
+                SCRIPT_REGISTER_VARIABLE("int16", "skillpoints", skillpoints);
+                SCRIPT_REGISTER_VARIABLE("int16", "weight", weight);
+                SCRIPT_REGISTER_VARIABLE("int16", "maxweight", maxweight);
+                SCRIPT_REGISTER_VARIABLE("int16", "karma", karma);
+                SCRIPT_REGISTER_VARIABLE("SitAction", "sitting", sitting);
+                SCRIPT_REGISTER_VARIABLE("uint8", "visible", visible);
+                SCRIPT_REGISTER_VARIABLE("int", "bankmax", bankmax);
+                SCRIPT_REGISTER_VARIABLE("int", "goldbank", goldbank);
+                SCRIPT_REGISTER_VARIABLE("int", "usage", usage);
+                SCRIPT_REGISTER_VARIABLE("Arena @", " next_arena", next_arena);
+                SCRIPT_REGISTER_VARIABLE("Arena @", " arena", arena);
+                SCRIPT_REGISTER_VARIABLE("int8", "arena_kills", arena_kills);
+                SCRIPT_REGISTER_VARIABLE("int16", "maxsp", maxsp);
+                SCRIPT_REGISTER_VARIABLE("int16", "maxhp", maxhp);
+                SCRIPT_REGISTER_VARIABLE("int16", "maxtp", maxtp);
+                SCRIPT_REGISTER_VARIABLE("int16", "accuracy", accuracy);
+                SCRIPT_REGISTER_VARIABLE("int16", "evade", evade);
+                SCRIPT_REGISTER_VARIABLE("int16", "armor", armor);
+                SCRIPT_REGISTER_VARIABLE("int16", "mindam", mindam);
+                SCRIPT_REGISTER_VARIABLE("int16", "maxdam", maxdam);
+                SCRIPT_REGISTER_VARIABLE("bool", "trading", trading);
+                SCRIPT_REGISTER_VARIABLE("Character @", " trade_partner", trade_partner);
+                SCRIPT_REGISTER_VARIABLE("bool", "trade_agree", trade_agree);
+                SCRIPT_REGISTER_VARIABLE("PtrList<Character_Item>", "trade_inventory", trade_inventory);
+                SCRIPT_REGISTER_VARIABLE("Character @", " party_trust_send", party_trust_send);
+                SCRIPT_REGISTER_VARIABLE("Character @", " party_trust_recv", party_trust_recv);
+                SCRIPT_REGISTER_VARIABLE("PartyRequestType", "party_send_type", party_send_type);
+                SCRIPT_REGISTER_VARIABLE("NPC @", " shop_npc", shop_npc);
+                SCRIPT_REGISTER_VARIABLE("NPC @", " bank_npc", bank_npc);
+                SCRIPT_REGISTER_VARIABLE("WarpAnimation", "warp_anim", warp_anim);
+                SCRIPT_REGISTER_VARIABLE("PtrList<Character_Item>", "inventory", inventory);
+                SCRIPT_REGISTER_VARIABLE("PtrList<Character_Item>", "bank", bank);
+                //SCRIPT_REGISTER_VARIABLE("Array<int, 15>", "paperdoll", paperdoll);
+                SCRIPT_REGISTER_VARIABLE("PtrList<Character_Spell>", "spells", spells);
+                SCRIPT_REGISTER_VARIABLE("PtrList<NPC>", " unregister_npc", unregister_npc);
+                SCRIPT_REGISTER_VARIABLE("World @", " world", world);
+                SCRIPT_REGISTER_VARIABLE("Player @", " player", player);
+                SCRIPT_REGISTER_VARIABLE("Guild @", " guild", guild);
+                SCRIPT_REGISTER_VARIABLE("string", "guild_tag", guild_tag);
+                SCRIPT_REGISTER_VARIABLE("uint8", "guild_rank", guild_rank);
+                SCRIPT_REGISTER_VARIABLE("Party @", " party", party);
+                SCRIPT_REGISTER_VARIABLE("Map @", " map", map);
+                SCRIPT_REGISTER_FUNCTION("void Msg(Character @from, string message)", Msg);
+                SCRIPT_REGISTER_FUNCTION("void ServerMsg(string message)", ServerMsg);
+                SCRIPT_REGISTER_FUNCTION("bool Walk(Direction direction)", Walk);
+                SCRIPT_REGISTER_FUNCTION("bool AdminWalk(Direction direction)", AdminWalk);
+                SCRIPT_REGISTER_FUNCTION("void Attack(Direction direction)", Attack);
+                SCRIPT_REGISTER_FUNCTION("void Sit(SitAction sit_type)", Sit);
+                SCRIPT_REGISTER_FUNCTION("void Stand()", Stand);
+                SCRIPT_REGISTER_FUNCTION("void Emote(Emote emote, bool relay)", Emote);
+                SCRIPT_REGISTER_FUNCTION("int HasItem(int16 item)", HasItem);
+                SCRIPT_REGISTER_FUNCTION("bool AddItem(int16 item, int amount)", AddItem);
+                SCRIPT_REGISTER_FUNCTION_PR("bool DelItem(int16 item, int amount)", DelItem, (short, int), bool);
+                SCRIPT_REGISTER_FUNCTION("bool AddTradeItem(int16 item, int amount)", AddTradeItem);
+                SCRIPT_REGISTER_FUNCTION("bool DelTradeItem(int16 item)", DelTradeItem);
+                SCRIPT_REGISTER_FUNCTION("bool Unequip(int16 item, uint8 subloc)", Unequip);
+                SCRIPT_REGISTER_FUNCTION("bool Equip(int16 item, uint8 subloc)", Equip);
+                SCRIPT_REGISTER_FUNCTION_PR("bool InRange(uint8 x, uint8 y)", InRange, (unsigned char, unsigned char), bool);
+                SCRIPT_REGISTER_FUNCTION_PR("bool InRange(Character @)", InRange, (Character *), bool);
+                SCRIPT_REGISTER_FUNCTION_PR("bool InRange(NPC @)", InRange, (NPC *), bool);
+                SCRIPT_REGISTER_FUNCTION_PR("bool InRange(Map_Item @)", InRange, (Map_Item *), bool);
+                SCRIPT_REGISTER_FUNCTION("void Warp(int16 map, uint8 x, uint8 y, WarpAnimation animation)", Warp);
+                SCRIPT_REGISTER_FUNCTION("void Refresh()", Refresh);
+                SCRIPT_REGISTER_FUNCTION("void ShowBoard(int boardid)", ShowBoard);
+                SCRIPT_REGISTER_FUNCTION("string PaddedGuildTag()", PaddedGuildTag);
+                SCRIPT_REGISTER_FUNCTION("int Usage()", Usage);
+                SCRIPT_REGISTER_FUNCTION("void CalculateStats()", CalculateStats);
+                SCRIPT_REGISTER_FUNCTION("void DropAll(Character @killer)", DropAll);
+                SCRIPT_REGISTER_FUNCTION("void Save()", Save);
+        SCRIPT_REGISTER_END()
 };
 

eoserv/trunk/src/config.hpp

@@ -45 +45 @@
                  */
                 void Read(std::string filename);
+
+        SCRIPT_REGISTER_REF_DF(Config)
+                SCRIPT_REGISTER_FUNCTION("void Read(string filename)", Read);
+        SCRIPT_REGISTER_END()
 };
 

eoserv/trunk/src/console.cpp

@@ -8 +8 @@
 
 #include <cstdio>
+#include <cstdarg>
 
 #if defined(WIN32) || defined(WIN64)

eoserv/trunk/src/console.hpp

@@ -8 +8 @@
 #define CONSOLE_HPP_INCLUDED
 
+#include "fwd/console.hpp"
+
 #include <string>
+
+#include "script.hpp"
 
 namespace Console
@@ -52 +56 @@
 void Dbg(std::string f, ...);
 
+inline void ScriptRegister(ScriptEngine &engine)
+{
+        engine.as->RegisterGlobalFunction("void Out(string)", asFUNCTION(Out), asCALL_CDECL);
+        engine.as->RegisterGlobalFunction("void Wrn(string)", asFUNCTION(Wrn), asCALL_CDECL);
+        engine.as->RegisterGlobalFunction("void Err(string)", asFUNCTION(Err), asCALL_CDECL);
+        engine.as->RegisterGlobalFunction("void Dbg(string)", asFUNCTION(Dbg), asCALL_CDECL);
+}
+
 }
 

eoserv/trunk/src/database.cpp

@@ -39 +39 @@
         }
 
-        ((Database *)data)->callbackdata.push_back(result);
+        static_cast<Database *>(data)->callbackdata.push_back(result);
         return 0;
 }
@@ -104 +104 @@
                                 throw Database_OpenFailed(mysql_error(this->mysql_handle));
                         }
+
                         this->connected = true;
+
                         break;
 #endif // DATABASE_MYSQL
@@ -114 +116 @@
                                 throw Database_OpenFailed(sqlite3_errmsg(this->sqlite_handle));
                         }
+
                         this->connected = true;
+
                         break;
 #endif // DATABASE_SQLITE
@@ -131 +135 @@
 
         this->connected = false;
+
         switch (this->engine)
         {
@@ -156 +161 @@
         va_list ap;
         va_start(ap, format);
+
         std::string finalquery;
         int tempi;
@@ -164 +170 @@
         for (const char *p = format; *p != '\0'; ++p)
         {
-                if (*p == '#'){
+                if (*p == '#')
+                {
                         tempi = va_arg(ap,int);
                         finalquery += util::to_string(tempi);
-                } else if (*p == '@'){
+                }
+                else if (*p == '@')
+                {
                         tempc = va_arg(ap,char *);
                         finalquery += static_cast<std::string>(tempc);
-                } else if (*p == '$'){
+                }
+                else if (*p == '$')
+                {
                         tempc = va_arg(ap,char *);
                         switch (this->engine)
@@ -192 +203 @@
 #endif // DATABASE_SQLITE
                         }
-                } else {
+                }
+                else
+                {
                         finalquery += *p;
                 }
         }
+
         va_end(ap);
 
@@ -215 +229 @@
                         {
                                 int myerr = mysql_errno(this->mysql_handle);
+
                                 if (myerr == CR_SERVER_GONE_ERROR || myerr == CR_SERVER_LOST)
                                 {

eoserv/trunk/src/database.hpp

@@ -163 +163 @@
                  */
                 Database_Result callbackdata;
+
+        SCRIPT_REGISTER_REF_DF(Database)
+                SCRIPT_REGISTER_ENUM("Engine");
+                        SCRIPT_REGISTER_ENUM_VALUE("Engine", MySQL);
+                        SCRIPT_REGISTER_ENUM_VALUE("Engine", SQLite);
+
+                SCRIPT_REGISTER_FUNCTION("void Connect(Engine type, string host, string user, string pass, string db)", Connect);
+                SCRIPT_REGISTER_FUNCTION("void Close()", Close);
+                SCRIPT_REGISTER_FUNCTION("string Escape(string)", Escape);
+        SCRIPT_REGISTER_END()
 };
 

eoserv/trunk/src/eoclient.cpp

@@ -132 +132 @@
 void EOClient::SendBuilder(PacketBuilder &builder)
 {
-        std::string packet = static_cast<std::string >(builder);
+        std::string packet(builder);
         this->Send(this->processor.Encode(packet));
 }
@@ -140 +140 @@
         if (this->player)
         {
-                delete this->player; // Player handles removing himself from the world
+                this->player->Logout();
         }
 }

eoserv/trunk/src/eoclient.hpp

@@ -10 +10 @@
 #include "stdafx.h"
 
+#include "eoserver.hpp"
 #include "packet.hpp"
 #include "socket.hpp"
@@ -86 +87 @@
                 PacketProcessor processor;
 
-                EOClient(void *void_server) : Client(void_server), server(static_cast<EOServer *>(void_server))
+                EOClient(EOServer *server_) : Client(server_), server(server_)
                 {
                         this->Initialize();
                 }
 
-                EOClient(SOCKET s, sockaddr_in sa, void *void_server) : Client(s, sa, void_server), server(static_cast<EOServer *>(void_server))
+                EOClient(SOCKET s, sockaddr_in sa, EOServer *server_) : Client(s, sa, server_), server(server_)
                 {
                         this->Initialize();
@@ -141 +142 @@
 #endif // DOXYGEN
 
-                virtual ~EOClient();
+                ~EOClient();
 };
 

eoserv/trunk/src/eoconst.hpp

@@ -186 +186 @@
 };
 
+namespace eoconst
+{
+inline void ScriptRegister(ScriptEngine &engine)
+{
+        SCRIPT_REGISTER_ENUM("AdminLevel");
+                SCRIPT_REGISTER_ENUM_VALUE("AdminLevel", ADMIN_PLAYER);
+                SCRIPT_REGISTER_ENUM_VALUE("AdminLevel", ADMIN_GUIDE);
+                SCRIPT_REGISTER_ENUM_VALUE("AdminLevel", ADMIN_GUARDIAN);
+                SCRIPT_REGISTER_ENUM_VALUE("AdminLevel", ADMIN_GM);
+                SCRIPT_REGISTER_ENUM_VALUE("AdminLevel", ADMIN_HGM);
+        SCRIPT_REGISTER_ENUM("Direction");
+                SCRIPT_REGISTER_ENUM_VALUE("Direction", DIRECTION_DOWN);
+                SCRIPT_REGISTER_ENUM_VALUE("Direction", DIRECTION_LEFT);
+                SCRIPT_REGISTER_ENUM_VALUE("Direction", DIRECTION_UP);
+                SCRIPT_REGISTER_ENUM_VALUE("Direction", DIRECTION_RIGHT);
+        SCRIPT_REGISTER_ENUM("SitState");
+                SCRIPT_REGISTER_ENUM_VALUE("SitState", SIT_SITTING);
+                SCRIPT_REGISTER_ENUM_VALUE("SitState", SIT_STANDING);
+        SCRIPT_REGISTER_ENUM("Emote");
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_HAPPY);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_DEPRESSED);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_SAD);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_ANGRY);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_CONFUSED);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_SURPRISED);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_HEARTS);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_MOON);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_SUICIDAL);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_EMBARASSED);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_DRUNK);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_TRADE);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_LEVELUP);
+                SCRIPT_REGISTER_ENUM_VALUE("Emote", EMOTE_PLAYFUL);
+        SCRIPT_REGISTER_ENUM("QuestAction");
+                SCRIPT_REGISTER_ENUM_VALUE("QuestAction", QUEST_PROGRESS);
+                SCRIPT_REGISTER_ENUM_VALUE("QuestAction", QUEST_HISTORY);
+        SCRIPT_REGISTER_ENUM("FileType");
+                SCRIPT_REGISTER_ENUM_VALUE("FileType", FILE_MAP);
+                SCRIPT_REGISTER_ENUM_VALUE("FileType", FILE_ITEM);
+                SCRIPT_REGISTER_ENUM_VALUE("FileType", FILE_NPC);
+                SCRIPT_REGISTER_ENUM_VALUE("FileType", FILE_SPELL);
+                SCRIPT_REGISTER_ENUM_VALUE("FileType", FILE_CLASS);
+        SCRIPT_REGISTER_ENUM("Gender");
+                SCRIPT_REGISTER_ENUM_VALUE("Gender", GENDER_FEMALE);
+                SCRIPT_REGISTER_ENUM_VALUE("Gender", GENDER_MALE);
+        SCRIPT_REGISTER_ENUM("Skin");
+                SCRIPT_REGISTER_ENUM_VALUE("Skin", SKIN_WHITE);
+                SCRIPT_REGISTER_ENUM_VALUE("Skin", SKIN_YELLOW);
+                SCRIPT_REGISTER_ENUM_VALUE("Skin", SKIN_TAN);
+                SCRIPT_REGISTER_ENUM_VALUE("Skin", SKIN_ORC);
+                SCRIPT_REGISTER_ENUM_VALUE("Skin", SKIN_SKELETON);
+                SCRIPT_REGISTER_ENUM_VALUE("Skin", SKIN_PANDA);
+                SCRIPT_REGISTER_ENUM_VALUE("Skin", SKIN_FISH);
+        SCRIPT_REGISTER_ENUM("PaperdollIcon");
+                SCRIPT_REGISTER_ENUM_VALUE("PaperdollIcon", ICON_NORMAL);
+                SCRIPT_REGISTER_ENUM_VALUE("PaperdollIcon", ICON_GM);
+                SCRIPT_REGISTER_ENUM_VALUE("PaperdollIcon", ICON_HGM);
+                SCRIPT_REGISTER_ENUM_VALUE("PaperdollIcon", ICON_PARTY);
+                SCRIPT_REGISTER_ENUM_VALUE("PaperdollIcon", ICON_GM_PARTY);
+                SCRIPT_REGISTER_ENUM_VALUE("PaperdollIcon", ICON_HGM_PARTY);
+        SCRIPT_REGISTER_ENUM("PartyRequestType");
+                SCRIPT_REGISTER_ENUM_VALUE("PartyRequestType", PARTY_REQUEST_JOIN);
+                SCRIPT_REGISTER_ENUM_VALUE("PartyRequestType", PARTY_REQUEST_INVITE);
+        SCRIPT_REGISTER_ENUM("ClothesSlot");
+                SCRIPT_REGISTER_ENUM_VALUE("ClothesSlot", SLOT_CLOTHES);
+                SCRIPT_REGISTER_ENUM_VALUE("ClothesSlot", SLOT_HAIR);
+                SCRIPT_REGISTER_ENUM_VALUE("ClothesSlot", SLOT_HAIRCOLOR);
+        SCRIPT_REGISTER_ENUM("InitReply");
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_OUT_OF_DATE);
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_OK);
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_BANNED);
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_FILE_MAP);
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_FILE_EIF);
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_FILE_ENF);
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_FILE_ESF);
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_PLAYERS);
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_MAP_MUTATION);
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_NOISE);
+                SCRIPT_REGISTER_ENUM_VALUE("InitReply", INIT_FILE_ECF);
+        SCRIPT_REGISTER_ENUM("InitBanType");
+                SCRIPT_REGISTER_ENUM_VALUE("InitBanType", INIT_BAN_TEMP);
+                SCRIPT_REGISTER_ENUM_VALUE("InitBanType", INIT_BAN_PERM);
+        SCRIPT_REGISTER_ENUM("AccountReply");
+                SCRIPT_REGISTER_ENUM_VALUE("AccountReply", ACCOUNT_EXISTS);
+                SCRIPT_REGISTER_ENUM_VALUE("AccountReply", ACCOUNT_NOT_APPROVED);
+                SCRIPT_REGISTER_ENUM_VALUE("AccountReply", ACCOUNT_CREATED);
+                SCRIPT_REGISTER_ENUM_VALUE("AccountReply", ACCOUNT_CHANGE_FAILED);
+                SCRIPT_REGISTER_ENUM_VALUE("AccountReply", ACCOUNT_CHANGED);
+                SCRIPT_REGISTER_ENUM_VALUE("AccountReply", ACCOUNT_CONTINUE);
+        SCRIPT_REGISTER_ENUM("CharacterReply");
+                SCRIPT_REGISTER_ENUM_VALUE("CharacterReply", CHARACTER_EXISTS);
+                SCRIPT_REGISTER_ENUM_VALUE("CharacterReply", CHARACTER_FULL);
+                SCRIPT_REGISTER_ENUM_VALUE("CharacterReply", CHARACTER_NOT_APPROVED);
+                SCRIPT_REGISTER_ENUM_VALUE("CharacterReply", CHARACTER_OK);
+                SCRIPT_REGISTER_ENUM_VALUE("CharacterReply", CHARACTER_DELETED);
+        SCRIPT_REGISTER_ENUM("LoginReply");
+                SCRIPT_REGISTER_ENUM_VALUE("LoginReply", LOGIN_WRONG_USER);
+                SCRIPT_REGISTER_ENUM_VALUE("LoginReply", LOGIN_WRONG_USERPASS);
+                SCRIPT_REGISTER_ENUM_VALUE("LoginReply", LOGIN_OK);
+                SCRIPT_REGISTER_ENUM_VALUE("LoginReply", LOGIN_LOGGEDIN);
+                SCRIPT_REGISTER_ENUM_VALUE("LoginReply", LOGIN_BUSY);
+        SCRIPT_REGISTER_ENUM("WarpReply");
+                SCRIPT_REGISTER_ENUM_VALUE("WarpReply", WARP_LOCAL);
+                SCRIPT_REGISTER_ENUM_VALUE("WarpReply", WARP_SWITCH);
+        SCRIPT_REGISTER_ENUM("TalkReply");
+                SCRIPT_REGISTER_ENUM_VALUE("TalkReply", TALK_NOTFOUND);
+        SCRIPT_REGISTER_ENUM("SitAction");
+                SCRIPT_REGISTER_ENUM_VALUE("SitAction", SIT_STAND);
+                SCRIPT_REGISTER_ENUM_VALUE("SitAction", SIT_CHAIR);
+                SCRIPT_REGISTER_ENUM_VALUE("SitAction", SIT_FLOOR);
+        SCRIPT_REGISTER_ENUM("WarpAnimation");
+                SCRIPT_REGISTER_ENUM_VALUE("WarpAnimation", WARP_ANIMATION_NONE);
+                SCRIPT_REGISTER_ENUM_VALUE("WarpAnimation", WARP_ANIMATION_SCROLL);
+                SCRIPT_REGISTER_ENUM_VALUE("WarpAnimation", WARP_ANIMATION_ADMIN);
+                SCRIPT_REGISTER_ENUM_VALUE("WarpAnimation", WARP_ANIMATION_INVALID);
+        SCRIPT_REGISTER_ENUM("MapEffect");
+                SCRIPT_REGISTER_ENUM_VALUE("MapEffect", MAP_EFFECT_QUAKE);
+}
+
+}
 
 #endif // EOCONST_HPP_INCLUDED

eoserv/trunk/src/eodata.cpp

@@ -39 +39 @@
 
         unsigned char namesize;
-        char *namebuf;
         std::string name;
         char buf[EIF::DATA_SIZE] = {0};
-        EIF_Data newdata;
-
-        this->data.resize(numobj+1, newdata);
-
-        this->data[0] = newdata;
+
+        this->data.resize(numobj+1);
+
+        this->data[0] = new EIF_Data;
 
         SAFE_READ(static_cast<void *>(&namesize), sizeof(char), 1, fh);
         for (int i = 1; i <= numobj; ++i)
         {
+                EIF_Data *newdata = new EIF_Data;
+
                 namesize = PacketProcessor::Number(namesize);
-                namebuf = new char[namesize];
-                SAFE_READ(namebuf, sizeof(char), namesize, fh);
-                name.assign(namebuf,namesize);
-                delete[] namebuf;
+                name.resize(namesize);
+                SAFE_READ(&name[0], sizeof(char), namesize, fh);
                 SAFE_READ(buf, sizeof(char), EIF::DATA_SIZE, fh);
 
-                newdata.id = i;
-                newdata.name = name;
-
-                newdata.graphic = PacketProcessor::Number(buf[0], buf[1]);
-                newdata.type = static_cast<EIF::Type>(PacketProcessor::Number(buf[2]));
-                newdata.subtype = static_cast<EIF::SubType>(PacketProcessor::Number(buf[3]));
+                newdata->id = i;
+                newdata->name = name;
+
+                newdata->graphic = PacketProcessor::Number(buf[0], buf[1]);
+                newdata->type = static_cast<EIF::Type>(PacketProcessor::Number(buf[2]));
+                newdata->subtype = static_cast<EIF::SubType>(PacketProcessor::Number(buf[3]));
                 // Ranged gun hack
-                if (newdata.id == 365 && newdata.name == "Gun")
-                {
-                        newdata.subtype = EIF::Ranged;
+                if (newdata->id == 365 && newdata->name == "Gun")
+                {
+                        newdata->subtype = EIF::Ranged;
                 }
                 // / Ranged gun hack
-                newdata.special = static_cast<EIF::Special>(PacketProcessor::Number(buf[4]));
-                newdata.hp = PacketProcessor::Number(buf[5], buf[6]);
-                newdata.tp = PacketProcessor::Number(buf[7], buf[8]);
-                newdata.mindam = PacketProcessor::Number(buf[9], buf[10]);
-                newdata.maxdam = PacketProcessor::Number(buf[11], buf[12]);
-                newdata.accuracy = PacketProcessor::Number(buf[13], buf[14]);
-                newdata.evade = PacketProcessor::Number(buf[15], buf[16]);
-                newdata.armor = PacketProcessor::Number(buf[17], buf[18]);
-                newdata.str = PacketProcessor::Number(buf[20]);
-                newdata.intl = PacketProcessor::Number(buf[21]);
-                newdata.wis = PacketProcessor::Number(buf[22]);
-                newdata.agi = PacketProcessor::Number(buf[23]);
-                newdata.con = PacketProcessor::Number(buf[24]);
-                newdata.cha = PacketProcessor::Number(buf[25]);
-                newdata.scrollmap = PacketProcessor::Number(buf[32]);
-                newdata.scrollx = PacketProcessor::Number(buf[35]);
-                newdata.scrolly = PacketProcessor::Number(buf[36]);
-
-                newdata.classreq = PacketProcessor::Number(buf[39]);
-
-                newdata.weight = PacketProcessor::Number(buf[55]);
+                newdata->special = static_cast<EIF::Special>(PacketProcessor::Number(buf[4]));
+                newdata->hp = PacketProcessor::Number(buf[5], buf[6]);
+                newdata->tp = PacketProcessor::Number(buf[7], buf[8]);
+                newdata->mindam = PacketProcessor::Number(buf[9], buf[10]);
+                newdata->maxdam = PacketProcessor::Number(buf[11], buf[12]);
+                newdata->accuracy = PacketProcessor::Number(buf[13], buf[14]);
+                newdata->evade = PacketProcessor::Number(buf[15], buf[16]);
+                newdata->armor = PacketProcessor::Number(buf[17], buf[18]);
+                newdata->str = PacketProcessor::Number(buf[20]);
+                newdata->intl = PacketProcessor::Number(buf[21]);
+                newdata->wis = PacketProcessor::Number(buf[22]);
+                newdata->agi = PacketProcessor::Number(buf[23]);
+                newdata->con = PacketProcessor::Number(buf[24]);
+                newdata->cha = PacketProcessor::Number(buf[25]);
+                newdata->scrollmap = PacketProcessor::Number(buf[32]);
+                newdata->scrollx = PacketProcessor::Number(buf[35]);
+                newdata->scrolly = PacketProcessor::Number(buf[36]);
+
+                newdata->classreq = PacketProcessor::Number(buf[39]);
+
+                newdata->weight = PacketProcessor::Number(buf[55]);
 
                 this->data[i] = newdata;
@@ -100 +98 @@
         }
 
-        if (newdata.name.compare("eof") == 0)
+        if (this->data.back()->name.compare("eof") == 0)
         {
                 this->data.pop_back();
@@ -114 +112 @@
         if (id > 0 && id < this->data.size())
         {
-                return &this->data[id];
+                return this->data[id];
         }
         else
         {
-                return &this->data[0];
+                return this->data[0];
         }
 }
@@ -140 +138 @@
 
         unsigned char namesize;
-        char *namebuf;
         std::string name;
         char buf[ENF::DATA_SIZE] = {0};
-        ENF_Data newdata;
-
-        this->data.resize(numobj+1, newdata);
-
-        this->data[0] = newdata;
+
+        this->data.resize(numobj+1);
+
+        this->data[0] = new ENF_Data;
 
         SAFE_READ(static_cast<void *>(&namesize), sizeof(char), 1, fh);
         for (int i = 1; i <= numobj; ++i)
         {
+                ENF_Data *newdata = new ENF_Data;
+
                 namesize = PacketProcessor::Number(namesize);
-                namebuf = new char[namesize];
-                SAFE_READ(namebuf, sizeof(char), namesize, fh);
-                name.assign(namebuf,namesize);
-                delete[] namebuf;
+                name.resize(namesize);
+                SAFE_READ(&name[0], sizeof(char), namesize, fh);
                 SAFE_READ(buf, sizeof(char), ENF::DATA_SIZE, fh);
 
-                newdata.id = i;
-                newdata.name = name;
-
-                newdata.graphic = PacketProcessor::Number(buf[0], buf[1]);
-
-                newdata.boss = PacketProcessor::Number(buf[3], buf[4]);
-                newdata.child = PacketProcessor::Number(buf[5], buf[6]);
-                newdata.type = static_cast<ENF::Type>(PacketProcessor::Number(buf[7], buf[8]));
-                newdata.hp = PacketProcessor::Number(buf[11], buf[12], buf[13]);
-
-                newdata.mindam = PacketProcessor::Number(buf[16], buf[17]);
-                newdata.maxdam = PacketProcessor::Number(buf[18], buf[19]);
-
-                newdata.accuracy = PacketProcessor::Number(buf[20], buf[21]);
-                newdata.evade = PacketProcessor::Number(buf[22], buf[23]);
-                newdata.armor = PacketProcessor::Number(buf[24], buf[25]);
-
-                newdata.exp = PacketProcessor::Number(buf[36], buf[37]);
+                newdata->id = i;
+                newdata->name = name;
+
+                newdata->graphic = PacketProcessor::Number(buf[0], buf[1]);
+
+                newdata->boss = PacketProcessor::Number(buf[3], buf[4]);
+                newdata->child = PacketProcessor::Number(buf[5], buf[6]);
+                newdata->type = static_cast<ENF::Type>(PacketProcessor::Number(buf[7], buf[8]));
+                newdata->hp = PacketProcessor::Number(buf[11], buf[12], buf[13]);
+
+                newdata->mindam = PacketProcessor::Number(buf[16], buf[17]);
+                newdata->maxdam = PacketProcessor::Number(buf[18], buf[19]);
+
+                newdata->accuracy = PacketProcessor::Number(buf[20], buf[21]);
+                newdata->evade = PacketProcessor::Number(buf[22], buf[23]);
+                newdata->armor = PacketProcessor::Number(buf[24], buf[25]);
+
+                newdata->exp = PacketProcessor::Number(buf[36], buf[37]);
 
                 this->data[i] = newdata;
@@ -186 +182 @@
         }
 
-        if (newdata.name.compare("eof") == 0)
+        if (this->data.back()->name.compare("eof") == 0)
         {
                 this->data.pop_back();
@@ -200 +196 @@
         if (id > 0 && id < this->data.size())
         {
-                return &this->data[id];
+                return this->data[id];
         }
         else
         {
-                return &this->data[0];
+                return this->data[0];
         }
 }
@@ -226 +222 @@
 
         unsigned char namesize, shoutsize;
-        char *namebuf, *shoutbuf;
         std::string name, shout;
         char buf[ESF::DATA_SIZE] = {0};
-        ESF_Data newdata;
-
-        this->data.resize(numobj+1, newdata);
-
-        this->data[0] = newdata;
+
+        this->data.resize(numobj+1);
+
+        this->data[0] = new ESF_Data;
 
         SAFE_READ(static_cast<void *>(&namesize), sizeof(char), 1, fh);
@@ -239 +233 @@
         for (int i = 1; i <= numobj; ++i)
         {
+                ESF_Data *newdata = new ESF_Data;
+
                 namesize = PacketProcessor::Number(namesize);
-                namebuf = new char[namesize];
-                SAFE_READ(namebuf, sizeof(char), namesize, fh);
-                name.assign(namebuf, namesize);
-                delete[] namebuf;
+                name.resize(namesize);
+                if (namesize > 0)
+                {
+                        SAFE_READ(&name[0], sizeof(char), namesize, fh);
+                }
 
                 shoutsize = PacketProcessor::Number(shoutsize);
-                shoutbuf = new char[shoutsize];
-                SAFE_READ(shoutbuf, sizeof(char), shoutsize, fh);
-                shout.assign(shoutbuf, shoutsize);
-                delete[] shoutbuf;
+                shout.resize(shoutsize);
+                if (shoutsize > 0)
+                {
+                        SAFE_READ(&shout[0], sizeof(char), shoutsize, fh);
+                }
 
                 SAFE_READ(buf, sizeof(char), ESF::DATA_SIZE, fh);
 
-                newdata.id = i;
-                newdata.name = name;
-                newdata.shout = shout;
+                newdata->id = i;
+                newdata->name = name;
+                newdata->shout = shout;
 
                 this->data[i] = newdata;
@@ -270 +268 @@
         }
 
-        if (this->data[numobj-1].name.compare("eof") == 0)
+        if (this->data.back()->name.compare("eof") == 0)
         {
                 this->data.pop_back();
@@ -298 +296 @@
 
         unsigned char namesize;
-        char *namebuf;
         std::string name;
         char buf[ECF::DATA_SIZE] = {0};
-        ECF_Data newdata;
-
-        this->data.resize(numobj+1, newdata);
-
-        this->data[0] = newdata;
+
+        this->data.resize(numobj+1);
+
+        this->data[0] = new ECF_Data;
 
         SAFE_READ(static_cast<void *>(&namesize), sizeof(char), 1, fh);
         for (int i = 1; i <= numobj; ++i)
         {
+                ECF_Data *newdata = new ECF_Data;
+
                 namesize = PacketProcessor::Number(namesize);
-                namebuf = new char[namesize];
-                SAFE_READ(namebuf, sizeof(char), namesize, fh);
-                name.assign(namebuf,namesize);
-                delete[] namebuf;
+                name.resize(namesize);
+                SAFE_READ(&name[0], sizeof(char), namesize, fh);
+
                 SAFE_READ(buf, sizeof(char), ECF::DATA_SIZE, fh);
 
-                newdata.id = i;
-                newdata.name = name;
+                newdata->id = i;
+                newdata->name = name;
 
                 this->data[i] = newdata;
@@ -328 +325 @@
         }
 
-        if (newdata.name.compare("eof") == 0)
+        if (this->data.back()->name.compare("eof") == 0)
         {
                 this->data.pop_back();

eoserv/trunk/src/eodata.hpp

@@ -13 +13 @@
  * Loads and stores information on all items from an EIF file
  */
-class EIF
+class EIF : public Shared
 {
         public:
@@ -72 +72 @@
                 unsigned char rid[4];
                 unsigned char len[2];
-                std::vector<EIF_Data> data;
+                PtrVector<EIF_Data> data;
                 EIF(std::string filename);
 
                 EIF_Data *Get(unsigned int id);
+
+                SCRIPT_REGISTER_REF(EIF)
+
+                SCRIPT_REGISTER_END()
 };
 
@@ -81 +85 @@
  * One item record in an EIF object
  */
-struct EIF_Data
+struct EIF_Data : public Shared
 {
         int id;
@@ -136 +140 @@
  * Loads and stores information on all NPCs from an ENF file
  */
-class ENF
+class ENF : public Shared
 {
         public:
@@ -161 +165 @@
                 unsigned char rid[4];
                 unsigned char len[2];
-                std::vector<ENF_Data> data;
+                PtrVector<ENF_Data> data;
                 ENF(std::string filename);
 
                 ENF_Data *Get(unsigned int id);
+
+                SCRIPT_REGISTER_REF(ENF)
+
+                SCRIPT_REGISTER_END()
 };
 
@@ -170 +178 @@
  * One NPC record in an ENF object
  */
-struct ENF_Data
+struct ENF_Data : public Shared
 {
         int id;
@@ -195 +203 @@
  * Loads and stores information on all spells from an ESF file
  */
-class ESF
+class ESF : public Shared
 {
         public:
@@ -201 +209 @@
                 unsigned char rid[4];
                 unsigned char len[2];
-                std::vector<ESF_Data> data;
+                PtrVector<ESF_Data> data;
                 ESF(std::string filename);
 
+                SCRIPT_REGISTER_REF(ESF)
+
+                SCRIPT_REGISTER_END()
 };
 
@@ -209 +220 @@
  * One spell record in an ESF object
  */
-struct ESF_Data
+struct ESF_Data : public Shared
 {
         int id;
@@ -221 +232 @@
  * Loads and stores information on all classes from an ECF file
  */
-class ECF
+class ECF : public Shared
 {
         public:
@@ -227 +238 @@
                 unsigned char rid[4];
                 unsigned char len[2];
-                std::vector<ECF_Data> data;
+                PtrVector<ECF_Data> data;
                 ECF(std::string filename);
 
+        SCRIPT_REGISTER_REF(ECF)
+
+        SCRIPT_REGISTER_END()
 };
 
@@ -235 +249 @@
  * One class record in an ECF object
  */
-struct ECF_Data
+struct ECF_Data : public Shared
 {
         int id;

eoserv/trunk/src/eoserver.cpp

@@ -36 +36 @@
         builder.AddChar(0);
 
-        UTIL_LIST_FOREACH_ALL(server->clients, EOClient *, client)
+        UTIL_PTR_LIST_FOREACH(server->clients, EOClient, client)
         {
                 if (client->needpong)
@@ -55 +55 @@
         double now = Timer::GetTime();
 
-        UTIL_LIST_FOREACH_ALL(server->clients, EOClient *, client)
+        UTIL_PTR_LIST_FOREACH(server->clients, EOClient, client)
         {
                 std::size_t size = client->queue.size();
@@ -124 +124 @@
 }
 
+Client *EOServer::ClientFactory(SOCKET sock, sockaddr_in sin)
+{
+        return new EOClient(sock, sin, this);
+}
+
 void EOServer::Initialize(util::array<std::string, 5> dbinfo, const Config &eoserv_config, const Config &admin_config)
 {
@@ -146 +151 @@
         if (this->sln)
         {
-                delete this->sln;
+                this->sln->Release();
         }
 
-        delete this->world;
+        this->world->Release();
 }

eoserv/trunk/src/eoserver.hpp

@@ -10 +10 @@
 #include "stdafx.h"
 
-#include "eoclient.hpp"
 #include "socket.hpp"
 
@@ -19 +18 @@
  * A server which accepts connections and creates EOClient instances from them
  */
-class EOServer : public Server<EOClient>
+class EOServer : public Server
 {
         private:
@@ -25 +24 @@
                 SLN *sln;
 
+        protected:
+                Client *ClientFactory(SOCKET sock, sockaddr_in sin);
+
         public:
                 World *world;
 
-                EOServer(IPAddress addr, unsigned short port, util::array<std::string, 5> dbinfo, const Config &eoserv_config, const Config &admin_config) : Server<EOClient>(addr, port)
+                EOServer(IPAddress addr, unsigned short port, util::array<std::string, 5> dbinfo, const Config &eoserv_config, const Config &admin_config) : Server(addr, port)
                 {
                         this->Initialize(dbinfo, eoserv_config, admin_config);
@@ -34 +36 @@
 
                 ~EOServer();
+
+        SCRIPT_REGISTER_REF(EOServer)
+
+        SCRIPT_REGISTER_END()
 };
 

eoserv/trunk/src/fwd/socket.hpp

@@ -10 +10 @@
 class IPAddress;
 class Client;
-template <class> class Server;
+class Server;
 
 /**

eoserv/trunk/src/fwd/timer.hpp

@@ -12 +12 @@
 struct TimeEvent;
 
+typedef void(*TimerCallback)(void *);
+
 #endif // FWD_TIMER_HPP_INCLUDED

eoserv/trunk/src/guild.hpp

@@ -14 +14 @@
  * Created by the World object when a member of the guild logs in, and destroyed when the last member logs out
  */
-class Guild
+class Guild : public Shared
 {
         public:
                 std::string tag;
                 std::string name;
-                std::vector<Character *> members;
+                PtrVector<Character> members;
                 util::array<std::string, 9> ranks;
                 std::time_t created;
 
-                void Msg(Character *from, std::string message);
+                void Msg(PtrVector<Character> from, std::string message);
+
+        SCRIPT_REGISTER_REF_DF(Guild)
+
+        SCRIPT_REGISTER_END()
 };
 

eoserv/trunk/src/handlers/Account.cpp

@@ -18 +18 @@
                         std::string username = reader.GetEndString();
 
-                        util::lowercase(username);
+                        username = util::lowercase(username);
 
                         reply.SetID(PACKET_ACCOUNT, PACKET_REPLY);
@@ -55 +55 @@
                         int hdid = util::to_int(reader.GetBreakString());
 
-                        util::lowercase(username);
+                        username = util::lowercase(username);
 
                         reply.SetID(PACKET_ACCOUNT, PACKET_REPLY);
@@ -70 +70 @@
                         else
                         {
-                                util::lowercase(username);
+                                username = util::lowercase(username);
 
                                 this->server->world->CreatePlayer(username, password, fullname, location, email, computer, util::to_string(hdid), static_cast<std::string>(this->GetRemoteAddr()));
@@ -121 +121 @@
                         CLIENT_SEND(reply);
 
-                        delete changepass;
+                        changepass->Release();
                 }
                 break;

eoserv/trunk/src/handlers/Bank.cpp

@@ -23 +23 @@
                         short id = reader.GetShort();
 
-                        UTIL_VECTOR_FOREACH_ALL(this->player->character->map->npcs, NPC *, npc)
+                        UTIL_PTR_VECTOR_FOREACH(this->player->character->map->npcs, NPC, npc)
                         {
                                 if (npc->index == id && npc->data->type == ENF::Bank)
                                 {
-                                        this->player->character->bank_npc = npc;
+                                        this->player->character->bank_npc = *npc;
 
                                         reply.SetID(PACKET_BANK, PACKET_OPEN);

eoserv/trunk/src/handlers/Board.cpp

@@ -32 +32 @@
                         }
 
-                        UTIL_LIST_IFOREACH_ALL(this->server->world->boards[boardid]->posts, Board_Post *, post)
+                        UTIL_PTR_LIST_FOREACH(this->server->world->boards[boardid]->posts, Board_Post, post)
                         {
-                                if ((*post)->id == postid)
+                                if (post->id == postid)
                                 {
-                                        if ((*post)->author_admin < this->player->character->admin
-                                         || (*post)->author == this->player->character->name)
+                                        if (post->author_admin < this->player->character->admin
+                                         || post->author == this->player->character->name)
                                         {
                                                 this->server->world->boards[boardid]->posts.erase(post);
@@ -78 +78 @@
                         int recent_post_count = 0;
 
-                        UTIL_LIST_FOREACH_ALL(this->server->world->boards[boardid]->posts, Board_Post *, post)
+                        UTIL_PTR_LIST_FOREACH(this->server->world->boards[boardid]->posts, Board_Post, post)
                         {
                                 if (post->author == this->player->character->name)
@@ -137 +137 @@
                         }
 
-                        UTIL_LIST_FOREACH_ALL(this->server->world->boards[boardid]->posts, Board_Post *, post)
+                        UTIL_PTR_LIST_FOREACH(this->server->world->boards[boardid]->posts, Board_Post, post)
                         {
                                 if (post->id == postid)

eoserv/trunk/src/handlers/Chair.cpp

@@ -31 +31 @@
                                 }
 
-                                UTIL_LIST_FOREACH_ALL(this->player->character->map->characters, Character *, character)
+                                UTIL_PTR_LIST_FOREACH(this->player->character->map->characters, Character, character)
                                 {
                                         if (character->x == x && character->y == y)

eoserv/trunk/src/handlers/Character.cpp

@@ -38 +38 @@
                         reader.GetByte();
                         std::string name = reader.GetBreakString();
-                        util::lowercase(name);
+                        name = util::lowercase(name);
 
                         if (gender != GENDER_MALE && gender != GENDER_FEMALE) return false;
@@ -68 +68 @@
                                 reply.AddByte(1); // ??
                                 reply.AddByte(255);
-                                UTIL_VECTOR_FOREACH_ALL(this->player->characters, Character *, character)
+                                UTIL_PTR_VECTOR_FOREACH(this->player->characters, Character, character)
                                 {
                                         reply.AddBreakString(character->name);
@@ -100 +100 @@
 
                         bool yourchar = false;
-                        std::vector<Character *>::iterator char_it;
+                        PtrVector<Character>::Iterator char_it(this->player->characters);
 
-                        UTIL_VECTOR_IFOREACH(this->player->characters.begin(), this->player->characters.end(), Character *, character)
+                        UTIL_PTR_VECTOR_FOREACH(this->player->characters, Character, character)
                         {
-                                if ((*character)->id == charid)
+                                if (character->id == charid)
                                 {
-                                        Console::Out("Deleted character: %s (%s)", (*character)->name.c_str(), this->player->username.c_str());
-                                        this->server->world->DeleteCharacter((*character)->name);
+                                        Console::Out("Deleted character: %s (%s)", character->name.c_str(), this->player->username.c_str());
+                                        this->server->world->DeleteCharacter(character->name);
                                         char_it = character;
                                         yourchar = true;
@@ -126 +126 @@
                         reply.AddByte(1); // ??
                         reply.AddByte(255);
-                        UTIL_VECTOR_FOREACH_ALL(this->player->characters, Character *, character)
+                        UTIL_PTR_VECTOR_FOREACH(this->player->characters, Character, character)
                         {
                                 reply.AddBreakString(character->name);
@@ -155 +155 @@
                         bool yourchar = false;
 
-                        UTIL_VECTOR_FOREACH_ALL(this->player->characters, Character *, character)
+                        UTIL_PTR_VECTOR_FOREACH(this->player->characters, Character, character)
                         {
                                 if (character->id == charid)

eoserv/trunk/src/handlers/Chest.cpp

@@ -34 +34 @@
                                 if (this->player->character->map->GetSpec(x, y) == Map_Tile::Chest)
                                 {
-                                        UTIL_VECTOR_FOREACH_ALL(this->player->character->map->chests, Map_Chest *, chest)
+                                        UTIL_PTR_VECTOR_FOREACH(this->player->character->map->chests, Map_Chest, chest)
                                         {
                                                 if (chest->x == x && chest->y == y)
@@ -49 +49 @@
                                                                 reply.AddChar(this->player->character->maxweight);
 
-                                                                UTIL_LIST_FOREACH_ALL(chest->items, Map_Chest_Item, item)
+                                                                UTIL_PTR_LIST_FOREACH(chest->items, Map_Chest_Item, item)
                                                                 {
-                                                                        if (item.id != 0)
+                                                                        if (item->id != 0)
                                                                         {
-                                                                                reply.AddShort(item.id);
-                                                                                reply.AddThree(item.amount);
+                                                                                reply.AddShort(item->id);
+                                                                                reply.AddThree(item->amount);
                                                                         }
                                                                 }
@@ -80 +80 @@
                                 if (this->player->character->map->GetSpec(x, y) == Map_Tile::Chest)
                                 {
-                                        UTIL_VECTOR_FOREACH_ALL(this->player->character->map->chests, Map_Chest *, chest)
+                                        UTIL_PTR_VECTOR_FOREACH(this->player->character->map->chests, Map_Chest, chest)
                                         {
                                                 if (chest->x == x && chest->y == y)
@@ -97 +97 @@
                                                                 reply.AddChar(this->player->character->maxweight);
 
-                                                                UTIL_LIST_FOREACH_ALL(chest->items, Map_Chest_Item, item)
+                                                                UTIL_PTR_LIST_FOREACH(chest->items, Map_Chest_Item, item)
                                                                 {
-                                                                        if (item.id != 0)
+                                                                        if (item->id != 0)
                                                                         {
-                                                                                reply.AddShort(item.id);
-                                                                                reply.AddThree(item.amount);
+                                                                                reply.AddShort(item->id);
+                                                                                reply.AddThree(item->amount);
                                                                         }
                                                                 }
@@ -131 +131 @@
                                         reply.AddChar(y);
 
-                                        UTIL_VECTOR_FOREACH_ALL(this->player->character->map->chests, Map_Chest *, chest)
+                                        UTIL_PTR_VECTOR_FOREACH(this->player->character->map->chests, Map_Chest, chest)
                                         {
                                                 if (chest->x == x && chest->y == y)
                                                 {
-                                                        UTIL_LIST_FOREACH_ALL(chest->items, Map_Chest_Item, item)
+                                                        UTIL_PTR_LIST_FOREACH(chest->items, Map_Chest_Item, item)
                                                         {
-                                                                if (item.id != 0)
+                                                                if (item->id != 0)
                                                                 {
-                                                                        reply.AddShort(item.id);
-                                                                        reply.AddThree(item.amount);
+                                                                        reply.AddShort(item->id);
+                                                                        reply.AddThree(item->amount);
                                                                 }
                                                         }

eoserv/trunk/src/handlers/Init.cpp

@@ -10 +10 @@
 {
         ++i;
-        int a = ((i % 11 + 1) * 119);
 
-        if (a == 0)
-        {
-                return 0;
-        }
-
-        return 110905 + (i % 9 + 1) * ((11092004 - i) % a) * 119 + i % 2004;
+        return 110905 + (i % 9 + 1) * ((11092004 - i) % ((i % 11 + 1) * 119)) * 119 + i % 2004;
 }
 

eoserv/trunk/src/handlers/Internal.cpp

@@ -6 +6 @@
 
 #include "handlers.h"
+
+#include "map.hpp"
 
 CLIENT_F_FUNC(Internal)

eoserv/trunk/src/handlers/Item.cpp

@@ -96 +96 @@
                                                 builder.AddChar(int(double(this->player->character->hp) / double(this->player->character->maxhp) * 100.0));
 
-                                                UTIL_LIST_FOREACH_ALL(this->player->character->map->characters, Character *, character)
-                                                {
-                                                        if (character != this->player->character && this->player->character->InRange(character))
+                                                UTIL_PTR_LIST_FOREACH(this->player->character->map->characters, Character, character)
+                                                {
+                                                        if (*character != this->player->character && this->player->character->InRange(*character))
                                                         {
                                                                 character->player->client->SendBuilder(builder);
@@ -129 +129 @@
                                                 builder.AddChar(item->haircolor);
 
-                                                UTIL_LIST_FOREACH_ALL(this->player->character->map->characters, Character *, character)
-                                                {
-                                                        if (character != this->player->character && this->player->character->InRange(character))
+                                                UTIL_PTR_LIST_FOREACH(this->player->character->map->characters, Character, character)
+                                                {
+                                                        if (*character != this->player->character && this->player->character->InRange(*character))
                                                         {
                                                                 character->player->client->SendBuilder(builder);
@@ -208 +208 @@
                                 {
                                         item->owner = this->player->id;
-                                        item->unprotecttime = Timer::GetTime() + static_cast<double>(this->server->world->config["ProctectPlayerDrop"]);
+                                        item->unprotecttime = Timer::GetTime() + static_cast<double>(this->server->world->config["ProtectPlayerDrop"]);
                                         this->player->character->DelItem(id, amount);
 
@@ -254 +254 @@
                         int uid = reader.GetShort();
 
-                        UTIL_LIST_FOREACH_ALL(this->player->character->map->items, Map_Item, item)
-                        {
-                                if (item.uid == uid)
-                                {
-                                        int distance = util::path_length(item.x, item.y, this->player->character->x, this->player->character->y);
-
-                                        if (distance > static_cast<int>(this->server->world->config["DropDistance"]))
-                                        {
-                                                break;
-                                        }
-
-                                        if (item.owner != this->player->id && item.unprotecttime > Timer::GetTime())
-                                        {
-                                                break;
-                                        }
-
-                                        this->player->character->AddItem(item.id, item.amount);
-                                        this->player->character->map->DelItem(uid, this->player->character);
-
-                                        reply.SetID(PACKET_ITEM, PACKET_GET);
-                                        reply.AddShort(uid);
-                                        reply.AddShort(item.id);
-                                        reply.AddThree(item.amount);
-                                        reply.AddChar(this->player->character->weight);
-                                        reply.AddChar(this->player->character->maxweight);
-                                        CLIENT_SEND(reply);
-                                        break;
-                                }
+                        Map_Item *item = this->player->character->map->GetItem(uid);
+                        if (item)
+                        {
+                                int distance = util::path_length(item->x, item->y, this->player->character->x, this->player->character->y);
+
+                                if (distance > static_cast<int>(this->server->world->config["DropDistance"]))
+                                {
+                                        break;
+                                }
+