diff --git a/pol-core/makefile.gcc b/pol-core/makefile.gcc index 9367e0990..dc8606c09 100644 --- a/pol-core/makefile.gcc +++ b/pol-core/makefile.gcc @@ -48,11 +48,11 @@ endif cpp_sources = \ clib/progver.cpp plib/polver.cpp \ - pol/account.cpp pol/accounts.cpp pol/acscrobj.cpp pol/allocd.cpp \ + pol/accounts/account.cpp pol/accounts/accounts.cpp pol/accounts/acscrobj.cpp pol/allocd.cpp \ pol/armor.cpp pol/attack.cpp \ pol/attribute.cpp pol/auxclient.cpp \ - pol/bannedips.cpp pol/binaryfilescrobj.cpp pol/boat.cpp pol/boatcomp.cpp \ - pol/boatemod.cpp pol/bowsalut.cpp \ + pol/bannedips.cpp pol/binaryfilescrobj.cpp pol/multi/boat.cpp pol/multi/boatcomp.cpp \ + pol/multi/boatemod.cpp pol/bowsalut.cpp \ pol/cfgemod.cpp pol/cfgrepos.cpp pol/cgdata.cpp pol/charactr.cpp \ pol/checkpnt.cpp \ pol/chrcast.cpp pol/chrituse.cpp pol/chrskuse.cpp pol/client.cpp \ @@ -63,7 +63,7 @@ cpp_sources = \ pol/cryptengine.cpp pol/crypt/cryptbase.cpp pol/crypt/cryptkey.cpp \ pol/crypt/nocrypt.cpp pol/crypt/blowfish.cpp pol/crypt/twofish.cpp \ pol/ctable.cpp \ - pol/customhouses.cpp pol/customhousehelp.cpp \ + pol/multi/customhouses.cpp pol/multi/customhousehelp.cpp \ pol/datastore.cpp pol/dblclick.cpp pol/decay.cpp pol/dice.cpp \ pol/door.cpp pol/dropitem.cpp \ pol/dye.cpp \ @@ -74,7 +74,7 @@ cpp_sources = \ pol/gameclck.cpp pol/getitem.cpp pol/getmsg.cpp pol/gflag.cpp \ pol/gprepos.cpp pol/guardrgn.cpp\ pol/guilds.cpp \ - pol/help.cpp pol/house.cpp \ + pol/help.cpp pol/multi/house.cpp \ pol/iostats.cpp pol/irequest.cpp pol/item.cpp pol/item00.cpp \ pol/itemcr.cpp pol/itemdesc.cpp \ pol/landtile.cpp \ @@ -83,8 +83,8 @@ cpp_sources = \ pol/menu.cpp pol/menusel.cpp pol/miscmsg.cpp \ pol/miscrgn.cpp pol/mkscrobj.cpp \ pol/movecost.cpp pol/movement.cpp pol/msgfiltr.cpp \ - pol/multicfg.cpp pol/multicr.cpp pol/multidef.cpp pol/multis.cpp \ - pol/multidef2.cpp \ + pol/multi/multicfg.cpp pol/multi/multicr.cpp pol/multi/multidef.cpp pol/multi/multis.cpp \ + pol/multi/multidef2.cpp \ pol/musicrgn.cpp \ pol/npc.cpp pol/npctmpl.cpp pol/npctemplates.cpp \ pol/objecthash.cpp \ diff --git a/pol-core/plib/realmfunc.cpp b/pol-core/plib/realmfunc.cpp index 7f0693abf..a9e029092 100644 --- a/pol-core/plib/realmfunc.cpp +++ b/pol-core/plib/realmfunc.cpp @@ -5,6 +5,7 @@ History added getstatics - to fill a list with statics 2005/06/06 Shinigami: added readmultis derivative - to get a list of statics 2005/09/03 Shinigami: fixed: Realm::walkheight ignored param doors_block +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -26,7 +27,7 @@ In standingheight checks there is a nasty bug. Items NOT locked down #include "pol/tiles.h" #include "pol/charactr.h" #include "pol/cgdata.h" -#include "pol/customhouses.h" +#include "pol/multi/customhouses.h" #include "pol/fnsearch.h" #include "pol/ssopt.h" #include "pol/uvars.h" @@ -34,8 +35,8 @@ In standingheight checks there is a nasty bug. Items NOT locked down #include "pol/item.h" #include "pol/itemdesc.h" #include "pol/itemdesc.h" -#include "pol/multi.h" -#include "pol/house.h" +#include "pol/multi/multi.h" +#include "pol/multi/house.h" #include "pol/uconst.h" #define HULL_HEIGHT_BUFFER 2 diff --git a/pol-core/plib/testenv.cpp b/pol-core/plib/testenv.cpp index 76b971779..fab560b40 100644 --- a/pol-core/plib/testenv.cpp +++ b/pol-core/plib/testenv.cpp @@ -1,6 +1,7 @@ /* History ======= +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -18,7 +19,7 @@ Notes #include "pol/item.h" #include "pol/itemdesc.h" -#include "pol/multi.h" +#include "pol/multi/multi.h" #include "pol/npc.h" #include "pol/objecthash.h" #include "pol/realms.h" diff --git a/pol-core/pol/account.cpp b/pol-core/pol/accounts/account.cpp similarity index 91% rename from pol-core/pol/account.cpp rename to pol-core/pol/accounts/account.cpp index 38c719ec9..ba9d5f64f 100644 --- a/pol-core/pol/account.cpp +++ b/pol-core/pol/accounts/account.cpp @@ -4,22 +4,23 @@ History 2005/05/25 Shinigami: added void writeto( ConfigElem& elem ) 2005/05/25 Shinigami: added getnextfreeslot() 2009/08/06 MuadDib: Removed PasswordOnlyHash support +2009/09/03 MuadDib: Relocation of account related cpp/h Notes ======= */ -#include "clib/stl_inc.h" -#include "clib/cfgelem.h" -#include "clib/MD5.h" +#include "../../clib/stl_inc.h" +#include "../../clib/cfgelem.h" +#include "../../clib/MD5.h" #include "account.h" #include "accounts.h" -#include "charactr.h" -#include "client.h" -#include "cmdlevel.h" -#include "polcfg.h" +#include "../charactr.h" +#include "../client.h" +#include "../cmdlevel.h" +#include "../polcfg.h" Account::Account( ConfigElem& elem ) : active_character(NULL), diff --git a/pol-core/pol/account.h b/pol-core/pol/accounts/account.h similarity index 87% rename from pol-core/pol/account.h rename to pol-core/pol/accounts/account.h index 5523ac253..7466634ba 100644 --- a/pol-core/pol/account.h +++ b/pol-core/pol/accounts/account.h @@ -13,12 +13,12 @@ Notes #ifndef ACCOUNT_H #define ACCOUNT_H -#include "ucfg.h" -#include "proplist.h" -#include "reftypes.h" +#include "../ucfg.h" +#include "../proplist.h" +#include "../reftypes.h" -#include "clib/strset.h" -#include "clib/refptr.h" +#include "../../clib/strset.h" +#include "../../clib/refptr.h" class Character; class Client; diff --git a/pol-core/pol/accounts.cpp b/pol-core/pol/accounts/accounts.cpp similarity index 93% rename from pol-core/pol/accounts.cpp rename to pol-core/pol/accounts/accounts.cpp index dbbb279e1..08e8b49fe 100644 --- a/pol-core/pol/accounts.cpp +++ b/pol-core/pol/accounts/accounts.cpp @@ -4,6 +4,7 @@ History 2005/05/24 Shinigami: added delete_account 2005/05/25 Shinigami: added duplicate_account 2007/06/17 Shinigami: added config.world_data_path +2009/09/03 MuadDib: Relocation of account related cpp/h Notes ======= @@ -26,10 +27,10 @@ Notes #include "account.h" #include "accounts.h" -#include "polcfg.h" -#include "polsig.h" -#include "schedule.h" -#include "uvars.h" +#include "../polcfg.h" +#include "../polsig.h" +#include "../schedule.h" +#include "../uvars.h" struct stat accounts_txt_stat; bool accounts_txt_dirty = false; diff --git a/pol-core/pol/accounts.h b/pol-core/pol/accounts/accounts.h similarity index 100% rename from pol-core/pol/accounts.h rename to pol-core/pol/accounts/accounts.h diff --git a/pol-core/pol/acscrobj.cpp b/pol-core/pol/accounts/acscrobj.cpp similarity index 94% rename from pol-core/pol/acscrobj.cpp rename to pol-core/pol/accounts/acscrobj.cpp index f22ff154f..ae8b5aa79 100644 --- a/pol-core/pol/acscrobj.cpp +++ b/pol-core/pol/accounts/acscrobj.cpp @@ -14,6 +14,7 @@ History 2005/11/26 Shinigami: changed "strcmp" into "stricmp" to suppress Script Errors 2006/05/16 Shinigami: account.Set_UO_Expansion( string ) - extended for Mondain's Legacy 2009/08/06 MuadDib: Removed PasswordOnlyHash support +2009/09/03 MuadDib: Relocation of account related cpp/h Notes ======= @@ -33,16 +34,16 @@ Notes #include "account.h" #include "accounts.h" #include "acscrobj.h" -#include "charactr.h" -#include "client.h" -#include "cmdlevel.h" -#include "core.h" -#include "objecthash.h" -#include "polcfg.h" -#include "realms.h" -#include "ufunc.h" -#include "uoscrobj.h" -#include "uoexhelp.h" +#include "../charactr.h" +#include "../client.h" +#include "../cmdlevel.h" +#include "../core.h" +#include "../objecthash.h" +#include "../polcfg.h" +#include "../realms.h" +#include "../ufunc.h" +#include "../uoscrobj.h" +#include "../uoexhelp.h" BApplicObjType accountobjimp_type; diff --git a/pol-core/pol/acscrobj.h b/pol-core/pol/accounts/acscrobj.h similarity index 93% rename from pol-core/pol/acscrobj.h rename to pol-core/pol/accounts/acscrobj.h index 670a53110..449c803bd 100644 --- a/pol-core/pol/acscrobj.h +++ b/pol-core/pol/accounts/acscrobj.h @@ -11,7 +11,7 @@ Notes #ifndef ACSCROBJ_H #define ACSCROBJ_H -#include "reftypes.h" +#include "../reftypes.h" class AccountPtrHolder { diff --git a/pol-core/pol/attack.cpp b/pol-core/pol/attack.cpp index 3d913ad64..e3d1ef2b1 100644 --- a/pol-core/pol/attack.cpp +++ b/pol-core/pol/attack.cpp @@ -18,7 +18,7 @@ Notes #include "clib/endian.h" -#include "account.h" +#include "accounts/account.h" #include "client.h" #include "charactr.h" #include "msghandl.h" diff --git a/pol-core/pol/cgdata.cpp b/pol-core/pol/cgdata.cpp index 3ad0fb171..d3d668c21 100644 --- a/pol-core/pol/cgdata.cpp +++ b/pol-core/pol/cgdata.cpp @@ -1,6 +1,7 @@ /* History ======= +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -18,7 +19,7 @@ Notes #include "cgdata.h" #include "fnsearch.h" -#include "house.h" +#include "multi/house.h" ClientGameData::ClientGameData() : vendor(NULL), diff --git a/pol-core/pol/charactr.cpp b/pol-core/pol/charactr.cpp index c6eb4a20f..40bba53dc 100644 --- a/pol-core/pol/charactr.cpp +++ b/pol-core/pol/charactr.cpp @@ -34,7 +34,8 @@ History STLport-5.2.1 fix: init order changed of party_can_loot_, party_decline_timeout_ and skillcap_ 2009/08/28 Turley: Crashfix for Character::on_poison_changed() 2009/09/03 MuadDib: Changed combat related ssopt stuff to combat_config. - + Changes for account related source file relocation + Changes for multi related source file relocation Notes ======= @@ -63,12 +64,12 @@ Notes #include "uconst.h" #include "plib/realm.h" -#include "account.h" +#include "accounts/account.h" #include "action.h" #include "anim.h" #include "armor.h" #include "attribute.h" -#include "boat.h" +#include "multi/boat.h" #include "cgdata.h" #include "checkpnt.h" #include "clidata.h" diff --git a/pol-core/pol/client.cpp b/pol-core/pol/client.cpp index 30e806d0c..64d5acac8 100644 --- a/pol-core/pol/client.cpp +++ b/pol-core/pol/client.cpp @@ -25,7 +25,7 @@ Notes #include "bscript/berror.h" -#include "account.h" +#include "accounts/account.h" #include "cgdata.h" #include "charactr.h" #include "client.h" diff --git a/pol-core/pol/cmbtcfg.h b/pol-core/pol/cmbtcfg.h index 62592a793..e5827f32d 100644 --- a/pol-core/pol/cmbtcfg.h +++ b/pol-core/pol/cmbtcfg.h @@ -1,7 +1,7 @@ /* History ======= -2005/23/11 MuadDib: Added warmode_wait timer for changing war mode. +2005/23/11 MuadDib: Added warmode_wait timer for changing war mode. 2009/09/03 MuadDib: Moved combat related settings to Combat Config from SSOPT Notes diff --git a/pol-core/pol/combat.cpp b/pol-core/pol/combat.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/pol-core/pol/combat.h b/pol-core/pol/combat.h new file mode 100644 index 000000000..e69de29bb diff --git a/pol-core/pol/containr.cpp b/pol-core/pol/containr.cpp index 596f7e0b2..c81729b8a 100644 --- a/pol-core/pol/containr.cpp +++ b/pol-core/pol/containr.cpp @@ -8,6 +8,7 @@ History Create vector for item storage called layer_list_ for corpses, to work as storage to show items listed as "equipped". Also created necessary functions to make use of this like WornItem Container has. +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -35,7 +36,7 @@ Notes #include "equipmnt.h" #include "gflag.h" #include "itemdesc.h" -#include "multi.h" +#include "multi/multi.h" #include "profile.h" #include "statmsg.h" #include "ucfg.h" diff --git a/pol-core/pol/core.cpp b/pol-core/pol/core.cpp index 3b5b5dc9f..418bdb6e6 100644 --- a/pol-core/pol/core.cpp +++ b/pol-core/pol/core.cpp @@ -1,6 +1,7 @@ /* History ======= +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -18,7 +19,7 @@ Notes #include "itemdesc.h" #include "polsem.h" #include "polsystememod.h" -#include "multi.h" +#include "multi/multi.h" #include "realms.h" #include "ufunc.h" #include "uworld.h" diff --git a/pol-core/pol/create.cpp b/pol-core/pol/create.cpp index f7030755e..162a9363b 100644 --- a/pol-core/pol/create.cpp +++ b/pol-core/pol/create.cpp @@ -26,7 +26,7 @@ Notes #include "plib/realm.h" -#include "account.h" +#include "accounts/account.h" #include "attribute.h" #include "charactr.h" #include "clidata.h" diff --git a/pol-core/pol/dblclick.cpp b/pol-core/pol/dblclick.cpp index c9818fb24..0e9b5182e 100644 --- a/pol-core/pol/dblclick.cpp +++ b/pol-core/pol/dblclick.cpp @@ -9,6 +9,7 @@ History 2008/09/24 Luth: If this is my paperdoll, tell me all about me otherwise tell less 2008/09/xx Turley: Paperdoll info decided with ssopt.cfg option (for luth's update) 2009/07/23 MuadDib: updates for new Enum::Packet Out ID +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -37,7 +38,7 @@ Notes #include "scrstore.h" #include "ufunc.h" #include "uoscrobj.h" -#include "multi.h" +#include "multi/multi.h" #include "ssopt.h" void send_paperdoll( Client *client, Character *chr ) diff --git a/pol-core/pol/dropitem.cpp b/pol-core/pol/dropitem.cpp index 3eda81c83..3654a6fda 100644 --- a/pol-core/pol/dropitem.cpp +++ b/pol-core/pol/dropitem.cpp @@ -13,6 +13,8 @@ History 2009/08/09 MuadDib: Refactor of Packet 0x25 for naming convention 2009/08/16 MuadDib: find_giveitem_container(), removed passert, made it return NULL to reject move instead of a crash. Added slot support to find_giveitem_container() +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes ======= @@ -36,7 +38,7 @@ FIXME: Does STW use slots with KR or newest 2d? If so, we must do slot checks th #include "plib/realm.h" -#include "boat.h" +#include "multi/boat.h" #include "charactr.h" #include "client.h" #include "dtrace.h" diff --git a/pol-core/pol/fnsearch.cpp b/pol-core/pol/fnsearch.cpp index 555d90cdf..cbae4fba3 100644 --- a/pol-core/pol/fnsearch.cpp +++ b/pol-core/pol/fnsearch.cpp @@ -1,6 +1,7 @@ /* History ======= +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes @@ -17,7 +18,7 @@ Notes #include "charactr.h" #include "item.h" #include "storage.h" -#include "multi.h" +#include "multi/multi.h" #include "uworld.h" #include "objecthash.h" diff --git a/pol-core/pol/getitem.cpp b/pol-core/pol/getitem.cpp index acc5fd6b5..1bbb63569 100644 --- a/pol-core/pol/getitem.cpp +++ b/pol-core/pol/getitem.cpp @@ -9,6 +9,9 @@ History 2008/12/17 MuadDub: unequipping item now resets item->layer to 0 2009/08/06 MuadDib: Added gotten_by code for items. 2009/08/16 MuadDib: Added Slot support to undo_get_item() +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation + Notes ======= @@ -23,7 +26,7 @@ Notes #include "plib/realm.h" -#include "boat.h" +#include "multi/boat.h" #include "charactr.h" #include "client.h" #include "los.h" diff --git a/pol-core/pol/item.cpp b/pol-core/pol/item.cpp index df18a88bc..a5a421bcd 100644 --- a/pol-core/pol/item.cpp +++ b/pol-core/pol/item.cpp @@ -5,6 +5,8 @@ History 2008/12/17 MuadDub: Added item.tile_layer - returns layer entry from tiledata/tiles.cfg 2009/08/06 MuadDib: Added gotten_by code for items. 2009/08/25 Shinigami: STLport-5.2.1 fix: new_ar not used +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes ======= @@ -48,7 +50,7 @@ Notes #include "clib/endian.h" #include "armor.h" -#include "boat.h" +#include "multi/boat.h" #include "door.h" #include "dye.h" #include "objtype.h" diff --git a/pol-core/pol/itemcr.cpp b/pol-core/pol/itemcr.cpp index 37c57f0f6..916de17dc 100644 --- a/pol-core/pol/itemcr.cpp +++ b/pol-core/pol/itemcr.cpp @@ -2,7 +2,8 @@ History ======= 2008/12/17 MuadDub: Added item.tile_layer - returns layer entry from tiledata/tiles.cfg - +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes ======= @@ -11,7 +12,7 @@ Notes #include "clib/stl_inc.h" #ifdef _MSC_VER -#pragma warning( disable: 4786 ) +# pragma warning( disable: 4786 ) #endif #include "clib/cfgfile.h" @@ -21,14 +22,14 @@ Notes #include "armor.h" #include "armrtmpl.h" -#include "boat.h" -#include "boatcomp.h" +#include "multi/boat.h" +#include "multi/boatcomp.h" #include "charactr.h" #include "client.h" #include "containr.h" #include "door.h" #include "dye.h" -#include "house.h" +#include "multi/house.h" #include "item.h" #include "itemdesc.h" #include "lockable.h" diff --git a/pol-core/pol/itemdesc.cpp b/pol-core/pol/itemdesc.cpp index cead00dae..c963f83e5 100644 --- a/pol-core/pol/itemdesc.cpp +++ b/pol-core/pol/itemdesc.cpp @@ -8,6 +8,7 @@ History no longer being used by ANYTHING in the core. So no longer will require this file to run POL. Same with config/armrdesc.cfg 2009/08/25 Shinigami: STLport-5.2.1 fix: init order changed of max_slots +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -41,7 +42,7 @@ Notes #include "clidata.h" #include "objtype.h" #include "itemdesc.h" -#include "multidef.h" +#include "multi/multidef.h" #include "plib/pkg.h" #include "resource.h" #include "ssopt.h" diff --git a/pol-core/pol/login.cpp b/pol-core/pol/login.cpp index 6aa334bc4..5c233530d 100644 --- a/pol-core/pol/login.cpp +++ b/pol-core/pol/login.cpp @@ -35,7 +35,7 @@ Notes #include "clib/logfile.h" #include "clib/fdump.h" -#include "account.h" +#include "accounts/account.h" #include "charactr.h" #include "client.h" #include "core.h" diff --git a/pol-core/pol/menusel.cpp b/pol-core/pol/menusel.cpp index 660bd7bf8..b84b16eb5 100644 --- a/pol-core/pol/menusel.cpp +++ b/pol-core/pol/menusel.cpp @@ -16,7 +16,7 @@ Notes #include "clib/logfile.h" #include "clib/passert.h" -#include "account.h" +#include "accounts/account.h" #include "charactr.h" #include "client.h" #include "msghandl.h" diff --git a/pol-core/pol/miscmsg.cpp b/pol-core/pol/miscmsg.cpp index dc66aeda1..a010e12f8 100644 --- a/pol-core/pol/miscmsg.cpp +++ b/pol-core/pol/miscmsg.cpp @@ -10,6 +10,8 @@ History 2006/05/30 Shinigami: Changed params of character_race_changer_handler() 2009/07/23 MuadDib: updates for new Enum::Packet IDs 2009/08/14 Turley: Added PKTBI_BF::TYPE_SCREEN_SIZE & TYPE_CLOSED_STATUS_GUMP (anti spam) +2009/09/03 MuadDib: Relocation of account related cpp/h +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -31,14 +33,14 @@ Notes #include "clib/stlutil.h" -#include "account.h" +#include "accounts/account.h" #include "charactr.h" #include "client.h" #include "cmbtcfg.h" -#include "customhouses.h" +#include "multi/customhouses.h" #include "fnsearch.h" #include "msghandl.h" -#include "multi.h" +#include "multi/multi.h" #include "pktboth.h" #include "pktin.h" #include "spells.h" diff --git a/pol-core/pol/movement.cpp b/pol-core/pol/movement.cpp index 85bf8a60f..9a31dc1a9 100644 --- a/pol-core/pol/movement.cpp +++ b/pol-core/pol/movement.cpp @@ -2,6 +2,7 @@ History ======= 2009/07/23 MuadDib: updates for new Enum::Packet Out ID +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -15,14 +16,14 @@ Notes #include "charactr.h" #include "client.h" -#include "customhouses.h" -#include "house.h" +#include "multi/customhouses.h" +#include "multi/house.h" #include "msghandl.h" #include "pktin.h" #include "pktout.h" #include "pktboth.h" #include "uvars.h" -#include "multi.h" +#include "multi/multi.h" #include "ssopt.h" #include "ufunc.h" #include "uworld.h" diff --git a/pol-core/pol/boat.cpp b/pol-core/pol/multi/boat.cpp similarity index 94% rename from pol-core/pol/boat.cpp rename to pol-core/pol/multi/boat.cpp index 9b949e3be..e8b022237 100644 --- a/pol-core/pol/boat.cpp +++ b/pol-core/pol/multi/boat.cpp @@ -6,6 +6,8 @@ History 2009/07/23 MuadDib: updates for new Enum::Packet Out ID 2009/08/25 Shinigami: STLport-5.2.1 fix: removed STLport-5.2.1 fix: boat_components changed little bit +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes ======= @@ -15,47 +17,47 @@ Notes #include "clib/stl_inc.h" #ifdef _MSC_VER -#pragma warning( disable: 4786 ) +# pragma warning( disable: 4786 ) #endif #include #include -#include "bscript/berror.h" +#include "../../bscript/berror.h" -#include "clib/cfgelem.h" -#include "clib/cfgfile.h" -#include "clib/endian.h" -#include "clib/passert.h" -#include "clib/stlutil.h" -#include "clib/strutil.h" +#include "../../clib/cfgelem.h" +#include "../../clib/cfgfile.h" +#include "../../clib/endian.h" +#include "../../clib/passert.h" +#include "../../clib/stlutil.h" +#include "../../clib/strutil.h" -#include "uconst.h" -#include "plib/realm.h" +#include "../uconst.h" +#include "../../plib/realm.h" #include "boat.h" #include "boatcomp.h" -#include "charactr.h" -#include "client.h" -#include "core.h" -#include "fnsearch.h" -#include "itemdesc.h" -#include "mdelta.h" -#include "mkscrobj.h" +#include "../charactr.h" +#include "../client.h" +#include "../core.h" +#include "../fnsearch.h" +#include "../itemdesc.h" +#include "../mdelta.h" +#include "../mkscrobj.h" #include "multi.h" #include "multidef.h" -#include "objtype.h" -#include "pktout.h" -#include "realms.h" -#include "scrsched.h" -#include "tiles.h" -#include "ufunc.h" -#include "uofile.h" -#include "ustruct.h" -#include "uvars.h" -#include "uworld.h" +#include "../objtype.h" +#include "../pktout.h" +#include "../realms.h" +#include "../scrsched.h" +#include "../tiles.h" +#include "../ufunc.h" +#include "../uofile.h" +#include "../ustruct.h" +#include "../uvars.h" +#include "../uworld.h" -#include "objecthash.h" +#include "../objecthash.h" //#define DEBUG_BOATS diff --git a/pol-core/pol/boat.h b/pol-core/pol/multi/boat.h similarity index 91% rename from pol-core/pol/boat.h rename to pol-core/pol/multi/boat.h index a8dfc004a..07a08c3fe 100644 --- a/pol-core/pol/boat.h +++ b/pol-core/pol/multi/boat.h @@ -2,6 +2,8 @@ History ======= 2005/04/02 Shinigami: move_offline_mobiles - added realm param +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes ======= @@ -13,8 +15,8 @@ Notes #define BOAT_H #include "multi.h" -#include "poltype.h" -#include "reftypes.h" +#include "../poltype.h" +#include "../reftypes.h" struct BoatShape; class MultiDef; diff --git a/pol-core/pol/boatcomp.cpp b/pol-core/pol/multi/boatcomp.cpp similarity index 57% rename from pol-core/pol/boatcomp.cpp rename to pol-core/pol/multi/boatcomp.cpp index f5658f0a1..97fcac8a9 100644 --- a/pol-core/pol/boatcomp.cpp +++ b/pol-core/pol/multi/boatcomp.cpp @@ -1,13 +1,16 @@ /* History ======= +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation + Notes ======= */ -#include "clib/stl_inc.h" +#include "../../clib/stl_inc.h" #include "boatcomp.h" UPlank::UPlank( const ItemDesc& descriptor ) : ULockable( descriptor, CLASS_ITEM ) diff --git a/pol-core/pol/boatcomp.h b/pol-core/pol/multi/boatcomp.h similarity index 73% rename from pol-core/pol/boatcomp.h rename to pol-core/pol/multi/boatcomp.h index dbc1491ff..e60da7a7e 100644 --- a/pol-core/pol/boatcomp.h +++ b/pol-core/pol/multi/boatcomp.h @@ -1,6 +1,9 @@ /* History ======= +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation + Notes @@ -12,7 +15,7 @@ Notes #define BOATCOMP_H #include "boat.h" -#include "lockable.h" +#include "../lockable.h" class UPlank : public ULockable { diff --git a/pol-core/pol/boatemod.cpp b/pol-core/pol/multi/boatemod.cpp similarity index 83% rename from pol-core/pol/boatemod.cpp rename to pol-core/pol/multi/boatemod.cpp index 8ee5ce088..3cacd3089 100644 --- a/pol-core/pol/boatemod.cpp +++ b/pol-core/pol/multi/boatemod.cpp @@ -2,33 +2,35 @@ History ======= 2006/09/26 Shinigami: GCC 3.4.x fix - added "template<>" to TmplExecutorModule +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes ======= */ -#include "clib/stl_inc.h" +#include "../../clib/stl_inc.h" + #ifdef _MSC_VER -#pragma warning( disable: 4786 ) +# pragma warning( disable: 4786 ) #endif +#include "../../bscript/berror.h" +#include "../../bscript/bobject.h" +#include "../../bscript/execmodl.h" +#include "../../bscript/executor.h" +#include "../../bscript/impstr.h" -#include "bscript/berror.h" -#include "bscript/bobject.h" -#include "bscript/execmodl.h" -#include "bscript/executor.h" -#include "bscript/impstr.h" - -#include "clib/rawtypes.h" -#include "plib/realm.h" +#include "../../clib/rawtypes.h" +#include "../../plib/realm.h" #include "boat.h" #include "boatemod.h" -#include "item.h" -#include "uoexhelp.h" -#include "uoscrobj.h" -#include "wrldsize.h" +#include "../item.h" +#include "../uoexhelp.h" +#include "../uoscrobj.h" +#include "../wrldsize.h" template<> TmplExecutorModule::FunctionDef diff --git a/pol-core/pol/boatemod.h b/pol-core/pol/multi/boatemod.h similarity index 71% rename from pol-core/pol/boatemod.h rename to pol-core/pol/multi/boatemod.h index 0ab59e1c0..e13758caf 100644 --- a/pol-core/pol/boatemod.h +++ b/pol-core/pol/multi/boatemod.h @@ -1,6 +1,8 @@ /* History ======= +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes @@ -11,7 +13,7 @@ Notes #ifndef BOATEMOD_H #define BOATEMOD_H -#include "bscript/execmodl.h" +#include "../../bscript/execmodl.h" class BObject; diff --git a/pol-core/pol/customhousehelp.cpp b/pol-core/pol/multi/customhousehelp.cpp similarity index 92% rename from pol-core/pol/customhousehelp.cpp rename to pol-core/pol/multi/customhousehelp.cpp index 23a93c6ad..bfe3ad313 100644 --- a/pol-core/pol/customhousehelp.cpp +++ b/pol-core/pol/multi/customhousehelp.cpp @@ -1,6 +1,7 @@ /* History ======= +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= diff --git a/pol-core/pol/customhouses.cpp b/pol-core/pol/multi/customhouses.cpp similarity index 95% rename from pol-core/pol/customhouses.cpp rename to pol-core/pol/multi/customhouses.cpp index 54deb2f83..d6b0d2b1d 100644 --- a/pol-core/pol/customhouses.cpp +++ b/pol-core/pol/multi/customhouses.cpp @@ -3,33 +3,35 @@ History ======= 2005/08/19 Shinigami: ZLib functionality linked directly into Core 2005/09/26 Shinigami: wrong styled break condition in ::Compress +2009/09/03 MuadDib: Relocation of multi related cpp/h + Notes ======= */ -#include "clib/stl_inc.h" -#include "clib/cfgelem.h" -#include "clib/endian.h" -#include "clib/stlutil.h" +#include "../../clib/stl_inc.h" +#include "../../clib/cfgelem.h" +#include "../../clib/endian.h" +#include "../../clib/stlutil.h" -#include "../../lib/zlib/zlib.h" +#include "../../../lib/zlib/zlib.h" -#include "charactr.h" -#include "cgdata.h" -#include "client.h" -#include "core.h" -#include "uvars.h" +#include "../charactr.h" +#include "../cgdata.h" +#include "../client.h" +#include "../core.h" +#include "../uvars.h" #include "house.h" #include "customhouses.h" -#include "fnsearch.h" +#include "../fnsearch.h" #include "multi.h" #include "multidef.h" -#include "pktboth.h" -#include "ufunc.h" -#include "ustruct.h" -#include "uworld.h" +#include "../pktboth.h" +#include "../ufunc.h" +#include "../ustruct.h" +#include "../uworld.h" //bytes per tile - currently only mode 0 works, meaning we send u16 graphic, s8 x,y,z offsets #define BYTES_PER_TILE 5 diff --git a/pol-core/pol/customhouses.h b/pol-core/pol/multi/customhouses.h similarity index 91% rename from pol-core/pol/customhouses.h rename to pol-core/pol/multi/customhouses.h index 456aaa3ce..5373cb8f2 100644 --- a/pol-core/pol/customhouses.h +++ b/pol-core/pol/multi/customhouses.h @@ -1,6 +1,7 @@ /* History ======= +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes @@ -11,12 +12,12 @@ Notes #ifndef _CUSTOMHOUSES_H #define _CUSTOMHOUSES_H -#include "clib/stl_inc.h" -#include "clib/cfgelem.h" -#include "clib/rawtypes.h" +#include "../../clib/stl_inc.h" +#include "../../clib/cfgelem.h" +#include "../../clib/rawtypes.h" -#include "client.h" -#include "pktboth.h" +#include "../client.h" +#include "../pktboth.h" #define CUSTOM_HOUSE_NUM_PLANES 5 diff --git a/pol-core/pol/house.cpp b/pol-core/pol/multi/house.cpp similarity index 93% rename from pol-core/pol/house.cpp rename to pol-core/pol/multi/house.cpp index ac170dea1..b77291093 100644 --- a/pol-core/pol/house.cpp +++ b/pol-core/pol/multi/house.cpp @@ -3,6 +3,7 @@ History ======= 2005/06/06 Shinigami: added readobjects - to get a list of statics 2005/11/26 Shinigami: changed "strcmp" into "stricmp" to suppress Script Errors +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -14,41 +15,41 @@ Notes #include -#include "bscript/berror.h" -#include "bscript/executor.h" -#include "bscript/objmembers.h" -#include "bscript/objmethods.h" +#include "../../bscript/berror.h" +#include "../../bscript/executor.h" +#include "../../bscript/objmembers.h" +#include "../../bscript/objmethods.h" -#include "clib/cfgelem.h" -#include "clib/endian.h" -#include "clib/logfile.h" -#include "clib/passert.h" -#include "clib/stlutil.h" -#include "clib/strutil.h" +#include "../../clib/cfgelem.h" +#include "../../clib/endian.h" +#include "../../clib/logfile.h" +#include "../../clib/passert.h" +#include "../../clib/stlutil.h" +#include "../../clib/strutil.h" -#include "plib/mapcell.h" -#include "plib/realm.h" -#include "plib/mapshape.h" +#include "../../plib/mapcell.h" +#include "../../plib/realm.h" +#include "../../plib/mapshape.h" -#include "cgdata.h" -#include "core.h" -#include "fnsearch.h" -#include "itemdesc.h" +#include "../cgdata.h" +#include "../core.h" +#include "../fnsearch.h" +#include "../itemdesc.h" #include "multidef.h" -#include "objtype.h" -#include "polcfg.h" -#include "realms.h" -#include "tiles.h" -#include "ufunc.h" -#include "uofile.h" -#include "uoscrobj.h" -#include "ustruct.h" -#include "uvars.h" -#include "uworld.h" +#include "../objtype.h" +#include "../polcfg.h" +#include "../realms.h" +#include "../tiles.h" +#include "../ufunc.h" +#include "../uofile.h" +#include "../uoscrobj.h" +#include "../ustruct.h" +#include "../uvars.h" +#include "../uworld.h" #include "house.h" -#include "objecthash.h" +#include "../objecthash.h" typedef list ItemList; typedef list MobileList; diff --git a/pol-core/pol/house.h b/pol-core/pol/multi/house.h similarity index 92% rename from pol-core/pol/house.h rename to pol-core/pol/multi/house.h index ef5625368..8c5e09698 100644 --- a/pol-core/pol/house.h +++ b/pol-core/pol/multi/house.h @@ -2,6 +2,7 @@ History ======= 2005/06/06 Shinigami: added readobjects - to get a list of statics +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -11,7 +12,7 @@ Notes #ifndef _HOUSE_H #define _HOUSE_H -#include "clib/stl_inc.h" +#include "../../clib/stl_inc.h" #include "customhouses.h" #include "multi.h" diff --git a/pol-core/pol/multi.h b/pol-core/pol/multi/multi.h similarity index 93% rename from pol-core/pol/multi.h rename to pol-core/pol/multi/multi.h index f2cca89ee..69e486564 100644 --- a/pol-core/pol/multi.h +++ b/pol-core/pol/multi/multi.h @@ -2,6 +2,7 @@ History ======= 2005/06/06 Shinigami: added readobjects template - to get a list of statics +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -22,7 +23,7 @@ Notes // (relative signed x/y, -128 to +127 // unsigned long is z << 16 | objtype -#include "item.h" +#include "../item.h" class MultiDef; class BObjectImp; diff --git a/pol-core/pol/multicfg.cpp b/pol-core/pol/multi/multicfg.cpp similarity index 73% rename from pol-core/pol/multicfg.cpp rename to pol-core/pol/multi/multicfg.cpp index b5995c453..bbeae40a6 100644 --- a/pol-core/pol/multicfg.cpp +++ b/pol-core/pol/multi/multicfg.cpp @@ -1,20 +1,20 @@ /* History ======= - +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= */ -#include "clib/stl_inc.h" -#include "clib/cfgfile.h" -#include "clib/fileutil.h" +#include "../../clib/stl_inc.h" +#include "../../clib/cfgfile.h" +#include "../../clib/fileutil.h" -#include "plib/pkg.h" +#include "../../plib/pkg.h" -#include "cfgrepos.h" +#include "../cfgrepos.h" void load_special_storedconfig( string cfgname ) { diff --git a/pol-core/pol/multicr.cpp b/pol-core/pol/multi/multicr.cpp similarity index 75% rename from pol-core/pol/multicr.cpp rename to pol-core/pol/multi/multicr.cpp index 670c0d38e..3afb308e3 100644 --- a/pol-core/pol/multicr.cpp +++ b/pol-core/pol/multi/multicr.cpp @@ -1,28 +1,29 @@ /* History ======= - +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes ======= */ -#include "clib/stl_inc.h" +#include "../../clib/stl_inc.h" -#include "bscript/berror.h" +#include "../../bscript/berror.h" -#include "clib/endian.h" -#include "clib/strutil.h" +#include "../../clib/endian.h" +#include "../../clib/strutil.h" #include "boat.h" #include "house.h" -#include "itemdesc.h" -#include "objtype.h" -#include "ufunc.h" -#include "uworld.h" +#include "../itemdesc.h" +#include "../objtype.h" +#include "../ufunc.h" +#include "../uworld.h" -#include "objecthash.h" +#include "../objecthash.h" bool isboat( u16 objtype ) { @@ -68,7 +69,7 @@ UMulti* UMulti::create( const ItemDesc& descriptor, u32 serial ) return multi; } -#include "uoscrobj.h" +#include "../uoscrobj.h" BObjectImp* UMulti::scripted_create( const ItemDesc& descriptor, u16 x, u16 y, s8 z, Realm* realm, long flags ) { if (descriptor.type == ItemDesc::BOATDESC) diff --git a/pol-core/pol/multidef.cpp b/pol-core/pol/multi/multidef.cpp similarity index 88% rename from pol-core/pol/multidef.cpp rename to pol-core/pol/multi/multidef.cpp index 5447d1778..d6e357402 100644 --- a/pol-core/pol/multidef.cpp +++ b/pol-core/pol/multi/multidef.cpp @@ -1,38 +1,40 @@ /* History ======= -2009/09/01 Turley: VS2005/2008 Support moved inline MultiDef::getkey to .h +2009/09/01 Turley: VS2005/2008 Support moved inline MultiDef::getkey to .h +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= */ -#include "clib/stl_inc.h" +#include "../../clib/stl_inc.h" + #ifdef _MSC_VER -#pragma warning( disable: 4786 ) +# pragma warning( disable: 4786 ) #endif #include #include -#include "clib/cfgelem.h" -#include "clib/cfgfile.h" -#include "clib/passert.h" -#include "clib/stlutil.h" -#include "clib/strutil.h" +#include "../../clib/cfgelem.h" +#include "../../clib/cfgfile.h" +#include "../../clib/passert.h" +#include "../../clib/stlutil.h" +#include "../../clib/strutil.h" -#include "plib/mapcell.h" -#include "plib/mapshape.h" +#include "../../plib/mapcell.h" +#include "../../plib/mapshape.h" -#include "itemdesc.h" -#include "objtype.h" -#include "udatfile.h" -#include "uofilei.h" -#include "uofile.h" +#include "../itemdesc.h" +#include "../objtype.h" +#include "../udatfile.h" +#include "../uofilei.h" +#include "../uofile.h" #include "multidef.h" -#include "ustruct.h" -#include "uofilei.h" +#include "../ustruct.h" +#include "../uofilei.h" bool BoatShapeExists( u16 graphic ); diff --git a/pol-core/pol/multidef.h b/pol-core/pol/multi/multidef.h similarity index 90% rename from pol-core/pol/multidef.h rename to pol-core/pol/multi/multidef.h index dbe65c24e..0203e89bd 100644 --- a/pol-core/pol/multidef.h +++ b/pol-core/pol/multi/multidef.h @@ -1,7 +1,8 @@ /* History ======= -2009/09/01 Turley: VS2005/2008 Support moved inline MultiDef::getkey to .h +2009/09/01 Turley: VS2005/2008 Support moved inline MultiDef::getkey to .h +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -25,8 +26,9 @@ Notes #include -#include "udatfile.h" -#include "clib/rawtypes.h" +#include "../udatfile.h" +#include "../../clib/rawtypes.h" + class ConfigElem; class MapShapeList; diff --git a/pol-core/pol/multidef2.cpp b/pol-core/pol/multi/multidef2.cpp similarity index 85% rename from pol-core/pol/multidef2.cpp rename to pol-core/pol/multi/multidef2.cpp index 8df1cc6b2..b388bbeff 100644 --- a/pol-core/pol/multidef2.cpp +++ b/pol-core/pol/multi/multidef2.cpp @@ -2,6 +2,7 @@ History ======= 2006/12/05 Shinigami: removed dummy floor creation in ::readobjects and ::readshapes +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -16,25 +17,24 @@ Notes #include #include -#include "clib/cfgelem.h" -#include "clib/cfgfile.h" -#include "clib/passert.h" -#include "clib/stlutil.h" -#include "clib/strutil.h" +#include "../../clib/cfgelem.h" +#include "../../clib/cfgfile.h" +#include "../../clib/passert.h" +#include "../../clib/stlutil.h" +#include "../../clib/strutil.h" -#include "plib/mapcell.h" -#include "plib/mapshape.h" +#include "../../plib/mapcell.h" +#include "../../plib/mapshape.h" -#include "tiles.h" -#include "itemdesc.h" -#include "objtype.h" -#include "udatfile.h" -#include "uofilei.h" -#include "uofile.h" +#include "../tiles.h" +#include "../itemdesc.h" +#include "../objtype.h" +#include "../udatfile.h" +#include "../uofilei.h" +#include "../uofile.h" #include "multidef.h" -#include "ustruct.h" -#include "uofilei.h" -//#include "uobject.h" +#include "../ustruct.h" +#include "../uofilei.h" // 8/9/03 this seems to be used only by uofile03 -Syz bool MultiDef::readobjects( StaticList& vec, int x, int y, int zbase ) const diff --git a/pol-core/pol/multis.cpp b/pol-core/pol/multi/multis.cpp similarity index 79% rename from pol-core/pol/multis.cpp rename to pol-core/pol/multi/multis.cpp index 601ca57fa..3c3525729 100644 --- a/pol-core/pol/multis.cpp +++ b/pol-core/pol/multi/multis.cpp @@ -2,35 +2,35 @@ History ======= 2005/11/26 Shinigami: changed "strcmp" into "stricmp" to suppress Script Errors +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= */ -#include "clib/stl_inc.h" +#include "../../clib/stl_inc.h" + #ifdef _MSC_VER #pragma warning( disable: 4786 ) #endif -#include "clib/passert.h" -#include "clib/strutil.h" +#include "../../clib/passert.h" +#include "../../clib/strutil.h" -#include "bscript/bstruct.h" -#include "bscript/objmembers.h" +#include "../../bscript/bstruct.h" +#include "../../bscript/objmembers.h" -#include "itemdesc.h" -#include "objtype.h" +#include "../itemdesc.h" +#include "../objtype.h" -#include "udatfile.h" -#include "uobjcnt.h" -#include "uobject.h" -#include "uofilei.h" -#include "uofile.h" +#include "../udatfile.h" +#include "../uobjcnt.h" +#include "../uobject.h" +#include "../uofilei.h" +#include "../uofile.h" #include "multi.h" -#include "ustruct.h" -//#include "uworld.h" -//#include "uobject.h" +#include "../ustruct.h" UMulti::UMulti( const ItemDesc& itemdesc ) : Item(itemdesc, CLASS_MULTI) diff --git a/pol-core/pol/objecthash.cpp b/pol-core/pol/objecthash.cpp index 696dad460..e491852d3 100644 --- a/pol-core/pol/objecthash.cpp +++ b/pol-core/pol/objecthash.cpp @@ -1,6 +1,7 @@ /* History ======= +2009/09/03 MuadDib: Relocation of account related cpp/h Notes @@ -14,7 +15,7 @@ Notes #include "clib/passert.h" #include "clib/logfile.h" -#include "account.h" +#include "accounts/account.h" #include "objecthash.h" #include "polcfg.h" #include "ufunc.h" diff --git a/pol-core/pol/objtype.h b/pol-core/pol/objtype.h index 79e2f0a9d..dfffc58a2 100644 --- a/pol-core/pol/objtype.h +++ b/pol-core/pol/objtype.h @@ -2,7 +2,9 @@ History ======= 2006/05/16 Shinigami: UOBJ_*MALE_GHOST renamed to UOBJ_HUMAN_*MALE_GHOST -added UOBJ_ELF_* constants + added UOBJ_ELF_* constants +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes diff --git a/pol-core/pol/packethooks.cpp b/pol-core/pol/packethooks.cpp index ff68ae21e..1f7e02031 100644 --- a/pol-core/pol/packethooks.cpp +++ b/pol-core/pol/packethooks.cpp @@ -8,6 +8,7 @@ History 2009/08/03 MuadDib: Renaming of MSG_HANDLER_6017 and related, to MSG_HANDLER_V2 for better description Renamed secondary handler class to *_V2 for naming convention 2009/08/25 Shinigami: STLport-5.2.1 fix: params in call of Log2() +2009/09/03 MuadDib: Relocation of account related cpp/h Notes ======= @@ -31,7 +32,7 @@ new Handler added to the core needs a new Version number here. As of 8/3/09 ther #include "plib/pkg.h" -#include "account.h" +#include "accounts/account.h" #include "charactr.h" #include "client.h" #include "msghandl.h" diff --git a/pol-core/pol/pol-2008.vcproj b/pol-core/pol/pol-2008.vcproj index c2ebc0661..893fb5077 100644 --- a/pol-core/pol/pol-2008.vcproj +++ b/pol-core/pol/pol-2008.vcproj @@ -209,18 +209,6 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > - - - - - - @@ -253,18 +241,6 @@ RelativePath=".\binaryfilescrobj.cpp" > - - - - - - @@ -321,6 +297,10 @@ RelativePath=".\cmdlevel.cpp" > + + @@ -349,14 +329,6 @@ RelativePath=".\ctable.cpp" > - - - - @@ -441,10 +413,6 @@ RelativePath=".\help.cpp" > - - @@ -569,26 +537,6 @@ RelativePath=".\msgfiltr.cpp" > - - - - - - - - - - @@ -1086,18 +1034,6 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl" > - - - - - - @@ -1134,18 +1070,6 @@ RelativePath=".\binaryfilescrobj.h" > - - - - - - @@ -1186,6 +1110,10 @@ RelativePath=".\cmdlevel.h" > + + @@ -1206,10 +1134,6 @@ RelativePath=".\ctable.h" > - - @@ -1290,10 +1214,6 @@ RelativePath=".\guilds.h" > - - @@ -1366,14 +1286,6 @@ RelativePath=".\msghandl.h" > - - - - @@ -1983,6 +1895,122 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pol-core/pol/pol.cpp b/pol-core/pol/pol.cpp index b7aa83f9a..8540e52a9 100644 --- a/pol-core/pol/pol.cpp +++ b/pol-core/pol/pol.cpp @@ -38,6 +38,8 @@ History Renamed secondary handler class to *_V2 for naming convention 2009/08/14 Turley: fixed definition of PKTIN_5D 2009/08/19 Turley: PKTIN_5D clientflag saved in client->UOExpansionFlagClient +2009/09/03 MuadDib: Relocation of account related cpp/h + Changes for multi related source file relocation Notes ======= @@ -84,9 +86,9 @@ Notes #include "plib/pkg.h" #include "plib/realm.h" -#include "account.h" +#include "accounts/account.h" #include "allocd.h" -#include "boat.h" +#include "multi/boat.h" #include "cgdata.h" #include "charactr.h" #include "checkpnt.h" @@ -107,7 +109,7 @@ Notes #include "msghandl.h" #include "msgfiltr.h" #include "musicrgn.h" -#include "multi.h" +#include "multi/multi.h" #include "objecthash.h" #include "objtype.h" #include "pktin.h" diff --git a/pol-core/pol/scrsched.cpp b/pol-core/pol/scrsched.cpp index 6e53491e8..62a92316f 100644 --- a/pol-core/pol/scrsched.cpp +++ b/pol-core/pol/scrsched.cpp @@ -7,6 +7,7 @@ History 2006/09/17 Shinigami: ::signal_event() will return error on full evene queue 2006/09/23 Shinigami: Script_Cycles, Sleep_Cycles and Script_passes uses 64bit now 2009/07/28 MuadDib: Packet Struct Refactoring +2009/09/03 MuadDib: Relocation of boat related cpp/h Notes ======= @@ -34,7 +35,7 @@ Notes #include "clib/unicode.h" #include "attributemod.h" -#include "boatemod.h" +#include "multi/boatemod.h" #include "cfgemod.h" #include "clemod.h" #include "charactr.h" diff --git a/pol-core/pol/speech.cpp b/pol-core/pol/speech.cpp index 3ce952179..97dd0b9de 100644 --- a/pol-core/pol/speech.cpp +++ b/pol-core/pol/speech.cpp @@ -5,6 +5,7 @@ History 2009/07/23 MuadDib: updates for new Enum::Packet Out ID 2009/08/01 MuadDib: Rewrote where needed to do away with TEXTDEF struct useage. Pointless. 2009/08/25 Shinigami: STLport-5.2.1 fix: buffer not used +2009/09/03 MuadDib: Relocation of account related cpp/h Notes ======= @@ -23,7 +24,7 @@ Notes #include "clib/random.h" #include "clib/strutil.h" -#include "account.h" +#include "accounts/account.h" #include "client.h" #include "listenpt.h" #include "mkscrobj.h" diff --git a/pol-core/pol/target.cpp b/pol-core/pol/target.cpp index 482df10b4..4555887aa 100644 --- a/pol-core/pol/target.cpp +++ b/pol-core/pol/target.cpp @@ -2,6 +2,8 @@ History ======= 2009/07/23 MuadDib: updates for new Enum::Packet Out ID +2009/09/03 MuadDib: Relocation of account related cpp/h + Relocation of multi related cpp/h Notes ======= @@ -17,7 +19,7 @@ Notes #include "plib/realm.h" -#include "account.h" +#include "accounts/account.h" #include "charactr.h" #include "client.h" #include "fnsearch.h" @@ -29,7 +31,7 @@ Notes #include "realms.h" #include "ufunc.h" #include "uvars.h" -#include "multi.h" +#include "multi/multi.h" #include "target.h" #include "polclass.h" diff --git a/pol-core/pol/textcmd.cpp b/pol-core/pol/textcmd.cpp index 3d09a1fb3..4a793f1a8 100644 --- a/pol-core/pol/textcmd.cpp +++ b/pol-core/pol/textcmd.cpp @@ -4,6 +4,7 @@ History 2006/06/15 Austin: Removed .set .priv and .priv 2006/05/30 Shinigami: fixed a smaller mistype in textcmd_startlog() set correct time stamp in textcmd_startlog() and textcmd_stoplog() + 2009/09/03 MuadDib: Relocation of account related cpp/h Notes ======= @@ -34,7 +35,7 @@ Notes #include "plib/realm.h" -#include "account.h" +#include "accounts/account.h" #include "action.h" #include "allocd.h" #include "armor.h" diff --git a/pol-core/pol/ufunc.cpp b/pol-core/pol/ufunc.cpp index f396a8348..fa197a2b4 100644 --- a/pol-core/pol/ufunc.cpp +++ b/pol-core/pol/ufunc.cpp @@ -18,6 +18,8 @@ History 2009/08/09 MuadDib: UpdateCharacterWeight() Rewritten to send stat msg intead of refreshar(). Refactor of Packet 0x25 for naming convention 2009/08/14 Turley: PKTOUT_B9_V2 removed unk u16 and changed flag to u32 +2009/09/03 MuadDib: Relocation of account related cpp/h + Relocation of multi related cpp/h Notes ======= @@ -39,7 +41,7 @@ Notes #include "plib/mapcell.h" #include "plib/realm.h" -#include "account.h" +#include "accounts/account.h" #include "charactr.h" #include "client.h" #include "equipmnt.h" @@ -59,7 +61,7 @@ Notes #include "tooltips.h" #include "uconst.h" #include "ufunc.h" -#include "multi.h" +#include "multi/multi.h" #include "uobject.h" #include "uoclient.h" #include "uofile.h" @@ -2055,7 +2057,7 @@ void move_boat_item( Item* item, unsigned short newx, unsigned short newy, signe } -#include "multi.h" +#include "multi/multi.h" void send_multi( Client* client, UMulti* multi ) { static PKTOUT_1A_C msg; diff --git a/pol-core/pol/uimport.cpp b/pol-core/pol/uimport.cpp index a3d9ea8c8..fbe9a2380 100644 --- a/pol-core/pol/uimport.cpp +++ b/pol-core/pol/uimport.cpp @@ -3,6 +3,8 @@ History ======= 2005/01/23 Shinigami: for_all_mobiles, write_items & write_multis - Tokuno MapDimension doesn't fit blocks of 64x64 (WGRID_SIZE) 2007/06/17 Shinigami: added config.world_data_path +2009/09/03 MuadDib: Relocation of account related cpp/h + Relocation of multi related cpp/h Notes ======= @@ -31,7 +33,7 @@ Notes #include "plib/polver.h" #include "plib/realm.h" -#include "account.h" +#include "accounts/account.h" #include "charactr.h" #include "fnsearch.h" #include "gflag.h" @@ -53,7 +55,7 @@ Notes #include "uvars.h" #include "ufunc.h" #include "uworld.h" -#include "multi.h" +#include "multi/multi.h" ////HASH #include "objecthash.h" diff --git a/pol-core/pol/uniemod.cpp b/pol-core/pol/uniemod.cpp index ca1c19d88..352a1d6a9 100644 --- a/pol-core/pol/uniemod.cpp +++ b/pol-core/pol/uniemod.cpp @@ -2,6 +2,7 @@ History ======= 2006/10/07 Shinigami: GCC 3.4.x fix - added "template<>" to TmplExecutorModule +2009/09/03 MuadDib: Relocation of account related cpp/h Notes ======= @@ -25,7 +26,7 @@ Notes #include "bscript/execmodl.h" #include "bscript/impstr.h" -#include "account.h" +#include "accounts/account.h" #include "cgdata.h" #include "charactr.h" #include "client.h" diff --git a/pol-core/pol/uoemod.cpp b/pol-core/pol/uoemod.cpp index bfeca12f7..89eb0986e 100644 --- a/pol-core/pol/uoemod.cpp +++ b/pol-core/pol/uoemod.cpp @@ -42,6 +42,8 @@ History 2009/08/08 MuadDib: mf_SetRawSkill(), mf_GetRawSkill(), mf_ApplyRawDamage(), mf_GameStat(), mf_AwardRawPoints(), old replace_properties(), mf_GetSkill() cleaned out. 2009/08/25 Shinigami: STLport-5.2.1 fix: additional parentheses in mf_ListMultisInBox +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes ======= @@ -86,7 +88,7 @@ Notes #include "plib/realm.h" #include "action.h" -#include "boat.h" +#include "multi/boat.h" #include "cfgemod.h" #include "cfgrepos.h" #include "cgdata.h" @@ -100,7 +102,7 @@ Notes #include "listenpt.h" #include "los.h" #include "menu.h" -#include "multidef.h" +#include "multi/multidef.h" #include "npc.h" #include "objtype.h" #include "osemod.h" @@ -4374,7 +4376,7 @@ BObjectImp* UOExecutorModule::mf_SendEvent() return new BError( "Invalid parameter" ); } } -#include "house.h" +#include "multi/house.h" BObjectImp* UOExecutorModule::mf_DestroyMulti() { UMulti* multi; diff --git a/pol-core/pol/uoemod2.cpp b/pol-core/pol/uoemod2.cpp index 913b2508e..e2ae7f8dc 100644 --- a/pol-core/pol/uoemod2.cpp +++ b/pol-core/pol/uoemod2.cpp @@ -16,6 +16,8 @@ History 2007/04/28 Shinigami: polcore().internal information will be logged in excel-friendly format too (leak.log) 2009/07/23 MuadDib: updates for new Enum::Packet Out ID 2009/08/06 MuadDib: Removed PasswordOnlyHash support +2009/09/03 MuadDib: Relocation of account related cpp/h + Relocation of multi related cpp/h Notes ======= @@ -50,7 +52,7 @@ Notes #include "plib/realm.h" -#include "account.h" +#include "accounts/account.h" #ifdef MEMORYLEAK # include "cfgrepos.h" #endif @@ -60,7 +62,7 @@ Notes #include "core.h" #include "exscrobj.h" #include "fnsearch.h" -#include "house.h" +#include "multi/house.h" #include "iostats.h" #include "itemdesc.h" #include "npc.h" @@ -1518,9 +1520,9 @@ BObjectImp* MakeMapCacheImp( ) return arr; } -#include "account.h" -#include "accounts.h" -#include "acscrobj.h" +#include "accounts/account.h" +#include "accounts/accounts.h" +#include "accounts/acscrobj.h" BObjectImp* UOExecutorModule::mf_CreateAccount() { const String* acctname; diff --git a/pol-core/pol/uofile03.cpp b/pol-core/pol/uofile03.cpp index ae79e6405..5b2526ccb 100644 --- a/pol-core/pol/uofile03.cpp +++ b/pol-core/pol/uofile03.cpp @@ -1,6 +1,7 @@ /* History ======= +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes @@ -23,7 +24,7 @@ Notes #include "udatfile.h" #include "ustruct.h" #include "uvars.h" -#include "multi.h" +#include "multi/multi.h" #include "uofile.h" #include "uofilei.h" #include "uworld.h" diff --git a/pol-core/pol/uolisten.cpp b/pol-core/pol/uolisten.cpp index 5b00b10da..1363e3826 100644 --- a/pol-core/pol/uolisten.cpp +++ b/pol-core/pol/uolisten.cpp @@ -1,6 +1,7 @@ /* History ======= +2009/09/03 MuadDib: Relocation of boat related cpp/h Notes diff --git a/pol-core/pol/uoscrobj.cpp b/pol-core/pol/uoscrobj.cpp index 5a0e9c4d3..3513e01ff 100644 --- a/pol-core/pol/uoscrobj.cpp +++ b/pol-core/pol/uoscrobj.cpp @@ -19,6 +19,8 @@ History 2009/07/20 MuadDib: ReAdded on_facing_change() to MBR_FACING: for items. 2009/08/06 MuadDib: Added gotten_by code for items. 2009/08/31 MuadDib: Changed layer check on graphic change, excluding mount layer entirely. +2009/09/03 MuadDib: Relocation of account related cpp/h + Relocation of multi related cpp/h Notes ======= @@ -47,12 +49,12 @@ Notes #include "plib/realm.h" -#include "account.h" -#include "acscrobj.h" +#include "accounts/account.h" +#include "accounts/acscrobj.h" #include "armor.h" #include "armrtmpl.h" #include "attribute.h" -#include "boatcomp.h" +#include "multi/boatcomp.h" #include "charactr.h" #include "client.h" #include "cmdlevel.h" @@ -60,7 +62,7 @@ Notes #include "exscrobj.h" #include "fnsearch.h" #include "guilds.h" -#include "house.h" +#include "multi/house.h" #include "item.h" #include "umap.h" #include "npc.h" diff --git a/pol-core/pol/uoscrobj.h b/pol-core/pol/uoscrobj.h index 379b348e8..0dcf812bb 100644 --- a/pol-core/pol/uoscrobj.h +++ b/pol-core/pol/uoscrobj.h @@ -1,8 +1,9 @@ /* History ======= - 2009/08/25 Shinigami: STLport-5.2.1 fix: removed +2009/09/03 MuadDib: Changes for account related source file relocation + Changes for multi related source file relocation Notes ======= @@ -19,7 +20,7 @@ Notes #include "charactr.h" #include "item.h" -#include "boat.h" +#include "multi/boat.h" #include "uobjcnt.h" extern BApplicObjType eitemrefobjimp_type; diff --git a/pol-core/pol/useskill.cpp b/pol-core/pol/useskill.cpp index 2be93f636..b655b7ec0 100644 --- a/pol-core/pol/useskill.cpp +++ b/pol-core/pol/useskill.cpp @@ -1,6 +1,7 @@ /* History ======= +2009/09/03 MuadDib: Relocation of account related cpp/h Notes @@ -14,7 +15,7 @@ Notes #include "bscript/eprog.h" #include "attribute.h" -#include "account.h" +#include "accounts/account.h" #include "charactr.h" #include "client.h" #include "extcmd.h" diff --git a/pol-core/pol/uvars.cpp b/pol-core/pol/uvars.cpp index 0cee9068d..8331e7ed7 100644 --- a/pol-core/pol/uvars.cpp +++ b/pol-core/pol/uvars.cpp @@ -7,6 +7,8 @@ History vitals too. Multidefs too. Oh well... Moved objecthash.ClearCharacterAccountReferences() out of the realms' loop Added clean_multidefs() +2009/09/03 MuadDib: Relocation of account related cpp/h + Changes for multi related source file relocation Notes ======= @@ -24,9 +26,9 @@ Notes #include "clib/fileutil.h" #include "clib/stlutil.h" -#include "account.h" +#include "accounts/account.h" #include "attribute.h" -#include "boat.h" +#include "multi/boat.h" #include "charactr.h" #include "client.h" #include "cmdlevel.h" @@ -35,7 +37,7 @@ Notes #include "item.h" #include "miscrgn.h" #include "musicrgn.h" -#include "multi.h" +#include "multi/multi.h" #include "objecthash.h" #include "packethooks.h" #include "polcfg.h" @@ -51,7 +53,7 @@ Notes #include "watch.h" #include "vital.h" -#include "multidef.h" +#include "multi/multidef.h" Accounts accounts; diff --git a/pol-core/pol/uworld.cpp b/pol-core/pol/uworld.cpp index e23d51292..2dd40075d 100644 --- a/pol-core/pol/uworld.cpp +++ b/pol-core/pol/uworld.cpp @@ -3,6 +3,7 @@ History ======= 2005/01/23 Shinigami: check_item_integrity & check_character_integrity - fix for multi realm support (had used WGRID_X & WGRID_Y) ClrCharacterWorldPosition - Tokuno MapDimension doesn't fit blocks of 64x64 (WGRID_SIZE) +2009/09/03 MuadDib: Relocation of multi related cpp/h Notes ======= @@ -19,7 +20,7 @@ Notes #include "plib/realm.h" #include "charactr.h" #include "item.h" -#include "multi.h" +#include "multi/multi.h" #include "realms.h" #include "uvars.h" #include "uworld.h" diff --git a/pol-core/uotool/uotool-2008.vcproj b/pol-core/uotool/uotool-2008.vcproj index c5fdf344f..cbcf83a12 100644 --- a/pol-core/uotool/uotool-2008.vcproj +++ b/pol-core/uotool/uotool-2008.vcproj @@ -208,7 +208,7 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > #include -#include "bscript/config.h" +#include "../bscript/config.h" -#include "clib/cfgelem.h" -#include "clib/cfgfile.h" -#include "clib/fdump.h" -#include "clib/strutil.h" -#include "clib/dirlist.h" +#include "../clib/cfgelem.h" +#include "../clib/cfgfile.h" +#include "../clib/fdump.h" +#include "../clib/strutil.h" +#include "../clib/dirlist.h" -#include "pol/crypwrap.h" -#include "pol/ustruct.h" -#include "pol/polfile.h" -#include "pol/uofile.h" -#include "pol/uofilei.h" -#include "pol/udatfile.h" -#include "pol/polcfg.h" -#include "pol/multidef.h" +#include "../pol/crypwrap.h" +#include "../pol/ustruct.h" +#include "../pol/polfile.h" +#include "../pol/uofile.h" +#include "../pol/uofilei.h" +#include "../pol/udatfile.h" +#include "../pol/polcfg.h" +#include "../pol/multi/multidef.h" unsigned long mapcache_misses; unsigned long mapcache_hits;