From: <mg...@us...> - 2007-10-15 16:06:05
|
Revision: 2 http://planeshift.svn.sourceforge.net/planeshift/?rev=2&view=rev Author: mgist Date: 2007-10-15 09:06:06 -0700 (Mon, 15 Oct 2007) Log Message: ----------- - Added part of cvs repo to personal branch. Added Paths: ----------- personal/Xordan/Jamfile.in personal/Xordan/Jamrules personal/Xordan/autogen.sh personal/Xordan/configure.ac personal/Xordan/data/ personal/Xordan/data/eedit/ personal/Xordan/data/eedit/camera.xml personal/Xordan/data/eedit/editeffect.xml personal/Xordan/data/eedit/eedit.xml personal/Xordan/data/eedit/error.xml personal/Xordan/data/eedit/filenavigation.xml personal/Xordan/data/eedit/fps.xml personal/Xordan/data/eedit/imagelist.xml personal/Xordan/data/eedit/inputbox/ personal/Xordan/data/eedit/inputbox/editanchor.xml personal/Xordan/data/eedit/inputbox/editanchorkeyframe.xml personal/Xordan/data/eedit/inputbox/float.xml personal/Xordan/data/eedit/inputbox/list.xml personal/Xordan/data/eedit/inputbox/newanchor.xml personal/Xordan/data/eedit/inputbox/newanchorkeyframe.xml personal/Xordan/data/eedit/inputbox/string.xml personal/Xordan/data/eedit/inputbox/vec3.xml personal/Xordan/data/eedit/inputbox/yesno.xml personal/Xordan/data/eedit/keys.xml personal/Xordan/data/eedit/keys_def.xml personal/Xordan/data/eedit/loadeffect.xml personal/Xordan/data/eedit/loadmap.xml personal/Xordan/data/eedit/position.xml personal/Xordan/data/eedit/render.xml personal/Xordan/data/eedit/shortcuts.xml personal/Xordan/data/eedit/target.xml personal/Xordan/data/effects/ personal/Xordan/data/effects/examples/ personal/Xordan/data/effects/examples/obj_quad.eff personal/Xordan/data/effects/examples/obj_spire.eff personal/Xordan/data/effects/examples/obj_star.eff personal/Xordan/data/effects/misc/ personal/Xordan/data/effects/misc/admin_location.eff personal/Xordan/data/effects/misc/admin_path_point.eff personal/Xordan/data/effects/misc/admin_waypoint.eff personal/Xordan/data/effects/misc/chatbubble.eff personal/Xordan/data/effects/misc/chatbubble_longphrase.eff personal/Xordan/data/effects/misc/chatbubble_metal.eff personal/Xordan/data/effects/misc/chatbubble_normal.eff personal/Xordan/data/effects/misc/chatbubble_shortphrase.eff personal/Xordan/data/effects/misc/entitylabel.eff personal/Xordan/data/effects/misc/marker.eff personal/Xordan/data/effects/misc/shadow.eff personal/Xordan/data/effects/misc/target.eff personal/Xordan/data/emotes.xml personal/Xordan/data/gui/ personal/Xordan/data/gui/actionlocation.xml personal/Xordan/data/gui/activemagicwindow.xml personal/Xordan/data/gui/bankwindow.xml personal/Xordan/data/gui/birth.xml personal/Xordan/data/gui/bookwriting.xml personal/Xordan/data/gui/borderlist.xml personal/Xordan/data/gui/buddy.xml personal/Xordan/data/gui/charcreate.xml personal/Xordan/data/gui/chardescwindow.xml personal/Xordan/data/gui/charpick.xml personal/Xordan/data/gui/chat.xml personal/Xordan/data/gui/chatmenu.xml personal/Xordan/data/gui/childhood.xml personal/Xordan/data/gui/configcamera.xml personal/Xordan/data/gui/configchat.xml personal/Xordan/data/gui/configchatfilter.xml personal/Xordan/data/gui/configchattabs.xml personal/Xordan/data/gui/configdetails.xml personal/Xordan/data/gui/configentityinter.xml personal/Xordan/data/gui/configentitylabels.xml personal/Xordan/data/gui/configkeys.xml personal/Xordan/data/gui/configmouse.xml personal/Xordan/data/gui/configpvp.xml personal/Xordan/data/gui/configsound.xml personal/Xordan/data/gui/configwindow.xml personal/Xordan/data/gui/containerdesc.xml personal/Xordan/data/gui/control.xml personal/Xordan/data/gui/control_styles.xml personal/Xordan/data/gui/craft.xml personal/Xordan/data/gui/credits_config.xml personal/Xordan/data/gui/creditswindow.xml personal/Xordan/data/gui/customwidgetslist.xml personal/Xordan/data/gui/detailwindow.xml personal/Xordan/data/gui/eedit.xml personal/Xordan/data/gui/exchange.xml personal/Xordan/data/gui/filenavigation.xml personal/Xordan/data/gui/fingering.xml personal/Xordan/data/gui/gameboard.xml personal/Xordan/data/gui/glyph.xml personal/Xordan/data/gui/gmaddeditaction.xml personal/Xordan/data/gui/gmguiwindow.xml personal/Xordan/data/gui/gmspawn.xml personal/Xordan/data/gui/group.xml personal/Xordan/data/gui/guildwindow.xml personal/Xordan/data/gui/helpwindow.xml personal/Xordan/data/gui/ignorewindow.xml personal/Xordan/data/gui/illumination.xml personal/Xordan/data/gui/infowindow.xml personal/Xordan/data/gui/interact.xml personal/Xordan/data/gui/inventory.xml personal/Xordan/data/gui/itemdesc.xml personal/Xordan/data/gui/lifeevents.xml personal/Xordan/data/gui/loadwindow.xml personal/Xordan/data/gui/loginwindow.xml personal/Xordan/data/gui/loot.xml personal/Xordan/data/gui/merchant.xml personal/Xordan/data/gui/money.xml personal/Xordan/data/gui/newoptions.xml personal/Xordan/data/gui/ok.xml personal/Xordan/data/gui/parents.xml personal/Xordan/data/gui/paths.xml personal/Xordan/data/gui/paws_generic.xml personal/Xordan/data/gui/petition.xml personal/Xordan/data/gui/petitiongm.xml personal/Xordan/data/gui/petstatwindow.xml personal/Xordan/data/gui/questnotebook.xml personal/Xordan/data/gui/questrewardwindow.xml personal/Xordan/data/gui/quitinfo.xml personal/Xordan/data/gui/readbook.xml personal/Xordan/data/gui/shortcutwindow.xml personal/Xordan/data/gui/skillwindow.xml personal/Xordan/data/gui/smallinventory.xml personal/Xordan/data/gui/spell_effect.xml personal/Xordan/data/gui/spellcancelwindow.xml personal/Xordan/data/gui/spellwindow.xml personal/Xordan/data/gui/splash.xml personal/Xordan/data/gui/styles.xml personal/Xordan/data/gui/summary.xml personal/Xordan/data/gui/tutorial.xml personal/Xordan/data/gui/widgetconfigwindow.xml personal/Xordan/data/gui/yesno.xml personal/Xordan/data/gui/zodiacs.xml personal/Xordan/data/guikeys.xml personal/Xordan/data/help.xml personal/Xordan/data/npcbehave.xml personal/Xordan/data/npcdefs.xml personal/Xordan/data/options/ personal/Xordan/data/options/camera_def.xml personal/Xordan/data/options/chat_def.xml personal/Xordan/data/options/chatbubbles.xml personal/Xordan/data/options/controls_def.xml personal/Xordan/data/options/entityinter_def.xml personal/Xordan/data/options/entitylabels_def.xml personal/Xordan/data/options/mouse_def.xml personal/Xordan/data/options/pvp_def.xml personal/Xordan/data/options/shortcutcommands_def.xml personal/Xordan/data/options/sound_def.xml personal/Xordan/data/phonics.xml personal/Xordan/data/prefs.xml personal/Xordan/data/pvp_regions.xml personal/Xordan/data/races/ personal/Xordan/data/races/descriptions.xml personal/Xordan/data/races/quickpaths.xml personal/Xordan/data/servers.xml personal/Xordan/data/ttf/ personal/Xordan/data/ttf/LiberationMono-Regular.ttf personal/Xordan/data/ttf/LiberationSans-Regular.ttf personal/Xordan/data/ttf/becker-m.ttf personal/Xordan/data/ttf/cupandtalon.ttf personal/Xordan/data/ttf/scurlock.ttf personal/Xordan/data/zoneinfo.xml personal/Xordan/docs/ personal/Xordan/docs/compiling.html personal/Xordan/docs/credit.txt personal/Xordan/docs/credits_AtomicBlue.txt personal/Xordan/docs/credits_CrystalBlue.txt personal/Xordan/docs/credits_MolecularBlue.txt personal/Xordan/docs/history.txt personal/Xordan/docs/history2003.txt personal/Xordan/docs/history2004.txt personal/Xordan/docs/history2005.txt personal/Xordan/docs/history2006.txt personal/Xordan/eedit.cfg personal/Xordan/include/ personal/Xordan/include/msvc/ personal/Xordan/include/msvc/psconfig.h personal/Xordan/include/msvc/psstdint.h personal/Xordan/lang/ personal/Xordan/lang/cesky/ personal/Xordan/lang/cesky/data/ personal/Xordan/lang/cesky/data/help.xml personal/Xordan/lang/cesky/stringtable.xml personal/Xordan/lang/deutsch/ personal/Xordan/lang/deutsch/data/ personal/Xordan/lang/deutsch/data/help.xml personal/Xordan/lang/deutsch/stringtable.xml personal/Xordan/mk/ personal/Xordan/mk/autoconf/ personal/Xordan/mk/autoconf/ac_check_typedef.m4 personal/Xordan/mk/autoconf/ac_compile_check_sizeof.m4 personal/Xordan/mk/autoconf/ac_need_stdint_h.m4 personal/Xordan/mk/autoconf/cel.m4 personal/Xordan/mk/autoconf/checkbinutils.m4 personal/Xordan/mk/autoconf/checkbuild.m4 personal/Xordan/mk/autoconf/checkcommon.m4 personal/Xordan/mk/autoconf/checkcppunit.m4 personal/Xordan/mk/autoconf/checkcswin32libs.m4 personal/Xordan/mk/autoconf/checklib.m4 personal/Xordan/mk/autoconf/checklibtool.m4 personal/Xordan/mk/autoconf/checkopengl.m4 personal/Xordan/mk/autoconf/checkpic.m4 personal/Xordan/mk/autoconf/checkprog.m4 personal/Xordan/mk/autoconf/checkpthread.m4 personal/Xordan/mk/autoconf/checkpython.m4 personal/Xordan/mk/autoconf/checktt2.m4 personal/Xordan/mk/autoconf/compiler.m4 personal/Xordan/mk/autoconf/config.guess personal/Xordan/mk/autoconf/config.sub personal/Xordan/mk/autoconf/crystal.m4 personal/Xordan/mk/autoconf/cs_check_host.m4 personal/Xordan/mk/autoconf/csbuild.m4 personal/Xordan/mk/autoconf/diagnose.m4 personal/Xordan/mk/autoconf/embed.m4 personal/Xordan/mk/autoconf/emit.m4 personal/Xordan/mk/autoconf/headercache.m4 personal/Xordan/mk/autoconf/install-sh personal/Xordan/mk/autoconf/installdirs.m4 personal/Xordan/mk/autoconf/jam.m4 personal/Xordan/mk/autoconf/jamcache.m4 personal/Xordan/mk/autoconf/libcurl.m4 personal/Xordan/mk/autoconf/makecache.m4 personal/Xordan/mk/autoconf/mkdir.m4 personal/Xordan/mk/autoconf/packageinfo.m4 personal/Xordan/mk/autoconf/path.m4 personal/Xordan/mk/autoconf/pkg.m4 personal/Xordan/mk/autoconf/progver.m4 personal/Xordan/mk/autoconf/qualify.m4 personal/Xordan/mk/autoconf/split.m4 personal/Xordan/mk/autoconf/textcache.m4 personal/Xordan/mk/autoconf/trim.m4 personal/Xordan/mk/autoconf/type_socklen_t.m4 personal/Xordan/mk/autoconf/warnings.m4 personal/Xordan/mk/jam/ personal/Xordan/mk/jam/application.jam personal/Xordan/mk/jam/assembler.jam personal/Xordan/mk/jam/bisonflex.jam personal/Xordan/mk/jam/build.jam personal/Xordan/mk/jam/cel_staticplugins_msvc.jam personal/Xordan/mk/jam/clean.jam personal/Xordan/mk/jam/compiler.jam personal/Xordan/mk/jam/crystalspace_staticplugins_msvc.jam personal/Xordan/mk/jam/docs.jam personal/Xordan/mk/jam/dump.jam personal/Xordan/mk/jam/flags.jam personal/Xordan/mk/jam/groups.jam personal/Xordan/mk/jam/help.jam personal/Xordan/mk/jam/helper.jam personal/Xordan/mk/jam/icons.jam personal/Xordan/mk/jam/install.jam personal/Xordan/mk/jam/jamcompatibility.jam personal/Xordan/mk/jam/library.jam personal/Xordan/mk/jam/macosx.jam personal/Xordan/mk/jam/msvcgen.jam personal/Xordan/mk/jam/objectivec.jam personal/Xordan/mk/jam/objects.jam personal/Xordan/mk/jam/options.jam personal/Xordan/mk/jam/plugin.jam personal/Xordan/mk/jam/property.jam personal/Xordan/mk/jam/pymarshall.jam personal/Xordan/mk/jam/pythmod.jam personal/Xordan/mk/jam/resource.jam personal/Xordan/mk/jam/static.jam personal/Xordan/mk/jam/strip.jam personal/Xordan/mk/jam/subdir.jam personal/Xordan/mk/jam/swig.jam personal/Xordan/mk/jam/unittest.jam personal/Xordan/mk/jam/unix.jam personal/Xordan/mk/jam/variant.jam personal/Xordan/mk/jam/win32.jam personal/Xordan/mk/msvc/ personal/Xordan/mk/msvc7/ personal/Xordan/mk/msvc71/ personal/Xordan/mk/msvc8/ personal/Xordan/mk/msvcgen/ personal/Xordan/mk/msvcgen/control.tlib personal/Xordan/mk/msvcgen/custom.cslib personal/Xordan/mk/msvcgen/custom2.cslib personal/Xordan/mk/msvcgen/custom3.cslib personal/Xordan/mk/msvcgen/macros.tlib personal/Xordan/mk/msvcgen/project6.tlib personal/Xordan/mk/msvcgen/project7.tlib personal/Xordan/mk/msvcgen/projectx6.tlib personal/Xordan/mk/msvcgen/projectx7.tlib personal/Xordan/mk/msvcgen/workspace6.tlib personal/Xordan/mk/msvcgen/workspace7.tlib personal/Xordan/mk/msvcgen/workspaces.jam personal/Xordan/npcclient.cfg personal/Xordan/planeshift.cfg personal/Xordan/psclient.cfg personal/Xordan/psserver.cfg personal/Xordan/src/ personal/Xordan/src/Jamfile personal/Xordan/src/client/ personal/Xordan/src/client/Jamfile personal/Xordan/src/client/actionhandler.cpp personal/Xordan/src/client/actionhandler.h personal/Xordan/src/client/authentclient.cpp personal/Xordan/src/client/authentclient.h personal/Xordan/src/client/charapp.cpp personal/Xordan/src/client/charapp.h personal/Xordan/src/client/chatbubbles.cpp personal/Xordan/src/client/chatbubbles.h personal/Xordan/src/client/clientcachemanager.cpp personal/Xordan/src/client/clientcachemanager.h personal/Xordan/src/client/clientvitals.cpp personal/Xordan/src/client/clientvitals.h personal/Xordan/src/client/cmdadmin.cpp personal/Xordan/src/client/cmdadmin.h personal/Xordan/src/client/cmdgroups.cpp personal/Xordan/src/client/cmdgroups.h personal/Xordan/src/client/cmdguilds.cpp personal/Xordan/src/client/cmdguilds.h personal/Xordan/src/client/cmdusers.cpp personal/Xordan/src/client/cmdusers.h personal/Xordan/src/client/cmdutil.cpp personal/Xordan/src/client/cmdutil.h personal/Xordan/src/client/entitylabels.cpp personal/Xordan/src/client/entitylabels.h personal/Xordan/src/client/globals.h personal/Xordan/src/client/gui/ personal/Xordan/src/client/gui/Jamfile personal/Xordan/src/client/gui/chatwindow.cpp personal/Xordan/src/client/gui/chatwindow.h personal/Xordan/src/client/gui/inventorywindow.cpp personal/Xordan/src/client/gui/inventorywindow.h personal/Xordan/src/client/gui/pawsactionlocationwindow.cpp personal/Xordan/src/client/gui/pawsactionlocationwindow.h personal/Xordan/src/client/gui/pawsactivemagicwindow.cpp personal/Xordan/src/client/gui/pawsactivemagicwindow.h personal/Xordan/src/client/gui/pawsbankwindow.cpp personal/Xordan/src/client/gui/pawsbankwindow.h personal/Xordan/src/client/gui/pawsbookreadingwindow.cpp personal/Xordan/src/client/gui/pawsbookreadingwindow.h personal/Xordan/src/client/gui/pawsbuddy.cpp personal/Xordan/src/client/gui/pawsbuddy.h personal/Xordan/src/client/gui/pawscharbirth.cpp personal/Xordan/src/client/gui/pawscharbirth.h personal/Xordan/src/client/gui/pawscharcreatemain.cpp personal/Xordan/src/client/gui/pawscharcreatemain.h personal/Xordan/src/client/gui/pawschardescription.cpp personal/Xordan/src/client/gui/pawschardescription.h personal/Xordan/src/client/gui/pawscharparents.cpp personal/Xordan/src/client/gui/pawscharparents.h personal/Xordan/src/client/gui/pawscharpick.cpp personal/Xordan/src/client/gui/pawscharpick.h personal/Xordan/src/client/gui/pawschild.cpp personal/Xordan/src/client/gui/pawschild.h personal/Xordan/src/client/gui/pawsconfigcamera.cpp personal/Xordan/src/client/gui/pawsconfigcamera.h personal/Xordan/src/client/gui/pawsconfigchat.cpp personal/Xordan/src/client/gui/pawsconfigchat.h personal/Xordan/src/client/gui/pawsconfigchatfilter.cpp personal/Xordan/src/client/gui/pawsconfigchatfilter.h personal/Xordan/src/client/gui/pawsconfigchattabs.cpp personal/Xordan/src/client/gui/pawsconfigchattabs.h personal/Xordan/src/client/gui/pawsconfigdetails.cpp personal/Xordan/src/client/gui/pawsconfigdetails.h personal/Xordan/src/client/gui/pawsconfigentityinter.cpp personal/Xordan/src/client/gui/pawsconfigentityinter.h personal/Xordan/src/client/gui/pawsconfigentitylabels.cpp personal/Xordan/src/client/gui/pawsconfigentitylabels.h personal/Xordan/src/client/gui/pawsconfigkeys.cpp personal/Xordan/src/client/gui/pawsconfigkeys.h personal/Xordan/src/client/gui/pawsconfigmouse.cpp personal/Xordan/src/client/gui/pawsconfigmouse.h personal/Xordan/src/client/gui/pawsconfigpvp.cpp personal/Xordan/src/client/gui/pawsconfigpvp.h personal/Xordan/src/client/gui/pawsconfigsound.cpp personal/Xordan/src/client/gui/pawsconfigsound.h personal/Xordan/src/client/gui/pawsconfigwindow.cpp personal/Xordan/src/client/gui/pawsconfigwindow.h personal/Xordan/src/client/gui/pawscontainerdescwindow.cpp personal/Xordan/src/client/gui/pawscontainerdescwindow.h personal/Xordan/src/client/gui/pawscontrolwindow.cpp personal/Xordan/src/client/gui/pawscontrolwindow.h personal/Xordan/src/client/gui/pawscraft.cpp personal/Xordan/src/client/gui/pawscraft.h personal/Xordan/src/client/gui/pawscreditswindow.cpp personal/Xordan/src/client/gui/pawscreditswindow.h personal/Xordan/src/client/gui/pawsdetailwindow.cpp personal/Xordan/src/client/gui/pawsdetailwindow.h personal/Xordan/src/client/gui/pawsexchangewindow.cpp personal/Xordan/src/client/gui/pawsexchangewindow.h personal/Xordan/src/client/gui/pawsgameboard.cpp personal/Xordan/src/client/gui/pawsgameboard.h personal/Xordan/src/client/gui/pawsglyphwindow.cpp personal/Xordan/src/client/gui/pawsglyphwindow.h personal/Xordan/src/client/gui/pawsgmaction.cpp personal/Xordan/src/client/gui/pawsgmaction.h personal/Xordan/src/client/gui/pawsgmgui.cpp personal/Xordan/src/client/gui/pawsgmgui.h personal/Xordan/src/client/gui/pawsgmspawn.cpp personal/Xordan/src/client/gui/pawsgmspawn.h personal/Xordan/src/client/gui/pawsgroupwindow.cpp personal/Xordan/src/client/gui/pawsgroupwindow.h personal/Xordan/src/client/gui/pawsguildwindow.cpp personal/Xordan/src/client/gui/pawsguildwindow.h personal/Xordan/src/client/gui/pawshelp.cpp personal/Xordan/src/client/gui/pawshelp.h personal/Xordan/src/client/gui/pawsignore.cpp personal/Xordan/src/client/gui/pawsignore.h personal/Xordan/src/client/gui/pawsilluminationwindow.cpp personal/Xordan/src/client/gui/pawsilluminationwindow.h personal/Xordan/src/client/gui/pawsinfowindow.cpp personal/Xordan/src/client/gui/pawsinfowindow.h personal/Xordan/src/client/gui/pawsinteractwindow.cpp personal/Xordan/src/client/gui/pawsinteractwindow.h personal/Xordan/src/client/gui/pawsinventorydollview.cpp personal/Xordan/src/client/gui/pawsinventorydollview.h personal/Xordan/src/client/gui/pawsitemdescriptionwindow.cpp personal/Xordan/src/client/gui/pawsitemdescriptionwindow.h personal/Xordan/src/client/gui/pawslife.cpp personal/Xordan/src/client/gui/pawslife.h personal/Xordan/src/client/gui/pawsloading.cpp personal/Xordan/src/client/gui/pawsloading.h personal/Xordan/src/client/gui/pawsloginwindow.cpp personal/Xordan/src/client/gui/pawsloginwindow.h personal/Xordan/src/client/gui/pawslootwindow.cpp personal/Xordan/src/client/gui/pawslootwindow.h personal/Xordan/src/client/gui/pawsmerchantwindow.cpp personal/Xordan/src/client/gui/pawsmerchantwindow.h personal/Xordan/src/client/gui/pawsmoney.cpp personal/Xordan/src/client/gui/pawsmoney.h personal/Xordan/src/client/gui/pawspath.cpp personal/Xordan/src/client/gui/pawspath.h personal/Xordan/src/client/gui/pawspetitiongmwindow.cpp personal/Xordan/src/client/gui/pawspetitiongmwindow.h personal/Xordan/src/client/gui/pawspetitionwindow.cpp personal/Xordan/src/client/gui/pawspetitionwindow.h personal/Xordan/src/client/gui/pawspetstatwindow.cpp personal/Xordan/src/client/gui/pawspetstatwindow.h personal/Xordan/src/client/gui/pawsquestrewardwindow.cpp personal/Xordan/src/client/gui/pawsquestrewardwindow.h personal/Xordan/src/client/gui/pawsquestwindow.cpp personal/Xordan/src/client/gui/pawsquestwindow.h personal/Xordan/src/client/gui/pawsquitinfobox.cpp personal/Xordan/src/client/gui/pawsquitinfobox.h personal/Xordan/src/client/gui/pawsskillwindow.cpp personal/Xordan/src/client/gui/pawsskillwindow.h personal/Xordan/src/client/gui/pawsslot.cpp personal/Xordan/src/client/gui/pawsslot.h personal/Xordan/src/client/gui/pawssmallinventory.cpp personal/Xordan/src/client/gui/pawssmallinventory.h personal/Xordan/src/client/gui/pawsspellbookwindow.cpp personal/Xordan/src/client/gui/pawsspellbookwindow.h personal/Xordan/src/client/gui/pawsspellcancelwindow.cpp personal/Xordan/src/client/gui/pawsspellcancelwindow.h personal/Xordan/src/client/gui/pawssplashwindow.cpp personal/Xordan/src/client/gui/pawssplashwindow.h personal/Xordan/src/client/gui/pawssummary.cpp personal/Xordan/src/client/gui/pawssummary.h personal/Xordan/src/client/gui/pawstutorialwindow.cpp personal/Xordan/src/client/gui/pawstutorialwindow.h personal/Xordan/src/client/gui/pawswritingwindow.cpp personal/Xordan/src/client/gui/pawswritingwindow.h personal/Xordan/src/client/gui/psmainwidget.cpp personal/Xordan/src/client/gui/psmainwidget.h personal/Xordan/src/client/gui/shortcutwindow.cpp personal/Xordan/src/client/gui/shortcutwindow.h personal/Xordan/src/client/guihandler.cpp personal/Xordan/src/client/guihandler.h personal/Xordan/src/client/iclient/ personal/Xordan/src/client/iclient/isoundmngr.h personal/Xordan/src/client/iclient/netmanager.h personal/Xordan/src/client/modehandler.cpp personal/Xordan/src/client/modehandler.h personal/Xordan/src/client/pscal3dcallback.cpp personal/Xordan/src/client/pscal3dcallback.h personal/Xordan/src/client/pscamera.cpp personal/Xordan/src/client/pscamera.h personal/Xordan/src/client/pscelclient.cpp personal/Xordan/src/client/pscelclient.h personal/Xordan/src/client/pscharcontrol.cpp personal/Xordan/src/client/pscharcontrol.h personal/Xordan/src/client/psclientchar.cpp personal/Xordan/src/client/psclientchar.h personal/Xordan/src/client/psclientdr.cpp personal/Xordan/src/client/psclientdr.h personal/Xordan/src/client/psengine.cpp personal/Xordan/src/client/psengine.h personal/Xordan/src/client/psinventorycache.cpp personal/Xordan/src/client/psinventorycache.h personal/Xordan/src/client/psmovement.cpp personal/Xordan/src/client/psmovement.h personal/Xordan/src/client/psnetmanager.cpp personal/Xordan/src/client/psnetmanager.h personal/Xordan/src/client/psoptions.cpp personal/Xordan/src/client/psoptions.h personal/Xordan/src/client/psslotmgr.cpp personal/Xordan/src/client/psslotmgr.h personal/Xordan/src/client/questionclient.cpp personal/Xordan/src/client/questionclient.h personal/Xordan/src/client/shadowmanager.cpp personal/Xordan/src/client/shadowmanager.h personal/Xordan/src/client/sound/ personal/Xordan/src/client/sound/Jamfile personal/Xordan/src/client/sound/pssoundmngr.cpp personal/Xordan/src/client/sound/pssoundmngr.h personal/Xordan/src/client/weather.cpp personal/Xordan/src/client/weather.h personal/Xordan/src/client/win32/ personal/Xordan/src/client/win32/mdump.cpp personal/Xordan/src/client/win32/mdump.h personal/Xordan/src/client/zonehandler.cpp personal/Xordan/src/client/zonehandler.h personal/Xordan/src/common/ personal/Xordan/src/common/Jamfile personal/Xordan/src/common/effects/ personal/Xordan/src/common/effects/Jamfile personal/Xordan/src/common/effects/pseffect.cpp personal/Xordan/src/common/effects/pseffect.h personal/Xordan/src/common/effects/pseffect2drenderer.cpp personal/Xordan/src/common/effects/pseffect2drenderer.h personal/Xordan/src/common/effects/pseffectanchor.cpp personal/Xordan/src/common/effects/pseffectanchor.h personal/Xordan/src/common/effects/pseffectanchorbasic.cpp personal/Xordan/src/common/effects/pseffectanchorbasic.h personal/Xordan/src/common/effects/pseffectanchorsocket.cpp personal/Xordan/src/common/effects/pseffectanchorsocket.h personal/Xordan/src/common/effects/pseffectanchorspline.cpp personal/Xordan/src/common/effects/pseffectanchorspline.h personal/Xordan/src/common/effects/pseffectmanager.cpp personal/Xordan/src/common/effects/pseffectmanager.h personal/Xordan/src/common/effects/pseffectobj.cpp personal/Xordan/src/common/effects/pseffectobj.h personal/Xordan/src/common/effects/pseffectobjdecal.cpp personal/Xordan/src/common/effects/pseffectobjdecal.h personal/Xordan/src/common/effects/pseffectobjmesh.cpp personal/Xordan/src/common/effects/pseffectobjmesh.h personal/Xordan/src/common/effects/pseffectobjparticles.cpp personal/Xordan/src/common/effects/pseffectobjparticles.h personal/Xordan/src/common/effects/pseffectobjquad.cpp personal/Xordan/src/common/effects/pseffectobjquad.h personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp personal/Xordan/src/common/effects/pseffectobjsimpmesh.h personal/Xordan/src/common/effects/pseffectobjsound.cpp personal/Xordan/src/common/effects/pseffectobjsound.h personal/Xordan/src/common/effects/pseffectobjspire.cpp personal/Xordan/src/common/effects/pseffectobjspire.h personal/Xordan/src/common/effects/pseffectobjstar.cpp personal/Xordan/src/common/effects/pseffectobjstar.h personal/Xordan/src/common/effects/pseffectobjtext.cpp personal/Xordan/src/common/effects/pseffectobjtext.h personal/Xordan/src/common/effects/pseffectobjtext2d.cpp personal/Xordan/src/common/effects/pseffectobjtext2d.h personal/Xordan/src/common/effects/pseffectobjtextable.h personal/Xordan/src/common/effects/pseffectobjtrail.cpp personal/Xordan/src/common/effects/pseffectobjtrail.h personal/Xordan/src/common/engine/ personal/Xordan/src/common/engine/Jamfile personal/Xordan/src/common/engine/celbase.cpp personal/Xordan/src/common/engine/celbase.h personal/Xordan/src/common/engine/materialmanager.cpp personal/Xordan/src/common/engine/materialmanager.h personal/Xordan/src/common/engine/netpersist.cpp personal/Xordan/src/common/engine/netpersist.h personal/Xordan/src/common/engine/psworld.cpp personal/Xordan/src/common/engine/psworld.h personal/Xordan/src/common/net/ personal/Xordan/src/common/net/Jamfile personal/Xordan/src/common/net/adminmessage.cpp personal/Xordan/src/common/net/adminmessage.h personal/Xordan/src/common/net/charmessages.cpp personal/Xordan/src/common/net/charmessages.h personal/Xordan/src/common/net/clientmsghandler.cpp personal/Xordan/src/common/net/clientmsghandler.h personal/Xordan/src/common/net/cmdbase.cpp personal/Xordan/src/common/net/cmdbase.h personal/Xordan/src/common/net/cmdhandler.cpp personal/Xordan/src/common/net/cmdhandler.h personal/Xordan/src/common/net/connection.cpp personal/Xordan/src/common/net/connection.h personal/Xordan/src/common/net/message.h personal/Xordan/src/common/net/messages.cpp personal/Xordan/src/common/net/messages.h personal/Xordan/src/common/net/msghandler.cpp personal/Xordan/src/common/net/msghandler.h personal/Xordan/src/common/net/netbase.cpp personal/Xordan/src/common/net/netbase.h personal/Xordan/src/common/net/netinfos.cpp personal/Xordan/src/common/net/netinfos.h personal/Xordan/src/common/net/netpacket.cpp personal/Xordan/src/common/net/netpacket.h personal/Xordan/src/common/net/netprofile.cpp personal/Xordan/src/common/net/netprofile.h personal/Xordan/src/common/net/npcmessages.cpp personal/Xordan/src/common/net/npcmessages.h personal/Xordan/src/common/net/packing.h personal/Xordan/src/common/net/pstypes.h personal/Xordan/src/common/net/serverpinger.cpp personal/Xordan/src/common/net/serverpinger.h personal/Xordan/src/common/net/sockuni.h personal/Xordan/src/common/net/sockwin.h personal/Xordan/src/common/net/subscriber.h personal/Xordan/src/common/paws/ personal/Xordan/src/common/paws/Jamfile personal/Xordan/src/common/paws/pawsborder.cpp personal/Xordan/src/common/paws/pawsborder.h personal/Xordan/src/common/paws/pawsbutton.cpp personal/Xordan/src/common/paws/pawsbutton.h personal/Xordan/src/common/paws/pawscheckbox.cpp personal/Xordan/src/common/paws/pawscheckbox.h personal/Xordan/src/common/paws/pawscombo.cpp personal/Xordan/src/common/paws/pawscombo.h personal/Xordan/src/common/paws/pawscombopromptwindow.cpp personal/Xordan/src/common/paws/pawscombopromptwindow.h personal/Xordan/src/common/paws/pawscrollbar.cpp personal/Xordan/src/common/paws/pawscrollbar.h personal/Xordan/src/common/paws/pawsfilenavigation.cpp personal/Xordan/src/common/paws/pawsfilenavigation.h personal/Xordan/src/common/paws/pawsframedrawable.cpp personal/Xordan/src/common/paws/pawsframedrawable.h personal/Xordan/src/common/paws/pawsgenericview.cpp personal/Xordan/src/common/paws/pawsgenericview.h personal/Xordan/src/common/paws/pawsimagedrawable.cpp personal/Xordan/src/common/paws/pawsimagedrawable.h personal/Xordan/src/common/paws/pawskeyselectbox.cpp personal/Xordan/src/common/paws/pawskeyselectbox.h personal/Xordan/src/common/paws/pawslistbox.cpp personal/Xordan/src/common/paws/pawslistbox.h personal/Xordan/src/common/paws/pawsmainwidget.cpp personal/Xordan/src/common/paws/pawsmainwidget.h personal/Xordan/src/common/paws/pawsmanager.cpp personal/Xordan/src/common/paws/pawsmanager.h personal/Xordan/src/common/paws/pawsmenu.cpp personal/Xordan/src/common/paws/pawsmenu.h personal/Xordan/src/common/paws/pawsmouse.cpp personal/Xordan/src/common/paws/pawsmouse.h personal/Xordan/src/common/paws/pawsnumberpromptwindow.cpp personal/Xordan/src/common/paws/pawsnumberpromptwindow.h personal/Xordan/src/common/paws/pawsobjectview.cpp personal/Xordan/src/common/paws/pawsobjectview.h personal/Xordan/src/common/paws/pawsokbox.cpp personal/Xordan/src/common/paws/pawsokbox.h personal/Xordan/src/common/paws/pawsprefmanager.cpp personal/Xordan/src/common/paws/pawsprefmanager.h personal/Xordan/src/common/paws/pawsprogressbar.cpp personal/Xordan/src/common/paws/pawsprogressbar.h personal/Xordan/src/common/paws/pawspromptwindow.cpp personal/Xordan/src/common/paws/pawspromptwindow.h personal/Xordan/src/common/paws/pawsradio.cpp personal/Xordan/src/common/paws/pawsradio.h personal/Xordan/src/common/paws/pawsscript.cpp personal/Xordan/src/common/paws/pawsscript.h personal/Xordan/src/common/paws/pawsselector.cpp personal/Xordan/src/common/paws/pawsselector.h personal/Xordan/src/common/paws/pawssimplewindow.cpp personal/Xordan/src/common/paws/pawssimplewindow.h personal/Xordan/src/common/paws/pawsspinbox.cpp personal/Xordan/src/common/paws/pawsspinbox.h personal/Xordan/src/common/paws/pawsstringpromptwindow.cpp personal/Xordan/src/common/paws/pawsstringpromptwindow.h personal/Xordan/src/common/paws/pawsstyles.cpp personal/Xordan/src/common/paws/pawsstyles.h personal/Xordan/src/common/paws/pawstabwindow.cpp personal/Xordan/src/common/paws/pawstabwindow.h personal/Xordan/src/common/paws/pawstextbox.cpp personal/Xordan/src/common/paws/pawstextbox.h personal/Xordan/src/common/paws/pawstexturemanager.cpp personal/Xordan/src/common/paws/pawstexturemanager.h personal/Xordan/src/common/paws/pawstextwrap.cpp personal/Xordan/src/common/paws/pawstitle.cpp personal/Xordan/src/common/paws/pawstitle.h personal/Xordan/src/common/paws/pawstree.cpp personal/Xordan/src/common/paws/pawstree.h personal/Xordan/src/common/paws/pawswidget.cpp personal/Xordan/src/common/paws/pawswidget.h personal/Xordan/src/common/paws/pawsyesnobox.cpp personal/Xordan/src/common/paws/pawsyesnobox.h personal/Xordan/src/common/paws/psmousebinds.cpp personal/Xordan/src/common/paws/psmousebinds.h personal/Xordan/src/common/paws/widgetconfigwindow.cpp personal/Xordan/src/common/paws/widgetconfigwindow.h personal/Xordan/src/common/rpgrules/ personal/Xordan/src/common/rpgrules/Jamfile personal/Xordan/src/common/rpgrules/factions.cpp personal/Xordan/src/common/rpgrules/factions.h personal/Xordan/src/common/rpgrules/psmoney.cpp personal/Xordan/src/common/rpgrules/psmoney.h personal/Xordan/src/common/rpgrules/vitals.cpp personal/Xordan/src/common/rpgrules/vitals.h personal/Xordan/src/common/util/ personal/Xordan/src/common/util/Jamfile personal/Xordan/src/common/util/README personal/Xordan/src/common/util/command.h personal/Xordan/src/common/util/consoleout.cpp personal/Xordan/src/common/util/consoleout.h personal/Xordan/src/common/util/dbprofile.cpp personal/Xordan/src/common/util/dbprofile.h personal/Xordan/src/common/util/delimitedstring.cpp personal/Xordan/src/common/util/delimitedstring.h personal/Xordan/src/common/util/eventmanager.cpp personal/Xordan/src/common/util/eventmanager.h personal/Xordan/src/common/util/gameevent.cpp personal/Xordan/src/common/util/gameevent.h personal/Xordan/src/common/util/genericevent.h personal/Xordan/src/common/util/genqueue.cpp personal/Xordan/src/common/util/genqueue.h personal/Xordan/src/common/util/growarray.h personal/Xordan/src/common/util/heap.h personal/Xordan/src/common/util/localization.cpp personal/Xordan/src/common/util/localization.h personal/Xordan/src/common/util/location.cpp personal/Xordan/src/common/util/location.h personal/Xordan/src/common/util/log.cpp personal/Xordan/src/common/util/log.h personal/Xordan/src/common/util/mathscript.cpp personal/Xordan/src/common/util/mathscript.h personal/Xordan/src/common/util/minigame.h personal/Xordan/src/common/util/namegenerator.cpp personal/Xordan/src/common/util/namegenerator.h personal/Xordan/src/common/util/poolallocator.h personal/Xordan/src/common/util/prb.cpp personal/Xordan/src/common/util/prb.h personal/Xordan/src/common/util/pscache.cpp personal/Xordan/src/common/util/pscache.h personal/Xordan/src/common/util/psconst.h personal/Xordan/src/common/util/pscssetup.cpp personal/Xordan/src/common/util/pscssetup.h personal/Xordan/src/common/util/psdatabase.cpp personal/Xordan/src/common/util/psdatabase.h personal/Xordan/src/common/util/pserror.cpp personal/Xordan/src/common/util/pserror.h personal/Xordan/src/common/util/psmeshutil.cpp personal/Xordan/src/common/util/psmeshutil.h personal/Xordan/src/common/util/pspath.cpp personal/Xordan/src/common/util/pspath.h personal/Xordan/src/common/util/pspathnetwork.cpp personal/Xordan/src/common/util/pspathnetwork.h personal/Xordan/src/common/util/psprofile.cpp personal/Xordan/src/common/util/psprofile.h personal/Xordan/src/common/util/psres.cpp personal/Xordan/src/common/util/psres.h personal/Xordan/src/common/util/psresmngr.cpp personal/Xordan/src/common/util/psresmngr.h personal/Xordan/src/common/util/psscf.h personal/Xordan/src/common/util/psstring.cpp personal/Xordan/src/common/util/psstring.h personal/Xordan/src/common/util/psutil.cpp personal/Xordan/src/common/util/psutil.h personal/Xordan/src/common/util/psxmlparser.cpp personal/Xordan/src/common/util/psxmlparser.h personal/Xordan/src/common/util/scriptvar.h personal/Xordan/src/common/util/serverconsole.cpp personal/Xordan/src/common/util/serverconsole.h personal/Xordan/src/common/util/singleton.h personal/Xordan/src/common/util/skillcache.cpp personal/Xordan/src/common/util/skillcache.h personal/Xordan/src/common/util/sleep.cpp personal/Xordan/src/common/util/sleep.h personal/Xordan/src/common/util/slots.cpp personal/Xordan/src/common/util/slots.h personal/Xordan/src/common/util/stringarray.h personal/Xordan/src/common/util/strutil.cpp personal/Xordan/src/common/util/strutil.h personal/Xordan/src/common/util/texfactory.cpp personal/Xordan/src/common/util/texfactory.h personal/Xordan/src/common/util/waypoint.cpp personal/Xordan/src/common/util/waypoint.h personal/Xordan/src/eedit/ personal/Xordan/src/eedit/Jamfile personal/Xordan/src/eedit/econtrolmanager.cpp personal/Xordan/src/eedit/econtrolmanager.h personal/Xordan/src/eedit/eeditapp.cpp personal/Xordan/src/eedit/eeditapp.h personal/Xordan/src/eedit/eeditcameratoolbox.cpp personal/Xordan/src/eedit/eeditcameratoolbox.h personal/Xordan/src/eedit/eeditediteffecttoolbox.cpp personal/Xordan/src/eedit/eeditediteffecttoolbox.h personal/Xordan/src/eedit/eediterrortoolbox.cpp personal/Xordan/src/eedit/eediterrortoolbox.h personal/Xordan/src/eedit/eeditfpstoolbox.cpp personal/Xordan/src/eedit/eeditfpstoolbox.h personal/Xordan/src/eedit/eeditglobals.h personal/Xordan/src/eedit/eeditinputboxmanager.cpp personal/Xordan/src/eedit/eeditinputboxmanager.h personal/Xordan/src/eedit/eeditloadeffecttoolbox.cpp personal/Xordan/src/eedit/eeditloadeffecttoolbox.h personal/Xordan/src/eedit/eeditloadmaptoolbox.cpp personal/Xordan/src/eedit/eeditloadmaptoolbox.h personal/Xordan/src/eedit/eeditpositiontoolbox.cpp personal/Xordan/src/eedit/eeditpositiontoolbox.h personal/Xordan/src/eedit/eeditrendertoolbox.cpp personal/Xordan/src/eedit/eeditrendertoolbox.h personal/Xordan/src/eedit/eeditreporter.cpp personal/Xordan/src/eedit/eeditreporter.h personal/Xordan/src/eedit/eeditselecteditanchor.cpp personal/Xordan/src/eedit/eeditselecteditanchor.h personal/Xordan/src/eedit/eeditselecteditanchorkeyframe.cpp personal/Xordan/src/eedit/eeditselecteditanchorkeyframe.h personal/Xordan/src/eedit/eeditselectfloat.cpp personal/Xordan/src/eedit/eeditselectfloat.h personal/Xordan/src/eedit/eeditselectlist.cpp personal/Xordan/src/eedit/eeditselectlist.h personal/Xordan/src/eedit/eeditselectnewanchor.cpp personal/Xordan/src/eedit/eeditselectnewanchor.h personal/Xordan/src/eedit/eeditselectnewanchorkeyframe.cpp personal/Xordan/src/eedit/eeditselectnewanchorkeyframe.h personal/Xordan/src/eedit/eeditselectstring.cpp personal/Xordan/src/eedit/eeditselectstring.h personal/Xordan/src/eedit/eeditselectvec3.cpp personal/Xordan/src/eedit/eeditselectvec3.h personal/Xordan/src/eedit/eeditselectyesno.cpp personal/Xordan/src/eedit/eeditselectyesno.h personal/Xordan/src/eedit/eeditshortcutstoolbox.cpp personal/Xordan/src/eedit/eeditshortcutstoolbox.h personal/Xordan/src/eedit/eedittargettoolbox.cpp personal/Xordan/src/eedit/eedittargettoolbox.h personal/Xordan/src/eedit/eedittoolbox.cpp personal/Xordan/src/eedit/eedittoolbox.h personal/Xordan/src/eedit/eedittoolboxmanager.cpp personal/Xordan/src/eedit/eedittoolboxmanager.h personal/Xordan/src/eedit/pawseedit.cpp personal/Xordan/src/eedit/pawseedit.h personal/Xordan/src/eedit/pscal3dcallback.cpp personal/Xordan/src/eedit/pscal3dcallback.h personal/Xordan/src/npcclient/ personal/Xordan/src/npcclient/Jamfile personal/Xordan/src/npcclient/command.cpp personal/Xordan/src/npcclient/gem.cpp personal/Xordan/src/npcclient/gem.h personal/Xordan/src/npcclient/globals.h personal/Xordan/src/npcclient/main.cpp personal/Xordan/src/npcclient/networkmgr.cpp personal/Xordan/src/npcclient/networkmgr.h personal/Xordan/src/npcclient/npc.cpp personal/Xordan/src/npcclient/npc.h personal/Xordan/src/npcclient/npcbehave.cpp personal/Xordan/src/npcclient/npcbehave.h personal/Xordan/src/npcclient/npcclient.cpp personal/Xordan/src/npcclient/npcclient.h personal/Xordan/src/npcclient/pathfind.cpp personal/Xordan/src/npcclient/pathfind.h personal/Xordan/src/npcclient/perceptions.cpp personal/Xordan/src/npcclient/perceptions.h personal/Xordan/src/npcclient/status.cpp personal/Xordan/src/npcclient/status.h personal/Xordan/src/npcclient/tribe.cpp personal/Xordan/src/npcclient/tribe.h personal/Xordan/src/npcclient/tribeneed.cpp personal/Xordan/src/npcclient/tribeneed.h personal/Xordan/src/npcclient/walkpoly.cpp personal/Xordan/src/npcclient/walkpoly.h personal/Xordan/src/server/ personal/Xordan/src/server/Jamfile personal/Xordan/src/server/actionmanager.cpp personal/Xordan/src/server/actionmanager.h personal/Xordan/src/server/adminmanager.cpp personal/Xordan/src/server/adminmanager.h personal/Xordan/src/server/advicemanager.cpp personal/Xordan/src/server/advicemanager.h personal/Xordan/src/server/authentserver.cpp personal/Xordan/src/server/authentserver.h personal/Xordan/src/server/bankmanager.cpp personal/Xordan/src/server/bankmanager.h personal/Xordan/src/server/bulkobjects/ personal/Xordan/src/server/bulkobjects/Jamfile personal/Xordan/src/server/bulkobjects/dictionary.cpp personal/Xordan/src/server/bulkobjects/dictionary.h personal/Xordan/src/server/bulkobjects/psaccountinfo.cpp personal/Xordan/src/server/bulkobjects/psaccountinfo.h personal/Xordan/src/server/bulkobjects/psactionlocationinfo.cpp personal/Xordan/src/server/bulkobjects/psactionlocationinfo.h personal/Xordan/src/server/bulkobjects/pscharacter.cpp personal/Xordan/src/server/bulkobjects/pscharacter.h personal/Xordan/src/server/bulkobjects/pscharacterlist.cpp personal/Xordan/src/server/bulkobjects/pscharacterlist.h personal/Xordan/src/server/bulkobjects/pscharacterloader.cpp personal/Xordan/src/server/bulkobjects/pscharacterloader.h personal/Xordan/src/server/bulkobjects/pscharinventory.cpp personal/Xordan/src/server/bulkobjects/pscharinventory.h personal/Xordan/src/server/bulkobjects/psglyph.cpp personal/Xordan/src/server/bulkobjects/psglyph.h personal/Xordan/src/server/bulkobjects/psguildinfo.cpp personal/Xordan/src/server/bulkobjects/psguildinfo.h personal/Xordan/src/server/bulkobjects/psinventorycachesvr.cpp personal/Xordan/src/server/bulkobjects/psinventorycachesvr.h personal/Xordan/src/server/bulkobjects/psitem.cpp personal/Xordan/src/server/bulkobjects/psitem.h personal/Xordan/src/server/bulkobjects/psitemstats.cpp personal/Xordan/src/server/bulkobjects/psitemstats.h personal/Xordan/src/server/bulkobjects/psmerchantinfo.cpp personal/Xordan/src/server/bulkobjects/psmerchantinfo.h personal/Xordan/src/server/bulkobjects/psnpcdialog.cpp personal/Xordan/src/server/bulkobjects/psnpcdialog.h personal/Xordan/src/server/bulkobjects/psnpcloader.cpp personal/Xordan/src/server/bulkobjects/psnpcloader.h personal/Xordan/src/server/bulkobjects/psquest.cpp personal/Xordan/src/server/bulkobjects/psquest.h personal/Xordan/src/server/bulkobjects/psquestprereqops.cpp personal/Xordan/src/server/bulkobjects/psquestprereqops.h personal/Xordan/src/server/bulkobjects/psraceinfo.cpp personal/Xordan/src/server/bulkobjects/psraceinfo.h personal/Xordan/src/server/bulkobjects/pssectorinfo.cpp personal/Xordan/src/server/bulkobjects/pssectorinfo.h personal/Xordan/src/server/bulkobjects/psskills.cpp personal/Xordan/src/server/bulkobjects/psskills.h personal/Xordan/src/server/bulkobjects/psspell.cpp personal/Xordan/src/server/bulkobjects/psspell.h personal/Xordan/src/server/bulkobjects/pstrade.cpp personal/Xordan/src/server/bulkobjects/pstrade.h personal/Xordan/src/server/bulkobjects/pstrainerinfo.cpp personal/Xordan/src/server/bulkobjects/pstrainerinfo.h personal/Xordan/src/server/bulkobjects/pstrait.cpp personal/Xordan/src/server/bulkobjects/pstrait.h personal/Xordan/src/server/bulkobjects/servervitals.cpp personal/Xordan/src/server/bulkobjects/servervitals.h personal/Xordan/src/server/cachemanager.cpp personal/Xordan/src/server/cachemanager.h personal/Xordan/src/server/chatmanager.cpp personal/Xordan/src/server/chatmanager.h personal/Xordan/src/server/client.cpp personal/Xordan/src/server/client.h personal/Xordan/src/server/clients.cpp personal/Xordan/src/server/clients.h personal/Xordan/src/server/clientstatuslogger.cpp personal/Xordan/src/server/clientstatuslogger.h personal/Xordan/src/server/combatmanager.cpp personal/Xordan/src/server/combatmanager.h personal/Xordan/src/server/command.cpp personal/Xordan/src/server/commandmanager.cpp personal/Xordan/src/server/commandmanager.h personal/Xordan/src/server/creationmanager.cpp personal/Xordan/src/server/creationmanager.h personal/Xordan/src/server/database/ personal/Xordan/src/server/database/Jamfile personal/Xordan/src/server/database/mysql/ personal/Xordan/src/server/database/mysql/Jamfile personal/Xordan/src/server/database/mysql/accessrules.sql personal/Xordan/src/server/database/mysql/accounts.sql personal/Xordan/src/server/database/mysql/action_locations.sql personal/Xordan/src/server/database/mysql/alliances.sql personal/Xordan/src/server/database/mysql/armorvsweapon.sql personal/Xordan/src/server/database/mysql/bad_names.sql personal/Xordan/src/server/database/mysql/bans.sql personal/Xordan/src/server/database/mysql/char_adv.sql personal/Xordan/src/server/database/mysql/char_create_affinity.sql personal/Xordan/src/server/database/mysql/char_creation.sql personal/Xordan/src/server/database/mysql/char_skills.sql personal/Xordan/src/server/database/mysql/char_traits.sql personal/Xordan/src/server/database/mysql/character_events.sql personal/Xordan/src/server/database/mysql/character_limitations.sql personal/Xordan/src/server/database/mysql/character_quests.sql personal/Xordan/src/server/database/mysql/character_relationships.sql personal/Xordan/src/server/database/mysql/characters.sql personal/Xordan/src/server/database/mysql/command_access.sql personal/Xordan/src/server/database/mysql/commonstrings.sql personal/Xordan/src/server/database/mysql/create_all.sql personal/Xordan/src/server/database/mysql/createdrop.sh personal/Xordan/src/server/database/mysql/dal.cpp personal/Xordan/src/server/database/mysql/dal.h personal/Xordan/src/server/database/mysql/dbmysql.csplugin personal/Xordan/src/server/database/mysql/deletechar.sql personal/Xordan/src/server/database/mysql/deletenpc.sql personal/Xordan/src/server/database/mysql/deletenpc_mb.sql personal/Xordan/src/server/database/mysql/drop.sql personal/Xordan/src/server/database/mysql/factions.sql personal/Xordan/src/server/database/mysql/familiar_types.sql personal/Xordan/src/server/database/mysql/gm_command_log.sql personal/Xordan/src/server/database/mysql/gm_events.sql personal/Xordan/src/server/database/mysql/guildlevels.sql personal/Xordan/src/server/database/mysql/guilds.sql personal/Xordan/src/server/database/mysql/hunt_locations.sql personal/Xordan/src/server/database/mysql/item_animations.sql personal/Xordan/src/server/database/mysql/item_categories.sql personal/Xordan/src/server/database/mysql/item_instances.sql personal/Xordan/src/server/database/mysql/item_stats.sql personal/Xordan/src/server/database/mysql/loot_modifiers.sql personal/Xordan/src/server/database/mysql/loot_rule_details.sql personal/Xordan/src/server/database/mysql/loot_rules.sql personal/Xordan/src/server/database/mysql/math_scripts.sql personal/Xordan/src/server/database/mysql/merchant_item_cats.sql personal/Xordan/src/server/database/mysql/migration.sql personal/Xordan/src/server/database/mysql/money_events.sql personal/Xordan/src/server/database/mysql/movement.sql personal/Xordan/src/server/database/mysql/natural_resources.sql personal/Xordan/src/server/database/mysql/npc_bad_text.sql personal/Xordan/src/server/database/mysql/npc_disallowed_words.sql personal/Xordan/src/server/database/mysql/npc_kas.sql personal/Xordan/src/server/database/mysql/npc_responses.sql personal/Xordan/src/server/database/mysql/npc_spawn_ranges.sql personal/Xordan/src/server/database/mysql/npc_spawn_rules.sql personal/Xordan/src/server/database/mysql/npc_synonyms.sql personal/Xordan/src/server/database/mysql/npc_trigger_groups.sql personal/Xordan/src/server/database/mysql/npc_triggers.sql personal/Xordan/src/server/database/mysql/petitions.sql personal/Xordan/src/server/database/mysql/planeshift_db.png personal/Xordan/src/server/database/mysql/planeshift_db.xml personal/Xordan/src/server/database/mysql/player_spells.sql personal/Xordan/src/server/database/mysql/progress_events.sql personal/Xordan/src/server/database/mysql/quest_scripts.sql personal/Xordan/src/server/database/mysql/quests.sql personal/Xordan/src/server/database/mysql/race_info.sql personal/Xordan/src/server/database/mysql/sc_location_type.sql personal/Xordan/src/server/database/mysql/sc_locations.sql personal/Xordan/src/server/database/mysql/sc_npc_definitions.sql personal/Xordan/src/server/database/mysql/sc_path_points.sql personal/Xordan/src/server/database/mysql/sc_tribe_memories.sql personal/Xordan/src/server/database/mysql/sc_tribe_resources.sql personal/Xordan/src/server/database/mysql/sc_waypoint_links.sql personal/Xordan/src/server/database/mysql/sc_waypoints.sql personal/Xordan/src/server/database/mysql/sectors.sql personal/Xordan/src/server/database/mysql/security_levels.sql personal/Xordan/src/server/database/mysql/server_options.sql personal/Xordan/src/server/database/mysql/skills.sql personal/Xordan/src/server/database/mysql/spell_glyphs.sql personal/Xordan/src/server/database/mysql/spells.sql personal/Xordan/src/server/database/mysql/stances.sql personal/Xordan/src/server/database/mysql/tips.sql personal/Xordan/src/server/database/mysql/trade_autocontainers.sql personal/Xordan/src/server/database/mysql/trade_combinations.sql personal/Xordan/src/server/database/mysql/trade_constraints.sql personal/Xordan/src/server/database/mysql/trade_patterns.sql personal/Xordan/src/server/database/mysql/trade_processes.sql personal/Xordan/src/server/database/mysql/trade_transformations.sql personal/Xordan/src/server/database/mysql/trainer_skills.sql personal/Xordan/src/server/database/mysql/traits.sql personal/Xordan/src/server/database/mysql/tribe_members.sql personal/Xordan/src/server/database/mysql/tribes.sql personal/Xordan/src/server/database/mysql/unique_content.sql personal/Xordan/src/server/database/mysql/upgrade_schema.sql personal/Xordan/src/server/database/mysql/ways.sql personal/Xordan/src/server/deathcallback.h personal/Xordan/src/server/deleteobjcallback.h personal/Xordan/src/server/economymanager.cpp personal/Xordan/src/server/economymanager.h personal/Xordan/src/server/entitymanager.cpp personal/Xordan/src/server/entitymanager.h personal/Xordan/src/server/events.cpp personal/Xordan/src/server/events.h personal/Xordan/src/server/exchangemanager.cpp personal/Xordan/src/server/exchangemanager.h personal/Xordan/src/server/gem.cpp personal/Xordan/src/server/gem.h personal/Xordan/src/server/globals.h personal/Xordan/src/server/gmeventmanager.cpp personal/Xordan/src/server/gmeventmanager.h personal/Xordan/src/server/groupmanager.cpp personal/Xordan/src/server/groupmanager.h personal/Xordan/src/server/guildmanager.cpp personal/Xordan/src/server/guildmanager.h personal/Xordan/src/server/icachedobject.h personal/Xordan/src/server/invitemanager.cpp personal/Xordan/src/server/invitemanager.h personal/Xordan/src/server/iserver/ personal/Xordan/src/server/iserver/idal.h personal/Xordan/src/server/main.cpp personal/Xordan/src/server/marriagemanager.cpp personal/Xordan/src/server/marriagemanager.h personal/Xordan/src/server/minigamemanager.cpp personal/Xordan/src/server/minigamemanager.h personal/Xordan/src/server/msgmanager.cpp personal/Xordan/src/server/msgmanager.h personal/Xordan/src/server/netmanager.cpp personal/Xordan/src/server/netmanager.h personal/Xordan/src/server/npcmanager.cpp personal/Xordan/src/server/npcmanager.h personal/Xordan/src/server/paladinjr.cpp personal/Xordan/src/server/paladinjr.h personal/Xordan/src/server/playergroup.h personal/Xordan/src/server/progressionmanager.cpp personal/Xordan/src/server/progressionmanager.h personal/Xordan/src/server/psproxlist.cpp personal/Xordan/src/server/psproxlist.h personal/Xordan/src/server/psserver.cpp personal/Xordan/src/server/psserver.h personal/Xordan/src/server/psserverchar.cpp personal/Xordan/src/server/psserverchar.h personal/Xordan/src/server/psserverdr.cpp personal/Xordan/src/server/psserverdr.h personal/Xordan/src/server/questionmanager.cpp personal/Xordan/src/server/questionmanager.h personal/Xordan/src/server/questmanager.cpp personal/Xordan/src/server/questmanager.h personal/Xordan/src/server/serverstatus.cpp personal/Xordan/src/server/serverstatus.h personal/Xordan/src/server/slotmanager.cpp personal/Xordan/src/server/slotmanager.h personal/Xordan/src/server/spawnmanager.cpp personal/Xordan/src/server/spawnmanager.h personal/Xordan/src/server/spellmanager.cpp personal/Xordan/src/server/spellmanager.h personal/Xordan/src/server/tutorialmanager.cpp personal/Xordan/src/server/tutorialmanager.h personal/Xordan/src/server/usermanager.cpp personal/Xordan/src/server/usermanager.h personal/Xordan/src/server/weathermanager.cpp personal/Xordan/src/server/weathermanager.h personal/Xordan/src/server/workmanager.cpp personal/Xordan/src/server/workmanager.h personal/Xordan/src/tools/ personal/Xordan/src/tools/Jamfile personal/Xordan/src/tools/fparser/ personal/Xordan/src/tools/fparser/Jamfile personal/Xordan/src/tools/fparser/fparser.cpp personal/Xordan/src/tools/fparser/fparser.h personal/Xordan/src/tools/fparser/fparser.txt personal/Xordan/src/tools/fparser/fpconfig.h personal/Xordan/src/tools/fparser/fpoptimizer.cpp personal/Xordan/src/tools/fparser/fptypes.h personal/Xordan/tools/ personal/Xordan/tools/jobber-svn.cfg personal/Xordan/tools/jobber-svn.pl personal/Xordan/vfs.cfg Added: personal/Xordan/Jamfile.in =================================================================== --- personal/Xordan/Jamfile.in (rev 0) +++ personal/Xordan/Jamfile.in 2007-10-15 16:06:06 UTC (rev 2) @@ -0,0 +1,175 @@ +TOP ?= "@top_srcdir@" ; +BUILDTOP ?= "@top_builddir@" ; + +SubDir TOP ; + +# Common include directories. + +IncludeDir ; +IncludeDir "include" ; +IncludeDir src client ; +IncludeDir src server ; +IncludeDir src common ; +IncludeDir src tools wordnet ; +IncludeDir $(BUILDTOP) : : literal transient ; + + +# Delete the following dir and subdirs on running 'jam clean'. + +CleanDir clean : + out ; + +# Delete the following files on running 'jam distclean'. + +Clean distclean : + config.log + configure + Jamconfig + Jamfile + include/psconfig.h + include/psconfig.h.in + include/psstdint.h ; + +# Delete the following dir and subdirs on running 'jam distclean'. + +CleanDir distclean : + autom4te.cache ; + +# Invokes 'jam clean' on running 'jam distclean'. + +Depends distclean : clean ; + +# Description for 'jam help'. + +Help distclean : "Remove built targets and configuration" ; + +####################################################################### +# Msvcgen Setup # +####################################################################### + +# Specify the folder in which they are contained, and then the version of the project files to be generated. + +MsvcGenSubDir TOP mk msvc : common ; +MsvcGenSubDir TOP mk msvc7 : 7 ; +MsvcGenSubDir TOP mk msvc71 : 71 ; +MsvcGenSubDir TOP mk msvc8 : 8 ; + +# Dir in which the msvcgen files are located. + +MsvcGenTemplateDir TOP mk msvcgen ; + +# For MSVC project files, we need to include a dir containing MSVC specific includes. + +if [ Property build : projgen ] = msvc +{ + IncludeDir "include" msvc ; +} + +# File containing custom scripting. Found in mk/msvcgen. + +MsvcGenVariable customize : custom.cslib custom2.cslib custom3.cslib ; + +# Set up the workspaces we want msvcgen to synthesize. + +include [ ConcatDirs $(SUBDIR) mk msvcgen workspaces.jam ] ; + +# Set project-specific compiler and linker options for msvcgen. + +local hash = "\$" ; + +# CrystalSpace + +MsvcGenConfig CRYSTAL.AVAILABLE : yes ; +MsvcGenConfig CRYSTAL.DEFINES ; +MsvcGenConfig CRYSTAL.CFLAGS ; +MsvcGenConfig CRYSTAL.LFLAGS ; +MsvcGenConfig CRYSTAL.LIBS : "libcrystalspace.lib ws2_32.lib zlib.lib" ; +MsvcGenConfig CRYSTAL.LIBS.DEBUG : "libcrystalspace_d.lib ws2_32.lib zlib.lib" ; +MsvcGenConfig CRYSTAL.INCDIRS : + [ ConcatDirs .. .. .. CS include ] + [ ConcatDirs "$(hash)(CRYSTAL)" include ] + [ ConcatDirs "$(hash)(CRYSTAL)" include csutil ] + [ ConcatDirs "$(hash)(CRYSTAL)" include csutil win32 ] ; +MsvcGenConfig CRYSTAL.LIBDIRS : + [ ConcatDirs .. .. .. CS out release$(MSVC_VERSION) libs ] + [ ConcatDirs .. .. .. CS libs csutil win32 ] + [ ConcatDirs "$(hash)(CRYSTAL)" out release$(MSVC_VERSION) libs ] + [ ConcatDirs "$(hash)(CRYSTAL)" libs ] + [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ; +MsvcGenConfig CRYSTAL.LIBDIRS.DEBUG : + [ ConcatDirs .. .. .. CS out debug$(MSVC_VERSION) libs ] + [ ConcatDirs .. .. .. CS libs csutil win32 ] + [ ConcatDirs "$(hash)(CRYSTAL)" out debug$(MSVC_VERSION) libs ] + [ ConcatDirs "$(hash)(CRYSTAL)" libs ] + [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ; +MsvcGenConfig CRYSTAL.STATICDEPS : $(TOP)/mk/jam/crystalspace_staticplugins_msvc.jam ; + +# Cel + + MsvcGenConfig CEL.AVAILABLE : yes ; + MsvcGenConfig CEL.DEFINES : USE_CEL ; + MsvcGenConfig CEL.CFLAGS ; + MsvcGenConfig CEL.LFLAGS ; + MsvcGenConfig CEL.LIBS : "libceltool.lib" ; + MsvcGenConfig CEL.LIBS.DEBUG : "libceltool_d.lib" ; + MsvcGenConfig CEL.INCDIRS : + [ ConcatDirs .. .. .. cel include ] + [ ConcatDirs "$(hash)(CEL)" include ] + [ ConcatDirs "$(hash)(CEL)" include cel ] ; + MsvcGenConfig CEL.LIBDIRS : + [ ConcatDirs .. .. .. cel out release$(MSVC_VERSION) libs ] + [ ConcatDirs "$(hash)(CEL)" out release$(MSVC_VERSION) libs ] + [ ConcatDirs "$(hash)(CEL)" libs ] ; + MsvcGenConfig CEL.LIBDIRS.DEBUG : + [ ConcatDirs .. .. .. cel out debug$(MSVC_VERSION) libs ] + [ ConcatDirs "$(hash)(CEL)" out debug$(MSVC_VERSION) libs ] + [ ConcatDirs "$(hash)(CEL)" libs ] ; +MsvcGenConfig CEL.STATICDEPS : $(TOP)/mk/jam/cel_staticplugins_msvc.jam ; + +# Generate project files for static targets. + +MsvcGenConfig HAVE_STATIC_PLUGINS : yes ; + +# MySQL + +MsvcGenConfig LIBMYSQLCLIENT.AVAILABLE : yes ; +MsvcGenConfig LIBMYSQLCLIENT.DEFINES ; +MsvcGenConfig LIBMYSQLCLIENT.CFLAGS ; +MsvcGenConfig LIBMYSQLCLIENT.LFLAGS ; +MsvcGenConfig LIBMYSQLCLIENT.LIBS : "libmysql.lib" ; +MsvcGenConfig LIBMYSQLCLIENT.LIBS.DEBUG : "libmysql.lib" ; +MsvcGenConfig LIBMYSQLCLIENT.INCDIRS ; +MsvcGenConfig LIBMYSQLCLIENT.LIBDIRS ; +MsvcGenConfig LIBMYSQLCLIENT.LIBDIRS.DEBUG ; + +# CURL + +MsvcGenConfig CURL.AVAILABLE : yes ; +MsvcGenConfig CURL.DEFINES ; +MsvcGenConfig CURL.CFLAGS ; +MsvcGenConfig CURL.LFLAGS ; +MsvcGenConfig CURL.LIBS : "libcurl.lib" ; +MsvcGenConfig CURL.LIBS.DEBUG : "libcurl.lib" ; +MsvcGenConfig CURL.INCDIRS ; +MsvcGenConfig CURL.LIBDIRS ; +MsvcGenConfig CURL.LIBDIRS.DEBUG ; + +#################################################################### + +# Msvcgen setup _must_ occur before compile group registration! + +# Write a description of each compile group for 'jam help' +Description server : "Server components" ; +Description client : "Client components" ; +Descript... [truncated message content] |
From: <mg...@us...> - 2007-10-15 18:05:54
|
Revision: 6 http://planeshift.svn.sourceforge.net/planeshift/?rev=6&view=rev Author: mgist Date: 2007-10-15 11:05:51 -0700 (Mon, 15 Oct 2007) Log Message: ----------- - Line endings Modified Paths: -------------- personal/Xordan/Jamfile.in personal/Xordan/Jamrules personal/Xordan/autogen.sh personal/Xordan/configure.ac personal/Xordan/data/eedit/camera.xml personal/Xordan/data/eedit/editeffect.xml personal/Xordan/data/eedit/eedit.xml personal/Xordan/data/eedit/filenavigation.xml personal/Xordan/data/eedit/imagelist.xml personal/Xordan/data/eedit/inputbox/editanchor.xml personal/Xordan/data/eedit/inputbox/editanchorkeyframe.xml personal/Xordan/data/eedit/inputbox/float.xml personal/Xordan/data/eedit/inputbox/list.xml personal/Xordan/data/eedit/inputbox/newanchor.xml personal/Xordan/data/eedit/inputbox/newanchorkeyframe.xml personal/Xordan/data/eedit/inputbox/string.xml personal/Xordan/data/eedit/inputbox/vec3.xml personal/Xordan/data/eedit/inputbox/yesno.xml personal/Xordan/data/eedit/keys_def.xml personal/Xordan/data/eedit/loadeffect.xml personal/Xordan/data/eedit/loadmap.xml personal/Xordan/data/eedit/position.xml personal/Xordan/data/eedit/render.xml personal/Xordan/data/eedit/target.xml personal/Xordan/data/effects/examples/obj_quad.eff personal/Xordan/data/effects/examples/obj_spire.eff personal/Xordan/data/effects/examples/obj_star.eff personal/Xordan/data/effects/misc/admin_location.eff personal/Xordan/data/effects/misc/admin_path_point.eff personal/Xordan/data/effects/misc/chatbubble.eff personal/Xordan/data/effects/misc/chatbubble_longphrase.eff personal/Xordan/data/effects/misc/chatbubble_metal.eff personal/Xordan/data/effects/misc/chatbubble_normal.eff personal/Xordan/data/effects/misc/chatbubble_shortphrase.eff personal/Xordan/data/effects/misc/entitylabel.eff personal/Xordan/data/effects/misc/marker.eff personal/Xordan/data/effects/misc/shadow.eff personal/Xordan/data/effects/misc/target.eff personal/Xordan/data/emotes.xml personal/Xordan/data/gui/actionlocation.xml personal/Xordan/data/gui/activemagicwindow.xml personal/Xordan/data/gui/bankwindow.xml personal/Xordan/data/gui/birth.xml personal/Xordan/data/gui/bookwriting.xml personal/Xordan/data/gui/borderlist.xml personal/Xordan/data/gui/buddy.xml personal/Xordan/data/gui/charcreate.xml personal/Xordan/data/gui/chardescwindow.xml personal/Xordan/data/gui/charpick.xml personal/Xordan/data/gui/chat.xml personal/Xordan/data/gui/chatmenu.xml personal/Xordan/data/gui/childhood.xml personal/Xordan/data/gui/configcamera.xml personal/Xordan/data/gui/configchat.xml personal/Xordan/data/gui/configchatfilter.xml personal/Xordan/data/gui/configchattabs.xml personal/Xordan/data/gui/configdetails.xml personal/Xordan/data/gui/configentityinter.xml personal/Xordan/data/gui/configentitylabels.xml personal/Xordan/data/gui/configkeys.xml personal/Xordan/data/gui/configmouse.xml personal/Xordan/data/gui/configpvp.xml personal/Xordan/data/gui/configsound.xml personal/Xordan/data/gui/configwindow.xml personal/Xordan/data/gui/containerdesc.xml personal/Xordan/data/gui/control.xml personal/Xordan/data/gui/control_styles.xml personal/Xordan/data/gui/craft.xml personal/Xordan/data/gui/credits_config.xml personal/Xordan/data/gui/creditswindow.xml personal/Xordan/data/gui/customwidgetslist.xml personal/Xordan/data/gui/detailwindow.xml personal/Xordan/data/gui/eedit.xml personal/Xordan/data/gui/exchange.xml personal/Xordan/data/gui/filenavigation.xml personal/Xordan/data/gui/fingering.xml personal/Xordan/data/gui/glyph.xml personal/Xordan/data/gui/gmaddeditaction.xml personal/Xordan/data/gui/gmguiwindow.xml personal/Xordan/data/gui/gmspawn.xml personal/Xordan/data/gui/group.xml personal/Xordan/data/gui/guildwindow.xml personal/Xordan/data/gui/helpwindow.xml personal/Xordan/data/gui/ignorewindow.xml personal/Xordan/data/gui/illumination.xml personal/Xordan/data/gui/infowindow.xml personal/Xordan/data/gui/interact.xml personal/Xordan/data/gui/inventory.xml personal/Xordan/data/gui/itemdesc.xml personal/Xordan/data/gui/lifeevents.xml personal/Xordan/data/gui/loadwindow.xml personal/Xordan/data/gui/loginwindow.xml personal/Xordan/data/gui/loot.xml personal/Xordan/data/gui/merchant.xml personal/Xordan/data/gui/money.xml personal/Xordan/data/gui/newoptions.xml personal/Xordan/data/gui/ok.xml personal/Xordan/data/gui/parents.xml personal/Xordan/data/gui/paths.xml personal/Xordan/data/gui/paws_generic.xml personal/Xordan/data/gui/petition.xml personal/Xordan/data/gui/petitiongm.xml personal/Xordan/data/gui/petstatwindow.xml personal/Xordan/data/gui/questnotebook.xml personal/Xordan/data/gui/questrewardwindow.xml personal/Xordan/data/gui/quitinfo.xml personal/Xordan/data/gui/readbook.xml personal/Xordan/data/gui/shortcutwindow.xml personal/Xordan/data/gui/skillwindow.xml personal/Xordan/data/gui/smallinventory.xml personal/Xordan/data/gui/spell_effect.xml personal/Xordan/data/gui/spellcancelwindow.xml personal/Xordan/data/gui/spellwindow.xml personal/Xordan/data/gui/splash.xml personal/Xordan/data/gui/styles.xml personal/Xordan/data/gui/summary.xml personal/Xordan/data/gui/tutorial.xml personal/Xordan/data/gui/widgetconfigwindow.xml personal/Xordan/data/gui/yesno.xml personal/Xordan/data/help.xml personal/Xordan/data/npcbehave.xml personal/Xordan/data/npcdefs.xml personal/Xordan/data/options/camera_def.xml personal/Xordan/data/options/chat_def.xml personal/Xordan/data/options/chatbubbles.xml personal/Xordan/data/options/controls_def.xml personal/Xordan/data/options/entityinter_def.xml personal/Xordan/data/options/entitylabels_def.xml personal/Xordan/data/options/mouse_def.xml personal/Xordan/data/options/pvp_def.xml personal/Xordan/data/options/shortcutcommands_def.xml personal/Xordan/data/options/sound_def.xml personal/Xordan/data/phonics.xml personal/Xordan/data/pvp_regions.xml personal/Xordan/data/races/descriptions.xml personal/Xordan/data/races/quickpaths.xml personal/Xordan/data/zoneinfo.xml personal/Xordan/docs/compiling.html personal/Xordan/docs/credit.txt personal/Xordan/docs/credits_AtomicBlue.txt personal/Xordan/docs/credits_CrystalBlue.txt personal/Xordan/docs/credits_MolecularBlue.txt personal/Xordan/docs/history.txt personal/Xordan/docs/history2003.txt personal/Xordan/docs/history2004.txt personal/Xordan/docs/history2005.txt personal/Xordan/docs/history2006.txt personal/Xordan/eedit.cfg personal/Xordan/include/msvc/psconfig.h personal/Xordan/include/msvc/psstdint.h personal/Xordan/lang/cesky/data/help.xml personal/Xordan/lang/cesky/stringtable.xml personal/Xordan/lang/deutsch/data/help.xml personal/Xordan/mk/autoconf/ac_check_typedef.m4 personal/Xordan/mk/autoconf/ac_compile_check_sizeof.m4 personal/Xordan/mk/autoconf/ac_need_stdint_h.m4 personal/Xordan/mk/autoconf/cel.m4 personal/Xordan/mk/autoconf/checkbinutils.m4 personal/Xordan/mk/autoconf/checkbuild.m4 personal/Xordan/mk/autoconf/checkcommon.m4 personal/Xordan/mk/autoconf/checkcppunit.m4 personal/Xordan/mk/autoconf/checkcswin32libs.m4 personal/Xordan/mk/autoconf/checklib.m4 personal/Xordan/mk/autoconf/checklibtool.m4 personal/Xordan/mk/autoconf/checkopengl.m4 personal/Xordan/mk/autoconf/checkpic.m4 personal/Xordan/mk/autoconf/checkprog.m4 personal/Xordan/mk/autoconf/checkpthread.m4 personal/Xordan/mk/autoconf/checkpython.m4 personal/Xordan/mk/autoconf/checktt2.m4 personal/Xordan/mk/autoconf/compiler.m4 personal/Xordan/mk/autoconf/config.guess personal/Xordan/mk/autoconf/config.sub personal/Xordan/mk/autoconf/crystal.m4 personal/Xordan/mk/autoconf/cs_check_host.m4 personal/Xordan/mk/autoconf/csbuild.m4 personal/Xordan/mk/autoconf/diagnose.m4 personal/Xordan/mk/autoconf/embed.m4 personal/Xordan/mk/autoconf/emit.m4 personal/Xordan/mk/autoconf/headercache.m4 personal/Xordan/mk/autoconf/install-sh personal/Xordan/mk/autoconf/installdirs.m4 personal/Xordan/mk/autoconf/jam.m4 personal/Xordan/mk/autoconf/jamcache.m4 personal/Xordan/mk/autoconf/libcurl.m4 personal/Xordan/mk/autoconf/makecache.m4 personal/Xordan/mk/autoconf/mkdir.m4 personal/Xordan/mk/autoconf/packageinfo.m4 personal/Xordan/mk/autoconf/path.m4 personal/Xordan/mk/autoconf/pkg.m4 personal/Xordan/mk/autoconf/progver.m4 personal/Xordan/mk/autoconf/qualify.m4 personal/Xordan/mk/autoconf/split.m4 personal/Xordan/mk/autoconf/textcache.m4 personal/Xordan/mk/autoconf/trim.m4 personal/Xordan/mk/autoconf/type_socklen_t.m4 personal/Xordan/mk/autoconf/warnings.m4 personal/Xordan/mk/jam/application.jam personal/Xordan/mk/jam/assembler.jam personal/Xordan/mk/jam/bisonflex.jam personal/Xordan/mk/jam/build.jam personal/Xordan/mk/jam/cel_staticplugins_msvc.jam personal/Xordan/mk/jam/clean.jam personal/Xordan/mk/jam/compiler.jam personal/Xordan/mk/jam/crystalspace_staticplugins_msvc.jam personal/Xordan/mk/jam/docs.jam personal/Xordan/mk/jam/dump.jam personal/Xordan/mk/jam/flags.jam personal/Xordan/mk/jam/groups.jam personal/Xordan/mk/jam/help.jam personal/Xordan/mk/jam/helper.jam personal/Xordan/mk/jam/icons.jam personal/Xordan/mk/jam/install.jam personal/Xordan/mk/jam/jamcompatibility.jam personal/Xordan/mk/jam/library.jam personal/Xordan/mk/jam/macosx.jam personal/Xordan/mk/jam/msvcgen.jam personal/Xordan/mk/jam/objectivec.jam personal/Xordan/mk/jam/objects.jam personal/Xordan/mk/jam/options.jam personal/Xordan/mk/jam/plugin.jam personal/Xordan/mk/jam/property.jam personal/Xordan/mk/jam/pymarshall.jam personal/Xordan/mk/jam/pythmod.jam personal/Xordan/mk/jam/resource.jam personal/Xordan/mk/jam/static.jam personal/Xordan/mk/jam/strip.jam personal/Xordan/mk/jam/subdir.jam personal/Xordan/mk/jam/swig.jam personal/Xordan/mk/jam/unittest.jam personal/Xordan/mk/jam/unix.jam personal/Xordan/mk/jam/variant.jam personal/Xordan/mk/jam/win32.jam personal/Xordan/mk/msvcgen/control.tlib personal/Xordan/mk/msvcgen/custom.cslib personal/Xordan/mk/msvcgen/custom2.cslib personal/Xordan/mk/msvcgen/custom3.cslib personal/Xordan/mk/msvcgen/macros.tlib personal/Xordan/mk/msvcgen/project6.tlib personal/Xordan/mk/msvcgen/project7.tlib personal/Xordan/mk/msvcgen/projectx6.tlib personal/Xordan/mk/msvcgen/projectx7.tlib personal/Xordan/mk/msvcgen/workspace6.tlib personal/Xordan/mk/msvcgen/workspace7.tlib personal/Xordan/mk/msvcgen/workspaces.jam personal/Xordan/npcclient.cfg personal/Xordan/planeshift.cfg personal/Xordan/psclient.cfg personal/Xordan/psserver.cfg personal/Xordan/src/Jamfile personal/Xordan/src/client/Jamfile personal/Xordan/src/client/actionhandler.cpp personal/Xordan/src/client/actionhandler.h personal/Xordan/src/client/authentclient.cpp personal/Xordan/src/client/authentclient.h personal/Xordan/src/client/charapp.cpp personal/Xordan/src/client/charapp.h personal/Xordan/src/client/chatbubbles.cpp personal/Xordan/src/client/chatbubbles.h personal/Xordan/src/client/clientcachemanager.cpp personal/Xordan/src/client/clientcachemanager.h personal/Xordan/src/client/clientvitals.cpp personal/Xordan/src/client/clientvitals.h personal/Xordan/src/client/cmdadmin.cpp personal/Xordan/src/client/cmdadmin.h personal/Xordan/src/client/cmdgroups.cpp personal/Xordan/src/client/cmdgroups.h personal/Xordan/src/client/cmdguilds.cpp personal/Xordan/src/client/cmdguilds.h personal/Xordan/src/client/cmdusers.cpp personal/Xordan/src/client/cmdusers.h personal/Xordan/src/client/cmdutil.cpp personal/Xordan/src/client/cmdutil.h personal/Xordan/src/client/entitylabels.cpp personal/Xordan/src/client/entitylabels.h personal/Xordan/src/client/globals.h personal/Xordan/src/client/gui/Jamfile personal/Xordan/src/client/gui/chatwindow.cpp personal/Xordan/src/client/gui/chatwindow.h personal/Xordan/src/client/gui/inventorywindow.cpp personal/Xordan/src/client/gui/inventorywindow.h personal/Xordan/src/client/gui/pawsactionlocationwindow.cpp personal/Xordan/src/client/gui/pawsactionlocationwindow.h personal/Xordan/src/client/gui/pawsactivemagicwindow.cpp personal/Xordan/src/client/gui/pawsactivemagicwindow.h personal/Xordan/src/client/gui/pawsbankwindow.cpp personal/Xordan/src/client/gui/pawsbankwindow.h personal/Xordan/src/client/gui/pawsbookreadingwindow.cpp personal/Xordan/src/client/gui/pawsbookreadingwindow.h personal/Xordan/src/client/gui/pawsbuddy.cpp personal/Xordan/src/client/gui/pawsbuddy.h personal/Xordan/src/client/gui/pawscharbirth.cpp personal/Xordan/src/client/gui/pawscharbirth.h personal/Xordan/src/client/gui/pawscharcreatemain.cpp personal/Xordan/src/client/gui/pawscharcreatemain.h personal/Xordan/src/client/gui/pawschardescription.cpp personal/Xordan/src/client/gui/pawschardescription.h personal/Xordan/src/client/gui/pawscharparents.cpp personal/Xordan/src/client/gui/pawscharparents.h personal/Xordan/src/client/gui/pawscharpick.cpp personal/Xordan/src/client/gui/pawscharpick.h personal/Xordan/src/client/gui/pawschild.cpp personal/Xordan/src/client/gui/pawschild.h personal/Xordan/src/client/gui/pawsconfigcamera.cpp personal/Xordan/src/client/gui/pawsconfigcamera.h personal/Xordan/src/client/gui/pawsconfigchat.cpp personal/Xordan/src/client/gui/pawsconfigchat.h personal/Xordan/src/client/gui/pawsconfigchatfilter.cpp personal/Xordan/src/client/gui/pawsconfigchatfilter.h personal/Xordan/src/client/gui/pawsconfigchattabs.cpp personal/Xordan/src/client/gui/pawsconfigchattabs.h personal/Xordan/src/client/gui/pawsconfigdetails.cpp personal/Xordan/src/client/gui/pawsconfigdetails.h personal/Xordan/src/client/gui/pawsconfigentityinter.cpp personal/Xordan/src/client/gui/pawsconfigentityinter.h personal/Xordan/src/client/gui/pawsconfigentitylabels.cpp personal/Xordan/src/client/gui/pawsconfigentitylabels.h personal/Xordan/src/client/gui/pawsconfigkeys.cpp personal/Xordan/src/client/gui/pawsconfigkeys.h personal/Xordan/src/client/gui/pawsconfigmouse.cpp personal/Xordan/src/client/gui/pawsconfigmouse.h personal/Xordan/src/client/gui/pawsconfigpvp.cpp personal/Xordan/src/client/gui/pawsconfigpvp.h personal/Xordan/src/client/gui/pawsconfigsound.cpp personal/Xordan/src/client/gui/pawsconfigsound.h personal/Xordan/src/client/gui/pawsconfigwindow.cpp personal/Xordan/src/client/gui/pawsconfigwindow.h personal/Xordan/src/client/gui/pawscontainerdescwindow.cpp personal/Xordan/src/client/gui/pawscontainerdescwindow.h personal/Xordan/src/client/gui/pawscontrolwindow.cpp personal/Xordan/src/client/gui/pawscontrolwindow.h personal/Xordan/src/client/gui/pawscraft.cpp personal/Xordan/src/client/gui/pawscraft.h personal/Xordan/src/client/gui/pawscreditswindow.cpp personal/Xordan/src/client/gui/pawscreditswindow.h personal/Xordan/src/client/gui/pawsdetailwindow.cpp personal/Xordan/src/client/gui/pawsdetailwindow.h personal/Xordan/src/client/gui/pawsexchangewindow.cpp personal/Xordan/src/client/gui/pawsexchangewindow.h personal/Xordan/src/client/gui/pawsgameboard.cpp personal/Xordan/src/client/gui/pawsgameboard.h personal/Xordan/src/client/gui/pawsglyphwindow.cpp personal/Xordan/src/client/gui/pawsglyphwindow.h personal/Xordan/src/client/gui/pawsgmaction.cpp personal/Xordan/src/client/gui/pawsgmaction.h personal/Xordan/src/client/gui/pawsgmgui.cpp personal/Xordan/src/client/gui/pawsgmgui.h personal/Xordan/src/client/gui/pawsgmspawn.cpp personal/Xordan/src/client/gui/pawsgmspawn.h personal/Xordan/src/client/gui/pawsgroupwindow.cpp personal/Xordan/src/client/gui/pawsgroupwindow.h personal/Xordan/src/client/gui/pawsguildwindow.cpp personal/Xordan/src/client/gui/pawsguildwindow.h personal/Xordan/src/client/gui/pawshelp.cpp personal/Xordan/src/client/gui/pawshelp.h personal/Xordan/src/client/gui/pawsignore.cpp personal/Xordan/src/client/gui/pawsignore.h personal/Xordan/src/client/gui/pawsilluminationwindow.cpp personal/Xordan/src/client/gui/pawsilluminationwindow.h personal/Xordan/src/client/gui/pawsinfowindow.cpp personal/Xordan/src/client/gui/pawsinfowindow.h personal/Xordan/src/client/gui/pawsinteractwindow.cpp personal/Xordan/src/client/gui/pawsinteractwindow.h personal/Xordan/src/client/gui/pawsinventorydollview.cpp personal/Xordan/src/client/gui/pawsinventorydollview.h personal/Xordan/src/client/gui/pawsitemdescriptionwindow.cpp personal/Xordan/src/client/gui/pawsitemdescriptionwindow.h personal/Xordan/src/client/gui/pawslife.cpp personal/Xordan/src/client/gui/pawslife.h personal/Xordan/src/client/gui/pawsloading.cpp personal/Xordan/src/client/gui/pawsloading.h personal/Xordan/src/client/gui/pawsloginwindow.cpp personal/Xordan/src/client/gui/pawsloginwindow.h personal/Xordan/src/client/gui/pawslootwindow.cpp personal/Xordan/src/client/gui/pawslootwindow.h personal/Xordan/src/client/gui/pawsmerchantwindow.cpp personal/Xordan/src/client/gui/pawsmerchantwindow.h personal/Xordan/src/client/gui/pawsmoney.cpp personal/Xordan/src/client/gui/pawsmoney.h personal/Xordan/src/client/gui/pawspath.cpp personal/Xordan/src/client/gui/pawspath.h personal/Xordan/src/client/gui/pawspetitiongmwindow.cpp personal/Xordan/src/client/gui/pawspetitiongmwindow.h personal/Xordan/src/client/gui/pawspetitionwindow.cpp personal/Xordan/src/client/gui/pawspetitionwindow.h personal/Xordan/src/client/gui/pawspetstatwindow.cpp personal/Xordan/src/client/gui/pawspetstatwindow.h personal/Xordan/src/client/gui/pawsquestrewardwindow.cpp personal/Xordan/src/client/gui/pawsquestrewardwindow.h personal/Xordan/src/client/gui/pawsquestwindow.cpp personal/Xordan/src/client/gui/pawsquestwindow.h personal/Xordan/src/client/gui/pawsquitinfobox.cpp personal/Xordan/src/client/gui/pawsquitinfobox.h personal/Xordan/src/client/gui/pawsskillwindow.cpp personal/Xordan/src/client/gui/pawsskillwindow.h personal/Xordan/src/client/gui/pawsslot.cpp personal/Xordan/src/client/gui/pawsslot.h personal/Xordan/src/client/gui/pawssmallinventory.cpp personal/Xordan/src/client/gui/pawssmallinventory.h personal/Xordan/src/client/gui/pawsspellbookwindow.cpp personal/Xordan/src/client/gui/pawsspellbookwindow.h personal/Xordan/src/client/gui/pawsspellcancelwindow.cpp personal/Xordan/src/client/gui/pawsspellcancelwindow.h personal/Xordan/src/client/gui/pawssplashwindow.cpp personal/Xordan/src/client/gui/pawssplashwindow.h personal/Xordan/src/client/gui/pawssummary.cpp personal/Xordan/src/client/gui/pawssummary.h personal/Xordan/src/client/gui/pawstutorialwindow.cpp personal/Xordan/src/client/gui/pawstutorialwindow.h personal/Xordan/src/client/gui/pawswritingwindow.cpp personal/Xordan/src/client/gui/pawswritingwindow.h personal/Xordan/src/client/gui/psmainwidget.cpp personal/Xordan/src/client/gui/psmainwidget.h personal/Xordan/src/client/gui/shortcutwindow.cpp personal/Xordan/src/client/gui/shortcutwindow.h personal/Xordan/src/client/guihandler.cpp personal/Xordan/src/client/guihandler.h personal/Xordan/src/client/iclient/isoundmngr.h personal/Xordan/src/client/iclient/netmanager.h personal/Xordan/src/client/modehandler.cpp personal/Xordan/src/client/modehandler.h personal/Xordan/src/client/pscal3dcallback.cpp personal/Xordan/src/client/pscal3dcallback.h personal/Xordan/src/client/pscamera.cpp personal/Xordan/src/client/pscamera.h personal/Xordan/src/client/pscelclient.cpp personal/Xordan/src/client/pscelclient.h personal/Xordan/src/client/pscharcontrol.cpp personal/Xordan/src/client/pscharcontrol.h personal/Xordan/src/client/psclientchar.cpp personal/Xordan/src/client/psclientchar.h personal/Xordan/src/client/psclientdr.cpp personal/Xordan/src/client/psclientdr.h personal/Xordan/src/client/psengine.cpp personal/Xordan/src/client/psengine.h personal/Xordan/src/client/psinventorycache.cpp personal/Xordan/src/client/psinventorycache.h personal/Xordan/src/client/psmovement.cpp personal/Xordan/src/client/psmovement.h personal/Xordan/src/client/psnetmanager.cpp personal/Xordan/src/client/psnetmanager.h personal/Xordan/src/client/psoptions.cpp personal/Xordan/src/client/psoptions.h personal/Xordan/src/client/psslotmgr.cpp personal/Xordan/src/client/psslotmgr.h personal/Xordan/src/client/questionclient.cpp personal/Xordan/src/client/questionclient.h personal/Xordan/src/client/shadowmanager.cpp personal/Xordan/src/client/shadowmanager.h personal/Xordan/src/client/sound/Jamfile personal/Xordan/src/client/sound/pssoundmngr.cpp personal/Xordan/src/client/sound/pssoundmngr.h personal/Xordan/src/client/weather.cpp personal/Xordan/src/client/weather.h personal/Xordan/src/client/win32/mdump.cpp personal/Xordan/src/client/win32/mdump.h personal/Xordan/src/client/zonehandler.cpp personal/Xordan/src/client/zonehandler.h personal/Xordan/src/common/Jamfile personal/Xordan/src/common/effects/Jamfile personal/Xordan/src/common/effects/pseffect.cpp personal/Xordan/src/common/effects/pseffect.h personal/Xordan/src/common/effects/pseffect2drenderer.cpp personal/Xordan/src/common/effects/pseffect2drenderer.h personal/Xordan/src/common/effects/pseffectanchor.cpp personal/Xordan/src/common/effects/pseffectanchor.h personal/Xordan/src/common/effects/pseffectanchorbasic.cpp personal/Xordan/src/common/effects/pseffectanchorbasic.h personal/Xordan/src/common/effects/pseffectanchorsocket.cpp personal/Xordan/src/common/effects/pseffectanchorsocket.h personal/Xordan/src/common/effects/pseffectanchorspline.cpp personal/Xordan/src/common/effects/pseffectanchorspline.h personal/Xordan/src/common/effects/pseffectmanager.cpp personal/Xordan/src/common/effects/pseffectmanager.h personal/Xordan/src/common/effects/pseffectobj.cpp personal/Xordan/src/common/effects/pseffectobj.h personal/Xordan/src/common/effects/pseffectobjdecal.cpp personal/Xordan/src/common/effects/pseffectobjdecal.h personal/Xordan/src/common/effects/pseffectobjmesh.cpp personal/Xordan/src/common/effects/pseffectobjmesh.h personal/Xordan/src/common/effects/pseffectobjparticles.cpp personal/Xordan/src/common/effects/pseffectobjparticles.h personal/Xordan/src/common/effects/pseffectobjquad.cpp personal/Xordan/src/common/effects/pseffectobjquad.h personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp personal/Xordan/src/common/effects/pseffectobjsimpmesh.h personal/Xordan/src/common/effects/pseffectobjsound.cpp personal/Xordan/src/common/effects/pseffectobjsound.h personal/Xordan/src/common/effects/pseffectobjspire.cpp personal/Xordan/src/common/effects/pseffectobjspire.h personal/Xordan/src/common/effects/pseffectobjstar.cpp personal/Xordan/src/common/effects/pseffectobjstar.h personal/Xordan/src/common/effects/pseffectobjtext.cpp personal/Xordan/src/common/effects/pseffectobjtext.h personal/Xordan/src/common/effects/pseffectobjtext2d.cpp personal/Xordan/src/common/effects/pseffectobjtext2d.h personal/Xordan/src/common/effects/pseffectobjtextable.h personal/Xordan/src/common/effects/pseffectobjtrail.cpp personal/Xordan/src/common/effects/pseffectobjtrail.h personal/Xordan/src/common/engine/Jamfile personal/Xordan/src/common/engine/celbase.cpp personal/Xordan/src/common/engine/celbase.h personal/Xordan/src/common/engine/materialmanager.cpp personal/Xordan/src/common/engine/materialmanager.h personal/Xordan/src/common/engine/netpersist.cpp personal/Xordan/src/common/engine/netpersist.h personal/Xordan/src/common/engine/psworld.cpp personal/Xordan/src/common/engine/psworld.h personal/Xordan/src/common/net/Jamfile personal/Xordan/src/common/net/adminmessage.cpp personal/Xordan/src/common/net/adminmessage.h personal/Xordan/src/common/net/charmessages.cpp personal/Xordan/src/common/net/charmessages.h personal/Xordan/src/common/net/clientmsghandler.cpp personal/Xordan/src/common/net/clientmsghandler.h personal/Xordan/src/common/net/cmdbase.cpp personal/Xordan/src/common/net/cmdbase.h personal/Xordan/src/common/net/cmdhandler.cpp personal/Xordan/src/common/net/cmdhandler.h personal/Xordan/src/common/net/connection.cpp personal/Xordan/src/common/net/connection.h personal/Xordan/src/common/net/message.h personal/Xordan/src/common/net/messages.cpp personal/Xordan/src/common/net/messages.h personal/Xordan/src/common/net/msghandler.cpp personal/Xordan/src/common/net/msghandler.h personal/Xordan/src/common/net/netbase.cpp personal/Xordan/src/common/net/netbase.h personal/Xordan/src/common/net/netinfos.cpp personal/Xordan/src/common/net/netinfos.h personal/Xordan/src/common/net/netpacket.cpp personal/Xordan/src/common/net/netpacket.h personal/Xordan/src/common/net/netprofile.cpp personal/Xordan/src/common/net/netprofile.h personal/Xordan/src/common/net/npcmessages.cpp personal/Xordan/src/common/net/npcmessages.h personal/Xordan/src/common/net/packing.h personal/Xordan/src/common/net/pstypes.h personal/Xordan/src/common/net/serverpinger.cpp personal/Xordan/src/common/net/serverpinger.h personal/Xordan/src/common/net/sockuni.h personal/Xordan/src/common/net/sockwin.h personal/Xordan/src/common/net/subscriber.h personal/Xordan/src/common/paws/Jamfile personal/Xordan/src/common/paws/pawsborder.cpp personal/Xordan/src/common/paws/pawsborder.h personal/Xordan/src/common/paws/pawsbutton.cpp personal/Xordan/src/common/paws/pawsbutton.h personal/Xordan/src/common/paws/pawscheckbox.cpp personal/Xordan/src/common/paws/pawscheckbox.h personal/Xordan/src/common/paws/pawscombo.cpp personal/Xordan/src/common/paws/pawscombo.h personal/Xordan/src/common/paws/pawscombopromptwindow.cpp personal/Xordan/src/common/paws/pawscombopromptwindow.h personal/Xordan/src/common/paws/pawscrollbar.cpp personal/Xordan/src/common/paws/pawscrollbar.h personal/Xordan/src/common/paws/pawsfilenavigation.cpp personal/Xordan/src/common/paws/pawsfilenavigation.h personal/Xordan/src/common/paws/pawsframedrawable.cpp personal/Xordan/src/common/paws/pawsframedrawable.h personal/Xordan/src/common/paws/pawsgenericview.cpp personal/Xordan/src/common/paws/pawsgenericview.h personal/Xordan/src/common/paws/pawsimagedrawable.cpp personal/Xordan/src/common/paws/pawsimagedrawable.h personal/Xordan/src/common/paws/pawskeyselectbox.cpp personal/Xordan/src/common/paws/pawskeyselectbox.h personal/Xordan/src/common/paws/pawslistbox.cpp personal/Xordan/src/common/paws/pawslistbox.h personal/Xordan/src/common/paws/pawsmainwidget.cpp personal/Xordan/src/common/paws/pawsmainwidget.h personal/Xordan/src/common/paws/pawsmanager.cpp personal/Xordan/src/common/paws/pawsmanager.h personal/Xordan/src/common/paws/pawsmenu.cpp personal/Xordan/src/common/paws/pawsmenu.h personal/Xordan/src/common/paws/pawsmouse.cpp personal/Xordan/src/common/paws/pawsmouse.h personal/Xordan/src/common/paws/pawsnumberpromptwindow.cpp personal/Xordan/src/common/paws/pawsnumberpromptwindow.h personal/Xordan/src/common/paws/pawsobjectview.cpp personal/Xordan/src/common/paws/pawsobjectview.h personal/Xordan/src/common/paws/pawsokbox.cpp personal/Xordan/src/common/paws/pawsokbox.h personal/Xordan/src/common/paws/pawsprefmanager.cpp personal/Xordan/src/common/paws/pawsprefmanager.h personal/Xordan/src/common/paws/pawsprogressbar.cpp personal/Xordan/src/common/paws/pawsprogressbar.h personal/Xordan/src/common/paws/pawspromptwindow.cpp personal/Xordan/src/common/paws/pawspromptwindow.h personal/Xordan/src/common/paws/pawsradio.cpp personal/Xordan/src/common/paws/pawsradio.h personal/Xordan/src/common/paws/pawsscript.cpp personal/Xordan/src/common/paws/pawsscript.h personal/Xordan/src/common/paws/pawsselector.cpp personal/Xordan/src/common/paws/pawsselector.h personal/Xordan/src/common/paws/pawssimplewindow.cpp personal/Xordan/src/common/paws/pawssimplewindow.h personal/Xordan/src/common/paws/pawsspinbox.cpp personal/Xordan/src/common/paws/pawsspinbox.h personal/Xordan/src/common/paws/pawsstringpromptwindow.cpp personal/Xordan/src/common/paws/pawsstringpromptwindow.h personal/Xordan/src/common/paws/pawsstyles.cpp personal/Xordan/src/common/paws/pawsstyles.h personal/Xordan/src/common/paws/pawstabwindow.cpp personal/Xordan/src/common/paws/pawstabwindow.h personal/Xordan/src/common/paws/pawstextbox.cpp personal/Xordan/src/common/paws/pawstextbox.h personal/Xordan/src/common/paws/pawstexturemanager.cpp personal/Xordan/src/common/paws/pawstexturemanager.h personal/Xordan/src/common/paws/pawstextwrap.cpp personal/Xordan/src/common/paws/pawstitle.cpp personal/Xordan/src/common/paws/pawstitle.h personal/Xordan/src/common/paws/pawstree.cpp personal/Xordan/src/common/paws/pawstree.h personal/Xordan/src/common/paws/pawswidget.cpp personal/Xordan/src/common/paws/pawswidget.h personal/Xordan/src/common/paws/pawsyesnobox.cpp personal/Xordan/src/common/paws/pawsyesnobox.h personal/Xordan/src/common/paws/psmousebinds.cpp personal/Xordan/src/common/paws/psmousebinds.h personal/Xordan/src/common/paws/widgetconfigwindow.cpp personal/Xordan/src/common/paws/widgetconfigwindow.h personal/Xordan/src/common/rpgrules/Jamfile personal/Xordan/src/common/rpgrules/factions.cpp personal/Xordan/src/common/rpgrules/factions.h personal/Xordan/src/common/rpgrules/psmoney.cpp personal/Xordan/src/common/rpgrules/psmoney.h personal/Xordan/src/common/rpgrules/vitals.cpp personal/Xordan/src/common/rpgrules/vitals.h personal/Xordan/src/common/util/Jamfile personal/Xordan/src/common/util/README personal/Xordan/src/common/util/command.h personal/Xordan/src/common/util/consoleout.cpp personal/Xordan/src/common/util/consoleout.h personal/Xordan/src/common/util/dbprofile.cpp personal/Xordan/src/common/util/dbprofile.h personal/Xordan/src/common/util/delimitedstring.cpp personal/Xordan/src/common/util/delimitedstring.h personal/Xordan/src/common/util/eventmanager.cpp personal/Xordan/src/common/util/eventmanager.h personal/Xordan/src/common/util/gameevent.cpp personal/Xordan/src/common/util/gameevent.h personal/Xordan/src/common/util/genericevent.h personal/Xordan/src/common/util/genqueue.cpp personal/Xordan/src/common/util/genqueue.h personal/Xordan/src/common/util/growarray.h personal/Xordan/src/common/util/heap.h personal/Xordan/src/common/util/localization.cpp personal/Xordan/src/common/util/localization.h personal/Xordan/src/common/util/location.cpp personal/Xordan/src/common/util/location.h personal/Xordan/src/common/util/log.cpp personal/Xordan/src/common/util/log.h personal/Xordan/src/common/util/mathscript.cpp personal/Xordan/src/common/util/mathscript.h personal/Xordan/src/common/util/minigame.h personal/Xordan/src/common/util/namegenerator.cpp personal/Xordan/src/common/util/namegenerator.h personal/Xordan/src/common/util/poolallocator.h personal/Xordan/src/common/util/prb.cpp personal/Xordan/src/common/util/prb.h personal/Xordan/src/common/util/pscache.cpp personal/Xordan/src/common/util/pscache.h personal/Xordan/src/common/util/psconst.h personal/Xordan/src/common/util/pscssetup.cpp personal/Xordan/src/common/util/pscssetup.h personal/Xordan/src/common/util/psdatabase.cpp personal/Xordan/src/common/util/psdatabase.h personal/Xordan/src/common/util/pserror.cpp personal/Xordan/src/common/util/pserror.h personal/Xordan/src/common/util/psmeshutil.cpp personal/Xordan/src/common/util/psmeshutil.h personal/Xordan/src/common/util/pspath.cpp personal/Xordan/src/common/util/pspath.h personal/Xordan/src/common/util/pspathnetwork.cpp personal/Xordan/src/common/util/pspathnetwork.h personal/Xordan/src/common/util/psprofile.cpp personal/Xordan/src/common/util/psprofile.h personal/Xordan/src/common/util/psres.cpp personal/Xordan/src/common/util/psres.h personal/Xordan/src/common/util/psresmngr.cpp personal/Xordan/src/common/util/psresmngr.h personal/Xordan/src/common/util/psscf.h personal/Xordan/src/common/util/psstring.cpp personal/Xordan/src/common/util/psstring.h personal/Xordan/src/common/util/psutil.cpp personal/Xordan/src/common/util/psutil.h personal/Xordan/src/common/util/psxmlparser.cpp personal/Xordan/src/common/util/psxmlparser.h personal/Xordan/src/common/util/scriptvar.h personal/Xordan/src/common/util/serverconsole.cpp personal/Xordan/src/common/util/serverconsole.h personal/Xordan/src/common/util/singleton.h personal/Xordan/src/common/util/skillcache.cpp personal/Xordan/src/common/util/skillcache.h personal/Xordan/src/common/util/sleep.cpp personal/Xordan/src/common/util/sleep.h personal/Xordan/src/common/util/slots.cpp personal/Xordan/src/common/util/slots.h personal/Xordan/src/common/util/stringarray.h personal/Xordan/src/common/util/strutil.cpp personal/Xordan/src/common/util/strutil.h personal/Xordan/src/common/util/texfactory.cpp personal/Xordan/src/common/util/texfactory.h personal/Xordan/src/common/util/waypoint.cpp personal/Xordan/src/common/util/waypoint.h personal/Xordan/src/eedit/Jamfile personal/Xordan/src/eedit/econtrolmanager.cpp personal/Xordan/src/eedit/econtrolmanager.h personal/Xordan/src/eedit/eeditapp.cpp personal/Xordan/src/eedit/eeditapp.h personal/Xordan/src/eedit/eeditcameratoolbox.cpp personal/Xordan/src/eedit/eeditcameratoolbox.h personal/Xordan/src/eedit/eeditediteffecttoolbox.cpp personal/Xordan/src/eedit/eeditediteffecttoolbox.h personal/Xordan/src/eedit/eediterrortoolbox.cpp personal/Xordan/src/eedit/eediterrortoolbox.h personal/Xordan/src/eedit/eeditfpstoolbox.cpp personal/Xordan/src/eedit/eeditfpstoolbox.h personal/Xordan/src/eedit/eeditglobals.h personal/Xordan/src/eedit/eeditinputboxmanager.cpp personal/Xordan/src/eedit/eeditinputboxmanager.h personal/Xordan/src/eedit/eeditloadeffecttoolbox.cpp personal/Xordan/src/eedit/eeditloadeffecttoolbox.h personal/Xordan/src/eedit/eeditloadmaptoolbox.cpp personal/Xordan/src/eedit/eeditloadmaptoolbox.h personal/Xordan/src/eedit/eeditpositiontoolbox.cpp personal/Xordan/src/eedit/eeditpositiontoolbox.h personal/Xordan/src/eedit/eeditrendertoolbox.cpp personal/Xordan/src/eedit/eeditrendertoolbox.h personal/Xordan/src/eedit/eeditreporter.cpp personal/Xordan/src/eedit/eeditreporter.h personal/Xordan/src/eedit/eeditselecteditanchor.cpp personal/Xordan/src/eedit/eeditselecteditanchor.h personal/Xordan/src/eedit/eeditselecteditanchorkeyframe.cpp personal/Xordan/src/eedit/eeditselecteditanchorkeyframe.h personal/Xordan/src/eedit/eeditselectfloat.cpp personal/Xordan/src/eedit/eeditselectfloat.h personal/Xordan/src/eedit/eeditselectlist.cpp personal/Xordan/src/eedit/eeditselectlist.h personal/Xordan/src/eedit/eeditselectnewanchor.cpp personal/Xordan/src/eedit/eeditselectnewanchor.h personal/Xordan/src/eedit/eeditselectnewanchorkeyframe.cpp personal/Xordan/src/eedit/eeditselectnewanchorkeyframe.h personal/Xordan/src/eedit/eeditselectstring.cpp personal/Xordan/src/eedit/eeditselectstring.h personal/Xordan/src/eedit/eeditselectvec3.cpp personal/Xordan/src/eedit/eeditselectvec3.h personal/Xordan/src/eedit/eeditselectyesno.cpp personal/Xordan/src/eedit/eeditselectyesno.h personal/Xordan/src/eedit/eeditshortcutstoolbox.cpp personal/Xordan/src/eedit/eeditshortcutstoolbox.h personal/Xordan/src/eedit/eedittargettoolbox.cpp personal/Xordan/src/eedit/eedittargettoolbox.h personal/Xordan/src/eedit/eedittoolbox.cpp personal/Xordan/src/eedit/eedittoolbox.h personal/Xordan/src/eedit/eedittoolboxmanager.cpp personal/Xordan/src/eedit/eedittoolboxmanager.h personal/Xordan/src/eedit/pawseedit.cpp personal/Xordan/src/eedit/pawseedit.h personal/Xordan/src/eedit/pscal3dcallback.cpp personal/Xordan/src/eedit/pscal3dcallback.h personal/Xordan/src/npcclient/Jamfile personal/Xordan/src/npcclient/command.cpp personal/Xordan/src/npcclient/gem.cpp personal/Xordan/src/npcclient/gem.h personal/Xordan/src/npcclient/globals.h personal/Xordan/src/npcclient/main.cpp personal/Xordan/src/npcclient/networkmgr.cpp personal/Xordan/src/npcclient/networkmgr.h personal/Xordan/src/npcclient/npc.cpp personal/Xordan/src/npcclient/npc.h personal/Xordan/src/npcclient/npcbehave.cpp personal/Xordan/src/npcclient/npcbehave.h personal/Xordan/src/npcclient/npcclient.cpp personal/Xordan/src/npcclient/npcclient.h personal/Xordan/src/npcclient/pathfind.cpp personal/Xordan/src/npcclient/pathfind.h personal/Xordan/src/npcclient/perceptions.cpp personal/Xordan/src/npcclient/perceptions.h personal/Xordan/src/npcclient/status.cpp personal/Xordan/src/npcclient/status.h personal/Xordan/src/npcclient/tribe.cpp personal/Xordan/src/npcclient/tribe.h personal/Xordan/src/npcclient/tribeneed.cpp personal/Xordan/src/npcclient/tribeneed.h personal/Xordan/src/npcclient/walkpoly.cpp personal/Xordan/src/npcclient/walkpoly.h personal/Xordan/src/server/Jamfile personal/Xordan/src/server/actionmanager.cpp personal/Xordan/src/server/actionmanager.h personal/Xordan/src/server/adminmanager.cpp personal/Xordan/src/server/adminmanager.h personal/Xordan/src/server/advicemanager.cpp personal/Xordan/src/server/advicemanager.h personal/Xordan/src/server/authentserver.cpp personal/Xordan/src/server/authentserver.h personal/Xordan/src/server/bankmanager.cpp personal/Xordan/src/server/bankmanager.h personal/Xordan/src/server/bulkobjects/Jamfile personal/Xordan/src/server/bulkobjects/dictionary.cpp personal/Xordan/src/server/bulkobjects/dictionary.h personal/Xordan/src/server/bulkobjects/psaccountinfo.cpp personal/Xordan/src/server/bulkobjects/psaccountinfo.h personal/Xordan/src/server/bulkobjects/psactionlocationinfo.cpp personal/Xordan/src/server/bulkobjects/psactionlocationinfo.h personal/Xordan/src/server/bulkobjects/pscharacter.cpp personal/Xordan/src/server/bulkobjects/pscharacter.h personal/Xordan/src/server/bulkobjects/pscharacterlist.cpp personal/Xordan/src/server/bulkobjects/pscharacterlist.h personal/Xordan/src/server/bulkobjects/pscharacterloader.cpp personal/Xordan/src/server/bulkobjects/pscharacterloader.h personal/Xordan/src/server/bulkobjects/pscharinventory.cpp personal/Xordan/src/server/bulkobjects/pscharinventory.h personal/Xordan/src/server/bulkobjects/psglyph.cpp personal/Xordan/src/server/bulkobjects/psglyph.h personal/Xordan/src/server/bulkobjects/psguildinfo.cpp personal/Xordan/src/server/bulkobjects/psguildinfo.h personal/Xordan/src/server/bulkobjects/psinventorycachesvr.cpp personal/Xordan/src/server/bulkobjects/psinventorycachesvr.h personal/Xordan/src/server/bulkobjects/psitem.cpp personal/Xordan/src/server/bulkobjects/psitem.h personal/Xordan/src/server/bulkobjects/psitemstats.cpp personal/Xordan/src/server/bulkobjects/psitemstats.h personal/Xordan/src/server/bulkobjects/psmerchantinfo.cpp personal/Xordan/src/server/bulkobjects/psmerchantinfo.h personal/Xordan/src/server/bulkobjects/psnpcdialog.cpp personal/Xordan/src/server/bulkobjects/psnpcdialog.h personal/Xordan/src/server/bulkobjects/psnpcloader.cpp personal/Xordan/src/server/bulkobjects/psnpcloader.h personal/Xordan/src/server/bulkobjects/psquest.cpp personal/Xordan/src/server/bulkobjects/psquest.h personal/Xordan/src/server/bulkobjects/psquestprereqops.cpp personal/Xordan/src/server/bulkobjects/psquestprereqops.h personal/Xordan/src/server/bulkobjects/psraceinfo.cpp personal/Xordan/src/server/bulkobjects/psraceinfo.h personal/Xordan/src/server/bulkobjects/pssectorinfo.cpp personal/Xordan/src/server/bulkobjects/pssectorinfo.h personal/Xordan/src/server/bulkobjects/psskills.cpp personal/Xordan/src/server/bulkobjects/psskills.h personal/Xordan/src/server/bulkobjects/psspell.cpp personal/Xordan/src/server/bulkobjects/psspell.h personal/Xordan/src/server/bulkobjects/pstrade.cpp personal/Xordan/src/server/bulkobjects/pstrade.h personal/Xordan/src/server/bulkobjects/pstrainerinfo.cpp personal/Xordan/src/server/bulkobjects/pstrainerinfo.h personal/Xordan/src/server/bulkobjects/pstrait.cpp personal/Xordan/src/server/bulkobjects/pstrait.h personal/Xordan/src/server/bulkobjects/servervitals.cpp personal/Xordan/src/server/bulkobjects/servervitals.h personal/Xordan/src/server/cachemanager.cpp personal/Xordan/src/server/cachemanager.h personal/Xordan/src/server/chatmanager.cpp personal/Xordan/src/server/chatmanager.h personal/Xordan/src/server/client.cpp personal/Xordan/src/server/client.h personal/Xordan/src/server/clients.cpp personal/Xordan/src/server/clients.h personal/Xordan/src/server/clientstatuslogger.cpp personal/Xordan/src/server/clientstatuslogger.h personal/Xordan/src/server/combatmanager.cpp personal/Xordan/src/server/combatmanager.h personal/Xordan/src/server/command.cpp personal/Xordan/src/server/commandmanager.cpp personal/Xordan/src/server/commandmanager.h personal/Xordan/src/server/creationmanager.cpp personal/Xordan/src/server/creationmanager.h personal/Xordan/src/server/database/Jamfile personal/Xordan/src/server/database/mysql/Jamfile personal/Xordan/src/server/database/mysql/accessrules.sql personal/Xordan/src/server/database/mysql/accounts.sql personal/Xordan/src/server/database/mysql/action_locations.sql personal/Xordan/src/server/database/mysql/alliances.sql personal/Xordan/src/server/database/mysql/armorvsweapon.sql personal/Xordan/src/server/database/mysql/bad_names.sql personal/Xordan/src/server/database/mysql/bans.sql personal/Xordan/src/server/database/mysql/char_adv.sql personal/Xordan/src/server/database/mysql/char_create_affinity.sql personal/Xordan/src/server/database/mysql/char_creation.sql personal/Xordan/src/server/database/mysql/char_skills.sql personal/Xordan/src/server/database/mysql/char_traits.sql personal/Xordan/src/server/database/mysql/character_events.sql personal/Xordan/src/server/database/mysql/character_limitations.sql personal/Xordan/src/server/database/mysql/character_quests.sql personal/Xordan/src/server/database/mysql/character_relationships.sql personal/Xordan/src/server/database/mysql/characters.sql personal/Xordan/src/server/database/mysql/command_access.sql personal/Xordan/src/server/database/mysql/commonstrings.sql personal/Xordan/src/server/database/mysql/create_all.sql personal/Xordan/src/server/database/mysql/createdrop.sh personal/Xordan/src/server/database/mysql/dal.cpp personal/Xordan/src/server/database/mysql/dal.h personal/Xordan/src/server/database/mysql/dbmysql.csplugin personal/Xordan/src/server/database/mysql/deletechar.sql personal/Xordan/src/server/database/mysql/deletenpc.sql personal/Xordan/src/server/database/mysql/deletenpc_mb.sql personal/Xordan/src/server/database/mysql/drop.sql personal/Xordan/src/server/database/mysql/factions.sql personal/Xordan/src/server/database/mysql/familiar_types.sql personal/Xordan/src/server/database/mysql/gm_command_log.sql personal/Xordan/src/server/database/mysql/gm_events.sql personal/Xordan/src/server/database/mysql/guildlevels.sql personal/Xordan/src/server/database/mysql/guilds.sql personal/Xordan/src/server/database/mysql/hunt_locations.sql personal/Xordan/src/server/database/mysql/item_animations.sql personal/Xordan/src/server/database/mysql/item_categories.sql personal/Xordan/src/server/database/mysql/item_instances.sql personal/Xordan/src/server/database/mysql/item_stats.sql personal/Xordan/src/server/database/mysql/loot_modifiers.sql personal/Xordan/src/server/database/mysql/loot_rule_details.sql personal/Xordan/src/server/database/mysql/loot_rules.sql personal/Xordan/src/server/database/mysql/math_scripts.sql personal/Xordan/src/server/database/mysql/merchant_item_cats.sql personal/Xordan/src/server/database/mysql/migration.sql personal/Xordan/src/server/database/mysql/money_events.sql personal/Xordan/src/server/database/mysql/movement.sql personal/Xordan/src/server/database/mysql/npc_bad_text.sql personal/Xordan/src/server/database/mysql/npc_disallowed_words.sql personal/Xordan/src/server/database/mysql/npc_kas.sql personal/Xordan/src/server/database/mysql/npc_responses.sql personal/Xordan/src/server/database/mysql/npc_spawn_ranges.sql personal/Xordan/src/server/database/mysql/npc_spawn_rules.sql personal/Xordan/src/server/database/mysql/npc_synonyms.sql personal/Xordan/src/server/database/mysql/npc_trigger_groups.sql personal/Xordan/src/server/database/mysql/npc_triggers.sql personal/Xordan/src/server/database/mysql/petitions.sql personal/Xordan/src/server/database/mysql/planeshift_db.xml personal/Xordan/src/server/database/mysql/player_spells.sql personal/Xordan/src/server/database/mysql/progress_events.sql personal/Xordan/src/server/database/mysql/quest_scripts.sql personal/Xordan/src/server/database/mysql/quests.sql personal/Xordan/src/server/database/mysql/race_info.sql personal/Xordan/src/server/database/mysql/sc_location_type.sql personal/Xordan/src/server/database/mysql/sc_locations.sql personal/Xordan/src/server/database/mysql/sc_npc_definitions.sql personal/Xordan/src/server/database/mysql/sc_path_points.sql personal/Xordan/src/server/database/mysql/sc_tribe_memories.sql personal/Xordan/src/server/database/mysql/sc_tribe_resources.sql personal/Xordan/src/server/database/mysql/sc_waypoint_links.sql personal/Xordan/src/server/database/mysql/sc_waypoints.sql personal/Xordan/src/server/database/mysql/sectors.sql personal/Xordan/src/server/database/mysql/security_levels.sql personal/Xordan/src/server/database/mysql/server_options.sql personal/Xordan/src/server/database/mysql/skills.sql personal/Xordan/src/server/database/mysql/spell_glyphs.sql personal/Xordan/src/server/database/mysql/spells.sql personal/Xordan/src/server/database/mysql/stances.sql personal/Xordan/src/server/database/mysql/tips.sql personal/Xordan/src/server/database/mysql/trade_autocontainers.sql personal/Xordan/src/server/database/mysql/trade_combinations.sql personal/Xordan/src/server/database/mysql/trade_constraints.sql personal/Xordan/src/server/database/mysql/trade_patterns.sql personal/Xordan/src/server/database/mysql/trade_processes.sql personal/Xordan/src/server/database/mysql/trade_transformations.sql personal/Xordan/src/server/database/mysql/trainer_skills.sql personal/Xordan/src/server/database/mysql/traits.sql personal/Xordan/src/server/database/mysql/tribe_members.sql personal/Xordan/src/server/database/mysql/tribes.sql personal/Xordan/src/server/database/mysql/unique_content.sql personal/Xordan/src/server/database/mysql/upgrade_schema.sql personal/Xordan/src/server/database/mysql/ways.sql personal/Xordan/src/server/deathcallback.h personal/Xordan/src/server/deleteobjcallback.h personal/Xordan/src/server/economymanager.cpp personal/Xordan/src/server/economymanager.h personal/Xordan/src/server/entitymanager.cpp personal/Xordan/src/server/entitymanager.h personal/Xordan/src/server/events.cpp personal/Xordan/src/server/events.h personal/Xordan/src/server/exchangemanager.cpp personal/Xordan/src/server/exchangemanager.h personal/Xordan/src/server/gem.cpp personal/Xordan/src/server/gem.h personal/Xordan/src/server/globals.h personal/Xordan/src/server/gmeventmanager.cpp personal/Xordan/src/server/gmeventmanager.h personal/Xordan/src/server/groupmanager.cpp personal/Xordan/src/server/groupmanager.h personal/Xordan/src/server/guildmanager.cpp personal/Xordan/src/server/guildmanager.h personal/Xordan/src/server/icachedobject.h personal/Xordan/src/server/invitemanager.cpp personal/Xordan/src/server/invitemanager.h personal/Xordan/src/server/iserver/idal.h personal/Xordan/src/server/main.cpp personal/Xordan/src/server/marriagemanager.cpp personal/Xordan/src/server/marriagemanager.h personal/Xordan/src/server/minigamemanager.cpp personal/Xordan/src/server/minigamemanager.h personal/Xordan/src/server/msgmanager.cpp personal/Xordan/src/server/msgmanager.h personal/Xordan/src/server/netmanager.cpp personal/Xordan/src/server/netmanager.h personal/Xordan/src/server/npcmanager.cpp personal/Xordan/src/server/npcmanager.h personal/Xordan/src/server/paladinjr.cpp personal/Xordan/src/server/paladinjr.h personal/Xordan/src/server/playergroup.h personal/Xordan/src/server/progressionmanager.cpp personal/Xordan/src/server/progressionmanager.h personal/Xordan/src/server/psproxlist.cpp personal/Xordan/src/server/psproxlist.h personal/Xordan/src/server/psserver.cpp personal/Xordan/src/server/psserver.h personal/Xordan/src/server/psserverchar.cpp personal/Xordan/src/server/psserverchar.h personal/Xordan/src/server/psserverdr.cpp personal/Xordan/src/server/psserverdr.h personal/Xordan/src/server/questionmanager.cpp personal/Xordan/src/server/questionmanager.h personal/Xordan/src/server/questmanager.cpp personal/Xordan/src/server/questmanager.h personal/Xordan/src/server/serverstatus.cpp personal/Xordan/src/server/serverstatus.h personal/Xordan/src/server/slotmanager.cpp personal/Xordan/src/server/slotmanager.h personal/Xordan/src/server/spawnmanager.cpp personal/Xordan/src/server/spawnmanager.h personal/Xordan/src/server/spellmanager.cpp personal/Xordan/src/server/spellmanager.h personal/Xordan/src/server/tutorialmanager.cpp personal/Xordan/src/server/tutorialmanager.h personal/Xordan/src/server/usermanager.cpp personal/Xordan/src/server/usermanager.h personal/Xordan/src/server/weathermanager.cpp personal/Xordan/src/server/weathermanager.h personal/Xordan/src/server/workmanager.cpp personal/Xordan/src/server/workmanager.h personal/Xordan/src/tools/Jamfile personal/Xordan/src/tools/fparser/Jamfile personal/Xordan/src/tools/fparser/fparser.cpp personal/Xordan/src/tools/fparser/fparser.h personal/Xordan/src/tools/fparser/fparser.txt personal/Xordan/src/tools/fparser/fpconfig.h personal/Xordan/src/tools/fparser/fpoptimizer.cpp personal/Xordan/src/tools/fparser/fptypes.h personal/Xordan/vfs.cfg Property Changed: ---------------- personal/Xordan/Jamfile.in personal/Xordan/Jamrules personal/Xordan/autogen.sh personal/Xordan/configure.ac personal/Xordan/data/eedit/camera.xml personal/Xordan/data/eedit/editeffect.xml personal/Xordan/data/eedit/eedit.xml personal/Xordan/data/eedit/filenavigation.xml personal/Xordan/data/eedit/imagelist.xml personal/Xordan/data/eedit/inputbox/editanchor.xml personal/Xordan/data/eedit/inputbox/editanchorkeyframe.xml personal/Xordan/data/eedit/inputbox/float.xml personal/Xordan/data/eedit/inputbox/list.xml personal/Xordan/data/eedit/inputbox/newanchor.xml personal/Xordan/data/eedit/inputbox/newanchorkeyframe.xml personal/Xordan/data/eedit/inputbox/string.xml personal/Xordan/data/eedit/inputbox/vec3.xml personal/Xordan/data/eedit/inputbox/yesno.xml personal/Xordan/data/eedit/keys_def.xml personal/Xordan/data/eedit/loadeffect.xml personal/Xordan/data/eedit/loadmap.xml personal/Xordan/data/eedit/position.xml personal/Xordan/data/eedit/render.xml personal/Xordan/data/eedit/target.xml personal/Xordan/data/effects/examples/obj_quad.eff personal/Xordan/data/effects/examples/obj_spire.eff personal/Xordan/data/effects/examples/obj_star.eff personal/Xordan/data/effects/misc/admin_location.eff personal/Xordan/data/effects/misc/admin_path_point.eff personal/Xordan/data/effects/misc/chatbubble.eff personal/Xordan/data/effects/misc/chatbubble_longphrase.eff personal/Xordan/data/effects/misc/chatbubble_metal.eff personal/Xordan/data/effects/misc/chatbubble_normal.eff personal/Xordan/data/effects/misc/chatbubble_shortphrase.eff personal/Xordan/data/effects/misc/entitylabel.eff personal/Xordan/data/effects/misc/marker.eff personal/Xordan/data/effects/misc/shadow.eff personal/Xordan/data/effects/misc/target.eff personal/Xordan/data/emotes.xml personal/Xordan/data/gui/actionlocation.xml personal/Xordan/data/gui/activemagicwindow.xml personal/Xordan/data/gui/bankwindow.xml personal/Xordan/data/gui/birth.xml personal/Xordan/data/gui/bookwriting.xml personal/Xordan/data/gui/borderlist.xml personal/Xordan/data/gui/buddy.xml personal/Xordan/data/gui/charcreate.xml personal/Xordan/data/gui/chardescwindow.xml personal/Xordan/data/gui/charpick.xml personal/Xordan/data/gui/chat.xml personal/Xordan/data/gui/chatmenu.xml personal/Xordan/data/gui/childhood.xml personal/Xordan/data/gui/configcamera.xml personal/Xordan/data/gui/configchat.xml personal/Xordan/data/gui/configchatfilter.xml personal/Xordan/data/gui/configchattabs.xml personal/Xordan/data/gui/configdetails.xml personal/Xordan/data/gui/configentityinter.xml personal/Xordan/data/gui/configentitylabels.xml personal/Xordan/data/gui/configkeys.xml personal/Xordan/data/gui/configmouse.xml personal/Xordan/data/gui/configpvp.xml personal/Xordan/data/gui/configsound.xml personal/Xordan/data/gui/configwindow.xml personal/Xordan/data/gui/containerdesc.xml personal/Xordan/data/gui/control.xml personal/Xordan/data/gui/control_styles.xml personal/Xordan/data/gui/craft.xml personal/Xordan/data/gui/credits_config.xml personal/Xordan/data/gui/creditswindow.xml personal/Xordan/data/gui/customwidgetslist.xml personal/Xordan/data/gui/detailwindow.xml personal/Xordan/data/gui/eedit.xml personal/Xordan/data/gui/exchange.xml personal/Xordan/data/gui/filenavigation.xml personal/Xordan/data/gui/fingering.xml personal/Xordan/data/gui/glyph.xml personal/Xordan/data/gui/gmaddeditaction.xml personal/Xordan/data/gui/gmguiwindow.xml personal/Xordan/data/gui/gmspawn.xml personal/Xordan/data/gui/group.xml personal/Xordan/data/gui/guildwindow.xml personal/Xordan/data/gui/helpwindow.xml personal/Xordan/data/gui/ignorewindow.xml personal/Xordan/data/gui/illumination.xml personal/Xordan/data/gui/infowindow.xml personal/Xordan/data/gui/interact.xml personal/Xordan/data/gui/inventory.xml personal/Xordan/data/gui/itemdesc.xml personal/Xordan/data/gui/lifeevents.xml personal/Xordan/data/gui/loadwindow.xml personal/Xordan/data/gui/loginwindow.xml personal/Xordan/data/gui/loot.xml personal/Xordan/data/gui/merchant.xml personal/Xordan/data/gui/money.xml personal/Xordan/data/gui/newoptions.xml personal/Xordan/data/gui/ok.xml personal/Xordan/data/gui/parents.xml personal/Xordan/data/gui/paths.xml personal/Xordan/data/gui/paws_generic.xml personal/Xordan/data/gui/petition.xml personal/Xordan/data/gui/petitiongm.xml personal/Xordan/data/gui/petstatwindow.xml personal/Xordan/data/gui/questnotebook.xml personal/Xordan/data/gui/questrewardwindow.xml personal/Xordan/data/gui/quitinfo.xml personal/Xordan/data/gui/readbook.xml personal/Xordan/data/gui/shortcutwindow.xml personal/Xordan/data/gui/skillwindow.xml personal/Xordan/data/gui/smallinventory.xml personal/Xordan/data/gui/spell_effect.xml personal/Xordan/data/gui/spellcancelwindow.xml personal/Xordan/data/gui/spellwindow.xml personal/Xordan/data/gui/splash.xml personal/Xordan/data/gui/styles.xml personal/Xordan/data/gui/summary.xml personal/Xordan/data/gui/tutorial.xml personal/Xordan/data/gui/widgetconfigwindow.xml personal/Xordan/data/gui/yesno.xml personal/Xordan/data/help.xml personal/Xordan/data/npcbehave.xml personal/Xordan/data/npcdefs.xml personal/Xordan/data/options/camera_def.xml personal/Xordan/data/options/chat_def.xml personal/Xordan/data/options/chatbubbles.xml personal/Xordan/data/options/controls_def.xml personal/Xordan/data/options/entityinter_def.xml personal/Xordan/data/options/entitylabels_def.xml personal/Xordan/data/options/mouse_def.xml personal/Xordan/data/options/pvp_def.xml personal/Xordan/data/options/shortcutcommands_def.xml personal/Xordan/data/options/sound_def.xml personal/Xordan/data/phonics.xml personal/Xordan/data/pvp_regions.xml personal/Xordan/data/races/descriptions.xml personal/Xordan/data/races/quickpaths.xml personal/Xordan/data/zoneinfo.xml personal/Xordan/docs/compiling.html personal/Xordan/docs/credit.txt personal/Xordan/docs/credits_AtomicBlue.txt personal/Xordan/docs/credits_CrystalBlue.txt personal/Xordan/docs/credits_MolecularBlue.txt personal/Xordan/docs/history.txt personal/Xordan/docs/history2003.txt personal/Xordan/docs/history2004.txt personal/Xordan/docs/history2005.txt personal/Xordan/docs/history2006.txt personal/Xordan/eedit.cfg personal/Xordan/include/msvc/psconfig.h personal/Xordan/include/msvc/psstdint.h personal/Xordan/lang/cesky/data/help.xml personal/Xordan/lang/cesky/stringtable.xml personal/Xordan/lang/deutsch/data/help.xml personal/Xordan/mk/autoconf/ac_check_typedef.m4 personal/Xordan/mk/autoconf/ac_compile_check_sizeof.m4 personal/Xordan/mk/autoconf/ac_need_stdint_h.m4 personal/Xordan/mk/autoconf/cel.m4 personal/Xordan/mk/autoconf/checkbinutils.m4 personal/Xordan/mk/autoconf/checkbuild.m4 personal/Xordan/mk/autoconf/checkcommon.m4 personal/Xordan/mk/autoconf/checkcppunit.m4 personal/Xordan/mk/autoconf/checkcswin32libs.m4 personal/Xordan/mk/autoconf/checklib.m4 personal/Xordan/mk/autoconf/checklibtool.m4 personal/Xordan/mk/autoconf/checkopengl.m4 personal/Xordan/mk/autoconf/checkpic.m4 personal/Xordan/mk/autoconf/checkprog.m4 personal/Xordan/mk/autoconf/checkpthread.m4 personal/Xordan/mk/autoconf/checkpython.m4 personal/Xordan/mk/autoconf/checktt2.m4 personal/Xordan/mk/autoconf/compiler.m4 personal/Xordan/mk/autoconf/config.guess personal/Xordan/mk/autoconf/config.sub personal/Xordan/mk/autoconf/crystal.m4 personal/Xordan/mk/autoconf/cs_check_host.m4 personal/Xordan/mk/autoconf/csbuild.m4 personal/Xordan/mk/autoconf/diagnose.m4 ... [truncated message content] |
From: <mg...@us...> - 2008-06-13 20:21:26
|
Revision: 1752 http://planeshift.svn.sourceforge.net/planeshift/?rev=1752&view=rev Author: mgist Date: 2008-06-13 13:21:21 -0700 (Fri, 13 Jun 2008) Log Message: ----------- - Fixes/changes for trunk CS. Modified Paths: -------------- personal/Xordan/src/client/authentclient.cpp personal/Xordan/src/client/charapp.cpp personal/Xordan/src/client/charapp.h personal/Xordan/src/client/cmdutil.cpp personal/Xordan/src/client/gui/pawsgmgui.cpp personal/Xordan/src/client/gui/pawsloginwindow.cpp personal/Xordan/src/client/gui/psmainwidget.cpp personal/Xordan/src/client/modehandler.cpp personal/Xordan/src/client/pscamera.cpp personal/Xordan/src/client/pscamera.h personal/Xordan/src/client/pscelclient.cpp personal/Xordan/src/client/psclientchar.cpp personal/Xordan/src/client/psengine.cpp personal/Xordan/src/client/psengine.h personal/Xordan/src/client/psnetmanager.cpp personal/Xordan/src/client/psnetmanager.h personal/Xordan/src/client/sound/pssoundmngr.cpp personal/Xordan/src/client/weather.cpp personal/Xordan/src/common/effects/pseffectobj.cpp personal/Xordan/src/common/effects/pseffectobjdecal.cpp personal/Xordan/src/common/effects/pseffectobjlabel.cpp personal/Xordan/src/common/effects/pseffectobjmesh.cpp personal/Xordan/src/common/effects/pseffectobjparticles.cpp personal/Xordan/src/common/effects/pseffectobjquad.cpp personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp personal/Xordan/src/common/effects/pseffectobjsound.cpp personal/Xordan/src/common/effects/pseffectobjspire.cpp personal/Xordan/src/common/effects/pseffectobjstar.cpp personal/Xordan/src/common/effects/pseffectobjtext.cpp personal/Xordan/src/common/effects/pseffectobjtext2d.cpp personal/Xordan/src/common/effects/pseffectobjtrail.cpp personal/Xordan/src/common/paws/pawsgenericview.cpp personal/Xordan/src/common/paws/pawsobjectview.cpp personal/Xordan/src/common/util/heap.h personal/Xordan/vfs.cfg Removed Paths: ------------- personal/Xordan/src/client/iclient/netmanager.h Modified: personal/Xordan/src/client/authentclient.cpp =================================================================== --- personal/Xordan/src/client/authentclient.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/authentclient.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -32,8 +32,6 @@ #include "util/pserror.h" #include "util/log.h" -#include "iclient/netmanager.h" - #include "gui/pawsinfowindow.h" #include "gui/pawsloginwindow.h" #include "gui/psmainwidget.h" Modified: personal/Xordan/src/client/charapp.cpp =================================================================== --- personal/Xordan/src/client/charapp.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/charapp.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -4,7 +4,6 @@ //============================================================================= #include <iengine/engine.h> #include <iengine/material.h> -#include <iengine/region.h> #include <iengine/scenenode.h> #include <imap/loader.h> #include <imesh/object.h> @@ -35,7 +34,7 @@ psCharAppearance::psCharAppearance(iObjectRegistry* objectReg) { psengine->RegisterDelayedLoader(this); - stringSet = csQueryRegistryTagInterface<iStringSet>(objectReg, "crystalspace.shared.stringset"); + stringSet = csQueryRegistryTagInterface<iShaderVarStringSet>(objectReg, "crystalspace.shader.variablenameset"); engine = csQueryRegistry<iEngine>(objectReg); loader = csQueryRegistry<iLoader>(objectReg); vfs = csQueryRegistry<iVFS>(objectReg); @@ -199,7 +198,7 @@ if ( context_hair ) { - csStringID varName = stringSet->Request("colorize"); + CS::ShaderVarStringID varName = stringSet->Request("colorize"); csShaderVariable* var = context_hair->GetVariableAdd(varName); if ( var ) @@ -210,7 +209,7 @@ if ( context_beard ) { - csStringID varName = stringSet->Request("colorize"); + CS::ShaderVarStringID varName = stringSet->Request("colorize"); csShaderVariable* var = context_beard->GetVariableAdd(varName); if ( var ) Modified: personal/Xordan/src/client/charapp.h =================================================================== --- personal/Xordan/src/client/charapp.h 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/charapp.h 2008-06-13 20:21:21 UTC (rev 1752) @@ -201,7 +201,7 @@ csRef<iSpriteCal3DFactoryState> stateFactory; // The Cal3D factory object csRef<iSpriteCal3DState> state; // The Cal3D sprite state - csRef<iStringSet> stringSet; // Used by shader variables. + csRef<iShaderVarStringSet> stringSet; // Used by shader variables. // Crystal space objects. csRef<iEngine> engine; Modified: personal/Xordan/src/client/cmdutil.cpp =================================================================== --- personal/Xordan/src/client/cmdutil.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/cmdutil.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -229,7 +229,7 @@ //Begin the saving process //Get the iCamera stucture - iCamera *c = psengine->GetPSCamera()->GetICamera(); + iCamera *c = psengine->GetPSCamera()->GetICamera()->GetCamera(); csOrthoTransform& camtrans = c->GetTransform (); if (!c) return "No camera found! (This is fatal!)"; Modified: personal/Xordan/src/client/gui/pawsgmgui.cpp =================================================================== --- personal/Xordan/src/client/gui/pawsgmgui.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/gui/pawsgmgui.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -689,7 +689,7 @@ if ( IsVisible() ) { csString query( "" ); - iSector* sector = psengine->GetPSCamera()->GetICamera()->GetSector(); + iSector* sector = psengine->GetPSCamera()->GetICamera()->GetCamera()->GetSector(); const char* sectorname = sector->QueryObject()->GetName(); query.Append( "<location>" ); Modified: personal/Xordan/src/client/gui/pawsloginwindow.cpp =================================================================== --- personal/Xordan/src/client/gui/pawsloginwindow.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/gui/pawsloginwindow.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -23,7 +23,6 @@ #include <csutil/xmltiny.h> #include <csutil/csmd5.h> -#include "iclient/netmanager.h" #include "iclient/isoundmngr.h" #include "pawsloginwindow.h" #include "paws/pawsmanager.h" Modified: personal/Xordan/src/client/gui/psmainwidget.cpp =================================================================== --- personal/Xordan/src/client/gui/psmainwidget.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/gui/psmainwidget.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -405,7 +405,7 @@ if (mesh) { - iSector* sector = psengine->GetPSCamera()->GetICamera()->GetSector(); + iSector* sector = psengine->GetPSCamera()->GetICamera()->GetCamera()->GetSector(); const char* sectorname = sector->QueryObject()->GetName(); const char* meshname = mesh->QueryObject()->GetName(); Deleted: personal/Xordan/src/client/iclient/netmanager.h =================================================================== --- personal/Xordan/src/client/iclient/netmanager.h 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/iclient/netmanager.h 2008-06-13 20:21:21 UTC (rev 1752) @@ -1,51 +0,0 @@ -/* - * netmanager.h by Matze Braun <Mat...@gm...> - * - * Copyright (C) 2001 PlaneShift Team (in...@pl..., - * http://www.planeshift.it) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation (version 2 of the License) - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ -#ifndef __I_NETMANAGER_H__ -#define __I_NETMANAGER_H__ - -#include <csutil/scf.h> - -SCF_VERSION(iNetManager, 0, 0, 1); - -class MsgHandler; -class CmdHandler; - -struct iNetManager : public iBase -{ - virtual bool Connect(const char* server, int port) = 0; - virtual void Disconnect() = 0; - virtual void SendDisconnect(bool final = true) = 0; - virtual void Authenticate(const char* name, const char* pwd ) = 0; - - virtual MsgHandler* GetMsgHandler() = 0; - virtual CmdHandler* GetCmdHandler() = 0; - virtual const char* GetLastError() = 0; - virtual const char* GetAuthMessage() = 0; - - virtual bool IsConnected() = 0; - - enum - { - EXISTING_PLAYER = 0, - NEW_PLAYER = 1 - }; -}; - -#endif - Modified: personal/Xordan/src/client/modehandler.cpp =================================================================== --- personal/Xordan/src/client/modehandler.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/modehandler.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -243,8 +243,10 @@ else if (newlight->type == "light") { iLight* light = psengine->GetEngine()->FindLight(newlight->object); - if (light) - newlight->sector = light->GetSector()->QueryObject()->GetName(); + if (light && light->GetMovable()->GetSectors()->GetCount() > 0) + { + newlight->sector = light->GetMovable()->GetSectors()->Get(0)->QueryObject()->GetName(); + } } } return true; Modified: personal/Xordan/src/client/pscamera.cpp =================================================================== --- personal/Xordan/src/client/pscamera.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/pscamera.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -304,17 +304,17 @@ iSector* sector; actor->GetLastPosition(pos, yRot, sector); - view->GetCamera()->SetSector(sector); - view->GetCamera()->GetTransform().SetOrigin(pos); + view->GetPerspectiveCamera()->GetCamera()->SetSector(sector); + view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(pos); int width = psengine->GetG2D()->GetWidth(); int height = psengine->GetG2D()->GetHeight(); view->SetRectangle(0, 0, width, height); - view->GetCamera()->SetPerspectiveCenter(width >> 1, height >> 1); + view->GetPerspectiveCamera()->SetPerspectiveCenter(width >> 1, height >> 1); view->SetContext(psengine->GetG3D()); - view->GetCamera()->SetFOV( view->GetCamera()->GetFOV(), width ); + view->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), width ); for (int i=0; i<CAMERA_MODES_COUNT; i++) { @@ -704,11 +704,11 @@ } // assume the normal camera movement is good, and move the camera - view->GetCamera()->SetSector(actorSector); - view->GetCamera()->GetTransform().SetOrigin(actorPos + csVector3(0,1,0)); - view->GetCamera()->OnlyPortals(true); - view->GetCamera()->GetTransform().LookAt(GetTarget(CAMERA_ACTUAL_DATA) - GetPosition(CAMERA_ACTUAL_DATA), GetUp(CAMERA_ACTUAL_DATA)); - view->GetCamera()->MoveWorld(GetPosition(CAMERA_ACTUAL_DATA) - view->GetCamera()->GetTransform().GetOrigin()); + view->GetPerspectiveCamera()->GetCamera()->SetSector(actorSector); + view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(actorPos + csVector3(0,1,0)); + view->GetPerspectiveCamera()->GetCamera()->OnlyPortals(true); + view->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt(GetTarget(CAMERA_ACTUAL_DATA) - GetPosition(CAMERA_ACTUAL_DATA), GetUp(CAMERA_ACTUAL_DATA)); + view->GetPerspectiveCamera()->GetCamera()->MoveWorld(GetPosition(CAMERA_ACTUAL_DATA) - view->GetPerspectiveCamera()->GetCamera()->GetTransform().GetOrigin()); view->Draw(); @@ -860,9 +860,9 @@ return csString("Unknown"); } -iCamera *psCamera::GetICamera() +iPerspectiveCamera *psCamera::GetICamera() { - return view->GetCamera(); + return view->GetPerspectiveCamera(); } iView *psCamera::GetView() @@ -878,14 +878,14 @@ csVector3 vc, vo, vw; csVector2 perspective( x, GetICamera()->GetShiftY() * 2 - y ); - vc = GetICamera()->InvPerspective( perspective, 1 ); - vw = GetICamera()->GetTransform().This2Other( vc ); + vc = GetICamera()->GetCamera()->InvPerspective( perspective, 1 ); + vw = GetICamera()->GetCamera()->GetTransform().This2Other( vc ); - iSector* sector = GetICamera()->GetSector(); + iSector* sector = GetICamera()->GetCamera()->GetSector(); if ( sector ) { - vo = GetICamera()->GetTransform().GetO2TTranslation(); + vo = GetICamera()->GetCamera()->GetTransform().GetO2TTranslation(); csVector3 isect; csVector3 end = vo + (vw-vo)*1000; csIntersectingTriangle closest_tri; @@ -912,10 +912,10 @@ csVector3 vc, vo, vw; csVector2 perspective( x, GetICamera()->GetShiftY() * 2 - y ); - vc = GetICamera()->InvPerspective( perspective, 1 ); - vw = GetICamera()->GetTransform().This2Other( vc ); + vc = GetICamera()->GetCamera()->InvPerspective( perspective, 1 ); + vw = GetICamera()->GetCamera()->GetTransform().This2Other( vc ); - iSector* sector = GetICamera()->GetSector(); + iSector* sector = GetICamera()->GetCamera()->GetSector(); if(!sector) { return NULL; @@ -1026,7 +1026,7 @@ } else { - vo = GetICamera()->GetTransform().GetO2TTranslation(); + vo = GetICamera()->GetCamera()->GetTransform().GetO2TTranslation(); csVector3 end = vo + (vw-vo)*100; csSectorHitBeamResult result; @@ -1412,8 +1412,8 @@ csVector3 delta = targetPos - charPos; - float aspect = view->GetCamera()->GetShiftX() / view->GetCamera()->GetShiftY(); - float d = (middle - charPos).Norm() / (tanf(view->GetCamera()->GetFOVAngle()) * aspect * 0.5f) * 20.1f; + float aspect = view->GetPerspectiveCamera()->GetShiftX() / view->GetPerspectiveCamera()->GetShiftY(); + float d = (middle - charPos).Norm() / (tanf(view->GetPerspectiveCamera()->GetFOVAngle()) * aspect * 0.5f) * 20.1f; d += GetDistance(); if (d < 2.0f) @@ -1702,7 +1702,7 @@ { csVector3 v1(0, 0, dist), v2(0, 1, dist), v3(1, 0, dist); csPlane3 p(v1, v2, v3); - view->GetCamera()->SetFarPlane(&p); + view->GetPerspectiveCamera()->GetCamera()->SetFarPlane(&p); // control distance we see shadows as well psShadowManager *shadowManager = psengine->GetCelClient()->GetShadowManager(); @@ -1712,7 +1712,7 @@ float psCamera::GetDistanceClipping() { csPlane3 *p; - p = view->GetCamera()->GetFarPlane(); + p = view->GetPerspectiveCamera()->GetCamera()->GetFarPlane(); if (p != NULL) return p->DD / sqrt(p->norm.x*p->norm.x + p->norm.y*p->norm.y + p->norm.z*p->norm.z); else Modified: personal/Xordan/src/client/pscamera.h =================================================================== --- personal/Xordan/src/client/pscamera.h 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/pscamera.h 2008-06-13 20:21:21 UTC (rev 1752) @@ -39,7 +39,7 @@ struct RaceDefinition; struct iView; -struct iCamera; +struct iPerspectiveCamera; struct iSector; struct iCollideSystem; struct iMeshWrapper; @@ -171,7 +171,7 @@ /** returns the camera that CS use * @return An iCamera that CS uses */ - iCamera *GetICamera(); + iPerspectiveCamera *GetICamera(); /** returns the CS viewport * @return an iView of this camera's CS viewport Modified: personal/Xordan/src/client/pscelclient.cpp =================================================================== --- personal/Xordan/src/client/pscelclient.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/pscelclient.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -30,7 +30,6 @@ #include <ivaria/collider.h> #include <iengine/engine.h> #include <iengine/mesh.h> -#include <iengine/region.h> #include <iengine/movable.h> #include <iengine/sector.h> #include <iengine/scenenode.h> @@ -800,8 +799,8 @@ { if(psengine->GetGFXFeatures() & useNormalMaps) { - csRef<iStringSet> strings = csQueryRegistryTagInterface<iStringSet> - (object_reg, "crystalspace.shared.stringset"); + csRef<iShaderVarStringSet> strings = csQueryRegistryTagInterface<iShaderVarStringSet> + (object_reg, "crystalspace.shader.variablenameset"); iSector* sector = mesh->GetMovable()->GetSectors()->Get(0); csVector3 pos = mesh->GetMovable()->GetFullPosition(); Modified: personal/Xordan/src/client/psclientchar.cpp =================================================================== --- personal/Xordan/src/client/psclientchar.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/psclientchar.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -542,7 +542,7 @@ } else { - iSector * sector = psengine->GetPSCamera()->GetICamera()->GetSector(); // Sector should come in the message + iSector * sector = psengine->GetPSCamera()->GetICamera()->GetCamera()->GetSector(); // Sector should come in the message effectID = psengine->GetEffectManager()->RenderEffect(effect.name, sector, effect.offset, target, up,uniqueIDOverride); Modified: personal/Xordan/src/client/psengine.cpp =================================================================== --- personal/Xordan/src/client/psengine.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/psengine.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -451,7 +451,7 @@ paws->GetMouse()->Hide(true); DeclareExtraFactories(); - + // Register default PAWS sounds if (soundmanager.IsValid() && soundOn) { @@ -726,23 +726,6 @@ RegisterFactory (pawsConfigShadowsFactory); } - -// ---------------------------------------------------------------------------- - -// access funtions -MsgHandler* psEngine::GetMsgHandler() -{ - return netmanager->GetMsgHandler(); -} -CmdHandler * psEngine::GetCmdHandler() -{ - return netmanager->GetCmdHandler(); -} -iNetManager* psEngine::GetNetManager() -{ - return (iNetManager*)netmanager; -} - //----------------------------------------------------------------------------- /** Modified: personal/Xordan/src/client/psengine.h =================================================================== --- personal/Xordan/src/client/psengine.h 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/psengine.h 2008-06-13 20:21:21 UTC (rev 1752) @@ -30,6 +30,7 @@ #include "paws/psmousebinds.h" #include "psclientchar.h" #include "psinventorycache.h" +#include "psnetmanager.h" #include "util/prb.h" #include "util/slots.h" @@ -45,7 +46,6 @@ struct iEventQueue; struct iLoader; struct iMeshFactoryWrapper; -struct iNetManager; struct iSoundManager; struct iVFS; struct iVirtualClock; @@ -171,14 +171,13 @@ iDocumentSystem* GetXMLParser() { return xmlparser; } iLoader* GetLoader() { return loader; } iSoundManager* GetSoundManager() { return soundmanager; } - iNetManager* GetNetManager(); iConfigManager* GetConfig() { return cfgmgr; }; ///< config file csRandomGen& GetRandomGen() { return random; } float GetRandom() { return random.Get(); } - MsgHandler* GetMsgHandler(); - CmdHandler* GetCmdHandler(); + MsgHandler* GetMsgHandler() { return netmanager->GetMsgHandler(); } + CmdHandler* GetCmdHandler() { return netmanager->GetCmdHandler(); } psSlotManager* GetSlotManager() { return slotManager;} ClientCacheManager* GetCacheManager() { return cachemanager; } psClientCharManager* GetCharManager() { return charmanager; } @@ -192,6 +191,7 @@ psCharController* GetCharControl() { return charController; } psMouseBinds* GetMouseBinds(); psCamera* GetPSCamera() { return camera; } + psNetManager* GetNetManager() { return netmanager; } /// Access the player's petitioner target void SetTargetPetitioner(const char * pet) { targetPetitioner = pet; } Modified: personal/Xordan/src/client/psnetmanager.cpp =================================================================== --- personal/Xordan/src/client/psnetmanager.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/psnetmanager.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -35,14 +35,8 @@ #include "paws/pawsmanager.h" #include "globals.h" -SCF_IMPLEMENT_IBASE(psNetManager) - SCF_IMPLEMENTS_INTERFACE(iNetManager) -SCF_IMPLEMENT_IBASE_END - psNetManager::psNetManager() { - SCF_CONSTRUCT_IBASE(NULL); - connected = false; connection = NULL; } @@ -52,9 +46,7 @@ if (connected) Disconnect(); if (connection) - delete connection; - - SCF_DESTRUCT_IBASE(); + delete connection; } bool psNetManager::Initialize( iObjectRegistry* newobjreg ) Modified: personal/Xordan/src/client/psnetmanager.h =================================================================== --- personal/Xordan/src/client/psnetmanager.h 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/psnetmanager.h 2008-06-13 20:21:21 UTC (rev 1752) @@ -20,8 +20,7 @@ #define __PSNETMANAGER_H__ #include <csutil/csstring.h> -#include <csutil/ref.h> -#include "iclient/netmanager.h" +#include <csutil/refcount.h> class psNetConnection; class psAuthenticationClient; @@ -31,18 +30,18 @@ class psGroupCommands; class psUtilityCommands; class psAdminCommands; +class CmdHandler; +class MsgHandler; /** * This class holds references to different network classes and provides some * conveniance functions to access them */ -class psNetManager : public iNetManager +class psNetManager : public csRefCount { protected: public: - SCF_DECLARE_IBASE; - psNetManager(); virtual ~psNetManager(); Modified: personal/Xordan/src/client/sound/pssoundmngr.cpp =================================================================== --- personal/Xordan/src/client/sound/pssoundmngr.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/sound/pssoundmngr.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -153,8 +153,8 @@ ListenerInitialized=true; // take position/direction from view->GetCamera () - csVector3 v = view->GetCamera ()->GetTransform ().GetOrigin (); - csMatrix3 m = view->GetCamera ()->GetTransform ().GetT2O(); + csVector3 v = view->GetPerspectiveCamera ()->GetCamera ()->GetTransform ().GetOrigin (); + csMatrix3 m = view->GetPerspectiveCamera ()->GetCamera ()->GetTransform ().GetT2O(); csVector3 f = m.Col3(); csVector3 t = m.Col2(); sndListener->SetPosition(v); Modified: personal/Xordan/src/client/weather.cpp =================================================================== --- personal/Xordan/src/client/weather.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/client/weather.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -531,7 +531,7 @@ // Use this as a clipping plane if it's not adaptive psCamera* cam = psengine->GetPSCamera(); - if( cam && cam->GetICamera()->GetSector() == sector && !cam->GetDistanceCfg().adaptive ) + if( cam && cam->GetICamera()->GetCamera()->GetSector() == sector && !cam->GetDistanceCfg().adaptive ) { if(density) { Modified: personal/Xordan/src/common/effects/pseffectobj.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobj.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobj.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -21,7 +21,6 @@ #include <csutil/xmltiny.h> #include <iengine/engine.h> -#include <iengine/region.h> #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> @@ -474,7 +473,7 @@ { if (dir == DT_CAMERA) { - csVector3 camDir = -view->GetCamera()->GetTransform().GetO2TTranslation() + csVector3 camDir = -view->GetPerspectiveCamera()->GetCamera()->GetTransform().GetO2TTranslation() + anchorMesh->GetMovable()->GetFullPosition(); csReversibleTransform rt; rt.LookAt(camDir, csVector3(0.f,1.f,0.f)); @@ -482,7 +481,7 @@ } else if (dir == DT_BILLBOARD) { - matBase = view->GetCamera()->GetTransform().GetT2O() * billboardFix; + matBase = view->GetPerspectiveCamera()->GetCamera()->GetTransform().GetT2O() * billboardFix; } if (scale != 1.0f) mesh->GetMovable()->SetTransform(matBase * (1.0f / scale)); @@ -516,7 +515,7 @@ csMatrix3 matTransform; if (dir == DT_CAMERA) { - csVector3 camDir = -view->GetCamera()->GetTransform().GetO2TTranslation() + csVector3 camDir = -view->GetPerspectiveCamera()->GetCamera()->GetTransform().GetO2TTranslation() + anchorMesh->GetMovable()->GetFullPosition() + newPos; csReversibleTransform rt; rt.LookAt(camDir, csVector3(sinf(lerpSpin.y),cosf(lerpSpin.y),0.f)); @@ -528,7 +527,7 @@ } else if (dir == DT_BILLBOARD) { - matBase = view->GetCamera()->GetTransform().GetT2O() * billboardFix; + matBase = view->GetPerspectiveCamera()->GetCamera()->GetTransform().GetT2O() * billboardFix; matTransform = matBase; } else Modified: personal/Xordan/src/common/effects/pseffectobjdecal.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjdecal.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjdecal.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -26,7 +26,6 @@ #include <iengine/movable.h> #include <iengine/camera.h> #include <cstool/csview.h> -#include <iengine/region.h> #include <imesh/objmodel.h> #include <csutil/flags.h> #include <csgeom/tri.h> Modified: personal/Xordan/src/common/effects/pseffectobjlabel.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjlabel.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjlabel.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -27,7 +27,6 @@ #include <iengine/movable.h> #include <iengine/camera.h> #include <cstool/csview.h> -#include <iengine/region.h> #include <imesh/objmodel.h> #include <csutil/flags.h> #include <csgeom/tri.h> Modified: personal/Xordan/src/common/effects/pseffectobjmesh.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjmesh.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjmesh.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -25,7 +25,6 @@ #include <iengine/mesh.h> #include <iengine/movable.h> #include <imap/loader.h> -#include <iengine/region.h> #include <imesh/objmodel.h> #include <csutil/cscolor.h> #include <csutil/flags.h> Modified: personal/Xordan/src/common/effects/pseffectobjparticles.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjparticles.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjparticles.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -17,12 +17,10 @@ * */ -#if 1 #include <psconfig.h> #include <csutil/xmltiny.h> #include <iengine/engine.h> -#include <iengine/region.h> #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> @@ -196,4 +194,3 @@ return true; } -#endif Modified: personal/Xordan/src/common/effects/pseffectobjquad.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjquad.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjquad.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -26,7 +26,6 @@ #include <iengine/movable.h> #include <iengine/camera.h> #include <cstool/csview.h> -#include <iengine/region.h> #include <imesh/objmodel.h> #include <csutil/flags.h> #include <csgeom/tri.h> Modified: personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -24,7 +24,6 @@ #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> -#include <iengine/region.h> #include <iengine/sector.h> #include <imap/loader.h> #include <imesh/objmodel.h> Modified: personal/Xordan/src/common/effects/pseffectobjsound.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjsound.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjsound.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -27,7 +27,6 @@ #include <iengine/mesh.h> #include <iengine/movable.h> #include <iengine/sector.h> -#include <iengine/region.h> #include <imap/loader.h> @@ -226,7 +225,7 @@ sndSource->SetVolume(LERP_KEY(KA_SCALE) * volumeMultiplier); } - sndSource3d->SetPosition(view->GetCamera()->GetTransform().Other2This(soundPos)); + sndSource3d->SetPosition(view->GetPerspectiveCamera()->GetCamera()->GetTransform().Other2This(soundPos)); if (killTime <= 0) return true; Modified: personal/Xordan/src/common/effects/pseffectobjspire.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjspire.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjspire.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -24,7 +24,6 @@ #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> -#include <iengine/region.h> #include <imesh/object.h> #include <imesh/objmodel.h> #include <csutil/flags.h> Modified: personal/Xordan/src/common/effects/pseffectobjstar.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjstar.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjstar.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -24,7 +24,6 @@ #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> -#include <iengine/region.h> #include <imesh/objmodel.h> #include <csgeom/tri.h> #include <csutil/cscolor.h> Modified: personal/Xordan/src/common/effects/pseffectobjtext.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjtext.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjtext.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -27,7 +27,6 @@ #include <iengine/movable.h> #include <iengine/camera.h> #include <cstool/csview.h> -#include <iengine/region.h> #include <ivideo/graph2d.h> #include <iengine/sector.h> #include <imesh/particle.h> Modified: personal/Xordan/src/common/effects/pseffectobjtext2d.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjtext2d.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjtext2d.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -27,7 +27,6 @@ #include <iengine/movable.h> #include <iengine/camera.h> #include <cstool/csview.h> -#include <iengine/region.h> #include <ivideo/graph2d.h> #include <iengine/sector.h> @@ -411,15 +410,15 @@ } // transform 3D to camera - p = view->GetCamera()->GetTransform().Other2This(p); + p = view->GetPerspectiveCamera()->GetCamera()->GetTransform().Other2This(p); csVector2 sp; if (p.z <= 0.0f) sp.Set(-5000.0f, -5000.0f); else { // apply perspective - sp = view->GetCamera()->Perspective(p); - sp.y = view->GetCamera()->GetShiftY() * 2 - sp.y; + sp = view->GetPerspectiveCamera()->GetCamera()->Perspective(p); + sp.y = view->GetPerspectiveCamera()->GetShiftY() * 2 - sp.y; } len = elems.GetSize(); Modified: personal/Xordan/src/common/effects/pseffectobjtrail.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjtrail.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/effects/pseffectobjtrail.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -24,7 +24,6 @@ #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> -#include <iengine/region.h> #include <iengine/sector.h> #include <imesh/object.h> #include <imesh/objmodel.h> Modified: personal/Xordan/src/common/paws/pawsgenericview.cpp =================================================================== --- personal/Xordan/src/common/paws/pawsgenericview.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/paws/pawsgenericview.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -102,15 +102,15 @@ if (engine->GetCameraPositions()->GetCount() > 0) { iCameraPosition * cp = engine->GetCameraPositions()->Get(0); - view->GetCamera()->SetSector(engine->FindSector(cp->GetSector())); - view->GetCamera()->GetTransform().SetOrigin(cp->GetPosition()); - view->GetCamera()->GetTransform().LookAt(cp->GetForwardVector(), cp->GetUpwardVector()); + view->GetPerspectiveCamera()->GetCamera()->SetSector(engine->FindSector(cp->GetSector())); + view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(cp->GetPosition()); + view->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt(cp->GetForwardVector(), cp->GetUpwardVector()); } else { - view->GetCamera()->SetSector(stage); - view->GetCamera()->GetTransform().SetOrigin(csVector3(-33,1,-198)); - view->GetCamera()->GetTransform().LookAt(csVector3(0,0,4), csVector3(0,1,0)); + view->GetPerspectiveCamera()->GetCamera()->SetSector(stage); + view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(csVector3(-33,1,-198)); + view->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt(csVector3(0,0,4), csVector3(0,1,0)); } view->SetRectangle(screenFrame.xmin, screenFrame.ymin, @@ -132,12 +132,12 @@ screenFrame.Width(), screenFrame.Height() ); - view->GetCamera()->SetPerspectiveCenter( + view->GetPerspectiveCamera()->SetPerspectiveCenter( screenFrame.xmin + (screenFrame.Width() >> 1), PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.Height() - screenFrame.ymin + (screenFrame.Height() >> 1) ); - view->GetCamera()->SetFOV( view->GetCamera()->GetFOV(), screenFrame.Width() ); + view->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), screenFrame.Width() ); view->Draw(); Modified: personal/Xordan/src/common/paws/pawsobjectview.cpp =================================================================== --- personal/Xordan/src/common/paws/pawsobjectview.cpp 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/paws/pawsobjectview.cpp 2008-06-13 20:21:21 UTC (rev 1752) @@ -167,15 +167,15 @@ meshSector->ShineLights(); meshView = csPtr<iView> (new csView( engine, PawsManager::GetSingleton().GetGraphics3D() )); - meshView->GetCamera()->SetSector(meshSector); - meshView->GetCamera()->GetTransform().SetOrigin(csVector3(0,1,-distance)); + meshView->GetPerspectiveCamera()->GetCamera()->SetSector(meshSector); + meshView->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(csVector3(0,1,-distance)); meshView->SetRectangle(screenFrame.xmin, screenFrame.ymin, screenFrame.Width(),screenFrame.Height()); view = csPtr<iView> (new csView( engine, PawsManager::GetSingleton().GetGraphics3D() )); - view->GetCamera()->SetSector(stage); - view->GetCamera()->GetTransform().SetOrigin(csVector3(0,1,-distance)); + view->GetPerspectiveCamera()->GetCamera()->SetSector(stage); + view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(csVector3(0,1,-distance)); view->SetRectangle(screenFrame.xmin, screenFrame.ymin, @@ -308,16 +308,16 @@ screenFrame.Width(), screenFrame.Height() ); - view->GetCamera()->SetPerspectiveCenter( + view->GetPerspectiveCamera()->SetPerspectiveCenter( screenFrame.xmin + (screenFrame.Width() >> 1), PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.Height() - screenFrame.ymin + (screenFrame.Height() >> 1) ); - view->GetCamera()->SetFOV( view->GetCamera()->GetFOV(), screenFrame.Width() ); + view->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), screenFrame.Width() ); - view->GetCamera()->GetTransform().SetOrigin(cameraPosition); - view->GetCamera()->GetTransform().LookAt( + view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(cameraPosition); + view->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt( lookingAt, csVector3(0,1,0) ); @@ -335,16 +335,16 @@ screenFrame.Width(), screenFrame.Height() ); - meshView->GetCamera()->SetPerspectiveCenter( + meshView->GetPerspectiveCamera()->SetPerspectiveCenter( screenFrame.xmin + (screenFrame.Width() >> 1), PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.Height() - screenFrame.ymin + (screenFrame.Height() >> 1) ); - meshView->GetCamera()->SetFOV( view->GetCamera()->GetFOV(), screenFrame.Width() ); + meshView->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), screenFrame.Width() ); - meshView->GetCamera()->GetTransform().SetOrigin(cameraPosition); - meshView->GetCamera()->GetTransform().LookAt( + meshView->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(cameraPosition); + meshView->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt( lookingAt, csVector3(0,1,0) ); @@ -427,12 +427,12 @@ screenFrame.Width(), screenFrame.Height() ); - view->GetCamera()->SetPerspectiveCenter( + view->GetPerspectiveCamera()->SetPerspectiveCenter( screenFrame.xmin + (screenFrame.Width() >> 1), PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.Height() - screenFrame.ymin + (screenFrame.Height() >> 1) ); - view->GetCamera()->SetFOV( view->GetCamera()->GetFOV(), screenFrame.Width() ); + view->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), screenFrame.Width() ); csBox3 bbox; if(object) @@ -443,8 +443,8 @@ camera.y = 1; camera.z = objectPos.z + cos((double)camRotate)*((-distance)-1); - view->GetCamera()->GetTransform().SetOrigin(camera); - view->GetCamera()->GetTransform().LookAt( + view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(camera); + view->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt( objectPos + csVector3(0,bbox.GetCenter().y,0) - camera + cameraMod, csVector3(0,1,0) ); @@ -462,16 +462,16 @@ screenFrame.Width(), screenFrame.Height() ); - meshView->GetCamera()->SetPerspectiveCenter( + meshView->GetPerspectiveCamera()->SetPerspectiveCenter( screenFrame.xmin + (screenFrame.Width() >> 1), PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.Height() - screenFrame.ymin + (screenFrame.Height() >> 1) ); - meshView->GetCamera()->SetFOV( view->GetCamera()->GetFOV(), screenFrame.Width() ); + meshView->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), screenFrame.Width() ); - meshView->GetCamera()->GetTransform().SetOrigin(camera); - meshView->GetCamera()->GetTransform().LookAt( + meshView->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(camera); + meshView->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt( objectPos + csVector3(0,bbox.GetCenter().y,0) - camera, csVector3(0,1,0) ); Modified: personal/Xordan/src/common/util/heap.h =================================================================== --- personal/Xordan/src/common/util/heap.h 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/src/common/util/heap.h 2008-06-13 20:21:21 UTC (rev 1752) @@ -35,8 +35,8 @@ using csArray<T*>::Top; public: - Heap(int ilimit = 0, int ithreshold = 0) - : csArray<T*>(ilimit, ithreshold) + Heap(int ilimit = 0) + : csArray<T*>(ilimit) { } Modified: personal/Xordan/vfs.cfg =================================================================== --- personal/Xordan/vfs.cfg 2008-06-13 20:18:30 UTC (rev 1751) +++ personal/Xordan/vfs.cfg 2008-06-13 20:21:21 UTC (rev 1752) @@ -15,7 +15,7 @@ ; Configuration repository VFS.Mount.config = $@data$/config-plugins$/ -VFS.Mount.shader = $@data$/shader$/ +VFS.Mount.shader = $@data$/shader$/,$@data$/shader-old$/ ; The TTF font library VFS.Mount.fonts/ttf = $^data$/ttf$/, $(TTF_PATH:$.$/) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-06-27 22:06:40
|
Revision: 1810 http://planeshift.svn.sourceforge.net/planeshift/?rev=1810&view=rev Author: mgist Date: 2008-06-27 15:06:46 -0700 (Fri, 27 Jun 2008) Log Message: ----------- - Reverted a previous merge from trunk. Modified Paths: -------------- personal/Xordan/docs/compiling.html personal/Xordan/docs/history.txt personal/Xordan/src/client/gui/pawscharpick.cpp personal/Xordan/src/client/gui/pawsglyphwindow.cpp personal/Xordan/src/client/shadowmanager.cpp personal/Xordan/src/common/engine/psregion.cpp personal/Xordan/src/common/net/messages.cpp personal/Xordan/src/common/net/messages.h personal/Xordan/src/common/util/fileutil.cpp personal/Xordan/src/common/util/mathscript.cpp personal/Xordan/src/pslaunch/download.cpp personal/Xordan/src/pslaunch/download.h personal/Xordan/src/pslaunch/updaterengine.cpp personal/Xordan/src/server/gem.cpp personal/Xordan/src/server/spellmanager.cpp personal/Xordan/src/server/usermanager.cpp personal/Xordan/src/tools/libxpnet/nsSocket.cpp Modified: personal/Xordan/docs/compiling.html =================================================================== --- personal/Xordan/docs/compiling.html 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/docs/compiling.html 2008-06-27 22:06:46 UTC (rev 1810) @@ -18,7 +18,7 @@ var csWinLibsVersionStab = "1.3_003"; // cs win32 libs version. var csWinLibsVersion = "1.3_003"; // cs win32 libs version. //Update date and author, to be changed everytime and updates occurred - var UpdateDate = "13 June 2008"; //Date when the update occurred + var UpdateDate = "11 June 2008"; //Date when the update occurred var UpdateAuthor = "Caarrie"; //Author of the update --> </script> @@ -328,19 +328,11 @@ Dave Garrett, author of the new compiling guides layout;<br> Andrew Craig, author of the first Linux guides that were available on <a href="http://laanx.fragnetics.com">Laanx website</a>;<br> Platyna, author of the first compiling guide for Slackware distribution.<br> - Mike Gist, author of the static compiling guide.<br> -</div> - <div class="MacOSX"> - This guide gives a very basic description on how to get a working client up and - running on an Intel Mac. It gives instructions on how to get to check out the source code and configure it. At the end there you will have a - PlaneShift client and a PlaneShift updater application, and if you want also the server.<br><br> - <b>Credits</b><br> - Caarrie, Author of the first basic Mac guide with help from the <a href="http://vaalnor.mine.nu/psdoc/?q=node/38">PSDocs</a> guide and Trymm + Mike Gist, author of the static compiling guide. </div> <div class="MacOSX"> - <p>Here is a basic Mac guide based on the linux guide, for more specifics refer to <a href="http://vaalnor.mine.nu/psdoc/?q=node/38">PSDocs</a>, a user maintained guide.</p> - <div class="Static">There is no Mac static build guide at this time</div> + <p>We have no Mac guide at this time. Check the Linux guide, or refer to <a href="http://vaalnor.mine.nu/psdoc/?q=node/38">PSDocs</a>, a user maintained guide.</p> </div> </p> @@ -389,7 +381,7 @@ <p><i class="command">C:\development\</i></p> </div> <div class="MacOSX"> - <p><i class="command">$HOME/development</i></p> + <p><i class="command">/home/user/development</i></p> </div> <div class="Windows"><div class="MINGW"> @@ -715,70 +707,6 @@ <p>Via portage: <i class="command"># emerge nvidia-cg-toolkit</i></p> </div> </div> -<div class="MacOSX" > -To build on OSX you need to Install Xcode which you can get from <a href="https://connect.apple.com/">here.</a> This guide also recomends you to install fink. You can get fink from <a href="http://fink.sourceforge.net/">here.</a> -Note: Do not use darwinports if you are using fink. It can cause conflicts if -they both have the same package installed. <br /> -Open a terminal window and set the required environment variables for fink by -issuing the following command: -<br /> -<i class="commandBox" ><pre># <code>/sw/bin/pathsetup.sh</code></pre> -</i> -<i class="commandBox" ><pre># <code>source /sw/bin/init.sh</code></pre> -</i> -<br /> -<br /> -Configure fink (Optional) -We are going to configure fink to download and install packages from source only. (no binary packages)<br /> -This step is optional, but has a better success rate for installing the fink -dependencies. -<br /> -<i class="commandBox" ><pre># <code>fink configure</code></pre> -</i> -<br /> -Provided below are the questions and the standard recommended answers for the configuration: -<i class="commandBox" ><pre> -Password: -OK, I'll ask you some questions and update the configuration file in '/sw/etc/fink.conf'. -In what additional directory should Fink look for downloaded tarballs? [] -Which directory should Fink use to build packages? (If you don't know what this means, it is safe to leave it -at its default.) [] - -Should Fink try to download pre-compiled packages from the binary distribution if available? [y/N] n -(1) Quiet (do not show download statistics) -(2) Low (do not show tarballs being expanded) -(3) Medium (will show almost everything) -(4) High (will show everything) - -How verbose should Fink be? [4] 4 - -Proxy/Firewall settings -Enter the URL of the HTTP proxy to use, or 'none' for no proxy. The URL should start with http:// and may -contain username, password, and/or port specifications. Note that this value will be visible to all users on -your computer. -Example, http://username:password@hostname:port -Your proxy: [none] -Enter the URL of the FTP proxy to use, or 'none' for no proxy. The URL should start with http:// and may -contain username, password, and/or port specifications. Note that this value will be visible to all users on -your computer. -Example, http://username:password@hostname:port -Your proxy: [none] -Use passive mode FTP transfers (to get through a firewall)? [Y/n] y - -Mirror selection -All mirrors are set. Do you want to change them? [y/N] n - -Writing updated configuration to '/sw/etc/fink.conf'... -</pre></i> -<br /> - -You need to install Ftjam which you can get from <a href="http://sourceforge.net/project/showfiles.php?group_id=3157">here.</a> You also need to install the following packages from Fink <br /> -<i class="command"> libjpeg freetype freetype-shlibs freetype2 freetype2-dev freetype2-shlibs libogg libvorbis0 libvorbis0-shlibs libmng2 libpng3 autoconf2.5 automake1.9 libtool wget curl</i><br /><br /> - -Since SVN is not always installed you need to make sure it is installed you can get it from <a href="http://metissian.com/projects/macosx/subversion/">here.</a> <br /> - -You also need to install Nvidia's Cg Toolkit from <a href="http://www.nvidia.com/object/cg_toolkit.html"> -here.</a> <p> <h3>Server Databases</h3> <i>Optional section</i> @@ -828,7 +756,7 @@ mv libmysqlclient.a .. </div></p> </div> - </div></div> + </div> <b>WordNet:</b><br> You will also need the WordNet dictionaries. Download and install the <a href="http://wordnet.princeton.edu/obtain/">WordNet binaries</a>, version 2.1. @@ -1027,66 +955,7 @@ </p> </div> <div class="MacOSX"> - <h3>Cal3D</h3> - <p>We need to build cal3d from source before we can start on Crystal Space. Cal3d is a library that is used for - handling skeleton systems. This is a very nice system and can allow for fluid transformations between animations. - This needs to be built/installed first because when we configure Crystal Space it has to find the cal3d libraries - so it can know to build the sprcal3d plugin. Cal3D doesn't change much, so just download latest stable or checkout latest from svn:</p> - <p><a href="http://home.gna.org/cal3d/">Cal3D Home</a></p> - <p><i class="command">$HOME/development$ svn co -r CAL3D_SOURCE_REV svn://svn.gna.org/svn/cal3d/trunk/cal3d cal3d</i></p> - - <h3>Crystal Space (CS)</h3> - <p>Crystal Space 3D SDK is the engine that we use for rendering and sound.</p> - <div class="User"> - <p><i class="command">$HOME/development$ svn co -r CS_SOURCE_REV https://crystal.svn.sourceforge.net/svnroot/crystal/CS/branches/release/V1.4 cs</i></p> - </div> - <div class="Developer"> - <p><i class="command">$HOME/development$ svn co -r CS_SOURCE_REV_HEAD https://crystal.svn.sourceforge.net/svnroot/crystal/CS/branches/release/V1.4 cs</i></p> - </div> - - <h3>Crystal Entity Layer (CEL)</h3> - <p>CEL is a layer on top of Crystal Space that is used for entity and behavior control.</p> - <div class="User"> - <p><i class="command">$HOME/development$ svn co -r CEL_SOURCE_REV https://cel.svn.sourceforge.net/svnroot/cel/cel/branches/release/V1.4 cel</i></p> - </div> - <div class="Developer"> - <p><i class="command">$HOME/development$ svn co -r CEL_SOURCE_REV_HEAD https://cel.svn.sourceforge.net/svnroot/cel/cel/branches/release/V1.4 cel</i></p> - </div> - - <h3>PlaneShift</h3> - <p>Lastly, download our source:</p> - <div class="User"> - <p><i class="command">$HOME/development$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/stable planeshift</i></p> - </div> - <div class="Developer"> - <p><i class="command">$HOME/development$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/trunk planeshift</i></p> - </div> -<h3>Updating Sources</h3> - <p>From time to time, newer PlaneShift revisions will require you to upgrade your cal3d, CS, and CEL repositories to a newer revision as well. To update your supporting libraries, always be certain that you use the "-r" option keep from updating to the latest revision:</p> - - If you want to update to a new revision replace REVISON with the number of the revision you want to use: - <p><div class="commandBox"> - $HOME/development/cal3d$ svn update -r REVISION<br> - $HOME/development/cs$ svn update -r REVISION<br> - $HOME/development/cel$ svn update -r REVISION<br> - </div></p> - <p>Unlike the supporting libraries, you will generally want to use the latest PlaneShift source (or the HEAD) rather than an intermediate revision. In this case, you will omit the "-r" option like so: - <div class="commandBox"> - $HOME/development/planeshift$ svn update - </div></p><br> - If, for some reason, you wish to update any of the supporting libraries to the latest version (i.e. the HEAD), you have to remove the sticky date tag. WE DO NOT RECOMMEND THIS as it may break your build: - <p><div class="commandBox"> - $HOME/development/cal3d$ svn update -r HEAD<br> - $HOME/development/cs$ svn update -r HEAD<br> - $HOME/development/cel$ svn update -r HEAD<br> - </div></p> - - -If you update a repository, you will need to recompile that repository and each repository that depends on it. Before doing so, you should do a "jam clean" for each project you want to jam again. So, for example, if you want to rebuild PS you will do: - <p><div class="commandBox"> - $HOME/development/planeshift$ jam clean<br> - $HOME/development/planeshift$ jam -aq - </div></p> + No guide yet. Try the Linux version for now. </div> <!----------------------------------------------------------------------------------------------------> @@ -1185,9 +1054,9 @@ To do this, use the prefix line that was used for Cal3d above.</p></div> <div class="Linux-Generic" > <div class="User"><i class="commandBox"> - /home/user/development/cs$ ./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> + /home/user/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> <div class="Developer"><i class="commandBox"> - /home/user/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> + /home/user/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> <div class="Normal"><i class="command"> /home/user/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"><i class="command"> @@ -1195,9 +1064,9 @@ </div></div> <div class="Linux-Debian" > <div class="User"><i class="commandBox"> - /home/user/development/cs$ ./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> + /home/user/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> <div class="Developer"><i class="commandBox"> - /home/user/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> + /home/user/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> <div class="Normal"><i class="command"> /home/user/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"><i class="command"> @@ -1252,23 +1121,23 @@ </div></p> We should export the CEL environment variable so applications outside the CEL tree know where to find the .so's. - <p><i class="commandBox">export CEL=/home/user/development/cel<br />export CSCONFPATH=/home/user/development/cel</i></p> + <p><i class="command">export CEL=/home/user/development/cel</i></p> <h3>PlaneShift</h3> <p><i class="commandBox"> /home/user/development/planeshift$ ./autogen.sh<br> - <div class="User"> + <i class="User"> /home/user/development/planeshift$ ./configure --with-cal3d=/home/user/development/cal3d<br> - </div> - <div class="Developer"> + </i> + <i class="Developer"> /home/user/development/planeshift$ ./configure --enable-debug --with-cal3d=/home/user/development/cal3d<br> - </div> - <div class="Normal"> + </i> + <i class="Normal"> /home/user/development/planeshift$ jam -aq client - </div> - <div class="Static"> + </i> + <i class="Static"> /home/user/development/planeshift$ jam -aq client_static - </div> + </i> </i></p> If you also want to build the server, do this as well: <div class="Normal"> @@ -1286,80 +1155,11 @@ /home/user/development/planeshift$ ./psclient -cfgset=PlaneShift.UserConfigPath=/home/user/.PlaneShift2</i> <p> You can also edit this in the psclient.cfg file under the game section uncomment the appropriate line and edit the path.</p> </div> -</div></div></div> +</div> <div class="MacOSX"> - <p>If you have a dual core or better processor then you can take advantage of parallel make or jam by adding -j3 after the command. You can replace 3 with the number of jobs you want to run in parallel.</p> - <h3>Cal3D</h3> - <p>Since cal3d is a library in development we probably don't want to 'install' this one as root since there is a good - possibility it will change in the future. Instead we will 'install' it into our working directory. This is done - by using the --prefix option when we configure it.</p> - <div class="linux-Generic" > - Using a text editor open configure.in and remove the line - <p><i class="commandBox"> - AM_USE_UNITTESTCPP</i></p> - <p>Or you can use the following sed command</p> - <p> <i class="commandBox" > - mv configure.in configure-old.in<br /> -sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</i></p> -<p> Then you can build cal3d </p> - <p><i class="commandBox"> - $HOME/development/cal3d$ autoreconf --install --force<br> - $HOME/development/cal3d$ ./configure --prefix=$HOME/development/cal3d<br> - $HOME/development/cal3d$ make<br> - $HOME/development/cal3d$ make install - </i></p></div> - <h3>Crystal Space (CS)</h3> - <p>Now we can build it and use the configure line to tell it where we installed the cal3d libraries. - To do this, use the prefix line that was used for Cal3d above.</p> - <div class="User"><i class="commandBox"> - $HOME/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</i></div> - <div class="Developer"><i class="commandBox"> - $HOME/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</i></div><br> - <div class="Normal"><i class="command"> - $HOME/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> - <div class="Static"> there is no Mac static build guide at this time</div> - We should export the CRYSTAL environment variable so applications outside the Crystal Space - tree know where to find the .so's. - <p><i class="command">export CRYSTAL=$HOME/development/cs</i></p> - - <h3>Crystal Entity Layer (CEL)</h3> - <p><div class="commandBox"> - $HOME/development/cel$ ./configure --without-python<br> - <div class="Normal"> - $HOME/development/cel$ jam -aq libs plugins cel-config - </div> - <div class="Static"> there is no Mac static build guide at this time</div> - </div></p> - -We should export the CEL environment variable so applications outside the CEL tree know where to find the .so's. - <p><i class="command">export CEL=$HOME/development/cel</i></p> - -<h3>PlaneShift</h3> - <p><i class="commandBox"> - $HOME/development/planeshift$ ./autogen.sh<br> - <i class="User"> - $HOME/development/planeshift$ ./configure --with-cal3d=$HOME/development/cal3d<br> - </i> - <i class="Developer"> - $HOME/development/planeshift$ ./configure --enable-debug --with-cal3d=$HOME/development/cal3d<br> - </i> - <i class="Normal"> - $HOME/development/planeshift$ jam -aq client - </i> - <i class="Static"> there is no Mac static build guide at this time</i> -</i></p> - If you also want to build the server, do this as well: - <div class="Normal"> - <p><i class="command">$HOME/development/planeshift$ jam -aq server</i></p> - </div> - If you want to build the extra tools, just do "jam -a". -<p>If your psclient has no skin you are used to seeing launch pssetup after you have copied your art over and select a new skin</p> - <p>If you wish for your psclient to not use the same user files as your other build/install you may run ps with the following command<br /> - <i class="commandBox"> -$HOME/development/planeshift$ ./psclient.app/Contents/MacOS/psclient -cfgset=PlaneShift.UserConfigPath=$HOME/Library/Application Support/PlaneShift2</i> - <p> You can also edit this in the psclient.cfg file under the game section uncomment the appropriate line and edit the path.</p> - </div> + No guide yet. Try the Linux version for now. </div> +</div> <div class="MINGW"> <div class="Windows"> @@ -1661,9 +1461,7 @@ <div class="Linux"> <p>Simply copy the dictionary files from your /usr/share/wordnet folder to the /home/user/development/planeshift/data/dict folder.</p> </div> -<div class="MacOSX"> - <p>Simply copy the dictionary files from your /usr/share/wordnet folder to the $HOME/development/planeshift/data/dict folder.</p> -</div> + <h3>Create the Database</h3> <p>Check if MySQL is running.<br> <div class="Windows"> Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/docs/history.txt 2008-06-27 22:06:46 UTC (rev 1810) @@ -1,23 +1,3 @@ -*** 2007-06-17 by Mike Gist -- Fixed a bug in psregion where the vfs cache manager wasn't being - updated for the dir change. - -*** 2008-06-14 by Mike Gist -- Fixed permissions bugs in the updater. -- Fixed FS#1637, patch by Vornne. -- Fixed FS#1702. -- Enabled mathscript optimisations again. - -*** 2008-06-14 by Kenny Graunke -- Commit patch for part of FS#74. - -*** 2008-06-13 by Mike Gist -- Fixed crash if more than one psAuthApprovedMessage is received. - -*** 2008-06-13 by Steven Patrick -- Adding Mac section to compiling.html by Caarrie -- Fixed FS#685, patch by Kaerli - *** 2008-06-12 by Mike Gist - Made a lot of updater fixes. Modified: personal/Xordan/src/client/gui/pawscharpick.cpp =================================================================== --- personal/Xordan/src/client/gui/pawscharpick.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/client/gui/pawscharpick.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -106,9 +106,6 @@ // // character name and the factory of the mesh. case MSGTYPE_AUTHAPPROVED: { - if(charactersFound != 0) - return; - psAuthApprovedMessage msg(me); for (int i=0; i < msg.msgNumOfChars; i++) @@ -136,7 +133,7 @@ models[charactersFound].race = race; models[charactersFound].traits = traits; models[charactersFound].equipment = equipment; - charactersFound++; + charactersFound++; SelectCharacter(0,FindWidget("SelectCharacter0")); } Modified: personal/Xordan/src/client/gui/pawsglyphwindow.cpp =================================================================== --- personal/Xordan/src/client/gui/pawsglyphwindow.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/client/gui/pawsglyphwindow.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -97,7 +97,7 @@ if ( !msgHandler ) return false; // Subscribe our message types that we are interested in. - if ( !msgHandler->Subscribe( this, MSGTYPE_GLYPH_REQUEST ) ) return false; + if ( !msgHandler->Subscribe( this, MSGTYPE_GLPYH_REQUEST ) ) return false; if ( !msgHandler->Subscribe( this, MSGTYPE_GLYPH_ASSEMBLE ) ) return false; @@ -155,7 +155,7 @@ { switch( me->GetType() ) { - case MSGTYPE_GLYPH_REQUEST: + case MSGTYPE_GLPYH_REQUEST: { HandleGlyphList(me); break; Modified: personal/Xordan/src/client/shadowmanager.cpp =================================================================== --- personal/Xordan/src/client/shadowmanager.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/client/shadowmanager.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -40,9 +40,6 @@ bool psShadowManager::WithinRange(GEMClientObject * object) const { - if (!object || !object->GetMesh().IsValid()) - return false; - if (shadowRange < 0) return true; @@ -62,13 +59,9 @@ shadowRange = cfgmgr->GetFloat("PlaneShift.Visuals.ShadowRange", -1.0f); bool result = Load(USER_FILE); - if (!result) + if (result == false) { result = Load(DEFAULT_FILE); - if(!result) - { - Error2("Could not find file: %s", DEFAULT_FILE); - } } RecreateAllShadows(); @@ -93,6 +86,7 @@ if (buff == NULL) { + Error2("Could not find file: %s", filename); return false; } Modified: personal/Xordan/src/common/engine/psregion.cpp =================================================================== --- personal/Xordan/src/common/engine/psregion.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/common/engine/psregion.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -119,7 +119,6 @@ // Now load the map into the selected region vfs->ChDir (worlddir); - engine->SetVFSCacheManager(); csTicks start = csGetTicks(); Debug2(LOG_LOAD, 0,"Loading map file %s", worlddir.GetData()); @@ -137,7 +136,7 @@ if (using3D) { engine->ShineLights(collection); - engine->PrecacheDraw(collection); + engine->PrecacheDraw (collection); Debug2(LOG_LOAD, 0,"After Precache, %dms elapsed", csGetTicks()-start); } Modified: personal/Xordan/src/common/net/messages.cpp =================================================================== --- personal/Xordan/src/common/net/messages.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/common/net/messages.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -2876,7 +2876,7 @@ //-------------------------------------------------------------------------- -PSF_IMPLEMENT_MSG_FACTORY(psRequestGlyphsMessage,MSGTYPE_GLYPH_REQUEST); +PSF_IMPLEMENT_MSG_FACTORY(psRequestGlyphsMessage,MSGTYPE_GLPYH_REQUEST); psRequestGlyphsMessage::psRequestGlyphsMessage( uint32_t client ) { @@ -2885,7 +2885,7 @@ if ( client == 0 ) { msg.AttachNew(new MsgEntry()); - msg->SetType(MSGTYPE_GLYPH_REQUEST); + msg->SetType(MSGTYPE_GLPYH_REQUEST); msg->clientnum = client; } } @@ -2913,7 +2913,7 @@ void psRequestGlyphsMessage::Construct() { msg.AttachNew(new MsgEntry( size + sizeof(int) )); - msg->SetType(MSGTYPE_GLYPH_REQUEST); + msg->SetType(MSGTYPE_GLPYH_REQUEST); msg->clientnum = client; msg->Add( (uint32_t)glyphs.GetSize() ); Modified: personal/Xordan/src/common/net/messages.h =================================================================== --- personal/Xordan/src/common/net/messages.h 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/common/net/messages.h 2008-06-27 22:06:46 UTC (rev 1810) @@ -114,7 +114,7 @@ MSGTYPE_GUIGROUP, MSGTYPE_STATDRUPDATE, MSGTYPE_SPELL_BOOK, - MSGTYPE_GLYPH_REQUEST, + MSGTYPE_GLPYH_REQUEST, MSGTYPE_GLYPH_ASSEMBLE, MSGTYPE_PURIFY_GLYPH, MSGTYPE_SPELL_CAST, Modified: personal/Xordan/src/common/util/fileutil.cpp =================================================================== --- personal/Xordan/src/common/util/fileutil.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/common/util/fileutil.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -98,24 +98,20 @@ void FileUtil::MakeDirectory (const char* directory) { - csString dirAppended(directory); - dirAppended.Append("/"); - - csRef<iDataBuffer> realPath = vfs->GetRealPath(dirAppended); - while(!vfs->Exists(dirAppended)) + csRef<iDataBuffer> realPath = vfs->GetRealPath(directory); + while(!vfs->Exists(directory)) { - #ifdef CS_PLATFORM_WIN32 - int rc = mkdir(realPath->GetData()); + int rc = mkdir(realPath->GetData()); #else - int rc = mkdir(realPath->GetData(), S_IRUSR | S_IWUSR); + int rc = mkdir(realPath->GetData(), S_IRUSR | S_IWUSR); #endif csString dir = directory; - csRef<iDataBuffer> real = realPath; + csRef<iDataBuffer> real; while(rc < 0) { - dir.Truncate(dir.FindLast('/')); + dir.Truncate(dir.FindLast('/')+1); if(vfs->Exists(directory)) { @@ -123,7 +119,7 @@ return; } - real = vfs->GetRealPath(dir + "/"); + real = vfs->GetRealPath(dir); #ifdef CS_PLATFORM_WIN32 rc = mkdir(real->GetData()); #else @@ -132,8 +128,8 @@ } #ifdef CS_PLATFORM_UNIX - dir.Truncate(dir.FindLast('/')); - csRef<iDataBuffer> parent = vfs->GetRealPath(dir + "/"); + dir.Truncate(dir.FindLast('/')+1); + csRef<iDataBuffer> parent = vfs->GetRealPath(dir); csRef<FileStat> dirStat = StatFile(parent->GetData()); SetPermissions(real->GetData(), dirStat); #endif @@ -151,7 +147,7 @@ { // Make parent dir if needed. csString parent = to; - MakeDirectory(parent.Truncate(parent.FindLast('/'))); + MakeDirectory(parent.Truncate(parent.FindLast('/')+1)); if(!buff) { Modified: personal/Xordan/src/common/util/mathscript.cpp =================================================================== --- personal/Xordan/src/common/util/mathscript.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/common/util/mathscript.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -221,10 +221,6 @@ printf( "Caller: %s", myScript->name.GetData()); Error4("Error in Col %d: %s\n Script: \"%s\" ",(int)ret,fp.ErrorMsg(),scriptLine.GetData() ); } - else - { - fp.Optimize(); - } } void MathScriptLine::Execute() Modified: personal/Xordan/src/pslaunch/download.cpp =================================================================== --- personal/Xordan/src/pslaunch/download.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/pslaunch/download.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -92,7 +92,7 @@ { } -bool Downloader::DownloadFile(const char *file, const char *dest, bool URL, bool silent, uint retries) +bool Downloader::DownloadFile(const char *file, const char *dest, bool URL, bool silent) { // Get active url, append file to get full path. Mirror* mirror; @@ -128,33 +128,22 @@ return false; } - int httpCode = 200; + nsHTTPConn *conn = new nsHTTPConn(url.GetData()); + int result = conn->Open(); + result = conn->ResumeOrGet(ProgressCallback, destpath.GetData()); + int httpCode = conn->GetResponseCode(); + conn->Close(); + delete conn; + conn = NULL; + csString error; - for(uint i=0; i<=retries; i++) + if (result != nsSocket::OK && !silent) { - nsHTTPConn *conn = new nsHTTPConn(url.GetData()); - int result = conn->Open(); - result = conn->ResumeOrGet(ProgressCallback, destpath.GetData()); - httpCode = conn->GetResponseCode(); - conn->Close(); - delete conn; - conn = NULL; - - if (result != nsSocket::OK) - { - if(!silent) - { - if (result == nsSocket::E_INVALID_HOST) - error.Format("Couldn't connect to mirror %s\n", url.GetData()); - else - error.Format("Error while downloading file: %s\n", url.GetData()); - } - } + if (result == nsSocket::E_INVALID_HOST) + error.Format("Couldn't connect to mirror %s\n", url.GetData()); else - { - break; - } + error.Format("Error while downloading file: %s\n", url.GetData()); } // Tell the user that we failed Modified: personal/Xordan/src/pslaunch/download.h =================================================================== --- personal/Xordan/src/pslaunch/download.h 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/pslaunch/download.h 2008-06-27 22:06:46 UTC (rev 1810) @@ -39,7 +39,7 @@ * If URL is true; download a file from 'file' where 'file' is the * full URL to the file, and save to 'dest' */ - bool DownloadFile (const char* file, const char* dest, bool URL, bool silent = false, uint retries = 2); + bool DownloadFile (const char* file, const char* dest, bool URL, bool silent = false); /* Set the proxy server host and port */ void SetProxy (const char* host, int port); Modified: personal/Xordan/src/pslaunch/updaterengine.cpp =================================================================== --- personal/Xordan/src/pslaunch/updaterengine.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/pslaunch/updaterengine.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -971,8 +971,7 @@ csMD5::Digest md5 = csMD5::Encode(buffer->GetData(), buffer->GetSize()); csString md5s = md5.HexString(); - if((platform.Compare(config->GetCurrentConfig()->GetPlatform()) || - platform.Compare("all")) && !md5s.Compare(md5sum)) + if(platform.Compare(config->GetCurrentConfig()->GetPlatform()) && !md5s.Compare(md5sum)) { failed.Push(node); } @@ -1014,7 +1013,7 @@ // Make parent dir if needed. csString parent = downloadpath; - fileUtil->MakeDirectory(parent.Truncate(parent.FindLast('/'))); + fileUtil->MakeDirectory(parent.Truncate(parent.FindLast('/')+1)); // Download file. if(!downloader->DownloadFile(baseurl + failed.Get(i)->GetAttributeValue("path"), @@ -1026,24 +1025,23 @@ failed.Get(i)->GetAttributeValue("path"), true, true)) { // Restore file. - fileUtil->RemoveFile(downloadpath, true); fileUtil->MoveFile(downloadpath + ".bak", downloadpath, true, false, true); PrintOutput("Failed!\n"); - continue; } } -#ifdef CS_PLATFORM_UNIX + // Restore permissions. if(fs.IsValid()) { +#ifdef CS_PLATFORM_UNIX bool failedEx = failedExec.Get(failed.Get(i), false); if(failedEx) { fs->mode = fs->mode | S_IXUSR | S_IXGRP; } +#endif fileUtil->SetPermissions(rp->GetData(), fs); } -#endif fileUtil->RemoveFile(downloadpath + ".bak", true); PrintOutput("Success!\n"); } Modified: personal/Xordan/src/server/gem.cpp =================================================================== --- personal/Xordan/src/server/gem.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/server/gem.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -3952,15 +3952,17 @@ * and fake the stack count before calling AddToContainer with the test flag; * we put it back when we're done. */ - uint currentSize = 0; + float currentSize = 0; gemContainer::psContainerIterator iter(this); while (iter.HasNext()) { psItem* child = iter.Next(); currentSize += child->GetTotalStackSize(); } - if (item->GetItemSize()*amountToAdd + currentSize > itemdata->GetContainerMaxSize()) + if(((item->GetItemSize())*amountToAdd + currentSize) > itemdata->GetContainerMaxSize()) + { return false; + } unsigned short savedCount = item->GetStackCount(); Modified: personal/Xordan/src/server/spellmanager.cpp =================================================================== --- personal/Xordan/src/server/spellmanager.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/server/spellmanager.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -60,7 +60,7 @@ randomgen = psserver->rng; - psserver->GetEventManager()->Subscribe(this,MSGTYPE_GLYPH_REQUEST,REQUIRE_READY_CLIENT|REQUIRE_ALIVE); + psserver->GetEventManager()->Subscribe(this,MSGTYPE_GLPYH_REQUEST,REQUIRE_READY_CLIENT|REQUIRE_ALIVE); psserver->GetEventManager()->Subscribe(this,MSGTYPE_GLYPH_ASSEMBLE,REQUIRE_READY_CLIENT|REQUIRE_ALIVE); psserver->GetEventManager()->Subscribe(this,MSGTYPE_SPELL_CAST,REQUIRE_READY_CLIENT|REQUIRE_ALIVE); psserver->GetEventManager()->Subscribe(this,MSGTYPE_PURIFY_GLYPH,REQUIRE_READY_CLIENT|REQUIRE_ALIVE); @@ -84,7 +84,7 @@ { if (psserver->GetEventManager()) { - psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GLYPH_REQUEST); + psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GLPYH_REQUEST); psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GLYPH_ASSEMBLE); psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_SPELL_CAST); psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_PURIFY_GLYPH); @@ -114,7 +114,7 @@ SendSpellBook( client ); break; } - case MSGTYPE_GLYPH_REQUEST: + case MSGTYPE_GLPYH_REQUEST: { SendGlyphs( client ); break; Modified: personal/Xordan/src/server/usermanager.cpp =================================================================== --- personal/Xordan/src/server/usermanager.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/server/usermanager.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -510,13 +510,6 @@ return s; } -const enum PSITEMSTATS_STAT skilltostat[6] = {PSITEMSTATS_STAT_AGILITY, - PSITEMSTATS_STAT_CHARISMA, - PSITEMSTATS_STAT_ENDURANCE, - PSITEMSTATS_STAT_INTELLIGENCE, - PSITEMSTATS_STAT_STRENGTH, - PSITEMSTATS_STAT_WILL}; - void UserManager::SendCharacterDescription(Client * client, psCharacter * charData, bool full, bool simple, const csString & requestor) { StatSet* playerAttr = client->GetCharacterData()->GetAttributes(); @@ -536,9 +529,8 @@ desc += "\n\n"; desc += "HP: "+intToStr(int(charData->GetHP()))+" Max HP: "+intToStr(int(charData->GetHitPointsMax()))+"\n"; SkillSet *sks = charData->GetSkills(); - StatSet *sts = charData->GetAttributes(); - for(int skill = 0; sks && sts && skill < PSSKILL_COUNT; skill++) + for(int skill = 0; sks && skill < PSSKILL_COUNT; skill++) { psSkillInfo *skinfo; skinfo = CacheManager::GetSingleton().GetSkillByID((PSSKILL)skill); @@ -546,19 +538,9 @@ psCharacterDetailsMessage::NetworkDetailSkill s; s.category = skinfo->category; - if (PSSKILL_AGI <= skill && skill <= PSSKILL_WILL) - { - // handle stats specially in order to pick up buffs/debuffs - s.text = fmtStatLine(skinfo->name, - sts->GetStat(skilltostat[skill - PSSKILL_AGI], false), - sts->GetStat(skilltostat[skill - PSSKILL_AGI], true)); - } - else - { - s.text = fmtStatLine(skinfo->name, - sks->GetSkillRank(static_cast<PSSKILL>(skill), false), - sks->GetSkillRank(static_cast<PSSKILL>(skill), true)); - } + s.text = fmtStatLine( skinfo->name, + sks->GetSkillRank((PSSKILL)skill, false), + sks->GetSkillRank((PSSKILL)skill, true)); skills.Push(s); } } Modified: personal/Xordan/src/tools/libxpnet/nsSocket.cpp =================================================================== --- personal/Xordan/src/tools/libxpnet/nsSocket.cpp 2008-06-27 22:01:01 UTC (rev 1809) +++ personal/Xordan/src/tools/libxpnet/nsSocket.cpp 2008-06-27 22:06:46 UTC (rev 1810) @@ -314,20 +314,9 @@ if (rv == 0) return E_TIMEOUT; - rv = 0; - for(int i=0; i<3 && rv<=0; i++) - { -#ifdef CS_PLATFORM_WIN32 - rv = write(mFd, aBuf, *aBufSize); -#else - rv = send(mFd, aBuf, *aBufSize, MSG_NOSIGNAL); -#endif - } - + rv = write(mFd, aBuf, *aBufSize); if (rv <= 0) - { rv = E_WRITE; - } else { *aBufSize = rv; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2007-10-15 18:07:45
|
Revision: 7 http://planeshift.svn.sourceforge.net/planeshift/?rev=7&view=rev Author: mgist Date: 2007-10-15 11:07:50 -0700 (Mon, 15 Oct 2007) Log Message: ----------- - Set executable. Property Changed: ---------------- personal/Xordan/autogen.sh personal/Xordan/tools/jobber-svn.pl Property changes on: personal/Xordan/autogen.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: personal/Xordan/tools/jobber-svn.pl ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2007-10-16 17:16:43
|
Revision: 14 http://planeshift.svn.sourceforge.net/planeshift/?rev=14&view=rev Author: mgist Date: 2007-10-16 10:16:47 -0700 (Tue, 16 Oct 2007) Log Message: ----------- - Update. Modified Paths: -------------- personal/Xordan/docs/history.txt personal/Xordan/src/common/util/log.cpp Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2007-10-16 16:55:42 UTC (rev 13) +++ personal/Xordan/docs/history.txt 2007-10-16 17:16:47 UTC (rev 14) @@ -1,3 +1,6 @@ +*** 2007-10-16 by Kenny Graunke +- Fixed crash in CSV log rotation code. + *** 2007-10-14 by Michael Gist - Updated compiling guide to have the latest dates and revisions PS 020 will use. CS bump adds a fix for non-preload maps option, CEL brings the revision to version 1.2 Modified: personal/Xordan/src/common/util/log.cpp =================================================================== --- personal/Xordan/src/common/util/log.cpp 2007-10-16 16:55:42 UTC (rev 13) +++ personal/Xordan/src/common/util/log.cpp 2007-10-16 17:16:47 UTC (rev 14) @@ -318,25 +318,26 @@ // Need to rotate log if (csvFile[i] && csvFile[i]->GetSize() > maxSize) { - int index = 1; - CPrintf(CON_ERROR, "Log File %s is too big! Current size is: %u. Rotating log.", filename[i].GetData(), csvFile[i]->GetSize()); csvFile[i] = NULL; // Rolling history - for(index = 4;index > 0;index--) + for (int index = 4; index > 0; index--) { - if(vfs->Exists(filename[i].Append(index))) - // Rotate the files (move file[index] to file[index+1]) + csString src(filename[i]), dst(filename[i]); + src.Append(index); + dst.Append(index + 1); + // Rotate the files (move file[index] to file[index+1]) + if (vfs->Exists(src)) { - csRef<iDataBuffer> existingData = vfs->ReadFile(filename[i].Append(index), false); - vfs->WriteFile(filename[i].Append(index + 1), existingData->GetData(), existingData->GetSize()); + csRef<iDataBuffer> existingData = vfs->ReadFile(src, false); + vfs->WriteFile(dst, existingData->GetData(), existingData->GetSize()); } } csRef<iDataBuffer> existingData = vfs->ReadFile(filename[i], false); - vfs->WriteFile(filename[i].Append(1), existingData->GetData(), existingData->GetSize()); + vfs->WriteFile(filename[i] + "1", existingData->GetData(), existingData->GetSize()); csvFile[i] = vfs->Open(filename[i],VFS_FILE_WRITE); writeHeader = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2007-10-19 16:41:36
|
Revision: 19 http://planeshift.svn.sourceforge.net/planeshift/?rev=19&view=rev Author: mgist Date: 2007-10-19 09:41:36 -0700 (Fri, 19 Oct 2007) Log Message: ----------- - Last few files from cvs. Modified Paths: -------------- personal/Xordan/data/help.xml personal/Xordan/docs/history.txt personal/Xordan/psclient.cfg Modified: personal/Xordan/data/help.xml =================================================================== --- personal/Xordan/data/help.xml 2007-10-19 16:36:45 UTC (rev 18) +++ personal/Xordan/data/help.xml 2007-10-19 16:41:36 UTC (rev 19) @@ -471,8 +471,11 @@ <topic name="/set">/set attribute on|off Set a GM attribute on or off. Available flags are: invincible, invisible, viewall (see invisibles), nevertired, nofalldamage, infiniteinventory, questtester (bypass quest lockouts). Many of these features are enabled by default for GMs. You can also do "/set list" to view your current attributes.</topic> - <topic name="/setskill">/setskill [target] [skill|'all'] [value|-1] +<topic name="/setlabelcolor">/setlabelcolor [target] [npc|player|gm|gm1|normal] +Set the color of the label of target to the given value. The normal setting will again display the targets normal label color.</topic> +<topic name="/setskill">/setskill [target] [skill|'all'] [value|-1] + Set one of your or target's skills or stats to a specific value. Use 'all' as the name to set all skills and stats to the given value. Use -1 for value if you would like to view the current value of a skill or stat.</topic> <topic name="/show_gm">/show_gm Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2007-10-19 16:36:45 UTC (rev 18) +++ personal/Xordan/docs/history.txt 2007-10-19 16:41:36 UTC (rev 19) @@ -1,3 +1,22 @@ +*** 2007-10-18 by Michael Gist +- Removed the disable of texture_rectangle OGL extensions. + We need to track down the cards this doesn't work on, not disable it for everyone! +- Commented some unneeded console output. + +*** 2007-10-17 by Thomas Towey +- Removed some repair weapon server spam. + +*** 2007-10-17 by Michael Gist +- Re-enabled bilinear filtering for GUI textures. Resolves FS#404. +- Did some code nicefying and maybe fixed some possible accuracy problems. + Made a printf more useful too. +- If you die in the tutorial, you now respawn in the tutorial. +- Fixed a NaN occuring in AoE code. + +*** 2007-10-16 by Thomas Towey +- Check for ID 0 on item destroy. Sometimes items that were never properly created are + attempted to be destroyed. This change eliminates the common false error message. + *** 2007-10-16 by Kenny Graunke - Fixed crash in CSV log rotation code. Modified: personal/Xordan/psclient.cfg =================================================================== --- personal/Xordan/psclient.cfg 2007-10-19 16:36:45 UTC (rev 18) +++ personal/Xordan/psclient.cfg 2007-10-19 16:41:36 UTC (rev 19) @@ -180,9 +180,3 @@ Video.OpenGL.TextureFilterAnisotropy = 1 Video.OpenGL.TextureDownsample = 0 Font.ScalePercent = 100 - -; This prevents some clients from crashing -Video.OpenGL.UseExtension.GL_EXT_texture_rectangle = false -Video.OpenGL.UseExtension.GL_ARB_texture_rectangle = false -Video.OpenGL.UseExtension.GL_NV_texture_rectangle = false - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2007-11-07 12:18:16
|
Revision: 203 http://planeshift.svn.sourceforge.net/planeshift/?rev=203&view=rev Author: mgist Date: 2007-11-07 04:18:20 -0800 (Wed, 07 Nov 2007) Log Message: ----------- - Merged trunk into my branch. Modified Paths: -------------- personal/Xordan/data/gui/interact.xml personal/Xordan/data/help.xml personal/Xordan/data/zoneinfo.xml personal/Xordan/docs/compiling.html personal/Xordan/docs/history.txt personal/Xordan/mk/autoconf/checkprog.m4 personal/Xordan/mk/autoconf/checkpython.m4 personal/Xordan/mk/autoconf/compiler.m4 personal/Xordan/mk/jam/application.jam personal/Xordan/mk/jam/crystalspace_staticplugins_msvc.jam personal/Xordan/mk/jam/docs.jam personal/Xordan/mk/jam/flags.jam personal/Xordan/mk/jam/helper.jam personal/Xordan/mk/jam/install.jam personal/Xordan/mk/jam/library.jam personal/Xordan/mk/jam/msvcgen.jam personal/Xordan/mk/jam/objects.jam personal/Xordan/mk/jam/plugin.jam personal/Xordan/mk/jam/pythmod.jam personal/Xordan/mk/jam/static.jam personal/Xordan/mk/jam/strip.jam personal/Xordan/mk/jam/swig.jam personal/Xordan/mk/jam/unix.jam personal/Xordan/mk/jam/win32.jam personal/Xordan/mk/msvc/appeedit.rc personal/Xordan/mk/msvc/apppsclient.rc personal/Xordan/mk/msvc/apppsclient_static.rc personal/Xordan/mk/msvc/apppsnpcclient.rc personal/Xordan/mk/msvc/apppsnpcclient_static.rc personal/Xordan/mk/msvc/apppsserver.rc personal/Xordan/mk/msvc/apppsserver_static.rc personal/Xordan/mk/msvc/plgdbmysql.rc personal/Xordan/mk/msvc7/appeedit.vcproj personal/Xordan/mk/msvc7/apppsclient.vcproj personal/Xordan/mk/msvc7/apppsclient_static.vcproj personal/Xordan/mk/msvc7/apppsnpcclient.vcproj personal/Xordan/mk/msvc7/apppsnpcclient_static.vcproj personal/Xordan/mk/msvc7/apppsserver.vcproj personal/Xordan/mk/msvc7/apppsserver_static.vcproj personal/Xordan/mk/msvc7/grpall_psminimal.vcproj personal/Xordan/mk/msvc7/grpall_psminimalstatic.vcproj personal/Xordan/mk/msvc7/grpall_psstatic.vcproj personal/Xordan/mk/msvc7/grpall_pstypical.vcproj personal/Xordan/mk/msvc7/grpapps_psminimal.vcproj personal/Xordan/mk/msvc7/grpapps_psminimalstatic.vcproj personal/Xordan/mk/msvc7/grpapps_psstatic.vcproj personal/Xordan/mk/msvc7/grpapps_pstypical.vcproj personal/Xordan/mk/msvc7/grpclient_psminimal.vcproj personal/Xordan/mk/msvc7/grpclient_psminimalstatic.vcproj personal/Xordan/mk/msvc7/grpclient_psstatic.vcproj personal/Xordan/mk/msvc7/grpclient_pstypical.vcproj personal/Xordan/mk/msvc7/grpclient_static_psminimal.vcproj personal/Xordan/mk/msvc7/grpclient_static_psminimalstatic.vcproj personal/Xordan/mk/msvc7/grpclient_static_psstatic.vcproj personal/Xordan/mk/msvc7/grpclient_static_pstypical.vcproj personal/Xordan/mk/msvc7/grplibs_psminimal.vcproj personal/Xordan/mk/msvc7/grplibs_psminimalstatic.vcproj personal/Xordan/mk/msvc7/grplibs_psstatic.vcproj personal/Xordan/mk/msvc7/grplibs_pstypical.vcproj personal/Xordan/mk/msvc7/grpplugins_psminimal.vcproj personal/Xordan/mk/msvc7/grpplugins_psminimalstatic.vcproj personal/Xordan/mk/msvc7/grpplugins_psstatic.vcproj personal/Xordan/mk/msvc7/grpplugins_pstypical.vcproj personal/Xordan/mk/msvc7/grpserver_psminimal.vcproj personal/Xordan/mk/msvc7/grpserver_psminimalstatic.vcproj personal/Xordan/mk/msvc7/grpserver_psstatic.vcproj personal/Xordan/mk/msvc7/grpserver_pstypical.vcproj personal/Xordan/mk/msvc7/grpserver_static_psminimal.vcproj personal/Xordan/mk/msvc7/grpserver_static_psminimalstatic.vcproj personal/Xordan/mk/msvc7/grpserver_static_psstatic.vcproj personal/Xordan/mk/msvc7/grpserver_static_pstypical.vcproj personal/Xordan/mk/msvc7/grptools_psminimal.vcproj personal/Xordan/mk/msvc7/grptools_psminimalstatic.vcproj personal/Xordan/mk/msvc7/grptools_psstatic.vcproj personal/Xordan/mk/msvc7/grptools_pstypical.vcproj personal/Xordan/mk/msvc7/libbulkobjects.vcproj personal/Xordan/mk/msvc7/libdbmysqlstatic.vcproj personal/Xordan/mk/msvc7/libeffects.vcproj personal/Xordan/mk/msvc7/libfparser.vcproj personal/Xordan/mk/msvc7/libgui.vcproj personal/Xordan/mk/msvc7/libpaws.vcproj personal/Xordan/mk/msvc7/libpsengine.vcproj personal/Xordan/mk/msvc7/libpsnet.vcproj personal/Xordan/mk/msvc7/libpsrpgrules.vcproj personal/Xordan/mk/msvc7/libpssound.vcproj personal/Xordan/mk/msvc7/libpsutil.vcproj personal/Xordan/mk/msvc7/libwordnet.vcproj personal/Xordan/mk/msvc7/plgdbmysql.vcproj personal/Xordan/mk/msvc7/wkspsminimal.sln personal/Xordan/mk/msvc7/wkspsminimalstatic.sln personal/Xordan/mk/msvc7/wkspsstatic.sln personal/Xordan/mk/msvc7/wkspstypical.sln personal/Xordan/mk/msvc71/appeedit.vcproj personal/Xordan/mk/msvc71/apppsclient.vcproj personal/Xordan/mk/msvc71/apppsclient_static.vcproj personal/Xordan/mk/msvc71/apppsnpcclient.vcproj personal/Xordan/mk/msvc71/apppsnpcclient_static.vcproj personal/Xordan/mk/msvc71/apppsserver.vcproj personal/Xordan/mk/msvc71/apppsserver_static.vcproj personal/Xordan/mk/msvc71/grpall_psminimal.vcproj personal/Xordan/mk/msvc71/grpall_psminimalstatic.vcproj personal/Xordan/mk/msvc71/grpall_psstatic.vcproj personal/Xordan/mk/msvc71/grpall_pstypical.vcproj personal/Xordan/mk/msvc71/grpapps_psminimal.vcproj personal/Xordan/mk/msvc71/grpapps_psminimalstatic.vcproj personal/Xordan/mk/msvc71/grpapps_psstatic.vcproj personal/Xordan/mk/msvc71/grpapps_pstypical.vcproj personal/Xordan/mk/msvc71/grpclient_psminimal.vcproj personal/Xordan/mk/msvc71/grpclient_psminimalstatic.vcproj personal/Xordan/mk/msvc71/grpclient_psstatic.vcproj personal/Xordan/mk/msvc71/grpclient_pstypical.vcproj personal/Xordan/mk/msvc71/grpclient_static_psminimal.vcproj personal/Xordan/mk/msvc71/grpclient_static_psminimalstatic.vcproj personal/Xordan/mk/msvc71/grpclient_static_psstatic.vcproj personal/Xordan/mk/msvc71/grpclient_static_pstypical.vcproj personal/Xordan/mk/msvc71/grplibs_psminimal.vcproj personal/Xordan/mk/msvc71/grplibs_psminimalstatic.vcproj personal/Xordan/mk/msvc71/grplibs_psstatic.vcproj personal/Xordan/mk/msvc71/grplibs_pstypical.vcproj personal/Xordan/mk/msvc71/grpplugins_psminimal.vcproj personal/Xordan/mk/msvc71/grpplugins_psminimalstatic.vcproj personal/Xordan/mk/msvc71/grpplugins_psstatic.vcproj personal/Xordan/mk/msvc71/grpplugins_pstypical.vcproj personal/Xordan/mk/msvc71/grpserver_psminimal.vcproj personal/Xordan/mk/msvc71/grpserver_psminimalstatic.vcproj personal/Xordan/mk/msvc71/grpserver_psstatic.vcproj personal/Xordan/mk/msvc71/grpserver_pstypical.vcproj personal/Xordan/mk/msvc71/grpserver_static_psminimal.vcproj personal/Xordan/mk/msvc71/grpserver_static_psminimalstatic.vcproj personal/Xordan/mk/msvc71/grpserver_static_psstatic.vcproj personal/Xordan/mk/msvc71/grpserver_static_pstypical.vcproj personal/Xordan/mk/msvc71/grptools_psminimal.vcproj personal/Xordan/mk/msvc71/grptools_psminimalstatic.vcproj personal/Xordan/mk/msvc71/grptools_psstatic.vcproj personal/Xordan/mk/msvc71/grptools_pstypical.vcproj personal/Xordan/mk/msvc71/libbulkobjects.vcproj personal/Xordan/mk/msvc71/libdbmysqlstatic.vcproj personal/Xordan/mk/msvc71/libeffects.vcproj personal/Xordan/mk/msvc71/libfparser.vcproj personal/Xordan/mk/msvc71/libgui.vcproj personal/Xordan/mk/msvc71/libpaws.vcproj personal/Xordan/mk/msvc71/libpsengine.vcproj personal/Xordan/mk/msvc71/libpsnet.vcproj personal/Xordan/mk/msvc71/libpsrpgrules.vcproj personal/Xordan/mk/msvc71/libpssound.vcproj personal/Xordan/mk/msvc71/libpsutil.vcproj personal/Xordan/mk/msvc71/libwordnet.vcproj personal/Xordan/mk/msvc71/plgdbmysql.vcproj personal/Xordan/mk/msvc71/wkspsminimal.sln personal/Xordan/mk/msvc71/wkspsminimalstatic.sln personal/Xordan/mk/msvc71/wkspsstatic.sln personal/Xordan/mk/msvc71/wkspstypical.sln personal/Xordan/mk/msvc8/appeedit.vcproj personal/Xordan/mk/msvc8/apppsclient.vcproj personal/Xordan/mk/msvc8/apppsclient_static.vcproj personal/Xordan/mk/msvc8/apppsnpcclient.vcproj personal/Xordan/mk/msvc8/apppsnpcclient_static.vcproj personal/Xordan/mk/msvc8/apppsserver.vcproj personal/Xordan/mk/msvc8/apppsserver_static.vcproj personal/Xordan/mk/msvc8/grpall_psminimal.vcproj personal/Xordan/mk/msvc8/grpall_psminimalstatic.vcproj personal/Xordan/mk/msvc8/grpall_psstatic.vcproj personal/Xordan/mk/msvc8/grpall_pstypical.vcproj personal/Xordan/mk/msvc8/grpapps_psminimal.vcproj personal/Xordan/mk/msvc8/grpapps_psminimalstatic.vcproj personal/Xordan/mk/msvc8/grpapps_psstatic.vcproj personal/Xordan/mk/msvc8/grpapps_pstypical.vcproj personal/Xordan/mk/msvc8/grpclient_psminimal.vcproj personal/Xordan/mk/msvc8/grpclient_psminimalstatic.vcproj personal/Xordan/mk/msvc8/grpclient_psstatic.vcproj personal/Xordan/mk/msvc8/grpclient_pstypical.vcproj personal/Xordan/mk/msvc8/grpclient_static_psminimal.vcproj personal/Xordan/mk/msvc8/grpclient_static_psminimalstatic.vcproj personal/Xordan/mk/msvc8/grpclient_static_psstatic.vcproj personal/Xordan/mk/msvc8/grpclient_static_pstypical.vcproj personal/Xordan/mk/msvc8/grplibs_psminimal.vcproj personal/Xordan/mk/msvc8/grplibs_psminimalstatic.vcproj personal/Xordan/mk/msvc8/grplibs_psstatic.vcproj personal/Xordan/mk/msvc8/grplibs_pstypical.vcproj personal/Xordan/mk/msvc8/grpplugins_psminimal.vcproj personal/Xordan/mk/msvc8/grpplugins_psminimalstatic.vcproj personal/Xordan/mk/msvc8/grpplugins_psstatic.vcproj personal/Xordan/mk/msvc8/grpplugins_pstypical.vcproj personal/Xordan/mk/msvc8/grpserver_psminimal.vcproj personal/Xordan/mk/msvc8/grpserver_psminimalstatic.vcproj personal/Xordan/mk/msvc8/grpserver_psstatic.vcproj personal/Xordan/mk/msvc8/grpserver_pstypical.vcproj personal/Xordan/mk/msvc8/grpserver_static_psminimal.vcproj personal/Xordan/mk/msvc8/grpserver_static_psminimalstatic.vcproj personal/Xordan/mk/msvc8/grpserver_static_psstatic.vcproj personal/Xordan/mk/msvc8/grpserver_static_pstypical.vcproj personal/Xordan/mk/msvc8/grptools_psminimal.vcproj personal/Xordan/mk/msvc8/grptools_psminimalstatic.vcproj personal/Xordan/mk/msvc8/grptools_psstatic.vcproj personal/Xordan/mk/msvc8/grptools_pstypical.vcproj personal/Xordan/mk/msvc8/libbulkobjects.vcproj personal/Xordan/mk/msvc8/libdbmysqlstatic.vcproj personal/Xordan/mk/msvc8/libeffects.vcproj personal/Xordan/mk/msvc8/libfparser.vcproj personal/Xordan/mk/msvc8/libgui.vcproj personal/Xordan/mk/msvc8/libpaws.vcproj personal/Xordan/mk/msvc8/libpsengine.vcproj personal/Xordan/mk/msvc8/libpsnet.vcproj personal/Xordan/mk/msvc8/libpsrpgrules.vcproj personal/Xordan/mk/msvc8/libpssound.vcproj personal/Xordan/mk/msvc8/libpsutil.vcproj personal/Xordan/mk/msvc8/libwordnet.vcproj personal/Xordan/mk/msvc8/plgdbmysql.vcproj personal/Xordan/mk/msvc8/wkspsminimal.sln personal/Xordan/mk/msvc8/wkspsminimalstatic.sln personal/Xordan/mk/msvc8/wkspsstatic.sln personal/Xordan/mk/msvc8/wkspstypical.sln personal/Xordan/mk/msvcgen/control.tlib personal/Xordan/mk/msvcgen/macros.tlib personal/Xordan/mk/msvcgen/project7.tlib personal/Xordan/mk/msvcgen/projectx7.tlib personal/Xordan/mk/msvcgen/workspace7.tlib personal/Xordan/mk/msvcgen/workspaces.jam personal/Xordan/src/Jamfile personal/Xordan/src/client/charapp.cpp personal/Xordan/src/client/chatbubbles.cpp personal/Xordan/src/client/chatbubbles.h personal/Xordan/src/client/cmdadmin.cpp personal/Xordan/src/client/cmdusers.cpp personal/Xordan/src/client/cmdusers.h personal/Xordan/src/client/cmdutil.cpp personal/Xordan/src/client/entitylabels.cpp personal/Xordan/src/client/gui/pawsguildwindow.cpp personal/Xordan/src/client/gui/pawsskillwindow.cpp personal/Xordan/src/client/gui/pawsskillwindow.h personal/Xordan/src/client/gui/shortcutwindow.cpp personal/Xordan/src/client/pscamera.cpp personal/Xordan/src/client/pscamera.h personal/Xordan/src/client/pscelclient.cpp personal/Xordan/src/client/pscharcontrol.cpp personal/Xordan/src/client/pscharcontrol.h personal/Xordan/src/client/psclientchar.cpp personal/Xordan/src/client/psengine.cpp personal/Xordan/src/client/psmovement.cpp personal/Xordan/src/client/psmovement.h personal/Xordan/src/common/engine/materialmanager.cpp personal/Xordan/src/common/engine/psworld.cpp personal/Xordan/src/common/net/messages.cpp personal/Xordan/src/common/net/messages.h personal/Xordan/src/common/net/netbase.h personal/Xordan/src/common/net/npcmessages.cpp personal/Xordan/src/common/net/npcmessages.h personal/Xordan/src/common/paws/pawsbutton.cpp personal/Xordan/src/common/paws/pawsimagedrawable.cpp personal/Xordan/src/common/paws/pawslistbox.cpp personal/Xordan/src/common/paws/pawstree.cpp personal/Xordan/src/common/rpgrules/factions.cpp personal/Xordan/src/common/util/psutil.cpp personal/Xordan/src/common/util/psutil.h personal/Xordan/src/common/util/strutil.cpp personal/Xordan/src/common/util/strutil.h personal/Xordan/src/npcclient/networkmgr.cpp personal/Xordan/src/npcclient/networkmgr.h personal/Xordan/src/npcclient/npc.cpp personal/Xordan/src/npcclient/npc.h personal/Xordan/src/npcclient/npcbehave.cpp personal/Xordan/src/npcclient/npcclient.cpp personal/Xordan/src/server/actionmanager.h personal/Xordan/src/server/adminmanager.cpp personal/Xordan/src/server/adminmanager.h personal/Xordan/src/server/bankmanager.cpp personal/Xordan/src/server/bankmanager.h personal/Xordan/src/server/bulkobjects/pscharacter.cpp personal/Xordan/src/server/bulkobjects/pscharacter.h personal/Xordan/src/server/bulkobjects/pscharacterloader.cpp personal/Xordan/src/server/bulkobjects/pscharinventory.cpp personal/Xordan/src/server/bulkobjects/psguildinfo.cpp personal/Xordan/src/server/bulkobjects/psguildinfo.h personal/Xordan/src/server/bulkobjects/psitem.cpp personal/Xordan/src/server/bulkobjects/psitem.h personal/Xordan/src/server/bulkobjects/psitemstats.cpp personal/Xordan/src/server/bulkobjects/psitemstats.h personal/Xordan/src/server/bulkobjects/psnpcdialog.cpp personal/Xordan/src/server/bulkobjects/psnpcdialog.h personal/Xordan/src/server/bulkobjects/psnpcloader.cpp personal/Xordan/src/server/bulkobjects/psraceinfo.cpp personal/Xordan/src/server/bulkobjects/psraceinfo.h personal/Xordan/src/server/cachemanager.cpp personal/Xordan/src/server/cachemanager.h personal/Xordan/src/server/client.cpp personal/Xordan/src/server/client.h personal/Xordan/src/server/command.cpp personal/Xordan/src/server/creationmanager.cpp personal/Xordan/src/server/database/mysql/action_locations.sql personal/Xordan/src/server/database/mysql/character_quests.sql personal/Xordan/src/server/database/mysql/command_access.sql personal/Xordan/src/server/database/mysql/create_all.sql personal/Xordan/src/server/database/mysql/dal.cpp personal/Xordan/src/server/database/mysql/dal.h personal/Xordan/src/server/database/mysql/drop.sql personal/Xordan/src/server/database/mysql/item_instances.sql personal/Xordan/src/server/database/mysql/math_scripts.sql personal/Xordan/src/server/database/mysql/movement.sql personal/Xordan/src/server/database/mysql/race_info.sql personal/Xordan/src/server/database/mysql/server_options.sql personal/Xordan/src/server/database/mysql/upgrade_schema.sql personal/Xordan/src/server/exchangemanager.cpp personal/Xordan/src/server/gem.cpp personal/Xordan/src/server/gem.h personal/Xordan/src/server/gmeventmanager.cpp personal/Xordan/src/server/gmeventmanager.h personal/Xordan/src/server/guildmanager.cpp personal/Xordan/src/server/iserver/idal.h personal/Xordan/src/server/npcmanager.cpp personal/Xordan/src/server/progressionmanager.cpp personal/Xordan/src/server/psserver.cpp personal/Xordan/src/server/serverstatus.cpp personal/Xordan/src/server/slotmanager.cpp personal/Xordan/src/server/usermanager.cpp personal/Xordan/src/server/workmanager.cpp personal/Xordan/src/server/workmanager.h personal/Xordan/src/tools/Jamfile Added Paths: ----------- personal/Xordan/data/gui/launcherwindow.xml personal/Xordan/mk/jam/crystalspace_staticplugins_msvc7.jam personal/Xordan/mk/jam/crystalspace_staticplugins_msvc71.jam personal/Xordan/mk/jam/crystalspace_staticplugins_msvc8.jam personal/Xordan/mk/msvc/apppsclient_static_static_glue_app_CEL.cpp personal/Xordan/mk/msvc/apppsclient_static_static_glue_app_CRYSTAL.cpp personal/Xordan/mk/msvc/apppsclient_static_static_glue_lib_CEL.cpp personal/Xordan/mk/msvc/apppsclient_static_static_glue_lib_CRYSTAL.cpp personal/Xordan/mk/msvc/apppslaunch.manifest personal/Xordan/mk/msvc/apppslaunch.rc personal/Xordan/mk/msvc/apppslaunch_static.manifest personal/Xordan/mk/msvc/apppslaunch_static.rc personal/Xordan/mk/msvc/apppslaunch_static_static_glue_app_CRYSTAL.cpp personal/Xordan/mk/msvc/apppslaunch_static_static_glue_lib_CRYSTAL.cpp personal/Xordan/mk/msvc/apppslaunch_static_staticuse_CRYSTAL.cpp personal/Xordan/mk/msvc/apppsnpcclient_static_static_glue_app.cpp personal/Xordan/mk/msvc/apppsnpcclient_static_static_glue_app_CEL.cpp personal/Xordan/mk/msvc/apppsnpcclient_static_static_glue_app_CRYSTAL.cpp personal/Xordan/mk/msvc/apppsnpcclient_static_static_glue_lib.cpp personal/Xordan/mk/msvc/apppsnpcclient_static_static_glue_lib_CEL.cpp personal/Xordan/mk/msvc/apppsnpcclient_static_static_glue_lib_CRYSTAL.cpp personal/Xordan/mk/msvc/apppsserver_static_static_glue_app.cpp personal/Xordan/mk/msvc/apppsserver_static_static_glue_app_CEL.cpp personal/Xordan/mk/msvc/apppsserver_static_static_glue_app_CRYSTAL.cpp personal/Xordan/mk/msvc/apppsserver_static_static_glue_lib.cpp personal/Xordan/mk/msvc/apppsserver_static_static_glue_lib_CEL.cpp personal/Xordan/mk/msvc/apppsserver_static_static_glue_lib_CRYSTAL.cpp personal/Xordan/mk/msvc/apppsupdater.manifest personal/Xordan/mk/msvc/apppsupdater.rc personal/Xordan/mk/msvc/apppsupdater_static.manifest personal/Xordan/mk/msvc/apppsupdater_static.rc personal/Xordan/mk/msvc/apppsupdater_static_static_glue_app_CRYSTAL.cpp personal/Xordan/mk/msvc/apppsupdater_static_static_glue_lib_CRYSTAL.cpp personal/Xordan/mk/msvc/apppsupdater_static_staticuse_CRYSTAL.cpp personal/Xordan/mk/msvc/dbmysqlstatic_msvc7.jam personal/Xordan/mk/msvc/dbmysqlstatic_msvc71.jam personal/Xordan/mk/msvc/dbmysqlstatic_msvc8.jam personal/Xordan/mk/msvc7/apppslaunch.vcproj personal/Xordan/mk/msvc7/apppslaunch_static.vcproj personal/Xordan/mk/msvc7/apppsupdater.vcproj personal/Xordan/mk/msvc7/apppsupdater_static.vcproj personal/Xordan/mk/msvc7/libpsclient_static_plugins_CEL.vcproj personal/Xordan/mk/msvc7/libpsclient_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc7/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc7/libpsnpcclient_static_plugins.vcproj personal/Xordan/mk/msvc7/libpsnpcclient_static_plugins_CEL.vcproj personal/Xordan/mk/msvc7/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc7/libpsserver_static_plugins.vcproj personal/Xordan/mk/msvc7/libpsserver_static_plugins_CEL.vcproj personal/Xordan/mk/msvc7/libpsserver_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc7/libpsupdater_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc7/libxdelta3.vcproj personal/Xordan/mk/msvc71/apppslaunch.vcproj personal/Xordan/mk/msvc71/apppslaunch_static.vcproj personal/Xordan/mk/msvc71/apppsupdater.vcproj personal/Xordan/mk/msvc71/apppsupdater_static.vcproj personal/Xordan/mk/msvc71/libpsclient_static_plugins_CEL.vcproj personal/Xordan/mk/msvc71/libpsclient_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc71/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc71/libpsnpcclient_static_plugins.vcproj personal/Xordan/mk/msvc71/libpsnpcclient_static_plugins_CEL.vcproj personal/Xordan/mk/msvc71/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc71/libpsserver_static_plugins.vcproj personal/Xordan/mk/msvc71/libpsserver_static_plugins_CEL.vcproj personal/Xordan/mk/msvc71/libpsserver_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc71/libpsupdater_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc71/libxdelta3.vcproj personal/Xordan/mk/msvc8/apppslaunch.vcproj personal/Xordan/mk/msvc8/apppslaunch_static.vcproj personal/Xordan/mk/msvc8/apppsupdater.vcproj personal/Xordan/mk/msvc8/apppsupdater_static.vcproj personal/Xordan/mk/msvc8/libpsclient_static_plugins_CEL.vcproj personal/Xordan/mk/msvc8/libpsclient_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc8/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc8/libpsnpcclient_static_plugins.vcproj personal/Xordan/mk/msvc8/libpsnpcclient_static_plugins_CEL.vcproj personal/Xordan/mk/msvc8/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc8/libpsserver_static_plugins.vcproj personal/Xordan/mk/msvc8/libpsserver_static_plugins_CEL.vcproj personal/Xordan/mk/msvc8/libpsserver_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc8/libpsupdater_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc8/libxdelta3.vcproj personal/Xordan/pslaunch.cfg personal/Xordan/src/pslaunch/ personal/Xordan/src/pslaunch/Jamfile personal/Xordan/src/pslaunch/binarypatch.cpp personal/Xordan/src/pslaunch/binarypatch.h personal/Xordan/src/pslaunch/download.cpp personal/Xordan/src/pslaunch/download.h personal/Xordan/src/pslaunch/fileutil.cpp personal/Xordan/src/pslaunch/fileutil.h personal/Xordan/src/pslaunch/globals.h personal/Xordan/src/pslaunch/pawslauncherwindow.cpp personal/Xordan/src/pslaunch/pawslauncherwindow.h personal/Xordan/src/pslaunch/pslaunch.cfg personal/Xordan/src/pslaunch/pslaunch.cpp personal/Xordan/src/pslaunch/pslaunch.h personal/Xordan/src/pslaunch/updater.cpp personal/Xordan/src/pslaunch/updater.h personal/Xordan/src/pslaunch/updaterconfig.cpp personal/Xordan/src/pslaunch/updaterconfig.h personal/Xordan/src/pslaunch/updaterengine.cpp personal/Xordan/src/pslaunch/updaterengine.h personal/Xordan/src/pslaunch/updatexmls/ personal/Xordan/src/pslaunch/updatexmls/HowToTest.txt personal/Xordan/src/pslaunch/updatexmls/README personal/Xordan/src/pslaunch/updatexmls/changedfiles.xml personal/Xordan/src/pslaunch/updatexmls/deletedfiles.xml personal/Xordan/src/pslaunch/updatexmls/newfiles.xml personal/Xordan/src/pslaunch/updatexmls/updaterinfo.xml personal/Xordan/src/server/database/mysql/create_indexes.sql personal/Xordan/src/server/database/mysql/race_spawns.sql personal/Xordan/src/tools/xdelta3/ personal/Xordan/src/tools/xdelta3/Jamfile personal/Xordan/src/tools/xdelta3/xdelta3-cfgs.h personal/Xordan/src/tools/xdelta3/xdelta3-decode.h personal/Xordan/src/tools/xdelta3/xdelta3-list.h personal/Xordan/src/tools/xdelta3/xdelta3.c personal/Xordan/src/tools/xdelta3/xdelta3.h personal/Xordan/updaterinfo.xml Removed Paths: ------------- personal/Xordan/mk/msvc/dbmysqlstatic_msvc.jam personal/Xordan/src/common/net/adminmessage.cpp personal/Xordan/src/common/net/adminmessage.h personal/Xordan/src/pslaunch/Jamfile personal/Xordan/src/pslaunch/binarypatch.cpp personal/Xordan/src/pslaunch/binarypatch.h personal/Xordan/src/pslaunch/download.cpp personal/Xordan/src/pslaunch/download.h personal/Xordan/src/pslaunch/fileutil.cpp personal/Xordan/src/pslaunch/fileutil.h personal/Xordan/src/pslaunch/globals.h personal/Xordan/src/pslaunch/pawslauncherwindow.cpp personal/Xordan/src/pslaunch/pawslauncherwindow.h personal/Xordan/src/pslaunch/pslaunch.cfg personal/Xordan/src/pslaunch/pslaunch.cpp personal/Xordan/src/pslaunch/pslaunch.h personal/Xordan/src/pslaunch/updater.cpp personal/Xordan/src/pslaunch/updater.h personal/Xordan/src/pslaunch/updaterconfig.cpp personal/Xordan/src/pslaunch/updaterconfig.h personal/Xordan/src/pslaunch/updaterengine.cpp personal/Xordan/src/pslaunch/updaterengine.h personal/Xordan/src/pslaunch/updatexmls/ personal/Xordan/src/pslaunch/updatexmls/HowToTest.txt personal/Xordan/src/pslaunch/updatexmls/README personal/Xordan/src/pslaunch/updatexmls/changedfiles.xml personal/Xordan/src/pslaunch/updatexmls/deletedfiles.xml personal/Xordan/src/pslaunch/updatexmls/newfiles.xml personal/Xordan/src/pslaunch/updatexmls/updaterinfo.xml personal/Xordan/src/tools/xdelta3/Jamfile personal/Xordan/src/tools/xdelta3/xdelta3-cfgs.h personal/Xordan/src/tools/xdelta3/xdelta3-decode.h personal/Xordan/src/tools/xdelta3/xdelta3-list.h personal/Xordan/src/tools/xdelta3/xdelta3.c personal/Xordan/src/tools/xdelta3/xdelta3.h Modified: personal/Xordan/data/gui/interact.xml =================================================================== --- personal/Xordan/data/gui/interact.xml 2007-11-07 11:20:58 UTC (rev 202) +++ personal/Xordan/data/gui/interact.xml 2007-11-07 12:18:20 UTC (rev 203) @@ -122,7 +122,7 @@ </widget> <widget name="ButtonBank" factory="pawsButton" id="2400" tooltip="Start Personal Banking"> - <frame x="0" y="64" width="64" height="64" /> + <frame x="0" y="128" width="64" height="64" /> <bgimage resource="ButtonGive" /> </widget> Copied: personal/Xordan/data/gui/launcherwindow.xml (from rev 202, trunk/data/gui/launcherwindow.xml) =================================================================== --- personal/Xordan/data/gui/launcherwindow.xml (rev 0) +++ personal/Xordan/data/gui/launcherwindow.xml 2007-11-07 12:18:20 UTC (rev 203) @@ -0,0 +1,30 @@ +<widget_description> + +<widget name="launcher" factory="pawsLauncherWindow" visible="yes" savepositions="no" movable="no" resizable="no"> + + <bgimage resource="SetupBackground" alpha="255" fade="false"/> + + <frame x="0" y="0" width="850" height="600" border="no"/> + <title resource="Blue Title" text="Planeshift Launcher" align="left"/> + + <!-- Quit button --> + <widget name="Quit" factory="pawsButton"> + <frame x="210" y="520" width="130" height="30" border="no"/> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="12"/> + <buttonup resource="SetupButtonDown"/> + <buttondown resource="SetupButtonDown"/> + <label text="Quit"/> + </widget> + + <!-- Launch Client button --> + <widget name="LaunchButton" factory="pawsButton"> + <frame x="350" y="520" width="130" height="30" border="no"/> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="12"/> + <buttonup resource="SetupButtonDown"/> + <buttondown resource="SetupButtonDown"/> + <label text="Launch Client"/> + </widget> + +</widget> + +</widget_description> Modified: personal/Xordan/data/help.xml =================================================================== --- personal/Xordan/data/help.xml 2007-11-07 11:20:58 UTC (rev 202) +++ personal/Xordan/data/help.xml 2007-11-07 12:18:20 UTC (rev 203) @@ -388,8 +388,8 @@ When an event is complete, the GM should enter: /event complete -To reward the participants (all of them, or those within a specified range) of a current event: -/event reward [range 0-100 | all] [#] [item name]</topic> +To reward the participants (all of them, those within a specified range or an individual - by name or by target) of a current event: +/event reward [range 0-100 | all | player] [#] [item name]</topic> <topic name="/freeze">/freeze player Prevents a player from moving or using any commands until they quit/relog.</topic> @@ -461,6 +461,9 @@ <topic name="/pos">/pos target GMs have an enhanced version of the /pos command which shows your current region and the direction you are facing. It also has an optional parameter to get the position of another entity. (may specify by name or an ID)</topic> + <topic name="/quest">/quest command + +Manage completion of quests. When a player is targeted, commands are applied on him. Use /quest to list the quest completion status of the player. '/quest [status (0-discard, 1-complete)] [quest name]' to control the completion status of a player. </topic> <topic name="/rain"> /rain sector [drops [length [fade]]|stop] It creates rain effect in a specific sector, with a specific number of drops, the length of the effect (in milliseconds) and its fading @@ -474,9 +477,19 @@ <topic name="/setlabelcolor">/setlabelcolor [target] [npc|player|gm|gm1|normal] Set the color of the label of target to the given value. The normal setting will again display the targets normal label color.</topic> + <topic name="/setitemname">/setitemname command + +Allows changing the name and description of the targeted item. Usage: /setitemname [name] [description]. Description is optional.</topic> + <topic name="/setquality">/setquality command + +Allows changing the quality of the targeted item. Usage: /setquality [quality] [max quality]. Max quality is optional.</topic> <topic name="/setskill">/setskill [target] [skill|'all'] [value|-1] Set one of your or target's skills or stats to a specific value. Use 'all' as the name to set all skills and stats to the given value. Use -1 for value if you would like to view the current value of a skill or stat.</topic> + <topic name="/settrait">/settrait command + +Allows changing the traits of a targeted char (or self if no target). Usage: /settrait [trait name].</topic> + <topic name="/show_gm">/show_gm Shows the GM GUI, a window with a player list and quick access to many commands.</topic> @@ -493,10 +506,6 @@ <topic name="/takeitem">/takeitem [target] [quantity|'all'|''] [item] Command used to transfer an item to you from another character. Example: "/takeitem target 3 Sabre"</topic> - <topic name="/quest">/quest command - -Manage completion of quests. When a player is targeted, commands are applied on him. Use /quest to list the quest completion status of the player. '/quest [status (0-discard, 1-complete)] [quest name]' to control the completion status of a player. - </topic> <topic name="/teleport">/teleport subject destination Move the subject object/NPC/player to the given destination. In addition to the standard command syntax, the destination may be 'last' (last valid location; undo last teleport), 'spawn' (spawn point for that character), 'restore' (teleport offline character here), or 'map' followed by a mapname OR a sector and coordinates. Examples: "/teleport target here", "/teleport me Bob", "/teleport me map npcroom", "/teleport me map hydlaa_plaza 3 -42 10", "/teleport "Ink and Paper" map here -234.11 2.23 832"</topic> Modified: personal/Xordan/data/zoneinfo.xml =================================================================== --- personal/Xordan/data/zoneinfo.xml 2007-11-07 11:20:58 UTC (rev 202) +++ personal/Xordan/data/zoneinfo.xml 2007-11-07 12:18:20 UTC (rev 203) @@ -1,22 +1,34 @@ <zonelist> - <zone sector="one"> - <region map="warpsector" /> + + <!-- NPCRoom test level --> + + <zone sector="NPCroom" loadimage="Loading Background"> + <region map="npcroom1" /> + <region map="npcroom_corr" /> </zone> - <zone sector="two"> - <region map="warpsector" /> + + <zone sector="NPCroom1" loadimage="Loading Background"> + <region map="npcroom1" /> + <region map="npcroom_corr" /> </zone> - <zone sector="three"> - <region map="warpsector" /> + + <zone sector="NPCroom2" loadimage="Loading Background"> + <region map="npcroom2" /> + <region map="npcroom_corr" /> </zone> - <zone sector="four"> - <region map="warpsector" /> + + <zone sector="NPCroom3" loadimage="Loading Background"> + <region map="npcroom2" /> + <region map="npcroom_corr" /> </zone> - <zone sector="NPCroom"> - <region map="npcroom" /> + + <zone sector="NPCroomwarp" loadimage="Loading Background"> + <region map="npcroom2" /> + <region map="npcroom_corr" /> </zone> - <zone sector="NPCroom1"> - <region map="npcroom" /> - </zone> + + + <!-- final in game levels --> <zone sector="hydlaa_plaza"> <region map="temple" /> <region map="tower" /> @@ -109,4 +121,4 @@ <region map="room4" /> <region map="room1" /> </zone> -</zonelist> +</zonelist> \ No newline at end of file Modified: personal/Xordan/docs/compiling.html =================================================================== --- personal/Xordan/docs/compiling.html 2007-11-07 11:20:58 UTC (rev 202) +++ personal/Xordan/docs/compiling.html 2007-11-07 12:18:20 UTC (rev 203) @@ -1154,7 +1154,7 @@ <p>Make sure that your specific 'msvc' folder has the 'read only' box unchecked (right click on the folder and select Properties, 'read only' is one of the attributes in the General tab) before continuing.</p> - <p>Go into the 'Build' menu, and select 'configuration manager'. Change the 'Active Solution Configuration' to 'Debug'.<br> + <p>Go into the 'Build' menu, and select 'configuration manager'. Change the 'Active Solution Configuration' to 'Release(static libs)'.<br> Right click on the solution and select 'Build Solution'. To test the build of CS, run walktest.exe in C:\development\CS.<br> If you encounter any errors, check you have done everything correctly, and then if the problem persists, you can ask for help in the CS IRC channel:<br> @@ -1181,8 +1181,8 @@ folder. Under Projects choose "VC++ Directories". In the Show Directories for: choose "Library Files". Click the new folder icon to add the following directories:</p> <p> - C:\development\CS\out\debugX\libs<br> - C:\development\cel\out\debugX\libs + C:\development\CS\out\releaseX\libs<br> + C:\development\cel\out\releaseX\libs </p> <p>You have to change X (in the path concerning CS and cel libraries) to these values, depending from the version you have of MSVC:</p> Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2007-11-07 11:20:58 UTC (rev 202) +++ personal/Xordan/docs/history.txt 2007-11-07 12:18:20 UTC (rev 203) @@ -1,3 +1,214 @@ +*** 2007-11-07 by Sasha Levin +- Add a threaded sql query executor, allowing to run async queries. Usefull + for update and delete commands - Where waiting on return value isn't + necessary. +- Copying guarding char id when copying items. +- Fixed wrong format string causing GM item spawn gui not to work. + +*** 2007-11-06 by Roland Schulz +- fixed bug 1952 on the old BT: backward movement now also cancels autorun. +- comment out debug msgs from last commit + +*** 2007-11-06 by Roland Schulz +- fixed fix to FS#530 (the fix broke modifiers for keyboard keys). Both + key and mouse modifiers should work now. + +*** 2007-11-06 by Sasha Levin +- Shortcuts can be edited with alt + left click. +- Set unique flag on some uniqe indexes. +- Added more indexes - Including a unique one on username in accounts table. + +*** 2007-11-04 by Andrew Craig +- Fixed command parser on client to use standard XML parser system. + +*** 2007-11-04 by Kenny Graunke +- Clean up scary code (with warnings) in factions.cpp. + +*** 2007-11-04 by Sasha Levin +- Cleaned up the string utils a bit. +- A new training system to save up on sql queries and mouse clicks. Instead of + clicking lots of times on the train button, A number prompt window opens up. +- Preventing stacking of items with different name or description. +- Constified some methods in psItem and psItem stats. Todo: Constify anything + possible! + +*** 2007-11-04 by Andrew Craig +- Did some work on the slot manager to fix up some issue related to containers. + It was not splitting them correctly so was causing some problems when items + moved around. Fixes bug: + FS#246 - Changing furnace slots results in wrong number of molten +- Fixed some more problems with mouse clicks falling through some widgets. +- Fix FS#372 - Player's books showing in GM item spawn gui. Those + items will not show up under the /item->item window now. + +*** 2007-11-03 by Andrew Craig +- Fixed problem where clicking on a tree node button ( ie the +/- ) would + also make the character walk to point. +- Fixed problem with scroll bar that had the same issue. + +*** 2007-11-03 by Michael Gist +- Fixes to the region unloading code. + +*** 2007-11-03 by Dave Bentham +- Event GMs can award experience to participants. + /event reward [all | range # | playername] # item + where item = "exp" then # progression points are given. + +*** 2007-11-03 by Sasha Levin +- Fixed bug in material manager where LoadTexture() recieved a wrong name due + to wrong location of a temporary var. +- Keys that open different locks won't stack. +- Moved the banking button in interact menu to show the 'give' button too. + +*** 2007-11-02 by Andrew Craig +- Patch from Roland to fix FS#530 Ctrl+LeftClick combo does not work +- Patch from Roland to fix FS#415: Mouserun doesn't work when target selected +- Patch from Roland for Mouse Look: +Patch changes the mouselook behavior to allow selecting of items, +npcs and players in that mode. When in first person view, the item selected +is the one in the center of the screen (some pointing hand or crosshair like +in the cvs skin would be nice to have here) and in the other modes an item +roughly in front of the character (not the camera view) is selected. The +mouselook button +is also made into a toggle, so it can be used to temporarily switch out of +mouselook mode. Mouselook mode is no longer aborted when the left or right +mousebuttons are pressed and paws handling is passed through in mouselook +mode (otherwise the selection would never reach the handling layer) + + +*** 2007-11-02 by Sasha Levin +- Committed Lanarels' fix for FS#545. +- Added force discard for quest assignments. +- /quest now discards quests with infinite lockouts too. +- Fixed the MakeKey method, Now it properly creates simple keys too. +- Key properties are being checked when stacking. + +*** 2007-11-01 by Sasha Levin +- Converted the following hardcoded formulas into math scripts: Item sell price, Guild + account level (banking), Char account level (banking), Bank fee and Mining odds. +- Proper formatting of exchange messages. +- Fixed message parsing in cmdutil, Now /confirm works right with quotes. + +*** 2007-10-31 by Sasha Levin +- Removed usage of strcmp in psNPCDialog::SubstituteKeywords. +- Moved gender string generation to the psRaceInfo class. +- Calling mysql_real_query for queries, Should save up on lots of strlens. +- Not forcing QuestAssignments updates into db on char logout, dirty flag + is doing a good job already. +- Disabled skeleton key until the bug is solved. + +*** 2007-10-28 by Andrew Craig +- character skills now have a 'dirty' flag so they are only saved if + they have been changed since login. This should again greatly + reduce the total number of database hits. + +*** 2007-10-26 by Andrew Craig +- The last login time for guild memebers is now cached when guild + created. Before was hitting the database everytime a guild window + was opened. +- Saving of character skills now doesn't clear them all and rewrite them + anymore. Now it does and update and if that fails will do an insert. +- Added check to CacheManager::GetBasicItemStatsByID() to bail out if + the ID was 0. + +*** 2007-10-26 by Sasha Levin +- Added support for custom item names. +- DB VER BUMP! +- Added GM interface to change item names and descs, /setitemname. +- Added missing message after changing quality. +- Fixed slow mouse pointer. Seems like the cause was a wrong check, that made images fail + loading all the time, Making it impossible for the OS to accelerate them. +- Added /reload item command, allowing to reload (or load) item stats from db. + +*** 2007-10-26 by Kenny Graunke +- Changed default strafe speed to 2.0 m/s, halfway between sneak and walk. + Karyuu already updated most art for this a while ago, and Trymm is going + to look at the rest. + +*** 2007-10-26 by Sasha Levin +- Added db indexes for common selects. Should speed up those operations. +- Added a /setquality command for GMs. +- Added a fix for #2593 by Vornne +- Fixed broken char creation if tutorial doesn't exist (like in svn). +- Added /settrait command for GMs. + +*** 2007-10-24 by Andrew Craig +- Fixed an issue with hair colours not being set correctly when removing helm. + +*** 2007-10-24 by Anders Reggestad +- Added setting of impervious when disabling stuck NPCs so that they would not be easy + targets for players. + NPC NET VERSION BUMPED +- Fixed compiler warning in psraceinfo.cpp + +*** 2007-10-24 by Dave Bentham +- Rewards can be given to individual participants of events. + /event reward [all | range # | playername] # item + playername can be by target. # items is now mandatory. + +*** 2007-10-24 by Sasha Levin +- Added support for multiple spawn points for each race. +- DB VER BUMP! +- Fixed crash in MoveFromInventory. +- GM2+ can now pick up any PC guarded items. +- Added guarding for items in sacks too. +- Public containers now also have the 5m guard limit. If you walk from your furnace, Your + items are free for all! +- Interrupting repair work wasn't resetting the repaired item in-use status. Makes the + repaired item 'stick' in your hand. Fixed. +- Added an optional parameter to /event complete, allowing other GMs to close events + that they didn't start. +- Added /event list - Listing all running events. + +*** 2007-10-24 by Michael Gist +- Added skeleton version of launcher app. Atm there's just 'Quit' and 'Launch Client' + buttons on the GUI. Supports update checking and launcher self-restarting on client + crash. Also added basic .cfg and .xml files to the PS root dir, so the updater + can successfully find no updates available (and exit correctly). +- A few more changes to the updater version layout in updaterinfo.xml + +*** 2007-10-23 by Andrew Craig +- Cleaned up some more code. Moved server side stuff out of common and into server. + +*** 2007-10-23 by Andrew Craig +- Removed a large block of admin stuff that is no longer used and is just dead code. + +*** 2007-10-23 by Michael Gist +- Increased MAXQUEUESIZE to 20000. + +*** 2007-10-23 by Anders Reggestad +- Added disabling and stopping of NPCs that use to long time on a tick. + +*** 2007-10-22 by Andrew Craig +- Added patch from DarcSabre to improve the look of the pawsSkill window. + +*** 2007-10-22 by Andrew Craig +- /report logs are now time stamped. + +*** 2007-10-22 by Anders Reggestad +- Added listing of faction to WC. + +*** 2007-10-22 by Sasha Levin +- Fixed FS#498 - Repair issue +- Added guard for dropped items. Chars guard any items they dropped on the ground within + 5m range. Should prevent item 'stealing'. + +*** 2007-10-22 by Michael Gist +- Changed updater xml to hold an updater md5 for each platform. +- Some Jamfile work for the updater. + +*** 2007-10-20 by Michael Gist +- Updated build files from CS. +- Changed updater to use csmd5. + +*** 2007-10-20 by Sasha Levin +- Added dynamic item price calculation. Now it uses math script to include quality of the + item in the calculation. +- Fix by Lanarel for conflicting quests. + +*** 2007-10-19 by Michael Gist +- Wrote a new updater. Console only atm. + *** 2007-10-18 by Michael Gist - Removed the disable of texture_rectangle OGL extensions. We need to track down the cards this doesn't work on, not disable it for everyone! Modified: personal/Xordan/mk/autoconf/checkprog.m4 =================================================================== --- personal/Xordan/mk/autoconf/checkprog.m4 2007-11-07 11:20:58 UTC (rev 202) +++ personal/Xordan/mk/autoconf/checkprog.m4 2007-11-07 12:18:20 UTC (rev 203) @@ -30,7 +30,7 @@ # /sw/bin -- Fink, the MacOS/X manager of Unix packages, installs # executables here. #------------------------------------------------------------------------------ -m4_define([cs_bin_paths_default], [/usr/local/bin, /sw/bin]) +m4_define([cs_bin_paths_default], [/usr/local/bin, /sw/bin, ${srcdir}/bin]) #------------------------------------------------------------------------------ Modified: personal/Xordan/mk/autoconf/checkpython.m4 =================================================================== --- personal/Xordan/mk/autoconf/checkpython.m4 2007-11-07 11:20:58 UTC (rev 202) +++ personal/Xordan/mk/autoconf/checkpython.m4 2007-11-07 12:18:20 UTC (rev 203) @@ -43,7 +43,8 @@ # "yes", then CS_EMIT_BUILD_RESULT()'s default emitter will be used. # When EMITTER is provided, the following properties are emitted to the # output file: PYTHON (the actual interpreter), PYTHON.AVAILABLE ("yes" -# or "no"), PYTHON.CFLAGS, PYTHON.LFLAGS, and PYTHON.MODULE_EXT. +# or "no"), PYTHON.CFLAGS, PYTHON.LFLAGS, PYTHON.VERSION, +# and PYTHON.MODULE_EXT. #------------------------------------------------------------------------------ AC_DEFUN([CS_CHECK_PYTHON], [AC_REQUIRE([CS_CHECK_PTHREAD]) @@ -56,7 +57,7 @@ AS_IF([test -z "$with_python"], [with_python=m4_if([$2], [without], [no], [yes])]) - CS_CHECK_PROGS([PYTHON], [python]) + CS_CHECK_TOOLS([PYTHON], [python]) AC_SUBST([PYTHON]) CS_EMIT_BUILD_PROPERTY([PYTHON],[$PYTHON],[],[],CS_EMITTER_OPTIONAL([$1])) @@ -66,6 +67,9 @@ print string.join(map(str,sys.version_info[[:2]]),".")'])` cs_cv_pybase="python${cs_pyver}" + CS_EMIT_BUILD_PROPERTY([PYTHON.VERSION],[$cs_pyver],[],[], + CS_EMITTER_OPTIONAL([$1])) + cs_cv_pybase_cflags=CS_RUN_PATH_NORMALIZE([$PYTHON -c \ 'import distutils.sysconfig; \ print "-I" + distutils.sysconfig.get_python_inc()']) @@ -102,9 +106,9 @@ AS_IF([test -n "$cs_pyver" && test -n "$cs_cv_pybase_cflags" && - test -n "$cs_cv_pybase_lflags$cs_cv_pybase_sysprefix_lflags"], + test -n "$cs_cv_pybase_lflags_base$cs_cv_pybase_sysprefix_lflags"], [cs_cv_python_sdk=yes], [cs_cv_python_sdk=no])]) - + # Check if Python SDK is usable. The most common library name is the # basename with a few decorations (for example, libpython2.2.a), # however some Windows libraries lack the decimal point (for example, Modified: personal/Xordan/mk/autoconf/compiler.m4 =================================================================== --- personal/Xordan/mk/autoconf/compiler.m4 2007-11-07 11:20:58 UTC (rev 202) +++ personal/Xordan/mk/autoconf/compiler.m4 2007-11-07 12:18:20 UTC (rev 203) @@ -144,6 +144,20 @@ CS_CHECK_BUILD_FLAGS([if --no-as-needed is supported], [cs_cv_prog_link_no_as_needed], [CS_CREATE_TUPLE([-Wl,--no-as-needed])], [C++])])]) + + # Check if linker supports --gc-sections. + AC_ARG_ENABLE([gc-sections], + [AC_HELP_STRING([--enable-gc-sections], + [Utilize --gc-sections linker flag for some targets (default YES)])]) + AS_IF([test -z "$enable_gc_sections"], + [enable_gc_sections=yes]) + AS_IF([test "$enable_gc_sections" != "no"], + [CS_CHECK_BUILD_FLAGS([if --gc-sections is supported], + [cs_cv_prog_link_gc_sections], + [CS_CREATE_TUPLE([-Wl,--gc-sections])], + [C++], + [CS_EMIT_BUILD_PROPERTY([LINK.GC_SECTIONS], + [$cs_cv_prog_link_gc_sections])])]) ]) #----------------------------------------------------------------------------- Modified: personal/Xordan/mk/jam/application.jam =================================================================== --- personal/Xordan/mk/jam/application.jam 2007-11-07 11:20:58 UTC (rev 202) +++ personal/Xordan/mk/jam/application.jam 2007-11-07 12:18:20 UTC (rev 203) @@ -102,7 +102,6 @@ Always $(<)clean ; NotFile $(<)clean ; Clean $(<)clean : $(objects) $(cleanextra) ; - Clean clean : $(cleanextra) ; if ! [ IsElem nohelp : $(3) ] { Modified: personal/Xordan/mk/jam/crystalspace_staticplugins_msvc.jam =================================================================== --- personal/Xordan/mk/jam/crystalspace_staticplugins_msvc.jam 2007-11-07 11:20:58 UTC (rev 202) +++ personal/Xordan/mk/jam/crystalspace_staticplugins_msvc.jam 2007-11-07 12:18:20 UTC (rev 203) @@ -1,590 +1,14 @@ -# This file is automatically generated to be used together with crystalspace_staticplugins -# and must be integrated by setting the correct values for the -# HAVE_STATICDEPS.<package> and <package>.STATICDEPS via MsvcGenConfig. -# Furthermore, this file might require manual updates from the master copy -# (usually found in the package's source repository) every now and then. -STATICPLUGINS.AVAILABLE += csopcode ; -STATICPLUGIN.csopcode.CFLAGS.debug = ; -STATICPLUGIN.csopcode.CFLAGS.release = ; -STATICPLUGIN.csopcode.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.csopcode.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += csconin ; -STATICPLUGIN.csconin.CFLAGS.debug = ; -STATICPLUGIN.csconin.CFLAGS.release = ; -STATICPLUGIN.csconin.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.csconin.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += fancycon ; -STATICPLUGIN.fancycon.CFLAGS.debug = ; -STATICPLUGIN.fancycon.CFLAGS.release = ; -STATICPLUGIN.fancycon.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.fancycon.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += csconout ; -STATICPLUGIN.csconout.CFLAGS.debug = ; -STATICPLUGIN.csconout.CFLAGS.release = ; -STATICPLUGIN.csconout.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.csconout.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += _pycscegui ; -STATICPLUGIN._pycscegui.CFLAGS.debug = "/D SWIG_GLOBAL" "/D SWIG_GLOBAL" ; -STATICPLUGIN._pycscegui.CFLAGS.release = "/D SWIG_GLOBAL" "/D SWIG_GLOBAL" ; -STATICPLUGIN._pycscegui.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_python_d.lib libcrystalspace_d.lib CEGUIBase-vc8_d.lib ; -STATICPLUGIN._pycscegui.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace_python.lib libcrystalspace.lib CEGUIBase-vc8.lib ; -STATICPLUGINS.AVAILABLE += csparser ; -STATICPLUGIN.csparser.CFLAGS.debug = ; -STATICPLUGIN.csparser.CFLAGS.release = ; -STATICPLUGIN.csparser.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.csparser.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += cssynldr ; -STATICPLUGIN.cssynldr.CFLAGS.debug = ; -STATICPLUGIN.cssynldr.CFLAGS.release = ; -STATICPLUGIN.cssynldr.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.cssynldr.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += cssaver ; -STATICPLUGIN.cssaver.CFLAGS.debug = ; -STATICPLUGIN.cssaver.CFLAGS.release = ; -STATICPLUGIN.cssaver.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.cssaver.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += dynavis ; -STATICPLUGIN.dynavis.CFLAGS.debug = ; -STATICPLUGIN.dynavis.CFLAGS.release = ; -STATICPLUGIN.dynavis.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.dynavis.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += frustvis ; -STATICPLUGIN.frustvis.CFLAGS.debug = ; -STATICPLUGIN.frustvis.CFLAGS.release = ; -STATICPLUGIN.frustvis.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.frustvis.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += decal ; -STATICPLUGIN.decal.CFLAGS.debug = ; -STATICPLUGIN.decal.CFLAGS.release = ; -STATICPLUGIN.decal.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.decal.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += joywin ; -STATICPLUGIN.joywin.CFLAGS.debug = ; -STATICPLUGIN.joywin.CFLAGS.release = ; -STATICPLUGIN.joywin.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_directx_d.lib libcrystalspace_d.lib zlib.lib dsound.lib ddraw.lib dinput.lib ; -STATICPLUGIN.joywin.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace_directx.lib libcrystalspace.lib zlib.lib dsound.lib ddraw.lib dinput.lib ; -STATICPLUGINS.AVAILABLE += bindoc ; -STATICPLUGIN.bindoc.CFLAGS.debug = ; -STATICPLUGIN.bindoc.CFLAGS.release = ; -STATICPLUGIN.bindoc.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.bindoc.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += dsplex ; -STATICPLUGIN.dsplex.CFLAGS.debug = ; -STATICPLUGIN.dsplex.CFLAGS.release = ; -STATICPLUGIN.dsplex.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.dsplex.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += xmlread ; -STATICPLUGIN.xmlread.CFLAGS.debug = ; -STATICPLUGIN.xmlread.CFLAGS.release = ; -STATICPLUGIN.xmlread.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.xmlread.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += xmltiny ; -STATICPLUGIN.xmltiny.CFLAGS.debug = ; -STATICPLUGIN.xmltiny.CFLAGS.release = ; -STATICPLUGIN.xmltiny.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.xmltiny.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += engine ; -STATICPLUGIN.engine.CFLAGS.debug = ; -STATICPLUGIN.engine.CFLAGS.release = ; -STATICPLUGIN.engine.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.engine.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += rendloop_loader ; -STATICPLUGIN.rendloop_loader.CFLAGS.debug = ; -STATICPLUGIN.rendloop_loader.CFLAGS.release = ; -STATICPLUGIN.rendloop_loader.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.rendloop_loader.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += rendstep_std ; -STATICPLUGIN.rendstep_std.CFLAGS.debug = ; -STATICPLUGIN.rendstep_std.CFLAGS.release = ; -STATICPLUGIN.rendstep_std.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.rendstep_std.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += rendstep_stencil ; -STATICPLUGIN.rendstep_stencil.CFLAGS.debug = ; -STATICPLUGIN.rendstep_stencil.CFLAGS.release = ; -STATICPLUGIN.rendstep_stencil.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.rendstep_stencil.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += rendstep_stencil2 ; -STATICPLUGIN.rendstep_stencil2.CFLAGS.debug = ; -STATICPLUGIN.rendstep_stencil2.CFLAGS.release = ; -STATICPLUGIN.rendstep_stencil2.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.rendstep_stencil2.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += engseq ; -STATICPLUGIN.engseq.CFLAGS.debug = ; -STATICPLUGIN.engseq.CFLAGS.release = ; -STATICPLUGIN.engseq.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.engseq.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += vfs ; -STATICPLUGIN.vfs.CFLAGS.debug = ; -STATICPLUGIN.vfs.CFLAGS.release = ; -STATICPLUGIN.vfs.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.vfs.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += csfont ; -STATICPLUGIN.csfont.CFLAGS.debug = ; -STATICPLUGIN.csfont.CFLAGS.release = ; -STATICPLUGIN.csfont.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.csfont.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += fontplex ; -STATICPLUGIN.fontplex.CFLAGS.debug = ; -STATICPLUGIN.fontplex.CFLAGS.release = ; -STATICPLUGIN.fontplex.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.fontplex.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += freefnt2 ; -STATICPLUGIN.freefnt2.CFLAGS.debug = ; -STATICPLUGIN.freefnt2.CFLAGS.release = ; -STATICPLUGIN.freefnt2.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib freetype2.lib ; -STATICPLUGIN.freefnt2.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib freetype2.lib ; -STATICPLUGINS.AVAILABLE += cscegui ; -STATICPLUGIN.cscegui.CFLAGS.debug = ; -STATICPLUGIN.cscegui.CFLAGS.release = ; -STATICPLUGIN.cscegui.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib CEGUIBase-vc8_d.lib ; -STATICPLUGIN.cscegui.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib CEGUIBase-vc8.lib ; -STATICPLUGINS.AVAILABLE += bezier ; -STATICPLUGIN.bezier.CFLAGS.debug = ; -STATICPLUGIN.bezier.CFLAGS.release = ; -STATICPLUGIN.bezier.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.bezier.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += bezierldr ; -STATICPLUGIN.bezierldr.CFLAGS.debug = ; -STATICPLUGIN.bezierldr.CFLAGS.release = ; -STATICPLUGIN.bezierldr.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.bezierldr.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += emit ; -STATICPLUGIN.emit.CFLAGS.debug = ; -STATICPLUGIN.emit.CFLAGS.release = ; -STATICPLUGIN.emit.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.emit.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += emitldr ; -STATICPLUGIN.emitldr.CFLAGS.debug = ; -STATICPLUGIN.emitldr.CFLAGS.release = ; -STATICPLUGIN.emitldr.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.emitldr.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += genmesh ; -STATICPLUGIN.genmesh.CFLAGS.debug = ; -STATICPLUGIN.genmesh.CFLAGS.release = ; -STATICPLUGIN.genmesh.LFLAGS.debug = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ; -STATICPLUGIN.genmesh.LFLAGS.release = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ; -STATICPLUGINS.AVAILABLE += gmeshldr ; -STATICPLUGIN.gmeshldr.CFLAGS.debug = ; -STATICPLUGIN.gmeshldr.CFLAGS.rele... [truncated message content] |
From: <mg...@us...> - 2007-11-07 12:38:02
|
Revision: 204 http://planeshift.svn.sourceforge.net/planeshift/?rev=204&view=rev Author: mgist Date: 2007-11-07 04:38:07 -0800 (Wed, 07 Nov 2007) Log Message: ----------- - Deprecation fixes. Modified Paths: -------------- personal/Xordan/docs/history.txt personal/Xordan/src/client/pscelclient.cpp personal/Xordan/src/common/engine/celbase.cpp personal/Xordan/src/npcclient/status.h personal/Xordan/src/server/bulkobjects/pscharacterloader.cpp personal/Xordan/src/server/clients.h personal/Xordan/src/server/database/mysql/dal.cpp personal/Xordan/src/server/serverstatus.h Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2007-11-07 12:18:20 UTC (rev 203) +++ personal/Xordan/docs/history.txt 2007-11-07 12:38:07 UTC (rev 204) @@ -1,3 +1,6 @@ +*** 2007-11-07 by Michael Gist +- Deprecation fixes. + *** 2007-11-07 by Sasha Levin - Add a threaded sql query executor, allowing to run async queries. Usefull for update and delete commands - Where waiting on return value isn't Modified: personal/Xordan/src/client/pscelclient.cpp =================================================================== --- personal/Xordan/src/client/pscelclient.cpp 2007-11-07 12:18:20 UTC (rev 203) +++ personal/Xordan/src/client/pscelclient.cpp 2007-11-07 12:38:07 UTC (rev 204) @@ -26,7 +26,6 @@ #include <imesh/nullmesh.h> #include <cstool/collider.h> #include <ivaria/collider.h> -#include <igeom/polymesh.h> #include <iengine/mesh.h> #include <imesh/object.h> #include <imesh/spritecal3d.h> Modified: personal/Xordan/src/common/engine/celbase.cpp =================================================================== --- personal/Xordan/src/common/engine/celbase.cpp 2007-11-07 12:18:20 UTC (rev 203) +++ personal/Xordan/src/common/engine/celbase.cpp 2007-11-07 12:38:07 UTC (rev 204) @@ -65,7 +65,7 @@ QUERYPLUG(pluginMgr,iPluginManager, "iPluginManager"); - pl = CS_LOAD_PLUGIN(pluginMgr, "cel.physicallayer", iCelPlLayer); + pl = csLoadPlugin<iCelPlLayer>(pluginMgr, "cel.physicallayer"); if (!pl) { CPrintf (CON_ERROR, "Couldn't load plugin for PlLayer.\n"); @@ -86,7 +86,7 @@ bool CelBase::LoadPlugin (const char* pcfactname) { - csRef<iBase> plug = CS_LOAD_PLUGIN_ALWAYS(pluginMgr, pcfactname); + csRef<iBase> plug = csLoadPluginAlways(pluginMgr, pcfactname); if (!plug) { csReport (object_reg, CS_REPORTER_SEVERITY_ERROR, Modified: personal/Xordan/src/npcclient/status.h =================================================================== --- personal/Xordan/src/npcclient/status.h 2007-11-07 12:18:20 UTC (rev 203) +++ personal/Xordan/src/npcclient/status.h 2007-11-07 12:38:07 UTC (rev 204) @@ -3,7 +3,7 @@ #include <iutil/vfs.h> -#include <csutil/thread.h> +#include <csutil/threading/thread.h> #include <csutil/csstring.h> struct iObjectRegistry; Modified: personal/Xordan/src/server/bulkobjects/pscharacterloader.cpp =================================================================== --- personal/Xordan/src/server/bulkobjects/pscharacterloader.cpp 2007-11-07 12:18:20 UTC (rev 203) +++ personal/Xordan/src/server/bulkobjects/pscharacterloader.cpp 2007-11-07 12:38:07 UTC (rev 204) @@ -21,7 +21,7 @@ #include <psconfig.h> #include <iutil/object.h> -#include <csutil/thread.h> +#include <csutil/threading/thread.h> #include <csutil/stringarray.h> #include <physicallayer/entity.h> #include <propclass/mesh.h> Modified: personal/Xordan/src/server/clients.h =================================================================== --- personal/Xordan/src/server/clients.h 2007-11-07 12:18:20 UTC (rev 203) +++ personal/Xordan/src/server/clients.h 2007-11-07 12:38:07 UTC (rev 204) @@ -20,7 +20,7 @@ #define __CLIENTS_H__ #include <csutil/hash.h> -#include <csutil/thread.h> +#include <csutil/threading/thread.h> #include "client.h" Modified: personal/Xordan/src/server/database/mysql/dal.cpp =================================================================== --- personal/Xordan/src/server/database/mysql/dal.cpp 2007-11-07 12:18:20 UTC (rev 203) +++ personal/Xordan/src/server/database/mysql/dal.cpp 2007-11-07 12:38:07 UTC (rev 204) @@ -528,7 +528,7 @@ { while(!m_Close) { - while (arr.Length() > 0) + while (arr.GetSize() > 0) { csString currQuery = arr.Pop(); printf("Executing delayed query: %s\n", currQuery.GetData()); Modified: personal/Xordan/src/server/serverstatus.h =================================================================== --- personal/Xordan/src/server/serverstatus.h 2007-11-07 12:18:20 UTC (rev 203) +++ personal/Xordan/src/server/serverstatus.h 2007-11-07 12:38:07 UTC (rev 204) @@ -21,7 +21,7 @@ #include <iutil/vfs.h> -#include <csutil/thread.h> +#include <csutil/threading/thread.h> #include <csutil/csstring.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-01-19 02:24:42
|
Revision: 676 http://planeshift.svn.sourceforge.net/planeshift/?rev=676&view=rev Author: mgist Date: 2008-01-18 18:24:48 -0800 (Fri, 18 Jan 2008) Log Message: ----------- - Merged r675 from trunk. Modified Paths: -------------- personal/Xordan/docs/history.txt personal/Xordan/src/common/net/messages.cpp personal/Xordan/src/common/net/messages.h personal/Xordan/src/common/net/npcmessages.cpp personal/Xordan/src/common/net/npcmessages.h personal/Xordan/src/common/util/log.cpp personal/Xordan/src/npcclient/gem.cpp personal/Xordan/src/npcclient/gem.h personal/Xordan/src/npcclient/networkmgr.cpp personal/Xordan/src/npcclient/npc.cpp personal/Xordan/src/npcclient/npcclient.cpp personal/Xordan/src/npcclient/npcclient.h personal/Xordan/src/server/gem.cpp personal/Xordan/src/server/gem.h Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/docs/history.txt 2008-01-19 02:24:48 UTC (rev 676) @@ -1,4 +1,8 @@ *** 2008-01-18 by Anders Reggestad +- Added sending of instance in the all entity message to the npc client and + actor perseption message. + => NPC NET VERSION BUMPED! + => NET VERSION BUMPED! - Improved server command setlog <log> <flag> <filter> to match any unique substrings for the log argument. So now "setlog mes true" will enable log for LOG_MESSAGES. Modified: personal/Xordan/src/common/net/messages.cpp =================================================================== --- personal/Xordan/src/common/net/messages.cpp 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/common/net/messages.cpp 2008-01-19 02:24:48 UTC (rev 676) @@ -4469,6 +4469,8 @@ msg->Add( playerID ); msg->Add( groupID ); msg->Add( (uint32_t)ownerEID ); + posInstance = (int) msg->current; + msg->Add( (int32_t)0 ); if (flags) // No point sending 0, has to be at the end { msg->Add( flags ); @@ -4506,6 +4508,8 @@ playerID = me->GetUInt32(); groupID = me->GetUInt32(); ownerEID = me->GetUInt32(); + instance = me->GetInt32(); + if (!me->IsEmpty()) { flags = me->GetUInt32(); @@ -4537,6 +4541,7 @@ msgtext.AppendFmt(" PlayerID: %d",playerID); msgtext.AppendFmt(" GroupID: %d",groupID); msgtext.AppendFmt(" OwnerEID: %d",ownerEID); + msgtext.AppendFmt(" Instance: %d",instance); msgtext.AppendFmt(" Flags:"); if (flags & INVISIBLE) msgtext.AppendFmt(" INVISIBLE"); if (flags & INVINCIBLE) msgtext.AppendFmt(" INVINCIBLE"); @@ -4551,6 +4556,12 @@ msg->Add(playerID); } +void psPersistActor::SetInstance(int instance) +{ + msg->Reset(posInstance); + msg->Add(instance); +} + //------------------------------------------------------------------------------ PSF_IMPLEMENT_MSG_FACTORY(psPersistItem,MSGTYPE_PERSIST_ITEM); Modified: personal/Xordan/src/common/net/messages.h =================================================================== --- personal/Xordan/src/common/net/messages.h 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/common/net/messages.h 2008-01-19 02:24:48 UTC (rev 676) @@ -42,13 +42,13 @@ // This holds the version number of the network code, remember to increase // this each time you do an update which breaks compatibility -#define PS_NETVERSION 0x0083 +#define PS_NETVERSION 0x0084 // Remember to bump the version in pscssetup.h, as well. // NPC Networking version is separate so we don't have to break compatibility // with clients to enhance the superclients. Made it a large number to ensure // no inadvertent overlaps. -#define PS_NPCNETVERSION 0x100F +#define PS_NPCNETVERSION 0x1010 enum Slot_Containers { @@ -2882,6 +2882,11 @@ */ void SetPlayerID(uint32_t playerID); + /** + * Used to insert instance into the message buffer after creation. + */ + void SetInstance(int instance); + csString name; csString guild; csString factname; @@ -2900,7 +2905,10 @@ PS_ID ownerEID; bool control; uint32_t flags; - int posPlayerID; // Remeber the position the playerID in the generated message + int instance; + + int posPlayerID; // Remember the position the playerID in the generated message + int posInstance; // Remember the position of the instance field in the generated message }; Modified: personal/Xordan/src/common/net/npcmessages.cpp =================================================================== --- personal/Xordan/src/common/net/npcmessages.cpp 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/common/net/npcmessages.cpp 2008-01-19 02:24:48 UTC (rev 676) @@ -705,7 +705,7 @@ msg->Add((int16_t)elems); } -void psAllEntityPosMessage::Add(PS_ID id, csVector3& pos, iSector*& sector, csStringHash* msgstrings) +void psAllEntityPosMessage::Add(PS_ID id, csVector3& pos, iSector*& sector, int instance, csStringHash* msgstrings) { msg->Add((uint32_t)id); msg->Add(pos.x); @@ -718,10 +718,13 @@ msg->Add( (uint32_t) sectorNameStrId ); if (sectorNameStrId == csInvalidStringID) + { msg->Add(sectorName); + } + msg->Add( (int32_t)instance ); } -void psAllEntityPosMessage::Get(PS_ID& id, csVector3& pos, iSector*& sector, csStringHash* msgstrings, iEngine *engine) +void psAllEntityPosMessage::Get(PS_ID& id, csVector3& pos, iSector*& sector, int& instance, csStringHash* msgstrings, iEngine *engine) { id = msg->GetUInt32(); pos.x = msg->GetFloat(); @@ -740,10 +743,14 @@ sectorName = msg->GetStr(); } if(!sectorName.IsEmpty()) + { sector = engine->GetSectors ()->FindByName (sectorName); + } else + { sector = NULL; - + } + instance = msg->GetInt32(); } csString psAllEntityPosMessage::ToString(AccessPointers * access_ptrs) @@ -756,10 +763,11 @@ PS_ID id; csVector3 pos; iSector* sector; + int instance; - Get(id,pos,sector,access_ptrs->msgstrings,access_ptrs->engine); + Get(id, pos, sector, instance, access_ptrs->msgstrings, access_ptrs->engine); - msgtext.AppendFmt(" ID: %u Pos: %s",id,toString(pos,sector).GetDataSafe()); + msgtext.AppendFmt(" ID: %u Pos: %s Inst: %d", id, toString(pos,sector).GetDataSafe(), instance); } return msgtext; Modified: personal/Xordan/src/common/net/npcmessages.h =================================================================== --- personal/Xordan/src/common/net/npcmessages.h 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/common/net/npcmessages.h 2008-01-19 02:24:48 UTC (rev 676) @@ -250,10 +250,10 @@ void SetLength(int size,int client); /// Add a new entity's position to the data buffer - void Add(PS_ID id, csVector3& pos, iSector*& sector, csStringHash* msgstrings); + void Add(PS_ID id, csVector3& pos, iSector*& sector, int instance, csStringHash* msgstrings); /// Get the next entity and position from the buffer - void Get(PS_ID& id, csVector3& pos, iSector*& sector, csStringHash* msgstrings, iEngine *engine); + void Get(PS_ID& id, csVector3& pos, iSector*& sector, int& instance, csStringHash* msgstrings, iEngine *engine); }; /** Modified: personal/Xordan/src/common/util/log.cpp =================================================================== --- personal/Xordan/src/common/util/log.cpp 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/common/util/log.cpp 2008-01-19 02:24:48 UTC (rev 676) @@ -225,10 +225,15 @@ void SetFlag(const char *name, bool flag, uint32 filter) { - bool all = !strcasecmp(name, "all"); bool unique = true; int index = -1; + + csString logStr(name); + logStr.Upcase(); + name = logStr.GetDataSafe(); + bool all = !strcmp(name, "ALL"); + for (int i=0; i<MAX_FLAGS; i++) { if (!flagnames[i]) @@ -239,7 +244,7 @@ SetFlag(i, flag, filter); } - if (!all && strcasestr(flagnames[i], name)) + if (!all && strstr(flagnames[i], name)) { if (unique && index != -1) { Modified: personal/Xordan/src/npcclient/gem.cpp =================================================================== --- personal/Xordan/src/npcclient/gem.cpp 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/npcclient/gem.cpp 2008-01-19 02:24:48 UTC (rev 676) @@ -36,7 +36,7 @@ psNPCClient *gemNPCObject::cel = NULL; gemNPCObject::gemNPCObject( psNPCClient* cel, PS_ID id ) - :visible(true),invincible(false) + :visible(true),invincible(false),instance(0) { if (!this->cel) this->cel = cel; @@ -49,8 +49,15 @@ cel->GetPlLayer()->RemoveEntity( entity ); } -void gemNPCObject::Move(const csVector3& pos,float rotangle, const char* room) +void gemNPCObject::Move(const csVector3& pos, float rotangle, const char* room, int instance) { + SetInstance(instance); + Move(pos,rotangle,room); +} + + +void gemNPCObject::Move(const csVector3& pos, float rotangle, const char* room) +{ csRef<iEngine> engine = csQueryRegistry<iEngine> (cel->GetObjectReg()); // Position and sector @@ -113,8 +120,18 @@ return true; } +void gemNPCObject::SetPosition(csVector3& pos, iSector* sector, int* instance) +{ + psGameObject::SetPosition(GetEntity(), pos, sector); + if (instance) + { + SetInstance(*instance); + } +} + +//------------------------------------------------------------------------------- gemNPCActor::gemNPCActor( psNPCClient* cel, psPersistActor& mesg) @@ -130,7 +147,7 @@ SetVisible( ! (mesg.flags & psPersistActor::INVISIBLE)? true : false ); SetInvincible( (mesg.flags & psPersistActor::INVINCIBLE) ? true : false ); - + SetInstance( mesg.instance ); Debug3( LOG_CELPERSIST, id, "Actor %s(%u) Received\n", mesg.name.GetData(), mesg.entityid ); InitMesh( mesg.factname, mesg.filename, mesg.pos, mesg.yrot, mesg.sectorName ); Modified: personal/Xordan/src/npcclient/gem.h =================================================================== --- personal/Xordan/src/npcclient/gem.h 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/npcclient/gem.h 2008-01-19 02:24:48 UTC (rev 676) @@ -37,8 +37,10 @@ bool InitMesh(const char *factname,const char *filename, const csVector3& pos,const float rotangle, const char* sector ); - void Move(const csVector3& pos,float rotangle, const char* room); + void Move(const csVector3& pos, float rotangle, const char* room); + void Move(const csVector3& pos, float rotangle, const char* room, int instance); + int GetID() { return id; } csRef<iPcMesh> pcmesh; @@ -58,18 +60,23 @@ virtual bool IsInvincible() { return invincible; } virtual void SetInvincible(bool inv) { invincible = inv; } - virtual NPC *GetNPC() { return NULL; } + virtual NPC *GetNPC() { return NULL; } + virtual void SetPosition(csVector3& pos, iSector* sector = NULL, int* instance = NULL); + virtual void SetInstance(int instance ) { this->instance = instance; } + virtual int GetInstance(){ return instance; }; + protected: static psNPCClient *cel; csRef<iCelEntity> entity; csString name; - int id; - int type; + int id; + int type; bool visible; bool invincible; + int instance; }; Modified: personal/Xordan/src/npcclient/networkmgr.cpp =================================================================== --- personal/Xordan/src/npcclient/networkmgr.cpp 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/npcclient/networkmgr.cpp 2008-01-19 02:24:48 UTC (rev 676) @@ -239,9 +239,9 @@ // We already know this entity so just update the entity. CPrintf(CON_ERROR, "Already know about gemNPCActor: %s (%s), %u.\n", mesg.name.GetData(), obj->GetName(), mesg.entityid ); - obj->Move(mesg.pos, mesg.yrot, mesg.sectorName); + obj->Move(mesg.pos, mesg.yrot, mesg.sectorName, mesg.instance ); obj->SetVisible( !(mesg.flags & psPersistActor::INVISIBLE) ); - obj->SetInvincible((mesg.flags & psPersistActor::INVINCIBLE)? true : false ); + obj->SetInvincible( (mesg.flags & psPersistActor::INVINCIBLE) ); return; } @@ -390,9 +390,10 @@ csVector3 pos; PS_ID id; iSector* sector; + int instance; - updates.Get(id,pos, sector, npcclient->GetNetworkMgr()->GetMsgStrings(), engine); - npcclient->SetEntityPos(id,pos, sector); + updates.Get(id,pos, sector, instance, npcclient->GetNetworkMgr()->GetMsgStrings(), engine); + npcclient->SetEntityPos(id, pos, sector, instance); } } Modified: personal/Xordan/src/npcclient/npc.cpp =================================================================== --- personal/Xordan/src/npcclient/npc.cpp 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/npcclient/npc.cpp 2008-01-19 02:24:48 UTC (rev 676) @@ -350,14 +350,19 @@ csVector3 loc; iSector* sector; float rot; + int instance = -1; psGameObject::GetPosition(entity,loc,rot,sector); + if (npcActor) + { + instance = npcActor->GetInstance(); + } - CPrintf(CON_CMDOUTPUT, "States for %s (PID: %u)\n",name.GetData(),pid); CPrintf(CON_CMDOUTPUT, "---------------------------------------------\n"); CPrintf(CON_CMDOUTPUT, "Position: %s\n",toString(loc,sector).GetDataSafe()); CPrintf(CON_CMDOUTPUT, "Rotation: %.2f\n",rot); + CPrintf(CON_CMDOUTPUT, "Instance: %d\n",instance); CPrintf(CON_CMDOUTPUT, "Debugging: %d\n",debugging); CPrintf(CON_CMDOUTPUT, "DR Counter: %d\n",DRcounter); CPrintf(CON_CMDOUTPUT, "Alive: %s\n",alive?"True":"False"); Modified: personal/Xordan/src/npcclient/npcclient.cpp =================================================================== --- personal/Xordan/src/npcclient/npcclient.cpp 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/npcclient/npcclient.cpp 2008-01-19 02:24:48 UTC (rev 676) @@ -765,7 +765,7 @@ } } -void psNPCClient::SetEntityPos(PS_ID EID, csVector3& pos, iSector* sector) +void psNPCClient::SetEntityPos(PS_ID EID, csVector3& pos, iSector* sector, int instance) { gemNPCObject * obj = FindEntityID(EID); @@ -777,7 +777,7 @@ return; } - psGameObject::SetPosition(obj->GetEntity(),pos,sector); + obj->SetPosition(pos,sector,&instance); } else { @@ -1255,14 +1255,15 @@ if (!pattern || strstr(obj->GetName(),pattern)) { - CPrintf(CON_CMDOUTPUT, "%5d %-10s %-30s %-3s %-3s %-4s %s\n", + CPrintf(CON_CMDOUTPUT, "%5d %-10s %-30s %-3s %-3s %-4s %s %d\n", ent->GetID(), obj->GetObjectType(), obj->GetName(), (obj->IsVisible()?"Yes":"No"), (obj->IsInvincible()?"Yes":"No"), (obj->IsPickable()?"Yes":"No"), - toString(pos,sector).GetData()); + toString(pos,sector).GetData(), + obj->GetInstance()); } } Modified: personal/Xordan/src/npcclient/npcclient.h =================================================================== --- personal/Xordan/src/npcclient/npcclient.h 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/npcclient/npcclient.h 2008-01-19 02:24:48 UTC (rev 676) @@ -276,7 +276,7 @@ * SetEntityPos finds the given ID entity, and updates * its position in mesh and linmove. */ - void SetEntityPos(PS_ID id, csVector3& pos, iSector* sector); + void SetEntityPos(PS_ID id, csVector3& pos, iSector* sector, int instance); /** * Find the NPC* attached to the entity with the specified character ID Modified: personal/Xordan/src/server/gem.cpp =================================================================== --- personal/Xordan/src/server/gem.cpp 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/server/gem.cpp 2008-01-19 02:24:48 UTC (rev 676) @@ -541,26 +541,28 @@ gemObject *obj = iter.Next(); if (obj->GetPlayerID()) { - gemActor *actor = dynamic_cast<gemActor *>(obj); - if (actor) - { - csVector3 pos,pos2; - float yrot; - iSector *sector; - obj->GetPosition(pos,yrot,sector); - obj->GetLastSuperclientPos(pos2); - - float dist2 = (pos.x - pos2.x) * (pos.x - pos2.x) + - (pos.y - pos2.y) * (pos.y - pos2.y) + - (pos.z - pos2.z) * (pos.z - pos2.z); - - if (dist2 > .04) - { - count_actual++; - update.Add(obj->GetEntity()->GetID(),pos, sector, - CacheManager::GetSingleton().GetMsgStrings()); - obj->SetLastSuperclientPos(pos); - } + gemActor *actor = dynamic_cast<gemActor *>(obj); + if (actor) + { + csVector3 pos,pos2; + float yrot; + int instance,oldInstance; + iSector *sector; + obj->GetPosition(pos,yrot,sector); + instance = obj->GetInstance(); + obj->GetLastSuperclientPos(pos2,oldInstance); + + float dist2 = (pos.x - pos2.x) * (pos.x - pos2.x) + + (pos.y - pos2.y) * (pos.y - pos2.y) + + (pos.z - pos2.z) * (pos.z - pos2.z); + + if (dist2 > .04 || instance != oldInstance) + { + count_actual++; + update.Add(obj->GetEntity()->GetID(), pos, sector, obj->GetInstance(), + CacheManager::GetSingleton().GetMsgStrings()); + obj->SetLastSuperclientPos(pos,instance); + } } } } @@ -1634,7 +1636,8 @@ meshcache = factname; - last_sent_superclient_pos.Set(0,0,0); + lastSentSuperclientPos.Set(0,0,0); + lastSentSuperclientInstance = -1; psChar = chardata; @@ -2211,6 +2214,7 @@ if (to_superclient) { mesg.SetPlayerID(playerID); // Insert player id before sending to super client. + mesg.SetInstance(GetInstance()); if (clientnum == 0) // Send to all superclients { Debug1(LOG_SUPERCLIENT, clientnum, "Sending gemActor to superclients.\n"); @@ -2858,6 +2862,19 @@ return true; } +void gemActor::GetLastSuperclientPos(csVector3& pos, int& instance) const +{ + pos = lastSentSuperclientPos; + instance = lastSentSuperclientInstance; +} + +void gemActor::SetLastSuperclientPos(const csVector3& pos, int instance) +{ + lastSentSuperclientPos = pos; + lastSentSuperclientInstance = instance; +} + + float gemActor::GetRelativeFaction(gemActor *speaker) { return factions->FindWeightedDiff(speaker->factions); @@ -3749,6 +3766,7 @@ if (to_superclient) { mesg.SetPlayerID(playerID); // Insert player id before sending to super client. + mesg.SetInstance(GetInstance()); if (clientnum == 0) // Send to all superclients { CPrintf(CON_DEBUG, "Sending gemNPC to superclients.\n"); Modified: personal/Xordan/src/server/gem.h =================================================================== --- personal/Xordan/src/server/gem.h 2008-01-18 22:24:38 UTC (rev 675) +++ personal/Xordan/src/server/gem.h 2008-01-19 02:24:48 UTC (rev 676) @@ -252,8 +252,8 @@ virtual void BroadcastTargetStatDR(ClientConnectionSet *clients) { } virtual void SendTargetStatDR(Client *client) { } virtual psNPCDialog *GetNPCDialogPtr() { return 0; } - virtual void GetLastSuperclientPos(csVector3& pos) { } - virtual void SetLastSuperclientPos(csVector3& pos) { } + virtual void GetLastSuperclientPos(csVector3& pos, int& instance) const { } + virtual void SetLastSuperclientPos(const csVector3& pos, int instance) { } virtual void AddLootableClient(int cnum) { } virtual void RemoveLootableClient(int cnum) { } virtual bool IsLootableClient(int cnum) { return false; } @@ -476,7 +476,8 @@ /** Production Start Pos is used to record the place where people started digging. */ csVector3 productionStartPos; - csVector3 last_sent_superclient_pos; + csVector3 lastSentSuperclientPos; + int lastSentSuperclientInstance; csArray<iDeathCallback*> deathReceivers; // List of objects which are to be notified when this actor dies. @@ -626,8 +627,8 @@ void Resurrect(); virtual bool UpdateDR(); - virtual void GetLastSuperclientPos(csVector3& pos) { pos = last_sent_superclient_pos; } - virtual void SetLastSuperclientPos(csVector3& pos) { last_sent_superclient_pos = pos; } + virtual void GetLastSuperclientPos(csVector3& pos, int& instance) const; + virtual void SetLastSuperclientPos(const csVector3& pos, int instance); virtual void BroadcastTargetStatDR(ClientConnectionSet *clients); virtual void SendTargetStatDR(Client *client); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-01-19 14:16:27
|
Revision: 677 http://planeshift.svn.sourceforge.net/planeshift/?rev=677&view=rev Author: mgist Date: 2008-01-19 06:16:30 -0800 (Sat, 19 Jan 2008) Log Message: ----------- - Begun rewrites and refactors of the loading code; - Moved psregion into psregion.* - Changed most the loading code to no longer use iRegion but iCollection which will be implemented in CS sometime soon. - Removed LoadAllMaps option. - Fixed some CS 1.3 deprecations and begun removing Thing code. - Simplified some functions and made many cleanups. Modified Paths: -------------- personal/Xordan/docs/history.txt personal/Xordan/src/client/pscelclient.cpp personal/Xordan/src/client/pscelclient.h personal/Xordan/src/client/psengine.cpp personal/Xordan/src/client/zonehandler.cpp personal/Xordan/src/client/zonehandler.h personal/Xordan/src/common/engine/psworld.cpp personal/Xordan/src/common/engine/psworld.h Added Paths: ----------- personal/Xordan/src/common/engine/psregion.cpp personal/Xordan/src/common/engine/psregion.h Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2008-01-19 02:24:48 UTC (rev 676) +++ personal/Xordan/docs/history.txt 2008-01-19 14:16:30 UTC (rev 677) @@ -1,3 +1,12 @@ +*** 2008-01-19 by Mike Gist +- Begun rewrites and refactors of the loading code; + - Moved psregion into psregion.* + - Changed most the loading code to no longer use iRegion but iCollection + which will be implemented in CS sometime soon. + - Removed LoadAllMaps option. + - Fixed some CS 1.3 deprecations and begun removing Thing code. + - Simplified some functions and made many cleanups. + *** 2008-01-18 by Anders Reggestad - Added sending of instance in the all entity message to the npc client and actor perseption message. Modified: personal/Xordan/src/client/pscelclient.cpp =================================================================== --- personal/Xordan/src/client/pscelclient.cpp 2008-01-19 02:24:48 UTC (rev 676) +++ personal/Xordan/src/client/pscelclient.cpp 2008-01-19 14:16:30 UTC (rev 677) @@ -32,6 +32,7 @@ #include <iengine/mesh.h> #include <iengine/region.h> #include <iengine/movable.h> +#include <iengine/sector.h> #include <imesh/object.h> #include <imesh/spritecal3d.h> #include <imesh/nullmesh.h> @@ -735,20 +736,17 @@ } } - void psCelClient::SetPlayerReady(bool flag) { if (local_player) local_player->ready = flag; } -void psCelClient::OnRegionsDeleted(csArray<iRegion*>& regions) +void psCelClient::OnRegionsDeleted(csArray<psRegion*> ®ions) { - size_t entNum; - - for (entNum = 0; entNum < entities.GetSize(); entNum++) + for (size_t entNum=0; entNum<entities.GetSize(); entNum++) { - csRef<iMeshWrapper> mesh = entities[entNum]->Mesh(); + csRef<iMeshWrapper> mesh = entities[entNum]->Mesh(); if (mesh != NULL ) { iMovable* movable = mesh->GetMovable(); @@ -760,16 +758,22 @@ bool unresolved = true; // Are all the sectors going to be unloaded? - for(int i = 0;i<sectors->GetCount();i++) + for(int i=0; i<sectors->GetCount(); i++) { - // Get the iRegion this sector belongs to - csRef<iRegion> region = scfQueryInterface<iRegion> (sectors->Get(i)->QueryObject()->GetObjectParent()); - if(regions.Find(region)==csArrayItemNotFound) + int childCount = 0; + for(size_t j=0; j<regions.GetSize(); j++) { - // We've found a sector that won't be unloaded so the mesh won't need to be moved - unresolved = false; - break; + if(regions.Get(j)->GetCollection()->QueryObject()->GetChild(sectors->Get(i)->QueryObject()->GetName())) + { + childCount++; + } } + + if(childCount < sectors->Get(i)->GetRefCount()) + { + unresolved = false; + break; + } } if(unresolved) @@ -903,7 +907,7 @@ void psCelClient::UnattachObject( iObject* object, GEMClientObject* clientObject) { - csRef<psGemMeshAttach> attacher (CS_GET_CHILD_OBJECT (object, psGemMeshAttach)); + csRef<psGemMeshAttach> attacher (CS::GetChildObject<psGemMeshAttach>(object)); if (attacher) { if ( attacher->GetObject () == clientObject ) @@ -918,7 +922,7 @@ { GEMClientObject* found = 0; - csRef<psGemMeshAttach> attacher (CS_GET_CHILD_OBJECT (object, psGemMeshAttach)); + csRef<psGemMeshAttach> attacher (CS::GetChildObject<psGemMeshAttach>(object)); if (attacher) { found = attacher->GetObject(); Modified: personal/Xordan/src/client/pscelclient.h =================================================================== --- personal/Xordan/src/client/pscelclient.h 2008-01-19 02:24:48 UTC (rev 676) +++ personal/Xordan/src/client/pscelclient.h 2008-01-19 14:16:30 UTC (rev 677) @@ -30,7 +30,7 @@ //============================================================================= // Project Includes //============================================================================= - +#include "engine/psregion.h" #include "net/cmdbase.h" //============================================================================= @@ -139,7 +139,7 @@ /** Called when a region of the world is deleted from the client (because we don't need it loaded now) CelClient removes all GEMClientObjects that are in this region */ - void OnRegionsDeleted(csArray<iRegion *>& regions); + void OnRegionsDeleted(csArray<psRegion*> ®ions); psWorld* GetWorld() { return gameWorld; } @@ -151,7 +151,7 @@ void PruneEntities(); - bool IsUnresSector(iSector* sector) { return unresSector == sector;} + bool IsUnresSector(iSector* sector) { return unresSector == sector; } int GetRequestStatus() { return requeststatus; } Modified: personal/Xordan/src/client/psengine.cpp =================================================================== --- personal/Xordan/src/client/psengine.cpp 2008-01-19 02:24:48 UTC (rev 676) +++ personal/Xordan/src/client/psengine.cpp 2008-01-19 14:16:30 UTC (rev 677) @@ -539,7 +539,6 @@ celclient->IgnoreOthers(cmdline->GetBoolOption("ignore_others")); } - zonehandler->SetLoadAllMaps(GetConfig()->GetBool("Planeshift.Client.Loading.AllMaps",false)); zonehandler->SetKeepMapsLoaded(GetConfig()->GetBool("Planeshift.Client.Loading.KeepMaps",false)); unloadLast = GetConfig()->GetBool("Planeshift.Client.Loading.UnloadLast", true); Modified: personal/Xordan/src/client/zonehandler.cpp =================================================================== --- personal/Xordan/src/client/zonehandler.cpp 2008-01-19 02:24:48 UTC (rev 676) +++ personal/Xordan/src/client/zonehandler.cpp 2008-01-19 14:16:30 UTC (rev 677) @@ -177,7 +177,7 @@ Notify3(LOG_LOAD, "Crossed from sector %s to sector %s.", msg.oldSector.GetData(), msg.newSector.GetData() ); - if (needsToLoadMaps) + if(needsToLoadMaps) { Warning2(LOG_LOAD, "Still loading maps, ignoring crossing to sector %s.", msg.newSector.GetData()); return; @@ -195,7 +195,7 @@ FlagRegions(zone); - if (world->NeedsLoading(zone->transitional)) + if(world->NeedsLoading()) { needsToLoadMaps = true; sectorToLoad = msg.newSector; @@ -293,44 +293,15 @@ loading.Push(*map); } - if(loadAllMaps) - { - Debug1(LOG_LOAD,0, "Flagging all maps to be loaded"); - for (size_t i=0; i<alllist.GetSize(); i++) - { - bool found = false; - for (size_t j=0; j<loading.GetSize(); j++) - { - if(loading[j] == alllist[i]) - { - found = true; - break; - } - } - if(found) - continue; - - // Flag - world->FlagRegionAsNeeded(alllist[i]); - } - } - if (FindLoadWindow()) { - if (loadAllMaps) - { - loadProgressBar->SetTotalValue(alllist.GetSize()); - } - else - { - csArray<iRegion*> deletedRegions; - world->GetNotNeededRegions(deletedRegions); - loadProgressBar->SetTotalValue(zone->regions.GetSize() + deletedRegions.GetSize()); - } - - loadProgressBar->SetCurrentValue(0); - psengine->ForceRefresh(); + csArray<psRegion*> deletedRegions; + world->GetNotNeededRegions(deletedRegions); + loadProgressBar->SetTotalValue(zone->regions.GetSize() + deletedRegions.GetSize()); } + + loadProgressBar->SetCurrentValue(0); + psengine->ForceRefresh(); } void ZoneHandler::LoadZone(const char* sector) @@ -356,7 +327,7 @@ if(!found->transitional) { - csArray<iRegion*> deletedRegions; + csArray<psRegion*> deletedRegions; world->GetNotNeededRegions(deletedRegions); celclient->OnRegionsDeleted(deletedRegions); } Modified: personal/Xordan/src/client/zonehandler.h =================================================================== --- personal/Xordan/src/client/zonehandler.h 2008-01-19 02:24:48 UTC (rev 676) +++ personal/Xordan/src/client/zonehandler.h 2008-01-19 14:16:30 UTC (rev 677) @@ -103,7 +103,6 @@ /** Moves player to given location */ void MovePlayerTo(const csVector3 & newPos, const csString & newSector); - void SetLoadAllMaps(bool v) { loadAllMaps = v; } void SetKeepMapsLoaded(bool v) { keepMapsLoaded = v; } protected: @@ -119,7 +118,6 @@ csVector3 newPos; bool haveNewPos; int rgnsLoaded; - bool loadAllMaps; bool keepMapsLoaded; bool initialRefreshScreen; Added: personal/Xordan/src/common/engine/psregion.cpp =================================================================== --- personal/Xordan/src/common/engine/psregion.cpp (rev 0) +++ personal/Xordan/src/common/engine/psregion.cpp 2008-01-19 14:16:30 UTC (rev 677) @@ -0,0 +1,248 @@ +/* + * psregion.cpp + * + * Copyright (C) 2008 Atomic Blue (in...@pl..., http://www.atomicblue.org) + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation (version 2 of the License) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#include <psconfig.h> +//============================================================================= +// Crystal Space Includes +//============================================================================= +#include <cstool/collider.h> +#include <csutil/sysfunc.h> +#include <imap/loader.h> +#include <iutil/object.h> +#include <iutil/vfs.h> +#include <ivaria/collider.h> +#include <ivideo/graph3d.h> + +//============================================================================= +// Project Includes +//============================================================================= +#include "util/log.h" +#include "util/psconst.h" + +//============================================================================= +// Local Includes +//============================================================================= +#include "psregion.h" + +psRegion::psRegion(iObjectRegistry *obj_reg, const char *file) +{ + object_reg = obj_reg; + + worlddir.Format("/planeshift/world/%s", file); + worldfile = "world"; + regionName = file; + loaded = false; + Engine = csQueryRegistry<iEngine> (object_reg); +} + +psRegion::~psRegion() +{ + if (loaded) + Unload(); +} + + +bool psRegion::Load(bool loadMeshes) +{ + if (loaded) + return true; + + bool using3D; + + // Find out if we are ever going to render 3D + csRef<iGraphics3D> g3d = csQueryRegistry<iGraphics3D> (object_reg); + csRef<iFactory> factory = scfQueryInterface<iFactory> (g3d); + + const char* g3Dname = factory->QueryClassID(); + using3D = (strcmp("crystalspace.graphics3d.null", g3Dname)? true: false); + + csString target; + target.Format("%s/world", worlddir.GetData()); + csRef<iVFS> vfs = csQueryRegistry<iVFS > ( object_reg); + + csRef<iDocumentSystem> xml ( + csQueryRegistry<iDocumentSystem> (object_reg)); + + csRef<iDocument> doc = xml->CreateDocument(); + + csRef<iDataBuffer> buf (vfs->ReadFile (target.GetData())); + if (!buf || !buf->GetSize ()) + { + Error2("Error loading world file. %s\n", target.GetData()); + return false; + } + + const char* error = doc->Parse( buf ); + + if( error ) + { + Error3("Error %s loading file to be cleaned. %s\n",error, target.GetData()); + return false; + } + + csRef<iDocumentNode> worldNode = doc->GetRoot()->GetNode("world"); + + if(!loadMeshes) + { + // Clean the world file to remove all textures/meshes/models + Debug1(LOG_LOAD, 0,"Cleaning map file."); + worldNode = Clean(worldNode); + } + + // Create a new region with the given name. + collection = Engine->CreateCollection(regionName); + + // Now load the map into the selected region + csRef<iLoader> loader ( csQueryRegistry<iLoader> (object_reg)); + CS_ASSERT (loader != NULL); + csRef<iVFS> VFS ( csQueryRegistry<iVFS> (object_reg)); + CS_ASSERT (VFS != NULL); + VFS->ChDir (worlddir); + + csTicks start = csGetTicks(); + Debug2(LOG_LOAD, 0,"Loading map file %s", worlddir.GetData()); + + if (!loader->LoadMap(worldNode, CS_LOADER_KEEP_WORLD, 0, CS_LOADER_ACROSS_REGIONS, true, 0, 0, true, collection)) + { + Error3("loader->LoadMapFile(%s,%s) failed.",worlddir.GetData(),worldfile.GetData() ); + Error2("Region name was: %s", regionName.GetData() ); + return false; + } + Debug2(LOG_LOAD, 0,"After LoadMapFile, %dms elapsed", csGetTicks()-start); + + // Successfully loaded. Now get textures ready, etc. and return. + if (using3D) + { + Engine->PrecacheDraw(collection); + Debug2(LOG_LOAD, 0,"After Precache, %dms elapsed", csGetTicks()-start); + } + + if(loadMeshes) + { + SetupWorldColliders(); + Debug2(LOG_LOAD, 0,"After SetupWorldColliders, %dms elapsed\n", csGetTicks()-start); + } + + loaded = true; + + VFS->ChDir("/planeshift"); + Engine->SetVFSCacheManager(); + + printf("Map %s loaded successfully in %dms\n", regionName.GetData(), csGetTicks()-start); + return true; +} + +csRef<iDocumentNode> psRegion::Clean(csRef<iDocumentNode> world) +{ + csRef<iDocumentSystem> xml ( + csQueryRegistry<iDocumentSystem> (object_reg)); + + csRef<iDocument> doc = xml->CreateDocument(); + csRef<iDocumentNode> node = doc->CreateRoot(); + + // Copy the world node + csRef<iDocumentNode> cleanedWorld = node->CreateNodeBefore(CS_NODE_ELEMENT); + + cleanedWorld->SetValue("world"); + + // Copy the sector node + csRef<iDocumentNodeIterator> sectors = world->GetNodes("sector"); + while ( sectors->HasNext() ) + { + csRef<iDocumentNode> sector = sectors->Next(); + + csRef<iDocumentNode> cleanedSector = cleanedWorld->CreateNodeBefore(CS_NODE_ELEMENT); + cleanedSector->SetValue(sector->GetValue()); + + // Copy the sector attributes + csRef<iDocumentAttributeIterator> attrs = sector->GetAttributes(); + while(attrs->HasNext()) + { + csRef<iDocumentAttribute> attr = attrs->Next(); + cleanedSector->SetAttribute(attr->GetName(), attr->GetValue()); + } + + // Copy the portal + csRef<iDocumentNodeIterator> nodes = sector->GetNodes("portal"); + + while(nodes->HasNext()) + { + csRef<iDocumentNode> portal = nodes->Next(); + csRef<iDocumentNode> cleanedportal = cleanedSector->CreateNodeBefore(CS_NODE_ELEMENT); + CloneNode(portal, cleanedportal); + } + + // Copy the portals + csRef<iDocumentNodeIterator> portalsItr = sector->GetNodes("portals"); + + while(portalsItr->HasNext()) + { + csRef<iDocumentNode> portals = portalsItr->Next(); + csRef<iDocumentNode> cleanedportals = cleanedSector->CreateNodeBefore(CS_NODE_ELEMENT); + CloneNode(portals, cleanedportals); + } + + + } + + // Copy the start node + csRef<iDocumentNodeIterator> startLocations = world->GetNodes("start"); + while (startLocations->HasNext()) + { + csRef<iDocumentNode> start = startLocations->Next(); + csRef<iDocumentNode> cleanedStart = cleanedWorld->CreateNodeBefore(CS_NODE_ELEMENT); + CloneNode(start, cleanedStart); + } + + return cleanedWorld; +} + +void psRegion::CloneNode (iDocumentNode* from, iDocumentNode* to) +{ + to->SetValue (from->GetValue ()); + csRef<iDocumentNodeIterator> it = from->GetNodes (); + while (it->HasNext ()) + { + csRef<iDocumentNode> child = it->Next (); + csRef<iDocumentNode> child_clone = to->CreateNodeBefore ( + child->GetType (), 0); + CloneNode (child, child_clone); + } + csRef<iDocumentAttributeIterator> atit = from->GetAttributes (); + while (atit->HasNext ()) + { + csRef<iDocumentAttribute> attr = atit->Next (); + to->SetAttribute (attr->GetName (), attr->GetValue ()); + } +} + +void psRegion::Unload() +{ + if (!loaded) + return; + loaded = false; + + Engine->RemoveCollection(regionName); +} + +void psRegion::SetupWorldColliders() +{ + csRef<iCollideSystem> cdsys = csQueryRegistry<iCollideSystem> (object_reg); + csColliderHelper::InitializeCollisionWrappers(cdsys, Engine, collection); +} Added: personal/Xordan/src/common/engine/psregion.h =================================================================== --- personal/Xordan/src/common/engine/psregion.h (rev 0) +++ personal/Xordan/src/common/engine/psregion.h 2008-01-19 14:16:30 UTC (rev 677) @@ -0,0 +1,106 @@ +/* + * psregion.h + * + * Copyright (C) 2008 Atomic Blue (in...@pl..., http://www.atomicblue.org) + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation (version 2 of the License) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#ifndef __PSREGION_H__ +#define __PSREGION_H__ + +//============================================================================= +// Crystal Space Includes +//============================================================================= +#include <csutil/csstring.h> +#include <iengine/collection.h> +#include <iengine/engine.h> +#include <iutil/document.h> + +//============================================================================= +// Project Includes +//============================================================================= + +//============================================================================= +// Local Includes +//============================================================================= + + +class psRegion +{ +public: + /** + * Creates an entry representing a single region + * but does not load it. + */ + psRegion(iObjectRegistry *obj_reg, const char *file); + + /** + * Dtor unloads region if loaded + */ + ~psRegion(); + + /** + * Loads the file "world" from /planeshift/art/world/<name>.zip + * into the region called <name>. + */ + bool Load(bool loadMeshes = true); + + /** + * Unloads the region from the CS engine, deleting all objects + * in that region. + */ + void Unload(); + + bool IsLoaded() + { return loaded; } + + iCollection *GetCollection() { return collection; } + + /** + * Sets up the collision detection blockers for all meshes in + * the region. + */ + void SetupWorldColliders(); + + /** + * The retain flag is used by psWorld owner to manage the list + * of loaded and unloaded regions efficiently. See psWorld class + * def for details on how this is done. + */ + void SetNeededFlag(bool flag) + { isNeeded = flag; } + bool IsNeeded() + { return isNeeded; } + + const char *GetName() + { return regionName; } + + /// Cleans the given file and removes all meshes, lights, etc. not needed on the server. + csRef<iDocumentNode> Clean(csRef<iDocumentNode> worldNode); + +private: + iObjectRegistry* object_reg; + iCollection* collection; + csString regionName; + csRef<iEngine> Engine; + csString worlddir; + csString worldfile; + bool loaded; + bool isNeeded; + + static void CloneNode(iDocumentNode* from, iDocumentNode* to); +}; + +#endif // __PSREGION_H__ Modified: personal/Xordan/src/common/engine/psworld.cpp =================================================================== --- personal/Xordan/src/common/engine/psworld.cpp 2008-01-19 02:24:48 UTC (rev 676) +++ personal/Xordan/src/common/engine/psworld.cpp 2008-01-19 14:16:30 UTC (rev 677) @@ -19,38 +19,27 @@ */ #include <psconfig.h> -// CS -#include <iengine/rview.h> -#include <iengine/portal.h> -#include <iengine/portalcontainer.h> -#include <csutil/snprintf.h> -#include <csutil/sysfunc.h> -#include <iengine/region.h> -#include <iutil/vfs.h> -#include <csutil/csstring.h> +//============================================================================= +// Crystal Space Includes +//============================================================================= #include <cstool/collider.h> -#include <ivaria/collider.h> -#include <igeom/trimesh.h> -#include <imesh/objmodel.h> #include <iengine/mesh.h> -#include <imesh/object.h> -#include <imesh/thing.h> -#include <csutil/databuf.h> -#include <iengine/renderloop.h> -#include <csutil/xmltiny.h> #include <iengine/movable.h> -#include <iutil/objreg.h> +#include <iengine/portal.h> +#include <iengine/portalcontainer.h> +#include <imesh/object.h> -// PS -#include "engine/materialmanager.h" -#include "engine/psworld.h" -#include "util/psconst.h" +//============================================================================= +// Project Includes +//============================================================================= +#include "util/consoleout.h" #include "util/log.h" #include "util/strutil.h" -#include "util/consoleout.h" -#include "globals.h" -#define SHARED_REGION_NAME "SharedDataRegion" +//============================================================================= +// Local Includes +//============================================================================= +#include "psworld.h" psWorld::psWorld() { @@ -64,7 +53,7 @@ bool psWorld::Initialize(iObjectRegistry* objectReg, bool unloadingLast) { object_reg = objectReg; - engine = csQueryRegistry<iEngine>(object_reg); + Engine = csQueryRegistry<iEngine>(object_reg); startLoading = unloadingLast; return true; @@ -87,7 +76,7 @@ return rgn; } - psRegion *newregion = new psRegion(object_reg, this, mapfile); + psRegion *newregion = new psRegion(object_reg, mapfile); if (load && !newregion->Load(loadMeshes)) { delete newregion; @@ -200,13 +189,6 @@ regions.DeleteIndex(i-1); } } - // Check if any factories, materials or textures can be freed. - if(!MaterialManager::GetSingletonPtr()->KeepModels()) - { - MaterialManager::GetSingletonPtr()->UnloadUnusedFactories(); - MaterialManager::GetSingletonPtr()->UnloadUnusedMaterials(); - MaterialManager::GetSingletonPtr()->UnloadUnusedTextures(); - } } // Mark that we should start loading maps. @@ -222,20 +204,13 @@ return 0; } -bool psWorld::NeedsLoading(bool transitional) +bool psWorld::NeedsLoading() { - - // Transitional means that we should allow whatever - // levels are already loaded to stay loaded, but still - // ensure that listed levels are loaded also. - if (!transitional) - for (unsigned i=0; i < regions.GetSize(); i++) - if (!regions[i]->IsNeeded() ) - return true; - - for (unsigned i=0; i < regions.GetSize(); i++) - if (!regions[i]->IsLoaded() ) + for (size_t i=0; i<regions.GetSize(); i++) + { + if (regions[i]->IsNeeded() && !regions[i]->IsLoaded()) return true; + } return false; } @@ -253,16 +228,20 @@ return true; } -void psWorld::GetNotNeededRegions(csArray<iRegion*> & regs) +void psWorld::GetNotNeededRegions(csArray<psRegion*> ®s) { - for (unsigned i=0; i < regions.GetSize(); i++) - if (!regions[i]->IsNeeded() ) - regs.Push(regions[i]->GetRegion()); + for (unsigned i=0; i < regions.GetSize(); i++) + { + if (!regions[i]->IsNeeded()) + { + regs.Push(regions[i]); + } + } } void psWorld::BuildWarpCache() { - int sectorCount = engine->GetSectors()->GetCount(); + int sectorCount = Engine->GetSectors()->GetCount(); Debug2(LOG_STARTUP,0,"Building warp cache for %d sectors...",sectorCount); /// Clear existing entries @@ -274,9 +253,9 @@ for(int i=0; i<sectorCount; i++) { - const csSet<csPtrKey<iMeshWrapper> >& portals = engine->GetSectors()->Get(i)->GetPortalMeshes(); + const csSet<csPtrKey<iMeshWrapper> >& portals = Engine->GetSectors()->Get(i)->GetPortalMeshes(); Debug3(LOG_STARTUP,0," %zu portal meshes for %s",portals.GetSize(), - engine->GetSectors()->Get(i)->QueryObject()->GetName()); + Engine->GetSectors()->Get(i)->QueryObject()->GetName()); csSet<csPtrKey<iMeshWrapper> >::GlobalIterator it = portals.GetIterator (); while (it.HasNext ()) @@ -288,7 +267,7 @@ iPortal* portal = pc->GetPortal (j); if (portal->CompleteSector(0)) { - if (engine->GetSectors()->Find(portal->GetSector()) != -1) + if (Engine->GetSectors()->Find(portal->GetSector()) != -1) { transarray[i].Set(portal->GetSector(), portal->GetWarp()); } @@ -303,7 +282,7 @@ for(size_t i=0; i<transarray.GetSize(); i++) { csHash<csReversibleTransform*, csPtrKey<iSector> >::GlobalIterator it = transarray[i].GetIterator(); - iSector * fromSector = engine->GetSectors()->Get((int)i); + iSector *fromSector = Engine->GetSectors()->Get((int)i); CPrintf(CON_CMDOUTPUT,"%s\n",fromSector->QueryObject()->GetName()); while (it.HasNext()) { @@ -321,13 +300,13 @@ if(from == to) return true; // No need to transform, pos ok. - int i = engine->GetSectors()->Find((iSector*)from); + int i = Engine->GetSectors()->Find(from); if (i == -1) { return false; // Didn't find transformation, pos not ok. } - csReversibleTransform* transform = transarray[i].Get((iSector*)to); + csReversibleTransform* transform = transarray[i].Get(const_cast<iSector*>(to)); if(transform) { pos = *transform * pos; @@ -415,341 +394,3 @@ return angle; } - -//-------------------------------------------------------------------------- - -psRegion::psRegion(iObjectRegistry *obj_reg, psWorld * world, const char *file) -{ - object_reg = obj_reg; - this->world = world; - - worlddir.Format("/planeshift/world/%s", file); - worldfile = "world"; - regionname = file; - loaded = false; -} - -psRegion::~psRegion() -{ - if (loaded) - Unload(); -} - - -bool psRegion::Load(bool loadMeshes) -{ - if (loaded) - return true; - - bool using3D; - - csRef<iEngine> engine = csQueryRegistry<iEngine> (object_reg); - - // Find out if we are ever going to render 3D - csRef<iGraphics3D> g3d = csQueryRegistry<iGraphics3D> (object_reg); - csRef<iFactory> factory = - scfQueryInterface<iFactory> (g3d); - - const char* g3Dname = factory->QueryClassID(); - using3D = (strcmp("crystalspace.graphics3d.null", g3Dname)? true: false); - - csString target; - target.Format("%s/world", worlddir.GetData()); - csRef<iVFS> vfs = csQueryRegistry<iVFS > ( object_reg); - - csRef<iDocumentSystem> xml ( - csQueryRegistry<iDocumentSystem> (object_reg)); - - csRef<iDocument> doc = xml->CreateDocument(); - - csRef<iDataBuffer> buf (vfs->ReadFile (target.GetData())); - if (!buf || !buf->GetSize ()) - { - Error2("Error loading world file. %s\n", target.GetData()); - return false; - } - - const char* error = doc->Parse( buf ); - - if( error ) - { - Error3("Error %s loading file to be cleaned. %s\n",error, target.GetData()); - return false; - } - - csRef<iDocumentNode> worldNode = doc->GetRoot()->GetNode("world"); - - if(!loadMeshes) - { - // Clean the world file to remove all textures/meshes/models - Debug1(LOG_LOAD, 0,"Cleaning map file."); - worldNode = Clean(worldNode); - } - - // Create a new region with the given name, or select it if already there - iRegion* cur_region = engine->CreateRegion (regionname); - - // Clear it out if it already existed - cur_region->DeleteAll (); - - // Now load the map into the selected region - csRef<iLoader> loader ( csQueryRegistry<iLoader> (object_reg)); - CS_ASSERT (loader != NULL); - csRef<iVFS> VFS ( csQueryRegistry<iVFS> (object_reg)); - CS_ASSERT (VFS != NULL); - VFS->ChDir (worlddir); - engine->SetCacheManager(NULL); - - csTicks start = csGetTicks(); - Debug2(LOG_LOAD, 0,"Loading map file %s", worlddir.GetData()); - - if (!loader->LoadMap(worldNode, CS_LOADER_KEEP_WORLD,cur_region, CS_LOADER_ACROSS_REGIONS, true, 0, MaterialManager::GetSingletonPtr())) - { - Error3("loader->LoadMapFile(%s,%s) failed.",worlddir.GetData(),worldfile.GetData() ); - Error2("Region name was: %s", regionname.GetData() ); - return false; - } - Debug2(LOG_LOAD, 0,"After LoadMapFile, %dms elapsed", csGetTicks()-start); - - // Successfully loaded. Now get textures ready, etc. and return. - if (using3D) - { - cur_region->Prepare (); - Debug2(LOG_LOAD, 0,"After Prepare, %dms elapsed", csGetTicks()-start); - } - - if (using3D) - { - engine->PrecacheDraw (cur_region); - Debug2(LOG_LOAD, 0,"After Precache, %dms elapsed", csGetTicks()-start); - } - - if (loadMeshes) - { - SetupWorldColliders(engine,cur_region); - Debug2(LOG_LOAD, 0,"After SetupWorldColliders, %dms elapsed\n", csGetTicks()-start); - } - - loaded = true; - - VFS->ChDir("/planeshift"); - engine->SetCacheManager(NULL); - engine->GetCacheManager(); - - printf("Map %s loaded successfully in %dms\n", (const char *)regionname, csGetTicks()-start); - return true; -} - -csRef<iDocumentNode> psRegion::Clean(csRef<iDocumentNode> world) -{ - csRef<iDocumentSystem> xml ( - csQueryRegistry<iDocumentSystem> (object_reg)); - - csRef<iDocument> doc = xml->CreateDocument(); - csRef<iDocumentNode> node = doc->CreateRoot(); - - // Copy the world node - csRef<iDocumentNode> cleanedWorld = node->CreateNodeBefore(CS_NODE_ELEMENT); - - cleanedWorld->SetValue("world"); - - // Copy the sector node - csRef<iDocumentNodeIterator> sectors = world->GetNodes("sector"); - while ( sectors->HasNext() ) - { - csRef<iDocumentNode> sector = sectors->Next(); - - csRef<iDocumentNode> cleanedSector = cleanedWorld->CreateNodeBefore(CS_NODE_ELEMENT); - cleanedSector->SetValue(sector->GetValue()); - - // Copy the sector attributes - csRef<iDocumentAttributeIterator> attrs = sector->GetAttributes(); - while(attrs->HasNext()) - { - csRef<iDocumentAttribute> attr = attrs->Next(); - cleanedSector->SetAttribute(attr->GetName(), attr->GetValue()); - } - - // Copy the portal - csRef<iDocumentNodeIterator> nodes = sector->GetNodes("portal"); - - while(nodes->HasNext()) - { - csRef<iDocumentNode> portal = nodes->Next(); - csRef<iDocumentNode> cleanedportal = cleanedSector->CreateNodeBefore(CS_NODE_ELEMENT); - CloneNode(portal, cleanedportal); - } - - // Copy the portals - csRef<iDocumentNodeIterator> portalsItr = sector->GetNodes("portals"); - - while(portalsItr->HasNext()) - { - csRef<iDocumentNode> portals = portalsItr->Next(); - csRef<iDocumentNode> cleanedportals = cleanedSector->CreateNodeBefore(CS_NODE_ELEMENT); - CloneNode(portals, cleanedportals); - } - - - } - - // Copy the start node - csRef<iDocumentNodeIterator> startLocations = world->GetNodes("start"); - while (startLocations->HasNext()) - { - csRef<iDocumentNode> start = startLocations->Next(); - csRef<iDocumentNode> cleanedStart = cleanedWorld->CreateNodeBefore(CS_NODE_ELEMENT); - CloneNode(start, cleanedStart); - } - - return cleanedWorld; -} - -void psRegion::CloneNode (iDocumentNode* from, iDocumentNode* to) -{ - to->SetValue (from->GetValue ()); - csRef<iDocumentNodeIterator> it = from->GetNodes (); - while (it->HasNext ()) - { - csRef<iDocumentNode> child = it->Next (); - csRef<iDocumentNode> child_clone = to->CreateNodeBefore ( - child->GetType (), 0); - CloneNode (child, child_clone); - } - csRef<iDocumentAttributeIterator> atit = from->GetAttributes (); - while (atit->HasNext ()) - { - csRef<iDocumentAttribute> attr = atit->Next (); - to->SetAttribute (attr->GetName (), attr->GetValue ()); - } -} - -void psRegion::Unload() -{ - if (!loaded) - return; - loaded = false; - - // The engine needs to not be in the region when it is unloaded! - - csRef<iEngine> engine = csQueryRegistry<iEngine> (object_reg); - - iRegion* cur_region = engine->CreateRegion (regionname); - - // Array to point to RL objects. - csWeakRefArray<iRenderLoop> rls; - - // Copy pointers to objects into a vector. - csWeakRefArray<iObject> copy (1024, 256); - csRef<iObjectIterator> iter = cur_region->QueryObject()->GetIterator (); - while (iter->HasNext ()) - { - csWeakRef<iObject> o = iter->Next (); - csWeakRef<iSector> sec = scfQueryInterface<iSector>(o); - csWeakRef<iLight> light = scfQueryInterface<iLight>(o); - // If the object is a sector then remove it now, else copy the object. - if(sec) - { - // If the sector uses a non-default renderloop, make note of it for later. - csWeakRef<iRenderLoop> rl = sec->GetRenderLoop(); - if(rl) - rls.PushSmart(rl); - - // Remove any mesh generators and meshes. - sec->RemoveMeshGenerators(); - - // Remove sector. - engine->RemoveObject(o); - } - else if(!light) - copy.Push (o); - } - - size_t i; - - struct rcStruct { csString n; csWeakRef<iBase> weakb; }; - rcStruct* rc = new rcStruct[copy.GetSize()]; - - // Remove all objects from the region. - cur_region->QueryObject()->ObjRemoveAll(); - - // Go through all objects and remove them if they're not being used. - // Loop because references will be removed as objects are deleted, - // so we need to check multiple times. - bool doClean; - do - { - doClean = false; - i = 0; - while (i < copy.GetSize ()) - { - if(!copy[i]) - { - printf("Removing null object!\n"); - copy.DeleteIndex (i); - continue; - } - - csWeakRef<iBase> b = scfQueryInterface<iBase>(copy[i]); - if(b->GetRefCount() == 1) - { - if (engine->RemoveObject (b)) - { - copy.DeleteIndex (i); - doClean = true; - continue; - } - } - i++; - } - } - while (doClean); - - // Check for any objects that weren't deleted. - for (i = 0 ; i < copy.GetSize () ; i++) - if (rc[i].weakb != 0) - printf ("Not Deleted %p '%s' ref=%d\n", - (iBase*)rc[i].weakb, (const char*)rc[i].n, - rc[i].weakb->GetRefCount ()); - fflush (stdout); - delete[] rc; - - // Check all the renderloops that were being used by sectors to see if they can be removed. - for(uint i=0; i<rls.GetSize(); i++) - { - if(rls.Get(i)->GetRefCount() == 2) - engine->GetRenderLoopManager()->Unregister(rls.Get(i)); - } -} - -void psRegion::SetupWorldColliders(iEngine *engine,iRegion* cur_region) -{ - csRef<iCollideSystem> cdsys = - csQueryRegistry<iCollideSystem> (object_reg); - - csRef<iObjectIterator> iter = cur_region->QueryObject()->GetIterator(); - //return; - csRef<iTriangleMesh> mesh; - iObject *curr; - while ( iter->HasNext() ) - { - curr = iter->Next(); - // regions hold many objects, but only meshes are collide-able - csRef<iMeshWrapper> sp = scfQueryInterface<iMeshWrapper> (curr); - if (sp && sp->GetMeshObject() ) - { - csColliderHelper::InitializeCollisionWrapper(cdsys, sp); - - csRef<iThingState> thing = scfQueryInterface<iThingState> (sp->GetMeshObject()); - if (thing) - thing->Prepare (); - } - } -} - -iRegion * psRegion::GetRegion() -{ - csRef<iEngine> engine = csQueryRegistry<iEngine> (object_reg); - return engine->GetRegions()->FindByName(regionname); -} - Modified: personal/Xordan/src/common/engine/psworld.h =================================================================== --- personal/Xordan/src/common/engine/psworld.h 2008-01-19 02:24:48 UTC (rev 676) +++ personal/Xordan/src/common/engine/psworld.h 2008-01-19 14:16:30 UTC (rev 677) @@ -20,100 +20,23 @@ #ifndef __PSWORLD_H__ #define __PSWORLD_H__ -#include <csutil/ref.h> +//============================================================================= +// Crystal Space Includes +//============================================================================= +#include <csutil/parray.h> #include <csutil/weakref.h> -#include <csutil/weakrefarr.h> -#include <csutil/hash.h> -#include <iengine/sector.h> -#include <csgeom/transfrm.h> -#include "csutil/parray.h" -#include "csutil/csstring.h" +//============================================================================= +// Project Includes +//============================================================================= -class CelBase; -struct iSector; -struct iObjectRegistry; -struct iEngine; -struct iRegion; -class psWorld; +//============================================================================= +// Local Includes +//============================================================================= +#include "psregion.h" /** - * Replacement class for iPcRegion from CEL. - * This is more versatile for dynamic loading - * and unloading of multiple maps than iPcRegion. - */ -class psRegion -{ -protected: - iObjectRegistry* object_reg; - csString worlddir; - csString worldfile; - csString regionname; - bool loaded; - bool isNeeded; - psWorld * world; - - static void CloneNode(iDocumentNode* from, iDocumentNode* to); - -public: - /** - * Creates an entry representing a single region - * but does not load it. - */ - psRegion(iObjectRegistry *obj_reg, psWorld * world, const char *file); - - /** - * Dtor unloads region if loaded - */ - ~psRegion(); - - /** - * Loads the file "world" from /planeshift/art/world/<name>.zip - * into the region called <name>. - */ - bool Load(bool loadMeshes = true); - - /** - * Unloads the region from the CS engine, deleting all objects - * in that region. - */ - void Unload(); - - bool IsLoaded() - { return loaded; } - - iRegion * GetRegion(); - - /** - * Sets up the collision detection blockers for all meshes in - * the region. - */ - void SetupWorldColliders(iEngine *engine,iRegion *cur_region); - - /** - * The retain flag is used by psWorld owner to manage the list - * of loaded and unloaded regions efficiently. See psWorld class - * def for details on how this is done. - */ - void SetNeededFlag(bool flag) - { isNeeded = flag; } - bool IsNeeded() - { return isNeeded; } - - const char *GetName() - { return regionname; } - - /// Cleans the given file and removes all meshes, lights, etc. not needed on the server. - csRef<iDocumentNode> Clean(csRef<iDocumentNode> worldNode); - - -}; - -struct iObject; - -/** - * - * It is in charge of managing all regions (zone map files) + * psWorld is in charge of managing all regions (zone map files) * and loading/unloading them as needed. The main users * of this class are EntityManager and on the client, ZoneHandler. */ @@ -122,7 +45,7 @@ protected: csPDelArray<psRegion> regions; iObjectRegistry *object_reg; - csWeakRef<iEngine> engine; + csWeakRef<iEngine> Engine; class sectorTransformation { @@ -217,13 +140,13 @@ */ void FlagRegionAsNeeded(const char *map); - void GetNotNeededRegions(csArray<iRegion*> & regions); + void GetNotNeededRegions(csArray<psRegion*> & regions); /// Unload all regions to be unloaded, and load any regions to be kept but /// which are not loaded already. int ExecuteFlaggedRegions(bool transitional, bool unloadOrder = true); - bool NeedsLoading(bool transitional); + bool NeedsLoading(); bool IsAllLoaded(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-01-21 05:56:25
|
Revision: 682 http://planeshift.svn.sourceforge.net/planeshift/?rev=682&view=rev Author: mgist Date: 2008-01-20 21:56:30 -0800 (Sun, 20 Jan 2008) Log Message: ----------- - More work on converting from iRegion to iCollection. Modified Paths: -------------- personal/Xordan/docs/history.txt personal/Xordan/src/client/charapp.cpp personal/Xordan/src/client/clientcachemanager.cpp personal/Xordan/src/client/pscelclient.cpp personal/Xordan/src/client/pscelclient.h personal/Xordan/src/client/psengine.cpp personal/Xordan/src/client/psengine.h personal/Xordan/src/client/weather.cpp personal/Xordan/src/common/effects/pseffect2drenderer.h personal/Xordan/src/common/effects/pseffectmanager.cpp personal/Xordan/src/common/effects/pseffectmanager.h personal/Xordan/src/common/effects/pseffectobj.cpp personal/Xordan/src/common/effects/pseffectobj.h personal/Xordan/src/common/effects/pseffectobjdecal.cpp personal/Xordan/src/common/effects/pseffectobjlabel.cpp personal/Xordan/src/common/effects/pseffectobjmesh.cpp personal/Xordan/src/common/effects/pseffectobjparticles.cpp personal/Xordan/src/common/effects/pseffectobjquad.cpp personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp personal/Xordan/src/common/effects/pseffectobjsound.cpp personal/Xordan/src/common/effects/pseffectobjspire.cpp personal/Xordan/src/common/effects/pseffectobjstar.cpp personal/Xordan/src/common/effects/pseffectobjtext.cpp personal/Xordan/src/common/effects/pseffectobjtext2d.cpp personal/Xordan/src/common/effects/pseffectobjtext2d.h personal/Xordan/src/common/effects/pseffectobjtrail.cpp personal/Xordan/src/common/engine/celbase.h personal/Xordan/src/common/engine/materialmanager.cpp personal/Xordan/src/common/engine/materialmanager.h personal/Xordan/src/common/engine/psregion.cpp personal/Xordan/src/common/engine/psworld.h personal/Xordan/src/common/paws/pawsmanager.cpp personal/Xordan/src/common/util/psmeshutil.cpp personal/Xordan/src/common/util/psmeshutil.h personal/Xordan/src/npcclient/npcclient.cpp personal/Xordan/src/npcclient/pathfind.cpp personal/Xordan/src/server/actionmanager.cpp personal/Xordan/src/server/adminmanager.cpp personal/Xordan/src/server/command.cpp personal/Xordan/src/server/entitymanager.cpp personal/Xordan/src/server/gem.cpp personal/Xordan/src/server/psproxlist.cpp personal/Xordan/src/server/psserverdr.cpp personal/Xordan/src/server/usermanager.cpp Removed Paths: ------------- personal/Xordan/src/common/paws/pawsgenericview.cpp personal/Xordan/src/common/paws/pawsgenericview.h Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/docs/history.txt 2008-01-21 05:56:30 UTC (rev 682) @@ -1,3 +1,6 @@ +*** 2008-01-21 by Mike Gist +- More work on converting from iRegion to iCollection. + *** 2008-01-19 by Mike Gist - Begun rewrites and refactors of the loading code; - Moved psregion into psregion.* Modified: personal/Xordan/src/client/charapp.cpp =================================================================== --- personal/Xordan/src/client/charapp.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/client/charapp.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -4,7 +4,6 @@ //============================================================================= #include <iengine/engine.h> #include <iengine/material.h> -#include <iengine/region.h> #include <iengine/scenenode.h> #include <imap/loader.h> #include <imesh/object.h> @@ -81,7 +80,7 @@ csString materialParsed = ParseStrings("", faceMaterial); csString textureParsed = ParseStrings("", faceTexture); - iMaterialWrapper* material = MaterialManager::GetSingletonPtr()->MissingMaterial(materialParsed, textureParsed); + iMaterialWrapper* material = MaterialManager::GetSingletonPtr()->LoadMaterial(materialParsed, textureParsed); if ( !material ) { @@ -260,7 +259,7 @@ csString materialNameParsed = ParseStrings(part, material); csString textureNameParsed = ParseStrings(part, texture); - iMaterialWrapper* material = MaterialManager::GetSingletonPtr()->MissingMaterial(materialNameParsed, textureNameParsed ); + iMaterialWrapper* material = MaterialManager::GetSingletonPtr()->LoadMaterial(materialNameParsed, textureNameParsed ); if ( !material ) { // Not necisarily an error; this texture may just not exist for this character, yet @@ -450,7 +449,7 @@ csString meshNameParsed = ParseStrings(part, meshName); csString textureNameParsed = ParseStrings(part, textureName); - iMaterialWrapper* material = MaterialManager::GetSingletonPtr()->MissingMaterial( meshNameParsed, textureNameParsed ); + iMaterialWrapper* material = MaterialManager::GetSingletonPtr()->LoadMaterial(meshNameParsed, textureNameParsed); if ( !material ) { // Not necisarily an error; this texture may just not exist for this character, yet Modified: personal/Xordan/src/client/clientcachemanager.cpp =================================================================== --- personal/Xordan/src/client/clientcachemanager.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/client/clientcachemanager.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -29,8 +29,6 @@ //============================================================================= #include "util/psxmlparser.h" -#include "engine/materialmanager.h" - //============================================================================= // Local Includes //============================================================================= @@ -98,7 +96,7 @@ if (indexEntry->factory == NULL) { iBase* result = NULL; - psengine->GetLoader()->Load (file, result, 0, true, false, 0, 0, MaterialManager::GetSingletonPtr()); + psengine->GetLoader()->Load(file, result, 0, true, false, 0, 0, 0, true); iMeshFactoryWrapper* meshW = psengine->GetEngine()->GetMeshFactories()->FindByName(name); indexEntry->factory = meshW; } Modified: personal/Xordan/src/client/pscelclient.cpp =================================================================== --- personal/Xordan/src/client/pscelclient.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/client/pscelclient.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -30,7 +30,6 @@ #include <ivaria/collider.h> #include <iengine/engine.h> #include <iengine/mesh.h> -#include <iengine/region.h> #include <iengine/movable.h> #include <iengine/sector.h> #include <imesh/object.h> Modified: personal/Xordan/src/client/pscelclient.h =================================================================== --- personal/Xordan/src/client/pscelclient.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/client/pscelclient.h 2008-01-21 05:56:30 UTC (rev 682) @@ -25,7 +25,6 @@ #include <csutil/ref.h> #include <csutil/list.h> #include <csutil/hash.h> -#include <iengine/region.h> //============================================================================= // Project Includes Modified: personal/Xordan/src/client/psengine.cpp =================================================================== --- personal/Xordan/src/client/psengine.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/client/psengine.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -289,6 +289,7 @@ delete mouseBinds; delete guiHandler; delete inventoryCache; + delete materialManager; // Effect manager needs to be destoyed before the soundmanager @@ -543,11 +544,11 @@ unloadLast = GetConfig()->GetBool("Planeshift.Client.Loading.UnloadLast", true); - materialmanager.AttachNew(new MaterialManager(object_reg, preloadModels)); + materialManager = new MaterialManager(object_reg, preloadModels); if(preloadModels) { - materialmanager->PreloadTextures(); + materialManager->PreloadTextures(); } if (!celclient->Initialize(object_reg, GetMsgHandler(), zonehandler)) Modified: personal/Xordan/src/client/psengine.h =================================================================== --- personal/Xordan/src/client/psengine.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/client/psengine.h 2008-01-21 05:56:30 UTC (rev 682) @@ -396,7 +396,7 @@ csRef<ActionHandler> actionhandler; csRef<ZoneHandler> zonehandler; ///< Region/map file memory manager. csRef<psCal3DCallbackLoader> cal3DCallbackLoader; - csRef<MaterialManager> materialmanager; ///< Handles loading of materials/textures. + MaterialManager* materialManager; ///< Handles loading of materials/textures. psClientCharManager* charmanager; ///< Holds the charactermanager psMeshUtil* meshUtil; GUIHandler* guiHandler; Modified: personal/Xordan/src/client/weather.cpp =================================================================== --- personal/Xordan/src/client/weather.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/client/weather.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -214,7 +214,7 @@ float speed = 5; // Attempt to fetch material. - iMaterialWrapper* mat = MaterialManager::GetSingletonPtr()->MissingMaterial(matname, "/planeshift/art/effects/raindrop.dds"); + iMaterialWrapper* mat = MaterialManager::GetSingletonPtr()->LoadMaterial(matname, "/planeshift/art/effects/raindrop.dds"); if (!mat) { Bug2("Can't find material '%s' in memory for rain!", matname); @@ -374,7 +374,7 @@ float speed = 1.5f; // Attempt to fetch material. - iMaterialWrapper* mat = MaterialManager::GetSingletonPtr()->MissingMaterial(matname, "/planeshift/art/effects/snow.dds"); + iMaterialWrapper* mat = MaterialManager::GetSingletonPtr()->LoadMaterial(matname, "/planeshift/art/effects/snow.dds"); if (!mat) { Bug2("Can't find material '%s' in memory for snow!", matname); Modified: personal/Xordan/src/common/effects/pseffect2drenderer.h =================================================================== --- personal/Xordan/src/common/effects/pseffect2drenderer.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffect2drenderer.h 2008-01-21 05:56:30 UTC (rev 682) @@ -28,6 +28,8 @@ #include <ivideo/graph2d.h> #include <ivideo/fontserv.h> +#define EFFECTS_COLLECTION "effects" + #define PS_EFFECT_2D_TEXT_MAX_CHARS 512 /** Base class for all possible 2D Effect Elements Modified: personal/Xordan/src/common/effects/pseffectmanager.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectmanager.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectmanager.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -26,7 +26,6 @@ #include <iengine/movable.h> #include <imesh/object.h> #include <imesh/sprite3d.h> -#include <iengine/region.h> #include <csutil/syspath.h> #include "pseffectmanager.h" @@ -95,8 +94,8 @@ effect2DRenderer = new psEffect2DRenderer(); #ifndef DONT_DO_EFFECTS - csRef<iEngine> engine = csQueryRegistry<iEngine> (psCSSetup::object_reg); - region = engine->CreateRegion("effects"); + csRef<iEngine> engine = csQueryRegistry<iEngine> (psCSSetup::object_reg); + collection = engine->CreateCollection(EFFECTS_COLLECTION); #endif } @@ -119,7 +118,8 @@ delete tmpEffect; } actualEffects.DeleteAll(); - region->DeleteAll(); + csRef<iEngine> engine = csQueryRegistry<iEngine> (psCSSetup::object_reg); + engine->RemoveCollection(EFFECTS_COLLECTION); #endif effectLoader->SetManager(NULL); psCSSetup::object_reg->Unregister((psEffectLoader *)effectLoader, "PSEffects"); @@ -133,7 +133,7 @@ view = parentView; csRef<iLoader> loader = csQueryRegistry<iLoader> (psCSSetup::object_reg); - if (!loader->LoadLibraryFile(fileName, region, true, true)) + if (!loader->LoadLibraryFile(fileName, collection, true, true)) { Error2("Failed to load %s",fileName.GetDataSafe()); return false; @@ -382,16 +382,6 @@ #endif } -bool psEffectManager::Prepare() -{ -#ifndef DONT_DO_EFFECTS - if (!region) - return false; - - return region->Prepare(); -#endif -} - void psEffectManager::Clear() { #ifndef DONT_DO_EFFECTS @@ -405,8 +395,7 @@ delete itActual.Next(); actualEffects.DeleteAll(); - region->DeleteAll(); - region->Clear(); + collection->ReleaseAllObjects(); #endif } Modified: personal/Xordan/src/common/effects/pseffectmanager.h =================================================================== --- personal/Xordan/src/common/effects/pseffectmanager.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectmanager.h 2008-01-21 05:56:30 UTC (rev 682) @@ -31,13 +31,13 @@ #include <imap/reader.h> #include <ivideo/graph3d.h> #include <csutil/scf_implementation.h> +#include <iengine/collection.h> #include "effects/pseffect2drenderer.h" struct iSector; struct iSectorList; struct iMeshWrapper; -struct iRegion; struct iView; struct iMovable; class psEffect; @@ -150,11 +150,6 @@ */ void Update(csTicks elapsed = 0); - /** Prepares the effects -- do this once after load, but before render loop. - * @return true if effects are successfully prepared, false otherwise - */ - bool Prepare(); - /** Clears all effects. */ void Clear(); @@ -207,7 +202,7 @@ // csPDelArray<psEffect> actualEffects; /// effects have their own region to make them easier to manage - csRef<iRegion> region; + csRef<iCollection> collection; iView * view; Modified: personal/Xordan/src/common/effects/pseffectobj.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobj.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobj.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -21,7 +21,6 @@ #include <csutil/xmltiny.h> #include <iengine/engine.h> -#include <iengine/region.h> #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> @@ -288,7 +287,7 @@ scale = 1.0f; aspect = 1.0f; - region = engine->GetRegions()->FindByName("effects"); + collection = engine->GetCollection(EFFECTS_COLLECTION); keyFrames.AttachNew(new psEffectObjKeyFrameGroup); baseScale = 1.0f; Modified: personal/Xordan/src/common/effects/pseffectobj.h =================================================================== --- personal/Xordan/src/common/effects/pseffectobj.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobj.h 2008-01-21 05:56:30 UTC (rev 682) @@ -26,6 +26,7 @@ #include <csutil/parray.h> #include <csutil/refcount.h> #include <csutil/leakguard.h> +#include <iengine/collection.h> #include <iutil/virtclk.h> #include <imesh/object.h> #include <csgeom/matrix3.h> @@ -37,7 +38,6 @@ struct iView; struct iMeshFactoryWrapper; struct iSector; -struct iRegion; class psEffect2DRenderer; class psEffectAnchor; @@ -352,8 +352,8 @@ csRef<iEngine> engine; csRef<iView> view; - /// region to store the CS objects - csRef<iRegion> region; + /// Collection to store the CS objects + csRef<iCollection> collection; float scale; float aspect; Modified: personal/Xordan/src/common/effects/pseffectobjdecal.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjdecal.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjdecal.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -26,12 +26,12 @@ #include <iengine/movable.h> #include <iengine/camera.h> #include <cstool/csview.h> -#include <iengine/region.h> #include <imesh/objmodel.h> #include <csutil/flags.h> #include <csgeom/tri.h> #include <imesh/nullmesh.h> #include <iengine/sector.h> +#include <iutil/object.h> #include "effects/pseffectobjdecal.h" #include "effects/pseffectanchor.h" @@ -129,7 +129,7 @@ } // load material - csRef<iMaterialWrapper> mat = region->FindMaterial(materialName); + csRef<iMaterialWrapper> mat = CS::GetNamedChildObject<iMaterialWrapper>(collection->QueryObject(), materialName); if (!mat) { csReport(psCSSetup::object_reg, CS_REPORTER_SEVERITY_ERROR, "planeshift_effects", "Attempting to create an effect obj with no name.\n"); Modified: personal/Xordan/src/common/effects/pseffectobjlabel.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjlabel.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjlabel.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -27,10 +27,10 @@ #include <iengine/movable.h> #include <iengine/camera.h> #include <cstool/csview.h> -#include <iengine/region.h> #include <imesh/objmodel.h> #include <csutil/flags.h> #include <csgeom/tri.h> +#include <iutil/object.h> #include "effects/pseffectobjlabel.h" #include "effects/pseffectanchor.h" @@ -166,7 +166,7 @@ facName += uniqueID++; meshFact = engine->CreateMeshFactory ("crystalspace.mesh.object.genmesh", facName.GetData()); - region->Add(meshFact->QueryObject()); + collection->Add(meshFact->QueryObject()); iMeshObjectFactory * fact = meshFact->GetMeshObjectFactory(); facState = scfQueryInterface<iGeneralFactoryState> (fact); @@ -177,7 +177,7 @@ } // setup the material - csRef<iMaterialWrapper> mat = region->FindMaterial(materialName); + csRef<iMaterialWrapper> mat = CS::GetNamedChildObject<iMaterialWrapper>(collection->QueryObject(), materialName); if (mat) { fact->SetMaterialWrapper(mat); Modified: personal/Xordan/src/common/effects/pseffectobjmesh.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjmesh.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjmesh.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -25,8 +25,8 @@ #include <iengine/mesh.h> #include <iengine/movable.h> #include <imap/loader.h> -#include <iengine/region.h> #include <imesh/objmodel.h> +#include <iutil/object.h> #include <csutil/cscolor.h> #include <csutil/flags.h> @@ -107,7 +107,7 @@ // add the custom material if set if (materialName != "") { - csRef<iMaterialWrapper> mat = region->FindMaterial(materialName); + csRef<iMaterialWrapper> mat = CS::GetNamedChildObject<iMaterialWrapper>(collection->QueryObject(), materialName); if (mat != 0) { mesh->GetMeshObject()->SetMaterialWrapper(mat); @@ -176,7 +176,7 @@ csString facName = "effect_mesh_fac_"; facName += uniqueID++; - meshFact = region->FindMeshFactory(factName); + meshFact = CS::GetNamedChildObject<iMeshFactoryWrapper>(collection->QueryObject(), factName); if (!meshFact) { csReport(psCSSetup::object_reg, CS_REPORTER_SEVERITY_ERROR, "planeshift_effects", "Couldn't find mesh factory %s in effect %s\n", factName.GetData(), name.GetData()); Modified: personal/Xordan/src/common/effects/pseffectobjparticles.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjparticles.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjparticles.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -17,12 +17,10 @@ * */ -#if 1 #include <psconfig.h> #include <csutil/xmltiny.h> #include <iengine/engine.h> -#include <iengine/region.h> #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> @@ -32,6 +30,7 @@ #include <imesh/partsys.h> #include <imesh/objmodel.h> #include <csutil/flags.h> +#include <iutil/object.h> #include "effects/pseffectobjparticles.h" #include "effects/pseffectanchor.h" @@ -129,7 +128,7 @@ // add the custom material if set if (materialName != "") { - csRef<iMaterialWrapper> mat = region->FindMaterial(materialName); + csRef<iMaterialWrapper> mat = CS::GetNamedChildObject<iMaterialWrapper>(collection->QueryObject(), materialName); if (mat != 0) mesh->GetMeshObject()->SetMaterialWrapper(mat); } @@ -186,7 +185,7 @@ csString facName = "effect_particles_fac_"; facName += uniqueID++; - meshFact = region->FindMeshFactory(factName); + meshFact = CS::GetNamedChildObject<iMeshFactoryWrapper>(collection->QueryObject(), factName); if (!meshFact) { csReport(psCSSetup::object_reg, CS_REPORTER_SEVERITY_ERROR, "planeshift_effects", @@ -196,4 +195,3 @@ return true; } -#endif Modified: personal/Xordan/src/common/effects/pseffectobjquad.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjquad.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjquad.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -26,10 +26,10 @@ #include <iengine/movable.h> #include <iengine/camera.h> #include <cstool/csview.h> -#include <iengine/region.h> #include <imesh/objmodel.h> #include <csutil/flags.h> #include <csgeom/tri.h> +#include <iutil/object.h> #include "effects/pseffectobjquad.h" #include "effects/pseffectanchor.h" @@ -212,7 +212,7 @@ facName += uniqueID++; meshFact = engine->CreateMeshFactory ("crystalspace.mesh.object.genmesh", facName.GetData()); - region->Add(meshFact->QueryObject()); + collection->Add(meshFact->QueryObject()); // create the actual sprite3d data iMeshObjectFactory * fact = meshFact->GetMeshObjectFactory(); @@ -224,7 +224,7 @@ } // setup the material - mat = region->FindMaterial(materialName); + mat = CS::GetNamedChildObject<iMaterialWrapper>(collection->QueryObject(), materialName); if (mat) fact->SetMaterialWrapper(mat); Modified: personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -164,7 +164,7 @@ csRef<iLoader> loader = csQueryRegistry<iLoader> (psCSSetup::object_reg); - loader->LoadLibraryFile(fileName, region); + loader->LoadLibraryFile(fileName, collection); /* // setup the material Modified: personal/Xordan/src/common/effects/pseffectobjsound.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjsound.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjsound.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -27,7 +27,6 @@ #include <iengine/mesh.h> #include <iengine/movable.h> #include <iengine/sector.h> -#include <iengine/region.h> #include <imap/loader.h> Modified: personal/Xordan/src/common/effects/pseffectobjspire.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjspire.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjspire.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -24,12 +24,12 @@ #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> -#include <iengine/region.h> #include <imesh/object.h> #include <imesh/objmodel.h> #include <csutil/flags.h> #include <csutil/cscolor.h> #include <csgeom/tri.h> +#include <iutil/object.h> #include "effects/pseffectobjspire.h" #include "effects/pseffectanchor.h" @@ -298,14 +298,14 @@ csString facName = "effect_spire_fac_"; facName += uniqueID++; meshFact = engine->CreateMeshFactory ("crystalspace.mesh.object.genmesh", facName.GetData()); - region->Add(meshFact->QueryObject()); + collection->Add(meshFact->QueryObject()); // create the actual sprite3d data iMeshObjectFactory* fact = meshFact->GetMeshObjectFactory(); csRef<iGeneralFactoryState> facState = scfQueryInterface<iGeneralFactoryState> (fact); // setup the material - csRef<iMaterialWrapper> mat = region->FindMaterial(materialName); + csRef<iMaterialWrapper> mat = CS::GetNamedChildObject<iMaterialWrapper>(collection->QueryObject(), materialName); if (!mat) { csReport(psCSSetup::object_reg, CS_REPORTER_SEVERITY_ERROR, "planeshift_effects", "Couldn't find effect material: %s\n", materialName.GetData()); Modified: personal/Xordan/src/common/effects/pseffectobjstar.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjstar.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjstar.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -24,11 +24,11 @@ #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> -#include <iengine/region.h> #include <imesh/objmodel.h> #include <csgeom/tri.h> #include <csutil/cscolor.h> #include <csutil/flags.h> +#include <iutil/object.h> #include "effects/pseffectobjstar.h" #include "effects/pseffectanchor.h" @@ -227,14 +227,14 @@ csString facName = "effect_star_fac_"; facName += uniqueID++; meshFact = engine->CreateMeshFactory ("crystalspace.mesh.object.genmesh", facName.GetData()); - region->Add(meshFact->QueryObject()); + collection->Add(meshFact->QueryObject()); // create the actual sprite3d data iMeshObjectFactory* fact = meshFact->GetMeshObjectFactory(); csRef<iGeneralFactoryState> facState = scfQueryInterface<iGeneralFactoryState> (fact); // setup the material - csRef<iMaterialWrapper> mat = region->FindMaterial(materialName); + csRef<iMaterialWrapper> mat = CS::GetNamedChildObject<iMaterialWrapper>(collection->QueryObject(), materialName); if (!mat) { csReport(psCSSetup::object_reg, CS_REPORTER_SEVERITY_ERROR, "planeshift_effects", "Couldn't find effect material: %s\n", materialName.GetData()); Modified: personal/Xordan/src/common/effects/pseffectobjtext.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjtext.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjtext.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -27,7 +27,6 @@ #include <iengine/movable.h> #include <iengine/camera.h> #include <cstool/csview.h> -#include <iengine/region.h> #include <ivideo/graph2d.h> #include <iengine/sector.h> #include <imesh/particle.h> Modified: personal/Xordan/src/common/effects/pseffectobjtext2d.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjtext2d.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjtext2d.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -27,9 +27,9 @@ #include <iengine/movable.h> #include <iengine/camera.h> #include <cstool/csview.h> -#include <iengine/region.h> #include <ivideo/graph2d.h> #include <iengine/sector.h> +#include <iutil/object.h> #include "effects/pseffectobjtext2d.h" #include "effects/pseffectanchor.h" @@ -309,7 +309,7 @@ csRef<iDocumentNode> dataNode = node->GetNode("background"); - backgroundMat = region->FindMaterial(dataNode->GetAttributeValue("material")); + backgroundMat = CS::GetNamedChildObject<iMaterialWrapper>(collection->QueryObject(), dataNode->GetAttributeValue("material")); if (!backgroundMat) { csReport(psCSSetup::object_reg, CS_REPORTER_SEVERITY_ERROR, "planeshift_effects", Modified: personal/Xordan/src/common/effects/pseffectobjtext2d.h =================================================================== --- personal/Xordan/src/common/effects/pseffectobjtext2d.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjtext2d.h 2008-01-21 05:56:30 UTC (rev 682) @@ -78,7 +78,7 @@ int maxHeight; psEffectBackgroundAlign backgroundAlign; - iMaterialWrapper * backgroundMat; + csRef<iMaterialWrapper> backgroundMat; csArray<psEffectBackgroundElem> backgroundElems; csArray<psEffect2DElement *> elems; Modified: personal/Xordan/src/common/effects/pseffectobjtrail.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjtrail.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/effects/pseffectobjtrail.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -24,13 +24,13 @@ #include <iengine/material.h> #include <iengine/mesh.h> #include <iengine/movable.h> -#include <iengine/region.h> #include <iengine/sector.h> #include <imesh/object.h> #include <imesh/objmodel.h> #include <csutil/cscolor.h> #include <csgeom/tri.h> #include <csutil/flags.h> +#include <iutil/object.h> #include "effects/pseffect2drenderer.h" #include "effects/pseffectobjtrail.h" @@ -324,14 +324,14 @@ csString facName = "effect_trail_fac_"; facName += uniqueID++; meshFact = engine->CreateMeshFactory ("crystalspace.mesh.object.genmesh", facName.GetData()); - region->Add(meshFact->QueryObject()); + collection->Add(meshFact->QueryObject()); // create the actual sprite3d data iMeshObjectFactory* fact = meshFact->GetMeshObjectFactory(); csRef<iGeneralFactoryState> facState = scfQueryInterface<iGeneralFactoryState> (fact); // setup the material - csRef<iMaterialWrapper> mat = region->FindMaterial(materialName); + csRef<iMaterialWrapper> mat = CS::GetNamedChildObject<iMaterialWrapper>(collection->QueryObject(), materialName); if (!mat) { csReport(psCSSetup::object_reg, CS_REPORTER_SEVERITY_ERROR, "planeshift_effects", "Couldn't find effect material: %s\n", materialName.GetData()); Modified: personal/Xordan/src/common/engine/celbase.h =================================================================== --- personal/Xordan/src/common/engine/celbase.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/engine/celbase.h 2008-01-21 05:56:30 UTC (rev 682) @@ -40,7 +40,6 @@ #include <propclass/camera.h> #include <propclass/gravity.h> #include <propclass/timer.h> -#include <propclass/region.h> #include <propclass/input.h> #include <iengine/engine.h> Modified: personal/Xordan/src/common/engine/materialmanager.cpp =================================================================== --- personal/Xordan/src/common/engine/materialmanager.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/engine/materialmanager.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -19,26 +19,33 @@ #include <psconfig.h> +//============================================================================= +// Crystal Space Includes +//============================================================================= #include <iutil/stringarray.h> -#include <iutil/object.h> #include <ivideo/material.h> -#include "materialmanager.h" -#include "util/strutil.h" +//============================================================================= +// Project Includes +//============================================================================= #include "globals.h" +#include "util/strutil.h" -MaterialManager::MaterialManager(iObjectRegistry* _object_reg, bool _keepModels) : scfImplementationType (this) +//============================================================================= +// Local Includes +//============================================================================= +#include "materialmanager.h" + +MaterialManager::MaterialManager(iObjectRegistry* _object_reg, bool _keepModels) { - object_reg = _object_reg; - csRef<iGraphics3D> g3d = csQueryRegistry<iGraphics3D> (object_reg); - txtmgr = g3d->GetTextureManager(); + object_reg = _object_reg; engine = csQueryRegistry<iEngine> (object_reg); loader = csQueryRegistry<iLoader> (object_reg); vfs = csQueryRegistry<iVFS> (object_reg); keepModels = _keepModels; } -iMaterialWrapper* MaterialManager::MissingMaterial(const char *name, const char *filename) +iMaterialWrapper* MaterialManager::LoadMaterial(const char *name, const char *filename) { iMaterialWrapper* materialWrap = engine->GetMaterialList()->FindByName(name); if(!materialWrap) @@ -47,7 +54,7 @@ if (!vfs->Exists(filename)) return NULL; - iTextureWrapper* texture = MissingTexture(name, filename); + iTextureWrapper* texture = LoadTexture(name, filename); csRef<iMaterial> material (engine->CreateBaseMaterial(texture)); materialWrap = engine->GetMaterialList()->NewMaterial(material, name); @@ -55,7 +62,7 @@ return materialWrap; } -iTextureWrapper* MaterialManager::MissingTexture(const char *name, const char *filename) +iTextureWrapper* MaterialManager::LoadTexture(const char *name, const char *filename) { // name is the material name; blah.dds // filename will be /planeshift/blah/blah.dds @@ -71,7 +78,10 @@ iTextureWrapper* texture = engine->GetTextureList()->FindByName(name); if(!texture) - texture = loader->LoadTexture(name, filename, CS_TEXTURE_3D, txtmgr, true, false); + { + csRef<iGraphics3D> g3d = csQueryRegistry<iGraphics3D> (object_reg); + texture = loader->LoadTexture(name, filename, CS_TEXTURE_3D, g3d->GetTextureManager(), true, false, true); + } if (!texture) { @@ -111,7 +121,7 @@ const char* name = csStrNew(filename); const char* onlyname = PS_GetFileName(name); - if (!MissingMaterial(onlyname,filename)) + if (!LoadMaterial(onlyname,filename)) { delete[] name; return false; @@ -156,42 +166,3 @@ return true; } - -void MaterialManager::UnloadUnusedMaterials() -{ - iMaterialList *matList = engine->GetMaterialList(); - for(int i=0; i<matList->GetCount(); i++) - { - if(matList->Get(i)->GetRefCount() == 1) - { - matList->Remove(i); - i--; - } - } -} - -void MaterialManager::UnloadUnusedTextures() -{ - iTextureList *texList = engine->GetTextureList(); - for(int i=0; i<texList->GetCount(); i++) - { - if(texList->Get(i)->GetRefCount() == 1) - { - texList->Remove(i); - i--; - } - } -} - -void MaterialManager::UnloadUnusedFactories() -{ - iMeshFactoryList *factList = engine->GetMeshFactories(); - for(int i=0; i<factList->GetCount(); i++) - { - if(factList->Get(i)->GetRefCount() == 1) - { - factList->Remove(i); - i--; - } - } -} Modified: personal/Xordan/src/common/engine/materialmanager.h =================================================================== --- personal/Xordan/src/common/engine/materialmanager.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/engine/materialmanager.h 2008-01-21 05:56:30 UTC (rev 682) @@ -20,49 +20,43 @@ #ifndef __MATERIAL_MANAGER_H__ #define __MATERIAL_MANAGER_H__ -#include <csutil/scf_implementation.h> +//============================================================================= +// Crystal Space Includes +//============================================================================= #include <iengine/engine.h> #include <iengine/material.h> -#include <iengine/mesh.h> #include <iengine/texture.h> #include <imap/loader.h> #include <iutil/vfs.h> +#include <iutil/object.h> + +//============================================================================= +// Project Includes +//============================================================================= #include "util/singleton.h" -struct iObjectRegistry; +//============================================================================= +// Local Includes +//============================================================================= -class MaterialManager : public scfImplementation1<MaterialManager, iMissingLoaderData>, public Singleton<MaterialManager> +class MaterialManager : public Singleton<MaterialManager> { public: MaterialManager(iObjectRegistry* _object_reg, bool _keepModels); + ~MaterialManager() {} - virtual iMaterialWrapper* MissingMaterial (const char* name, const char* filename); + iMaterialWrapper* LoadMaterial (const char* name, const char* filename); - virtual iTextureWrapper* MissingTexture (const char* name, const char* filename); + iTextureWrapper* LoadTexture (const char* name, const char* filename); - virtual iShader* MissingShader (const char* name) { return 0; } - - virtual iMeshFactoryWrapper* MissingFactory (const char* name) { return 0; } - - virtual iMeshWrapper* MissingMesh (const char* name){ return 0; } - - virtual iSector* MissingSector (const char* name) { return 0; } - - virtual iLight* MissingLight (const char* name) { return 0; } - bool PreloadTextures(); bool KeepModels() { return keepModels; } - void UnloadUnusedMaterials(); - void UnloadUnusedTextures(); - void UnloadUnusedFactories(); - private: bool LoadTextureDir(const char *dir); bool keepModels; iObjectRegistry* object_reg; csRef<iEngine> engine; - csRef<iTextureManager> txtmgr; csRef<iLoader> loader; csRef<iVFS> vfs; }; Modified: personal/Xordan/src/common/engine/psregion.cpp =================================================================== --- personal/Xordan/src/common/engine/psregion.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/engine/psregion.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -118,7 +118,7 @@ csTicks start = csGetTicks(); Debug2(LOG_LOAD, 0,"Loading map file %s", worlddir.GetData()); - if (!loader->LoadMap(worldNode, CS_LOADER_KEEP_WORLD, 0, CS_LOADER_ACROSS_REGIONS, true, 0, 0, true, collection)) + if (!loader->LoadMap(worldNode, CS_LOADER_KEEP_WORLD, collection, CS_LOADER_ACROSS_REGIONS, true, 0, 0, true)) { Error3("loader->LoadMapFile(%s,%s) failed.",worlddir.GetData(),worldfile.GetData() ); Error2("Region name was: %s", regionName.GetData() ); Modified: personal/Xordan/src/common/engine/psworld.h =================================================================== --- personal/Xordan/src/common/engine/psworld.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/engine/psworld.h 2008-01-21 05:56:30 UTC (rev 682) @@ -23,6 +23,7 @@ //============================================================================= // Crystal Space Includes //============================================================================= +#include <csgeom/transfrm.h> #include <csutil/parray.h> #include <csutil/weakref.h> Deleted: personal/Xordan/src/common/paws/pawsgenericview.cpp =================================================================== --- personal/Xordan/src/common/paws/pawsgenericview.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/paws/pawsgenericview.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -1,145 +0,0 @@ -/* - * Author: Andrew Craig - * - * Copyright (C) 2003 Atomic Blue (in...@pl..., http://www.atomicblue.org) - * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation (version 2 of the License) - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include <psconfig.h> -#include <iutil/object.h> -#include <iutil/objreg.h> -#include <imap/loader.h> -#include <iutil/vfs.h> -#include <iengine/campos.h> - -#include "pawsgenericview.h" -#include "pawsmanager.h" -#include "util/log.h" -#include "util/psconst.h" - -int pawsGenericView::idName = 0; - -pawsGenericView::pawsGenericView() -{ - engine = csQueryRegistry<iEngine > ( PawsManager::GetSingleton().GetObjectRegistry()); - idName++; - - char newName[10]; - sprintf(newName, "NAME%d\n", idName ); - region = engine->CreateRegion (newName); - - loadedMap = false; -} - -pawsGenericView::~pawsGenericView() -{ - idName--; -} - -bool pawsGenericView::Setup(iDocumentNode* node ) -{ - csRef<iDocumentNode> mapNode = node->GetNode( "map" ); - if ( mapNode ) - { - csString mapFile = mapNode->GetAttributeValue("file"); - csString sector = mapNode->GetAttributeValue("sector"); - - LoadMap(mapFile, sector); - return true; - //return LoadMap( mapFile, sector ); - } - return false; -} - -bool pawsGenericView::LoadMap( const char* map, const char* sector ) -{ - csRef<iEngine> engine = csQueryRegistry<iEngine > ( PawsManager::GetSingleton().GetObjectRegistry()); - csRef<iLoader> loader = csQueryRegistry<iLoader > ( PawsManager::GetSingleton().GetObjectRegistry()); - csRef<iVFS> VFS = csQueryRegistry<iVFS> ( PawsManager::GetSingleton().GetObjectRegistry()); - - mapName = map; - - csString sectorName; - // Clear it out if it already existed - region->DeleteAll (); - - // Now load the map into the selected region - VFS->ChDir (map); - engine->SetCacheManager(NULL); - if ( !loader->LoadMapFile("world", CS_LOADER_KEEP_WORLD, region, CS_LOADER_ACROSS_REGIONS) ) - return false; - - if (sector) - sectorName = sector; - else if (engine->GetCameraPositions()->GetCount() > 0) - sectorName = engine->GetCameraPositions()->Get(0)->GetSector(); - else - return false; - - stage = engine->FindSector(sectorName); - CS_ASSERT( stage ); - region->Add( stage->QueryObject() ); - if ( !stage ) - return false; - - region->Prepare(); - - view = csPtr<iView> (new csView( engine, PawsManager::GetSingleton().GetGraphics3D() )); - - if (engine->GetCameraPositions()->GetCount() > 0) - { - iCameraPosition * cp = engine->GetCameraPositions()->Get(0); - view->GetCamera()->SetSector(engine->FindSector(cp->GetSector())); - view->GetCamera()->GetTransform().SetOrigin(cp->GetPosition()); - view->GetCamera()->GetTransform().LookAt(cp->GetForwardVector(), cp->GetUpwardVector()); - } - else - { - view->GetCamera()->SetSector(stage); - view->GetCamera()->GetTransform().SetOrigin(csVector3(-33,1,-198)); - view->GetCamera()->GetTransform().LookAt(csVector3(0,0,4), csVector3(0,1,0)); - } - - view->SetRectangle(screenFrame.xmin, screenFrame.ymin, - screenFrame.Width(),screenFrame.Height()); - - loadedMap = true; - return true; -} - -void pawsGenericView::Draw() -{ - graphics2D->SetClipRect( 0,0, graphics2D->GetWidth(), graphics2D->GetHeight()); - // tell CS to render the scene - if (!PawsManager::GetSingleton().GetGraphics3D()->BeginDraw( engine->GetBeginDrawFlags() | CSDRAW_3DGRAPHICS)) - return; - - view->SetRectangle( screenFrame.xmin, - PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.ymax , - screenFrame.Width(), - screenFrame.Height() ); - - view->GetCamera()->SetPerspectiveCenter( - screenFrame.xmin + (screenFrame.Width() >> 1), - PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.Height() - - screenFrame.ymin + (screenFrame.Height() >> 1) ); - - view->GetCamera()->SetFOV( view->GetCamera()->GetFOV(), screenFrame.Width() ); - - view->Draw(); - - PawsManager::GetSingleton().GetGraphics3D()->BeginDraw( CSDRAW_2DGRAPHICS ); - pawsWidget::Draw(); -} Deleted: personal/Xordan/src/common/paws/pawsgenericview.h =================================================================== --- personal/Xordan/src/common/paws/pawsgenericview.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/paws/pawsgenericview.h 2008-01-21 05:56:30 UTC (rev 682) @@ -1,82 +0,0 @@ -/* - * Author: Andrew Craig - * - * Copyright (C) 2003 Atomic Blue (in...@pl..., http://www.atomicblue.org) - * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation (version 2 of the License) - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ -#ifndef PAWS_GENERIC_VIEW_HEADER -#define PAWS_GENERIC_VIEW_HEADER - -#include <iengine/camera.h> -#include <iengine/engine.h> -#include <iengine/light.h> -#include <iengine/material.h> -#include <iengine/mesh.h> -#include <iengine/movable.h> -#include <iengine/region.h> -#include <iengine/sector.h> - -#include <imesh/lighting.h> -#include <imesh/object.h> -#include <imesh/sprite3d.h> -#include <imesh/thing.h> - -#include <cstool/csview.h> -#include <csutil/leakguard.h> - -#include "pawswidget.h" - -/** This widget is used to view a mesh in it's own seperate world. - */ -class pawsGenericView : public pawsWidget -{ -public: - pawsGenericView(); - ~pawsGenericView(); - - /** Creates the room ( world ) for the mesh to be placed. - */ - bool Setup(iDocumentNode* node); - - /** Loads a map to use as the backdrop. - * @param map The full path name of the map to load - * @return True if the map was loaded correctly. False otherwise. - */ - bool LoadMap ( const char* map, const char* sector = 0); - - void Draw(); - - iView *GetView() { return view; } - - const char * GetMapName() const { return mapName; } - -private: - bool CreateArea(); - - csRef<iSector> stage; - csRef<iView> view; - csRef<iEngine> engine; - csRef<iRegion> region; - - csVector3 objectPos; - static int idName; - - csString mapName; - bool loadedMap; -}; -CREATE_PAWS_FACTORY( pawsGenericView ); - - -#endif Modified: personal/Xordan/src/common/paws/pawsmanager.cpp =================================================================== --- personal/Xordan/src/common/paws/pawsmanager.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/paws/pawsmanager.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -60,7 +60,6 @@ //#include "pawsinfowindow.h" #include "pawsprefmanager.h" #include "pawsobjectview.h" -#include "pawsgenericview.h" #include "pawstree.h" #include "pawsprogressbar.h" #include "pawsmenu.h" @@ -944,7 +943,6 @@ RegisterFactory (pawsButtonFactory); RegisterFactory (pawsScrollBarFactory); RegisterFactory (pawsObjectViewFactory); - RegisterFactory (pawsGenericViewFactory); RegisterFactory (pawsTextBoxFactory); RegisterFactory (pawsKeySelectBoxFactory); RegisterFactory (pawsMultiLineTextBoxFactory); Modified: personal/Xordan/src/common/util/psmeshutil.cpp =================================================================== --- personal/Xordan/src/common/util/psmeshutil.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/util/psmeshutil.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -19,6 +19,7 @@ #include <psconfig.h> +#include "engine/materialmanager.h" #include "util/psmeshutil.h" #include "util/psstring.h" #include "util/log.h" @@ -30,7 +31,6 @@ #include <iengine/material.h> #include <iengine/scenenode.h> #include <iengine/texture.h> -#include <iengine/region.h> #include <imesh/object.h> #include <imesh/spritecal3d.h> #include <imap/loader.h> @@ -48,38 +48,6 @@ txtmgr = g3d->GetTextureManager(); } -iMaterialWrapper* psMeshUtil::LoadMaterial(const char* name, const char* texture, iRegion* region) -{ - if (!name || !texture) - return NULL; - - iMaterialWrapper* mat_wrapper = engine->FindMaterial(name); - if ( mat_wrapper ) - return mat_wrapper; - - // Check to see if we even have this texture - if ( !vfs->Exists(texture) ) - return NULL; - - csRef<iTextureHandle> th = loader->LoadTexture(texture); - iTextureList *txlist = engine->GetTextureList(); - if ( !th || !txlist ) - return NULL; - - // Add the texture to the engine's list of textures - iTextureWrapper* tex_wrapper = txlist->NewTexture(th); - if ( !tex_wrapper ) - return NULL; - - // Create the material and register it with the engine - mat_wrapper = engine->CreateMaterial(name,tex_wrapper); - - if (region && mat_wrapper) - region->Add(mat_wrapper->QueryObject()); - - return mat_wrapper; -} - csString psMeshUtil::ParseStrings(iMeshWrapper* mesh, const char * part, const char* str) const { psString result(str); @@ -103,7 +71,7 @@ csString meshNameParsed = ParseStrings(mesh, part, meshName); csString textureNameParsed = ParseStrings(mesh, part, textureName); - iMaterialWrapper* material = LoadMaterial( meshNameParsed, textureNameParsed ); + iMaterialWrapper* material = MaterialManager::GetSingletonPtr()->LoadMaterial( meshNameParsed, textureNameParsed ); if ( !material ) { // Not necisarily an error; this texture may just not exist for this character, yet Modified: personal/Xordan/src/common/util/psmeshutil.h =================================================================== --- personal/Xordan/src/common/util/psmeshutil.h 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/common/util/psmeshutil.h 2008-01-21 05:56:30 UTC (rev 682) @@ -36,15 +36,6 @@ public: psMeshUtil(iObjectRegistry *obj_reg); - /** Returns an iMaterialWrapper to the given texture, creates one if one doesn't exist. - * - * @param name the name of the texture, as stored in CS - * @param texture the vfs file path to the texture - * @param region the region to add the effect to (leave 0 for none) - * @return NULL on failure, the iMaterialWrapper of the texture on success - */ - iMaterialWrapper* LoadMaterial(const char* name, const char* texture, iRegion* region=0 ); - /** Parse the string and change $F with factname, $P with part * * @param mesh The object to take data from Modified: personal/Xordan/src/npcclient/npcclient.cpp =================================================================== --- personal/Xordan/src/npcclient/npcclient.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/npcclient/npcclient.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -910,7 +910,7 @@ void psNPCClient::UnattachNPC(iCelEntity *entity, NPC *npc) { csRef<iObject> object ( scfQueryInterface<iObject> (entity)); - csRef<NPCFinder> cef (CS_GET_CHILD_OBJECT (object, NPCFinder)); + csRef<NPCFinder> cef (CS::GetChildObject<NPCFinder>(object)); if (cef) { if (cef->GetNPC () != npc) @@ -923,7 +923,7 @@ NPC* psNPCClient::FindAttachedNPC(iCelEntity *entity) { csRef<iObject> object ( scfQueryInterface<iObject> (entity)); - csRef<NPCFinder> cef (CS_GET_CHILD_OBJECT (object, NPCFinder)); + csRef<NPCFinder> cef (CS::GetChildObject<NPCFinder>(object)); if (cef) return cef->GetNPC(); return 0; Modified: personal/Xordan/src/npcclient/pathfind.cpp =================================================================== --- personal/Xordan/src/npcclient/pathfind.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/npcclient/pathfind.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -19,7 +19,6 @@ #include <psconfig.h> #include <math.h> -#include <iengine/region.h> #include <csutil/databuf.h> #include <iutil/object.h> Modified: personal/Xordan/src/server/actionmanager.cpp =================================================================== --- personal/Xordan/src/server/actionmanager.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/server/actionmanager.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -31,7 +31,6 @@ #include <csgeom/math3d.h> #include <iutil/object.h> #include <iengine/campos.h> -#include <iengine/region.h> #include <propclass/linmove.h> //============================================================================= Modified: personal/Xordan/src/server/adminmanager.cpp =================================================================== --- personal/Xordan/src/server/adminmanager.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/server/adminmanager.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -25,7 +25,6 @@ #include <iutil/object.h> #include <iutil/stringarray.h> #include <iengine/campos.h> -#include <iengine/region.h> #include <propclass/linmove.h> #include <iengine/mesh.h> #include <iengine/movable.h> @@ -3079,24 +3078,21 @@ bool AdminManager::GetStartOfMap(Client * client, const csString & map, iSector * & targetSector, csVector3 & targetPoint) { iEngine* engine = EntityManager::GetSingleton().GetEngine(); - iRegionList* regions = engine->GetRegions(); - assert(regions); - if ( map.Length() == 0 ) { psserver->SendSystemError( client->GetClientNum(), "Map name not given"); return false; } - iRegion* region = regions->FindByName(map.GetData()); - if (region == NULL) + iCollection* collection = engine->GetCollection(map.GetData()); + if (collection == NULL) { psserver->SendSystemError(client->GetClientNum(), "Map not found."); return false; } - iCameraPosition* loc = region->FindCameraPosition("Camera01"); + iCameraPosition* loc = engine->FindCameraPosition("Camera01", collection); if (loc == NULL) { psserver->SendSystemError(client->GetClientNum(), "Starting location not found in map."); Modified: personal/Xordan/src/server/command.cpp =================================================================== --- personal/Xordan/src/server/command.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/server/command.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -36,7 +36,6 @@ #include <csutil/csstring.h> #include <csutil/csmd5.h> #include <iutil/stringarray.h> -#include <iengine/region.h> #include "util/command.h" #include "util/serverconsole.h" #include "net/messages.h" @@ -1693,7 +1692,8 @@ csRef<iEngine> engine = csQueryRegistry<iEngine> (psserver->GetObjectReg()); csRef<iSectorList> sectorList = engine->GetSectors(); iRegionList* regionList = engine->GetRegions(); - for (int i = 0; i < sectorList->GetCount(); i++){ + for (int i = 0; i < sectorList->GetCount(); i++) + { iSector * sector = sectorList->Get(i); csString sectorName = sector->QueryObject()->GetName(); psSectorInfo * si = CacheManager::GetSingleton().GetSectorInfoByName(sectorName); Modified: personal/Xordan/src/server/entitymanager.cpp =================================================================== --- personal/Xordan/src/server/entitymanager.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/server/entitymanager.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -48,7 +48,6 @@ #include <propclass/camera.h> #include <propclass/gravity.h> #include <propclass/timer.h> -#include <propclass/region.h> #include <propclass/input.h> #include <propclass/linmove.h> Modified: personal/Xordan/src/server/gem.cpp =================================================================== --- personal/Xordan/src/server/gem.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/server/gem.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -56,7 +56,6 @@ #include <propclass/camera.h> #include <propclass/gravity.h> #include <propclass/timer.h> -#include <propclass/region.h> #include <propclass/input.h> #include <propclass/linmove.h> #include <propclass/colldet.h> Modified: personal/Xordan/src/server/psproxlist.cpp =================================================================== --- personal/Xordan/src/server/psproxlist.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/server/psproxlist.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -34,7 +34,6 @@ #include <cstool/collider.h> #include <iengine/movable.h> #include <iengine/engine.h> -#include <iengine/region.h> #include <ivaria/collider.h> #include <physicallayer/entity.h> Modified: personal/Xordan/src/server/psserverdr.cpp =================================================================== --- personal/Xordan/src/server/psserverdr.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/server/psserverdr.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -23,7 +23,6 @@ #include <iutil/databuff.h> #include <iengine/movable.h> #include <iengine/mesh.h> -#include <iengine/region.h> #include <iutil/object.h> #include <propclass/linmove.h> Modified: personal/Xordan/src/server/usermanager.cpp =================================================================== --- personal/Xordan/src/server/usermanager.cpp 2008-01-20 21:37:48 UTC (rev 681) +++ personal/Xordan/src/server/usermanager.cpp 2008-01-21 05:56:30 UTC (rev 682) @@ -29,7 +29,6 @@ #include <iengine/movable.h> #include <iengine/sector.h> #include <iutil/object.h> -#include <iengine/region.h> //============================================================================= // Project Includes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-02-05 22:55:29
|
Revision: 761 http://planeshift.svn.sourceforge.net/planeshift/?rev=761&view=rev Author: mgist Date: 2008-02-05 14:55:34 -0800 (Tue, 05 Feb 2008) Log Message: ----------- - Merged trunk to my branch. Modified Paths: -------------- personal/Xordan/configure.ac personal/Xordan/data/effects/misc/label.eff personal/Xordan/data/gui/actionlocation.xml personal/Xordan/data/gui/birth.xml personal/Xordan/data/gui/bookwriting.xml personal/Xordan/data/gui/buddy.xml personal/Xordan/data/gui/charcreate.xml personal/Xordan/data/gui/charpick.xml personal/Xordan/data/gui/chat.xml personal/Xordan/data/gui/childhood.xml personal/Xordan/data/gui/configcamera.xml personal/Xordan/data/gui/configchat.xml personal/Xordan/data/gui/configchatfilter.xml personal/Xordan/data/gui/configchattabs.xml personal/Xordan/data/gui/configdetails.xml personal/Xordan/data/gui/configentityinter.xml personal/Xordan/data/gui/configentitylabels.xml personal/Xordan/data/gui/configkeys.xml personal/Xordan/data/gui/configmouse.xml personal/Xordan/data/gui/configpvp.xml personal/Xordan/data/gui/configsound.xml personal/Xordan/data/gui/configwindow.xml personal/Xordan/data/gui/containerdesc.xml personal/Xordan/data/gui/craft.xml personal/Xordan/data/gui/creditswindow.xml personal/Xordan/data/gui/detailwindow.xml personal/Xordan/data/gui/exchange.xml personal/Xordan/data/gui/fingering.xml personal/Xordan/data/gui/glyph.xml personal/Xordan/data/gui/gmguiwindow.xml personal/Xordan/data/gui/gmspawn.xml personal/Xordan/data/gui/guildwindow.xml personal/Xordan/data/gui/helpwindow.xml personal/Xordan/data/gui/illumination.xml personal/Xordan/data/gui/infowindow.xml personal/Xordan/data/gui/itemdesc.xml personal/Xordan/data/gui/lifeevents.xml personal/Xordan/data/gui/loadwindow.xml personal/Xordan/data/gui/loginwindow.xml personal/Xordan/data/gui/merchant.xml personal/Xordan/data/gui/ok.xml personal/Xordan/data/gui/parents.xml personal/Xordan/data/gui/paths.xml personal/Xordan/data/gui/petition.xml personal/Xordan/data/gui/petitiongm.xml personal/Xordan/data/gui/petstatwindow.xml personal/Xordan/data/gui/readbook.xml personal/Xordan/data/gui/shortcutwindow.xml personal/Xordan/data/gui/skillwindow.xml personal/Xordan/data/gui/smallinventory.xml personal/Xordan/data/gui/spellwindow.xml personal/Xordan/data/gui/summary.xml personal/Xordan/data/gui/tutorial.xml personal/Xordan/data/gui/widgetconfigwindow.xml personal/Xordan/data/help.xml personal/Xordan/docs/compiling.html personal/Xordan/docs/history.txt personal/Xordan/mk/autoconf/checkbuild.m4 personal/Xordan/mk/autoconf/compiler.m4 personal/Xordan/mk/autoconf/emit.m4 personal/Xordan/mk/autoconf/warnings.m4 personal/Xordan/mk/jam/win32.jam personal/Xordan/src/client/entitylabels.cpp personal/Xordan/src/client/gui/chatwindow.cpp personal/Xordan/src/client/gui/pawsexchangewindow.cpp personal/Xordan/src/client/gui/pawsgmgui.cpp personal/Xordan/src/client/gui/pawsgmgui.h personal/Xordan/src/client/gui/pawsgmspawn.cpp personal/Xordan/src/client/gui/pawsgmspawn.h personal/Xordan/src/client/gui/pawshelp.cpp personal/Xordan/src/client/gui/pawsilluminationwindow.cpp personal/Xordan/src/client/pscelclient.cpp personal/Xordan/src/client/psmovement.cpp personal/Xordan/src/common/effects/pseffectobjlabel.cpp personal/Xordan/src/common/effects/pseffectobjlabel.h personal/Xordan/src/common/effects/pseffectobjsimpmesh.cpp personal/Xordan/src/common/net/messages.cpp personal/Xordan/src/common/net/messages.h personal/Xordan/src/common/paws/pawswidget.cpp personal/Xordan/src/npcclient/networkmgr.cpp personal/Xordan/src/npcclient/npcoperations.cpp personal/Xordan/src/npcclient/npcoperations.h personal/Xordan/src/server/actionmanager.cpp personal/Xordan/src/server/adminmanager.cpp personal/Xordan/src/server/bulkobjects/dictionary.cpp personal/Xordan/src/server/bulkobjects/pscharinventory.cpp personal/Xordan/src/server/bulkobjects/pscharinventory.h personal/Xordan/src/server/bulkobjects/psitem.cpp personal/Xordan/src/server/bulkobjects/psitem.h personal/Xordan/src/server/bulkobjects/psitemstats.cpp personal/Xordan/src/server/bulkobjects/psitemstats.h personal/Xordan/src/server/bulkobjects/psspell.cpp personal/Xordan/src/server/bulkobjects/psspell.h personal/Xordan/src/server/cachemanager.cpp personal/Xordan/src/server/chatmanager.cpp personal/Xordan/src/server/combatmanager.cpp personal/Xordan/src/server/combatmanager.h personal/Xordan/src/server/creationmanager.cpp personal/Xordan/src/server/creationmanager.h personal/Xordan/src/server/database/mysql/action_locations.sql personal/Xordan/src/server/database/mysql/commonstrings.sql personal/Xordan/src/server/database/mysql/item_stats.sql personal/Xordan/src/server/database/mysql/progress_events.sql personal/Xordan/src/server/database/mysql/spell_glyphs.sql personal/Xordan/src/server/database/mysql/spells.sql personal/Xordan/src/server/database/mysql/trade_transformations.sql personal/Xordan/src/server/exchangemanager.cpp personal/Xordan/src/server/gem.cpp personal/Xordan/src/server/gem.h personal/Xordan/src/server/npcmanager.cpp personal/Xordan/src/server/progressionmanager.cpp personal/Xordan/src/server/psserverchar.cpp personal/Xordan/src/server/psserverdr.cpp personal/Xordan/src/server/slotmanager.cpp personal/Xordan/src/server/spawnmanager.cpp personal/Xordan/src/server/spawnmanager.h personal/Xordan/src/server/spellmanager.cpp personal/Xordan/src/server/usermanager.cpp personal/Xordan/src/server/workmanager.cpp personal/Xordan/src/server/workmanager.h Added Paths: ----------- personal/Xordan/data/effects/misc/glyphs_baar_sophia.xml personal/Xordan/mk/autoconf/checkstl.m4 personal/Xordan/mk/autoconf/language.m4 personal/Xordan/mk/autoconf/visibility.m4 Modified: personal/Xordan/configure.ac =================================================================== --- personal/Xordan/configure.ac 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/configure.ac 2008-02-05 22:55:34 UTC (rev 761) @@ -259,151 +259,28 @@ CS_CHECK_OPTIMIZE_FLAGS #------------------------------------------------------------------------------ -# Check if "hidden" visibilty for inline functions is supported. -# -# IMPLEMENTATION NOTES -# -# There is an obscure bug in gcc 3.4.x and 4.0.x where -# -fvisibility-inlines-hidden on AMD64 in combination with -fPIC and -shared -# flags causes the linker to fail with a bogus error stating that the target -# library needs to be built with -fPIC even when it has been built using that -# option. On such installations, if Crystal Space is built with -# -fvisibility-inlines-hidden, then clients liking against Crystal Space -# experience this bogus error. Normally, we would test for this anomaly by -# manipulating a std::basic_string<> in a test program, and avoid -# -fvisibility-inlines-hidden if the test program fails to link, however, -# practical experience has shown that this test is not 100% reliable for all -# such installations. Instead, for simplicity, we disable this flag presently -# for gcc below version 4.1 on AMD64. References: -# -# http://dev.gentoo.org/~kugelfang/pappy-visibility.txt -# http://www.gnu.org/software/gcc/gcc-4.0/changes.html#visibility -# http://www.nedprod.com/programs/gccvisibility.html -# http://bugs.gentoo.org/show_bug.cgi?id=78720 -# -# Furthermore, there seems to be a bug on MacOS/X with gcc 4.0.x where use of -# -fvisibility-inlines-hidden causes link problems with external clients which -# do not specify this flag. For this reason, we also disable this flag on -# MacOS/X. In particular, clients receive errors of this sort: -# -# /usr/bin/ld: libcrystalspace.a(scf.o) malformed object, illegal -# reference for -dynamic code (reference to a coalesced section -# (__TEXT,__textcoal_nt) from section (__TEXT,__text) relocation -# entry (1)) +# Check how to declare symbol visibility. #------------------------------------------------------------------------------ -CS_CHECK_BUILD_FLAGS([for inline visibility flag], - [cs_cv_prog_cxx_visibility_inlines_hidden], - [CS_CREATE_TUPLE([-fvisibility-inlines-hidden])],[C++]) - -AS_IF([test -n "$cs_cv_prog_cxx_visibility_inlines_hidden"], - [CS_CHECK_PROG_VERSION([g++], [$CXX --version], [4.1], [9.9|.9], - [cs_cv_gxx_version_4_1=yes], - [cs_cv_gxx_version_4_1=no]) - AC_CACHE_CHECK([if $cs_cv_prog_cxx_visibility_inlines_hidden is buggy], - [cs_cv_prog_cxx_visibility_inlines_hidden_buggy], - [AS_IF([test $ac_compiler_gnu = yes], - [AS_IF([test \( $host_cpu = x86_64 -a cs_cv_gxx_version_4_1 = no \) \ - || test x$cs_host_macosx = xyes], - [cs_cv_prog_cxx_visibility_inlines_hidden_buggy=yes], - [cs_cv_prog_cxx_visibility_inlines_hidden_buggy=no])], - [cs_cv_prog_cxx_visibility_inlines_hidden_buggy=no])])], - [cs_cv_prog_cxx_visibility_inlines_hidden_buggy=no]) - -AS_IF([test $cs_cv_prog_cxx_visibility_inlines_hidden_buggy != yes], +CS_VISIBILITY_FLAG_INLINES_HIDDEN( [CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS], - [$cs_cv_prog_cxx_visibility_inlines_hidden], [+])]) + [$cs_prog_cxx_visibility_inlines_hidden], [+])]) +CS_VISIBILITY_FLAG_HIDDEN([C], [], + [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], + [$cs_cv_prog_c_visibility_hidden], [+])]) -#------------------------------------------------------------------------------ -# Check how to set default symbol visibility, and how to override the setting -# in code. -#------------------------------------------------------------------------------ -CS_CHECK_BUILD_FLAGS([for symbol visibility flag], - [cs_cv_prog_cxx_visibility_hidden], - [CS_CREATE_TUPLE([-fvisibility=hidden])], [C++]) +CS_VISIBILITY_FLAG_DEFAULT([C], [], + [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.VISIBILITY_DEFAULT], + [$cs_cv_prog_c_visibility_default])]) -CS_SYMBOL_QUALIFIER([how to declare default visibility], - [cs_cv_prog_cxx_declare_visible_def], - [__attribute__((visibility("default")))], [], [C++]) +CS_VISIBILITY_DECLARE_HIDDEN([C++], [], + [CS_HEADER_PROPERTY([CS_VISIBILITY_HIDDEN], + [$cs_cv_prog_cxx_declare_visibility_hidden])]) -AS_IF([test $cs_cv_prog_cxx_declare_visible_def != no && \ - test -n "$cs_cv_prog_cxx_visibility_hidden"], - [CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS], - [$cs_cv_prog_cxx_visibility_hidden], [+]) - CS_HEADER_PROPERTY([CS_VISIBILITY_DEFAULT], - [$cs_cv_prog_cxx_declare_visible_def])]) +CS_VISIBILITY_DECLARE_DEFAULT([C++], [], + [CS_HEADER_PROPERTY([CS_VISIBILITY_DEFAULT], + [$cs_cv_prog_cxx_declare_visibility_default])]) -#------------------------------------------------------------------------------ -# Check for X-Windows. If the X-Windows implementation is XFree86, then also -# enable the `VideoMode' extension. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_X_CHECK_PREPARE], - [AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([CS_CHECK_HOST]) - - # Explicitly disable X checking on Windows to avoid discovering XFree86 in - # case Cygwin is installed. Doing so allows us to avoid Mesa's OpenGL - # headers during the OpenGL check, and prefer Microsoft's OpenGL headers. - # The Mesa OpenGL headers cause link errors because they do not employ - # __stdcall. - case $host_os in - mingw*|cygwin*) with_x=no ;; - esac - - # Explicitly disable X checking on MacOS/X in case the optional XFree86 is - # installed since we want to avoid an undesirable dependency upon XFree86 - # in the CS executables and plugins. If the user is actually - # cross-building for Darwin on MacOS/X, then the --with-x option will - # override this test (by setting cs_host_macosx to "no"). - AS_IF([test x$cs_host_macosx = xyes], [with_x=no])]) - -CS_X_CHECK_PREPARE -AC_PATH_X -AC_PATH_XTRA - -AS_IF([test "$no_x" != yes], - [# We must be especially careful to instruct CS_EMIT_BUILD_PROPERTY() to - # emit the following properties even if their values are empty. This is - # necessary because of the way that Jam performs "product-wise" variable - # expansion. For example, if X is "x" and Y is undefined, Jam will expand - # "$(X) $(Y)" to "", whereas every other tool in the world will expand it - # to "x ". Since the emitted X11.CFLAGS, X11.LFLAGS, XFREE86VM.CFLAGS, and - # XFREE86VM.LFLAGS properties reference the other variables by name, we - # must ensure that those other variables are defined (even if only with an - # empty string). - CS_EMIT_BUILD_PROPERTY([X11.AVAILABLE], [yes]) - CS_EMIT_BUILD_PROPERTY([X_CFLAGS], [$X_CFLAGS], [], [Y]) - CS_EMIT_BUILD_PROPERTY([X_LIBS], [$X_LIBS], [], [Y]) - CS_EMIT_BUILD_PROPERTY([X_PRE_LIBS], [$X_PRE_LIBS], [], [Y]) - CS_EMIT_BUILD_PROPERTY([X_EXTRA_LIBS], [$X_EXTRA_LIBS], [], [Y]) - CS_EMIT_BUILD_PROPERTY([X11.CFLAGS], [AS_ESCAPE([$(X_CFLAGS)])]) - CS_EMIT_BUILD_PROPERTY([X11.LFLAGS], - [AS_ESCAPE([$(X_PRE_LIBS) $(X_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)])]) - - CS_CHECK_LIB_WITH([Xxf86vm], - [AC_LANG_PROGRAM( - [[#define XK_MISCELLANY 1 - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include <X11/Xatom.h> - #include <X11/extensions/xf86vmode.h>]], - [XF86VidModeLockModeSwitch(0, 0, 0)])], [], [], - [CS_EMIT_BUILD_PROPERTY([XFREE86VM.AVAILABLE], [yes]) - CS_EMIT_BUILD_PROPERTY([XFREE86VM.CFLAGS], [AS_ESCAPE([$(X_CFLAGS)])]) - CS_EMIT_BUILD_PROPERTY([XFREE86VM.LFLAGS], - [AS_ESCAPE([$(X_PRE_LIBS) $(X_LIBS) -lXxf86vm -lXext -lX11 - $(X_EXTRA_LIBS)])])], [], - [$X_CFLAGS], [], [$X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS]) - - CS_CHECK_LIB_WITH([Xaw], - [AC_LANG_PROGRAM( - [[#include <X11/Shell.h> - #include <X11/Xaw/Form.h>]], - [XtVaGetValues(0,0,0,0)])], - [], [], [CS_EMIT_BUILD_RESULT([cs_cv_libXaw], [XAW])], [], - [$X_CFLAGS], [], [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS])]) - - #---------------------------------------------------------------------------- # Check for Crystal Space (CS) #---------------------------------------------------------------------------- Copied: personal/Xordan/data/effects/misc/glyphs_baar_sophia.xml (from rev 760, trunk/data/effects/misc/glyphs_baar_sophia.xml) =================================================================== --- personal/Xordan/data/effects/misc/glyphs_baar_sophia.xml (rev 0) +++ personal/Xordan/data/effects/misc/glyphs_baar_sophia.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -0,0 +1,98 @@ +<glyphs> + <glyph id="032" width="20" height="112" x="720" y="0"></glyph> + <glyph id="033" width="20" height="112" x="10" y="0"></glyph> + <glyph id="034" width="30" height="112" x="41" y="0"></glyph> + <glyph id="035" width="60" height="112" x="77" y="0"></glyph> + <glyph id="036" width="46" height="112" x="144" y="0"></glyph> + <glyph id="037" width="81" height="112" x="198" y="0"></glyph> + <glyph id="038" width="58" height="112" x="288" y="0"></glyph> + <glyph id="039" width="24" height="112" x="346" y="0"></glyph> + <glyph id="040" width="36" height="112" x="374" y="0"></glyph> + <glyph id="041" width="36" height="112" x="451" y="0"></glyph> + <glyph id="042" width="42" height="112" x="458" y="0"></glyph> + <glyph id="043" width="56" height="112" x="503" y="0"></glyph> + <glyph id="044" width="23" height="112" x="560" y="0"></glyph> + <glyph id="045" width="38" height="112" x="591" y="0"></glyph> + <glyph id="046" width="19" height="112" x="658" y="0"></glyph> + <glyph id="047" width="50" height="112" x="713" y="0"></glyph> + <glyph id="048" width="56" height="112" x="1" y="112"></glyph> + <glyph id="049" width="28" height="112" x="64" y="112"></glyph> + <glyph id="050" width="51" height="112" x="103" y="112"></glyph> + <glyph id="051" width="52" height="112" x="163" y="112"></glyph> + <glyph id="052" width="56" height="112" x="223" y="112"></glyph> + <glyph id="053" width="51" height="112" x="285" y="112"></glyph> + <glyph id="054" width="54" height="112" x="345" y="112"></glyph> + <glyph id="055" width="48" height="112" x="404" y="112"></glyph> + <glyph id="056" width="55" height="112" x="456" y="112"></glyph> + <glyph id="057" width="55" height="112" x="517" y="112"></glyph> + <glyph id="058" width="19" height="112" x="583" y="112"></glyph> + <glyph id="059" width="24" height="112" x="610" y="112"></glyph> + <glyph id="060" width="67" height="112" x="641" y="112"></glyph> + <glyph id="061" width="51" height="112" x="713" y="112"></glyph> + <glyph id="062" width="68" height="112" x="767" y="112"></glyph> + <glyph id="063" width="41" height="112" x="837" y="112"></glyph> + <glyph id="064" width="73" height="112" x="4" y="224"></glyph> + <glyph id="065" width="61" height="112" x="85" y="224"></glyph> + <glyph id="066" width="53" height="112" x="155" y="224"></glyph> + <glyph id="067" width="57" height="112" x="216" y="224"></glyph> + <glyph id="068" width="61" height="112" x="282" y="224"></glyph> + <glyph id="069" width="45" height="112" x="354" y="224"></glyph> + <glyph id="070" width="43" height="112" x="409" y="224"></glyph> + <glyph id="071" width="62" height="112" x="457" y="224"></glyph> + <glyph id="072" width="59" height="112" x="531" y="224"></glyph> + <glyph id="073" width="23" height="112" x="601" y="224"></glyph> + <glyph id="074" width="32" height="112" x="632" y="224"></glyph> + <glyph id="075" width="55" height="112" x="677" y="224"></glyph> + <glyph id="076" width="43" height="112" x="741" y="224"></glyph> + <glyph id="077" width="74" height="112" x="791" y="224"></glyph> + <glyph id="078" width="58" height="112" x="879" y="224"></glyph> + <glyph id="079" width="66" height="112" x="948" y="224"></glyph> + <glyph id="080" width="51" height="112" x="5" y="336"></glyph> + <glyph id="081" width="70" height="112" x="64" y="336"></glyph> + <glyph id="082" width="54" height="112" x="142" y="336"></glyph> + <glyph id="083" width="49" height="112" x="203" y="336"></glyph> + <glyph id="084" width="53" height="112" x="257" y="336"></glyph> + <glyph id="085" width="57" height="112" x="318" y="336"></glyph> + <glyph id="086" width="59" height="112" x="383" y="336"></glyph> + <glyph id="087" width="83" height="112" x="448" y="336"></glyph> + <glyph id="088" width="56" height="112" x="536" y="336"></glyph> + <glyph id="089" width="56" height="112" x="597" y="336"></glyph> + <glyph id="090" width="54" height="112" x="655" y="336"></glyph> + <glyph id="091" width="27" height="112" x="718" y="336"></glyph> + <glyph id="092" width="48" height="112" x="751" y="336"></glyph> + <glyph id="093" width="28" height="112" x="800" y="336"></glyph> + <glyph id="094" width="45" height="112" x="841" y="336"></glyph> + <glyph id="095" width="53" height="112" x="895" y="336"></glyph> + <glyph id="096" width="40" height="112" x="13" y="448"></glyph> + <glyph id="097" width="49" height="112" x="43" y="448"></glyph> + <glyph id="098" width="50" height="112" x="102" y="448"></glyph> + <glyph id="099" width="44" height="112" x="158" y="448"></glyph> + <glyph id="100" width="51" height="112" x="206" y="448"></glyph> + <glyph id="101" width="49" height="112" x="266" y="448"></glyph> + <glyph id="102" width="35" height="112" x="320" y="448"></glyph> + <glyph id="103" width="49" height="112" x="356" y="448"></glyph> + <glyph id="104" width="49" height="112" x="416" y="448"></glyph> + <glyph id="105" width="22" height="112" x="476" y="448"></glyph> + <glyph id="106" width="29" height="112" x="499" y="448"></glyph> + <glyph id="107" width="47" height="112" x="536" y="448"></glyph> + <glyph id="108" width="18" height="112" x="590" y="448"></glyph> + <glyph id="109" width="76" height="112" x="618" y="448"></glyph> + <glyph id="110" width="48" height="112" x="705" y="448"></glyph> + <glyph id="111" width="52" height="112" x="762" y="448"></glyph> + <glyph id="112" width="51" height="112" x="3" y="560"></glyph> + <glyph id="113" width="53" height="112" x="59" y="560"></glyph> + <glyph id="114" width="37" height="112" x="121" y="560"></glyph> + <glyph id="115" width="43" height="112" x="158" y="560"></glyph> + <glyph id="116" width="34" height="112" x="206" y="560"></glyph> + <glyph id="117" width="48" height="112" x="247" y="560"></glyph> + <glyph id="118" width="48" height="112" x="302" y="560"></glyph> + <glyph id="119" width="74" height="112" x="354" y="560"></glyph> + <glyph id="120" width="47" height="112" x="431" y="560"></glyph> + <glyph id="121" width="49" height="112" x="483" y="560"></glyph> + <glyph id="122" width="44" height="112" x="534" y="560"></glyph> + <glyph id="123" width="31" height="112" x="583" y="560"></glyph> + <glyph id="124" width="15" height="112" x="624" y="560"></glyph> + <glyph id="125" width="31" height="112" x="648" y="560"></glyph> + <glyph id="126" width="49" height="112" x="692" y="560"></glyph> + <glyph id="127" width="0" height="112" x="0" y="0"></glyph> +</glyphs> Modified: personal/Xordan/data/effects/misc/label.eff =================================================================== --- personal/Xordan/data/effects/misc/label.eff 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/effects/misc/label.eff 2008-02-05 22:55:34 UTC (rev 761) @@ -2,8 +2,8 @@ <library> <textures> <texture name="labelfonttable"> - <file>/this/art/effects/character_set_myriad.dds</file> - <alpha><binary/></alpha> + <file>/this/art/effects/character_set_baar_sophia.dds</file> + <alpha><binary /></alpha> </texture> </textures> <materials> @@ -16,8 +16,8 @@ <anchor type="basic" name="pos"> <dir>none</dir> </anchor> - <obj type="label" name="label" material="mat_labelfonttable" - sizefile="/this/data/effects/misc/labelfontglyphs.xml"> + <obj type="label" name="label" labelwidth="2.0" material="mat_labelfonttable" + sizefile="/this/data/effects/misc/glyphs_baar_sophia.xml"> <mixmode>alpha</mixmode> <attach>pos</attach> <death>none</death> Modified: personal/Xordan/data/gui/actionlocation.xml =================================================================== --- personal/Xordan/data/gui/actionlocation.xml 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/gui/actionlocation.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -9,7 +9,7 @@ <widget name="Name" factory="pawsTextBox" > <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="14" /> - <frame x="50" y="20" width="140" height="25" border="no"/> + <frame x="50" y="20" width="300" height="25" border="no"/> </widget> <!-- Description --> Modified: personal/Xordan/data/gui/birth.xml =================================================================== --- personal/Xordan/data/gui/birth.xml 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/gui/birth.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -3,45 +3,45 @@ <widget name="CharBirth" factory="pawsCharBirth" visible="no" movable="no" resizable="no" resizetoscreen="yes" > <frame x="0" y="0" width="800" height="600" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="15" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="15" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <bgimage resource="Charbirth Background" /> <!-- Title --> <widget name="label_birth" factory="pawsTextBox"> <frame x="230" y="10" width="350" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="26" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="26" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="BIRTH" horizAdjust="CENTRE" /> </widget> <!-- CP --> <widget name="CP" factory="pawsTextBox"> <frame x="695" y="133" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="15" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="14" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="CP: 0" horizAdjust="CENTRE" /> </widget> <!-- Randomize button --> <widget name="randomize" factory="pawsButton"> <frame x="693" y="210" width="75" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="12" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <label text="Randomize"/> </widget> <widget name="label" factory="pawsTextBox"> <frame x="210" y="95" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="16" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="16" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Day:" horizAdjust="CENTRE" /> </widget> <!-- Date of birth --> <widget name="day" factory="pawsComboBox"> <frame x="242" y="116" width="59" height="35" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <listbox rows="6" height="20" text="Day" alpha="100"/> </widget> <widget name="label" factory="pawsTextBox"> <frame x="350" y="95" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="16" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Month:" horizAdjust="CENTRE" /> </widget> @@ -53,13 +53,13 @@ <widget name="label" factory="pawsTextBox"> <frame x="475" y="95" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="16" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Year:" horizAdjust="CENTRE" /> </widget> <widget name="year" factory="pawsTextBox"> <frame x="496" y="118" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="13" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="750" horizAdjust="CENTRE" /> </widget> @@ -69,20 +69,20 @@ <widget name="zodiac" factory="pawsTextBox"> <frame x="270" y="222" width="210" height="25" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="18" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="18" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string=""/> </widget> <widget name="zodiac_description" factory="pawsMultiLineTextBox"> <frame x="275" y="242" width="400" height="100" border="no"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="-1" g="-1" b="-1" size="11" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="11" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Choose a month of birth"/> </widget> <!-- Siblings --> <widget name="text" factory="pawsTextBox" > <frame x="202" y="354" width="80" height="30" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="18" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="18" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Siblings" /> </widget> @@ -114,20 +114,20 @@ <widget name="sibling_desc" factory="pawsMultiLineTextBox" > <frame x="395" y="377" width="260" height="115" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="16" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="11" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Select your sibling count" /> </widget> <!-- Navigation Buttons --> <widget name="BackButton" factory="pawsButton" id="6000"> <frame x="30" y="503" width="80" height="50" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <label text="Prev"/> </widget> <widget name="NextButton" factory="pawsButton" id="5000"> <frame x="699" y="516" width="80" height="55" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <label text="Next"/> </widget> Modified: personal/Xordan/data/gui/bookwriting.xml =================================================================== --- personal/Xordan/data/gui/bookwriting.xml 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/gui/bookwriting.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -15,12 +15,14 @@ </widget> <widget name="save" factory="pawsButton" id="103" style="button" > - <frame x="106" y="400" width="50"/> + <frame x="106" y="400" width="50" height="30"/> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="12"/> <label text="OK"/> </widget> <widget name="cancel" factory="pawsButton" id="101" style="button" > - <frame x="290" y="400" width="50"/> + <frame x="290" y="400" width="70" height="30"/> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="12"/> <label text="Cancel"/> </widget> Modified: personal/Xordan/data/gui/buddy.xml =================================================================== --- personal/Xordan/data/gui/buddy.xml 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/gui/buddy.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -1,11 +1,11 @@ <widget_description> <widget name="BuddyWindow" factory="pawsBuddyWindow" - visible="no" savepositions="yes" movable="yes" configurable="yes" - resizable="yes"> + visible="no" savepositions="yes" movable="yes" keepaspect="no" configurable="yes" resizable="yes"> <frame x="0" y="100" width="170" height="290" border="yes" /> - <minframe width="120" height="160" /> + <minframe width="165" height="230" /> + <maxframe width="355" height="860" /> <title resource="Blue Title" text="Buddy List" align="left" close_button="yes" /> <bgimage resource="Buddy Background" alpha="128" /> @@ -16,14 +16,14 @@ <columns height="16"> <column width="250" > <widget name="Name" factory="pawsTextBox"> - <font name="/planeshift/data/ttf/LiberationMono-Regular.ttf" size="10"/> + <font name="/planeshift/data/ttf/LiberationMono-Regular.ttf" size="10" scalefont="no" /> </widget> </column> </columns> <attachpoints> - <attach point="ATTACH_RIGHT" /> + <attach point="PROPORTIONAL_RIGHT" /> <attach point="PROPORTIONAL_TOP" /> - <attach point="ATTACH_LEFT" /> + <attach point="PROPORTIONAL_LEFT" /> <attach point="PROPORTIONAL_BOTTOM" /> </attachpoints> </widget> @@ -59,7 +59,7 @@ <buttonup resource="Standard Button" /> <buttondown resource="Standard Button" /> <attachpoints> - <attach point="ATTACH_RIGHT" /> + <attach point="PROPORTIONAL_RIGHT" /> <attach point="PROPORTIONAL_LEFT" /> <attach point="PROPORTIONAL_TOP" /> <attach point="ATTACH_BOTTOM" /> Modified: personal/Xordan/data/gui/charcreate.xml =================================================================== --- personal/Xordan/data/gui/charcreate.xml 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/gui/charcreate.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -4,13 +4,13 @@ visible="no" movable="no" resizable="no" resizetoscreen="yes" > <frame x="0" y="0" width="800" height="600" border="no" /> <bgimage resource="Charmain Background" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="15" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" /> <!-- Title --> <widget name="label_charcreate" factory="pawsTextBox"> <frame x="175" y="10" width="450" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="26" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="26" resizetoscreen="yes" /> <text string="CHARACTER CREATION" horizAdjust="CENTRE" /> </widget> @@ -18,7 +18,7 @@ <!-- Gender Label --> <widget name="label_gender" factory="pawsTextBox"> <frame x="370" y="53" width="70" height="20" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="17" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="17" resizetoscreen="yes" /> <text string="Gender:" /> </widget> @@ -42,7 +42,7 @@ <!-- Race selection --> <widget name="RaceBox" factory="pawsRadioButtonGroup"> <frame x ="50" y="116" width="200" height="340" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="15" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <radio on="radioon2" off="radiooff2"/> <widget name="race3" factory="pawsRadioButton" id="3"> @@ -120,13 +120,13 @@ <!-- Name entry --> <widget name="charname" factory="pawsTextBox"> <frame x="518" y="156" width="180" height="30"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="17" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="17" resizetoscreen="yes" /> <text string="Character Name:" /> </widget> <widget name="charhelp" factory="pawsButton" id = "900" tooltip="Requirements"> <frame x="702" y="110" width="50" height="80"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="60" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="60" resizetoscreen="yes" /> <label text="?" /> </widget> @@ -136,8 +136,8 @@ <widget name="randomNameLabel" factory="pawsTextBox"> <frame x="717" y="239" width="70" height="32"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="12" shadow="yes" resizetoscreen="yes" /> - <text string="<- Random"/> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="12" resizetoscreen="yes" /> + <text string="Random"/> </widget> <widget name="randomName" factory="pawsButton" tooltip="Random name"> <frame x="689" y="234" width="21" height="21"/> @@ -148,14 +148,14 @@ <frame x="540" y="240" width="40" height="25"/> <buttonup resource="Left Arrow"/> <buttondown resource="Left Arrow"/> - <text string="<" position="right"/> + <text string="" position="right"/> </widget> <widget name="Custom Choice Set 1 >" factory="pawsButton" > <frame x="575" y="240" width="40" height="25"/> <buttonup resource="Right Arrow"/> <buttondown resource="Right Arrow"/> - <text string=">" position="right"/> + <text string="" position="right"/> </widget> <widget name="Face" factory="pawsTextBox"> @@ -247,19 +247,19 @@ <!-- Navigation Buttons --> <widget name="BackButton" factory="pawsButton" id="1000"> <frame x="30" y="503" width="80" height="50" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> <label text="Prev"/> </widget> <widget name="QuickButton" factory="pawsButton" id="2000"> <frame x="355" y="560" width="100" height="40" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> <label text="Quick"/> </widget> <widget name="NextButton" factory="pawsButton" id="3000"> <frame x="665" y="495" width="120" height="55" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> <label text="Custom"/> </widget> Modified: personal/Xordan/data/gui/charpick.xml =================================================================== --- personal/Xordan/data/gui/charpick.xml 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/gui/charpick.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -2,7 +2,7 @@ <widget name="CharPickerWindow" factory="pawsCharacterPickerWindow" visible="no" movable="no" resizable="no" resizetoscreen="yes" scalablefont="yes" > <frame x="0" y="0" width="800" height="600" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="14" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="14" resizetoscreen="yes" /> <bgimage resource="Charpick Background"/> <form> @@ -14,14 +14,14 @@ <!-- Title --> <widget name="label_login" factory="pawsTextBox"> <frame x="200" y="10" width="400" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="26" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="26" resizetoscreen="yes" /> <text string="CHARACTER SELECT" horizAdjust="CENTRE"/> </widget> <!-- Server wait --> <widget name="wait_label" factory="pawsTextBox"> <frame x="0" y="55" width="800" height="30" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="16" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="16" resizetoscreen="yes" /> <text string="Waiting on server data.." horizAdjust="CENTRE"/> </widget> @@ -33,7 +33,7 @@ <widget name="SelectCharacter0" factory="pawsButton" id="0" visible="no"> <frame x="550" y="210" width="140" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" b="255" g="255" size="13" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <label text="New Character"/> </widget> @@ -44,7 +44,7 @@ <widget name="SelectCharacter1" factory="pawsButton" id="1" visible="no"> <frame x="550" y="265" width="140" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" b="255" g="255" size="13" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <label text="New Character"/> </widget> @@ -55,7 +55,7 @@ <widget name="SelectCharacter2" factory="pawsButton" id="2" visible="no"> <frame x="550" y="320" width="140" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" b="255" g="255" size="13" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <label text="New Character"/> </widget> @@ -66,7 +66,7 @@ <widget name="SelectCharacter3" factory="pawsButton" id="3" visible="no"> <frame x="550" y="375" width="140" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" b="255" g="255" size="13" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <label text="New Character"/> </widget> @@ -74,34 +74,34 @@ <frame x="290" y="120" width="223" height="398" border="no"/> <mask resource="charborder"/> <map file="/planeshift/world/podium" sector="room"/> - <distance value="4"/> + <distance value="3.5"/> </widget> <!-- Join Game Button --> <widget name="login" factory="pawsButton" id="100" visible="yes" key="L"> <frame x="550" y="440" width="135" height="50" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="20" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="20" resizetoscreen="yes" /> <label text="Join"/> </widget> <!-- Delete Char Button --> <widget name="delete" factory="pawsButton" id="150" visible="yes"> <frame x="336" y="515" width="135" height="50" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" b="255" g="255" size="14" sr="0" sg="0" sb="0" shaddow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="14" resizetoscreen="yes" /> <label text="Delete"/> </widget> <!-- Back Button --> <widget name="back" factory="pawsButton" id="200" key="B"> <frame x="80" y="290" width="120" height="50" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" b="255" g="255" size="22" sr="0" sg="0" sb="0" shaddow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="22" resizetoscreen="yes" /> <label text="Back"/> </widget> <!-- Navigation Buttons --> <widget name="quit" factory="pawsButton" id="250" key="Q"> <frame x="20" y="484" width="100" height="90" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> <label text="Quit"/> </widget> Modified: personal/Xordan/data/gui/chat.xml =================================================================== --- personal/Xordan/data/gui/chat.xml 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/gui/chat.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -1,9 +1,9 @@ <widget_description> <widget name="ChatWindow" factory="pawsChatWindow" visible="yes" savepositions="yes" movable="yes" resizable="yes" keepaspect="no" configurable="yes"> <!-- ContextMenu="data/gui/chatmenu.xml" disabled until its finished --> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="-1" g="-1" b="-1" size="8" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" /> <frame x="360" y="300" width="330" height="122" border="no" /> - <minframe width="330" height="120" /> + <minframe width="475" height="190" /> <bgimage resource="Chat Background" alpha="128" /> <title resource="Nanaki Title Bar" text="Communication" align="left" close_button="yes"/> <childborders> @@ -25,6 +25,7 @@ </widget> <widget name="Chat Tabs" factory="pawsTabWindow"> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="10" scalefont="no" /> <frame x="6" y="2" width="330" height="100" border="no" /> <attachpoints> <attach point="ATTACH_RIGHT" /> @@ -46,7 +47,7 @@ <buttonspecial resource="Chat Tab Button Special" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> - <attach point="ATTACH_LEFT" /> + <attach point="PROPORTIONAL_LEFT" /> <attach point="ATTACH_TOP" /> <attach point="PROPORTIONAL_BOTTOM" /> </attachpoints> Modified: personal/Xordan/data/gui/childhood.xml =================================================================== --- personal/Xordan/data/gui/childhood.xml 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/gui/childhood.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -3,35 +3,35 @@ <widget name="Childhood" factory="pawsChildhoodWindow" visible="no" movable="no" resizable="no" resizetoscreen="yes" > <frame x="0" y="0" width="800" height="600" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="15" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <bgimage resource="Childhood Background" /> <!-- Title --> <widget name="label_childhood" factory="pawsTextBox"> <frame x="230" y="10" width="350" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="26" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="26" resizetoscreen="yes" /> <text string="CHILDHOOD" horizAdjust="CENTRE" /> </widget> <!-- CP --> <widget name="CP" factory="pawsTextBox"> <frame x="695" y="133" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="15" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <text string="CP: 0" horizAdjust="CENTRE" /> </widget> <!-- Birth Event --> <widget name="text" factory="pawsTextBox" > <frame x="204" y="122" width="110" height="30" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="15" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <text string="Birth Event:" horizAdjust="CENTRE" /> </widget> <widget name="bevent" factory="pawsListBox" id="1" > <frame x="180" y="138" width="162" height="96" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="12" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <scrollbar arrowup="Up Arrow" arrowdown="Down Arrow" arrowsize="8" width="15" border="no"/> - <columns height="19"> + <columns height="20"> <column width="148" > <widget name="" factory="pawsTextBox"></widget> </column> @@ -40,22 +40,22 @@ <widget name="bdesc" factory="pawsMultiLineTextBox" > <frame x="380" y="135" width="290" height="100" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="16" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> <text string="Select event that happend on your birthday" /> </widget> <!-- For Childhood activity --> <widget name="text" factory="pawsTextBox" > <frame x="204" y="244" width="110" height="30" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="15" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <text string="Activity:" horizAdjust="CENTRE" /> </widget> <widget name="activity" factory="pawsListBox" id="2" > <frame x="181" y="263" width="165" height="91" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="10" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <scrollbar arrowup="Up Arrow" arrowdown="Down Arrow" arrowsize="8" width="15" border="no"/> - <columns height="15"> + <columns height="20"> <column width="151" > <widget name="" factory="pawsTextBox"></widget> </column> @@ -63,22 +63,22 @@ </widget> <widget name="adesc" factory="pawsMultiLineTextBox" > <frame x="380" y="259" width="290" height="100" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="16" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> <text string="Select your childhood game" /> </widget> <!-- For house --> <widget name="text" factory="pawsTextBox" > <frame x="204" y="373" width="110" height="30" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="15" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <text string="House:" horizAdjust="CENTRE" /> </widget> <widget name="house" factory="pawsListBox" id="3"> <frame x="182" y="392" width="167" height="91" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="10" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <scrollbar arrowup="Up Arrow" arrowdown="Down Arrow" arrowsize="8" width="15" border="no"/> - <columns height="15"> + <columns height="20"> <column width="153" > <widget name="" factory="pawsTextBox"></widget> </column> @@ -87,27 +87,27 @@ <widget name="hdesc" factory="pawsMultiLineTextBox" > <frame x="380" y="388" width="290" height="100" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="-1" g="-1" b="-1" size="16" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> <text string="Select your childhood home" /> </widget> <!-- Randomize button --> <widget name="randomize" factory="pawsButton"> <frame x="693" y="210" width="75" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <label text="Randomize"/> </widget> <!-- Navigation Buttons --> <widget name="BackButton" factory="pawsButton" id="6000"> <frame x="30" y="503" width="80" height="50" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> <label text="Prev"/> </widget> <widget name="NextButton" factory="pawsButton" id="5000"> <frame x="699" y="516" width="80" height="55" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> <label text="Next"/> </widget> Modified: personal/Xordan/data/gui/configcamera.xml =================================================================== --- personal/Xordan/data/gui/configcamera.xml 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/gui/configcamera.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -4,6 +4,8 @@ visible="yes" savepositions="no" movable="yes" resizable="no"> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + <widget factory="pawsSeqTreeNode"> <widget factory="pawsWidgetTreeNode"> <nodewidget> Modified: personal/Xordan/data/gui/configchat.xml =================================================================== --- personal/Xordan/data/gui/configchat.xml 2008-02-05 22:40:55 UTC (rev 760) +++ personal/Xordan/data/gui/configchat.xml 2008-02-05 22:55:34 UTC (rev 761) @@ -2,9 +2,10 @@ <widget name="ConfigChatTree" factory="pawsConfigChat" visible="no" savepositions="no" movable="no" resizable="no" > - + <frame x="225" y="10" width="400" height="300" border="no" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> <widget name="loosefocus" factory="pawsCheckBox"> - <frame x="10" y="10" width="350" height="20" /> + <frame x="10" y="10" width="350" height="20"/> <text string="Lose focus when sending message" /> </widget> @@ -99,47 +100,47 @@ <widget name="helptextb" factory="pawsEditTextBox"><frame border="yes" x="220" y="230" width="30" height="20" /></widget> <widget name="logAllChat" factory="pawsCheckBox"> - <frame x="10" y="250" width="160" height="20" /> + <frame x="10" y="250" width="180" height="20" /> <text string="Log the chat messages" /> </widget> <widget name="logSystemChat" factory="pawsCheckBox"> - <frame x="170" y="250" width="160" height="20" /> + <frame x="200" y="250" width="200" height="20" /> <text string="Log the system messages" /> </widget> <widget name="badwordsincoming" factory="pawsCheckBox"> - <frame x="10" y="270" width="160" height="20" /> + <frame x="10" y="270" width="180" height="20" /> <text string="Filter incoming bad words" /> </widget> <widget name="badwordsoutgoing" factory="pawsCheckBox"> - <frame x="170" y="270" width="160" height="20" /> + <frame x="200" y="270" width="180" height="20" /> <text string="Filter outgoing bad words" /> </widget> <widget name="selecttabstyle" factory="pawsRadioButtonGroup"> <frame x="255" y="30" width="150" height="120" /> <widget factory="pawsTextBox" name=""> - <frame x="0" y="0" width="180" height="20" border="no" /> + <frame x="10" y="0" width... [truncated message content] |
From: <mg...@us...> - 2008-02-22 17:40:25
|
Revision: 968 http://planeshift.svn.sourceforge.net/planeshift/?rev=968&view=rev Author: mgist Date: 2008-02-22 09:40:31 -0800 (Fri, 22 Feb 2008) Log Message: ----------- - Added support for loading colldet from reduced maps. - Cleaned up psregion some more. Modified Paths: -------------- personal/Xordan/docs/history.txt personal/Xordan/src/common/engine/psregion.cpp personal/Xordan/src/common/engine/psregion.h Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2008-02-22 13:39:43 UTC (rev 967) +++ personal/Xordan/docs/history.txt 2008-02-22 17:40:31 UTC (rev 968) @@ -1,3 +1,7 @@ +*** 2008-02-22 by Mike Gist +- Added support for loading colldet from reduced maps. +- Cleaned up psregion some more. + *** 2008-02-05 by Roland Schulz - patch by Vornne to substitute appropriate GM_* defines for numerical constants - fix for FS#1057 and FS#1058 by peeg Modified: personal/Xordan/src/common/engine/psregion.cpp =================================================================== --- personal/Xordan/src/common/engine/psregion.cpp 2008-02-22 13:39:43 UTC (rev 967) +++ personal/Xordan/src/common/engine/psregion.cpp 2008-02-22 17:40:31 UTC (rev 968) @@ -45,10 +45,16 @@ object_reg = obj_reg; worlddir.Format("/planeshift/world/%s", file); + colldetworlddir.Format("/planeshift/world/colldet_%s", file); worldfile = "world"; regionName = file; loaded = false; Engine = csQueryRegistry<iEngine> (object_reg); + + vfs = csQueryRegistry<iVFS>(object_reg); + xml = csQueryRegistry<iDocumentSystem>(object_reg); + loader = csQueryRegistry<iLoader>(object_reg); + } psRegion::~psRegion() @@ -63,31 +69,24 @@ if (loaded) return true; - bool using3D; - // Find out if we are ever going to render 3D csRef<iGraphics3D> g3d = csQueryRegistry<iGraphics3D> (object_reg); csRef<iFactory> factory = scfQueryInterface<iFactory> (g3d); - const char* g3Dname = factory->QueryClassID(); - using3D = (strcmp("crystalspace.graphics3d.null", g3Dname)? true: false); + bool using3D = (strcmp("crystalspace.graphics3d.null", factory->QueryClassID())? true: false); csString target; - target.Format("%s/world", worlddir.GetData()); - csRef<iVFS> vfs = csQueryRegistry<iVFS > ( object_reg); + target.Format("%s/%s", worlddir.GetData(), worldfile.GetData()); - csRef<iDocumentSystem> xml ( - csQueryRegistry<iDocumentSystem> (object_reg)); - - csRef<iDocument> doc = xml->CreateDocument(); - - csRef<iDataBuffer> buf (vfs->ReadFile (target.GetData())); + csRef<iDataBuffer> buf = vfs->ReadFile(target.GetData()); if (!buf || !buf->GetSize ()) { Error2("Error loading world file. %s\n", target.GetData()); return false; } + csRef<iDocument> doc = xml->CreateDocument(); + const char* error = doc->Parse( buf ); if( error ) @@ -109,19 +108,15 @@ collection = Engine->CreateCollection(regionName); // Now load the map into the selected region - csRef<iLoader> loader ( csQueryRegistry<iLoader> (object_reg)); - CS_ASSERT (loader != NULL); - csRef<iVFS> VFS ( csQueryRegistry<iVFS> (object_reg)); - CS_ASSERT (VFS != NULL); - VFS->ChDir (worlddir); + vfs->ChDir (worlddir); csTicks start = csGetTicks(); Debug2(LOG_LOAD, 0,"Loading map file %s", worlddir.GetData()); - if (!loader->LoadMap(worldNode, CS_LOADER_KEEP_WORLD, collection, CS_LOADER_ACROSS_REGIONS, true, 0, 0, true)) + if(!loader->LoadMap(worldNode, CS_LOADER_KEEP_WORLD, collection, CS_LOADER_ACROSS_REGIONS, true, 0, 0, true, KEEP_USED)) { - Error3("loader->LoadMapFile(%s,%s) failed.",worlddir.GetData(),worldfile.GetData() ); - Error2("Region name was: %s", regionName.GetData() ); + Error3("LoadMap failed: %s, %s.",worlddir.GetData(),worldfile.GetData() ); + Error2("Region name was: %s", regionName.GetData()); return false; } Debug2(LOG_LOAD, 0,"After LoadMapFile, %dms elapsed", csGetTicks()-start); @@ -243,6 +238,46 @@ void psRegion::SetupWorldColliders() { + iCollection* colldetCollection = Engine->CreateCollection("colldetPS"); csRef<iCollideSystem> cdsys = csQueryRegistry<iCollideSystem> (object_reg); - csColliderHelper::InitializeCollisionWrappers(cdsys, Engine, collection); + + csString target; + target.Format("%s/%s", colldetworlddir.GetData(), worldfile.GetData()); + + csRef<iDataBuffer> buf = vfs->ReadFile(target.GetData()); + if (!buf || !buf->GetSize()) + { + csColliderHelper::InitializeCollisionWrappers(cdsys, Engine, collection); + } + else + { + const char* error = doc->Parse(buf); + if(error) + { + Error3("Error %s while loading colldet world file: %s.\nFalling back to normal colldet, please report this error.\n", error, target.GetData()); + csColliderHelper::InitializeCollisionWrappers(cdsys, Engine, collection); + } + else + { + + csRef<iDocumentNode> worldNode = doc->GetRoot()->GetNode("world"); + + iCollection* colldetCollection = Engine->CreateCollection("colldetPS"); + + vfs->ChDir(colldetworlddir); + + if(!loader->LoadMap(worldNode, CS_LOADER_KEEP_WORLD, colldetCollection) + { + Error3("LoadMap failed: %s, %s.\n", colldetworlddir.GetData(), worldfile.GetData() ); + Error2("Region name was: %s\nFalling back to normal colldet, please report this error.\n", regionName.GetData()); + csColliderHelper::InitializeCollisionWrappers(cdsys, Engine, collection); + } + else + { + csColliderHelper::InitializeCollisionWrappers(cdsys, Engine, colldetCollection); + } + + Engine->RemoveCollection("colldetPS"); + } + } } Modified: personal/Xordan/src/common/engine/psregion.h =================================================================== --- personal/Xordan/src/common/engine/psregion.h 2008-02-22 13:39:43 UTC (rev 967) +++ personal/Xordan/src/common/engine/psregion.h 2008-02-22 17:40:31 UTC (rev 968) @@ -96,10 +96,15 @@ csString regionName; csRef<iEngine> Engine; csString worlddir; + csString colldetworlddir; csString worldfile; bool loaded; bool isNeeded; + csRef<iVFS> vfs; + csRef<iDocumentSystem> xml; + csRef<iLoader> loader; + static void CloneNode(iDocumentNode* from, iDocumentNode* to); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-06-13 20:18:26
|
Revision: 1751 http://planeshift.svn.sourceforge.net/planeshift/?rev=1751&view=rev Author: mgist Date: 2008-06-13 13:18:30 -0700 (Fri, 13 Jun 2008) Log Message: ----------- - Merged r1745:1749 from trunk. Modified Paths: -------------- personal/Xordan/docs/compiling.html personal/Xordan/docs/history.txt personal/Xordan/src/client/gui/pawscharpick.cpp personal/Xordan/src/server/usermanager.cpp Modified: personal/Xordan/docs/compiling.html =================================================================== --- personal/Xordan/docs/compiling.html 2008-06-13 20:13:01 UTC (rev 1750) +++ personal/Xordan/docs/compiling.html 2008-06-13 20:18:30 UTC (rev 1751) @@ -18,7 +18,7 @@ var csWinLibsVersionStab = "1.3_003"; // cs win32 libs version. var csWinLibsVersion = "1.3_003"; // cs win32 libs version. //Update date and author, to be changed everytime and updates occurred - var UpdateDate = "11 June 2008"; //Date when the update occurred + var UpdateDate = "13 June 2008"; //Date when the update occurred var UpdateAuthor = "Caarrie"; //Author of the update --> </script> @@ -328,11 +328,19 @@ Dave Garrett, author of the new compiling guides layout;<br> Andrew Craig, author of the first Linux guides that were available on <a href="http://laanx.fragnetics.com">Laanx website</a>;<br> Platyna, author of the first compiling guide for Slackware distribution.<br> - Mike Gist, author of the static compiling guide. + Mike Gist, author of the static compiling guide.<br> +</div> + <div class="MacOSX"> + This guide gives a very basic description on how to get a working client up and + running on an Intel Mac. It gives instructions on how to get to check out the source code and configure it. At the end there you will have a + PlaneShift client and a PlaneShift updater application, and if you want also the server.<br><br> + <b>Credits</b><br> + Caarrie, Author of the first basic Mac guide with help from the <a href="http://vaalnor.mine.nu/psdoc/?q=node/38">PSDocs</a> guide and Trymm </div> <div class="MacOSX"> - <p>We have no Mac guide at this time. Check the Linux guide, or refer to <a href="http://vaalnor.mine.nu/psdoc/?q=node/38">PSDocs</a>, a user maintained guide.</p> + <p>Here is a basic Mac guide based on the linux guide, for more specifics refer to <a href="http://vaalnor.mine.nu/psdoc/?q=node/38">PSDocs</a>, a user maintained guide.</p> + <div class="Static">There is no Mac static build guide at this time</div> </div> </p> @@ -381,7 +389,7 @@ <p><i class="command">C:\development\</i></p> </div> <div class="MacOSX"> - <p><i class="command">/home/user/development</i></p> + <p><i class="command">$HOME/development</i></p> </div> <div class="Windows"><div class="MINGW"> @@ -707,6 +715,70 @@ <p>Via portage: <i class="command"># emerge nvidia-cg-toolkit</i></p> </div> </div> +<div class="MacOSX" > +To build on OSX you need to Install Xcode which you can get from <a href="https://connect.apple.com/">here.</a> This guide also recomends you to install fink. You can get fink from <a href="http://fink.sourceforge.net/">here.</a> +Note: Do not use darwinports if you are using fink. It can cause conflicts if +they both have the same package installed. <br /> +Open a terminal window and set the required environment variables for fink by +issuing the following command: +<br /> +<i class="commandBox" ><pre># <code>/sw/bin/pathsetup.sh</code></pre> +</i> +<i class="commandBox" ><pre># <code>source /sw/bin/init.sh</code></pre> +</i> +<br /> +<br /> +Configure fink (Optional) +We are going to configure fink to download and install packages from source only. (no binary packages)<br /> +This step is optional, but has a better success rate for installing the fink +dependencies. +<br /> +<i class="commandBox" ><pre># <code>fink configure</code></pre> +</i> +<br /> +Provided below are the questions and the standard recommended answers for the configuration: +<i class="commandBox" ><pre> +Password: +OK, I'll ask you some questions and update the configuration file in '/sw/etc/fink.conf'. +In what additional directory should Fink look for downloaded tarballs? [] +Which directory should Fink use to build packages? (If you don't know what this means, it is safe to leave it +at its default.) [] + +Should Fink try to download pre-compiled packages from the binary distribution if available? [y/N] n +(1) Quiet (do not show download statistics) +(2) Low (do not show tarballs being expanded) +(3) Medium (will show almost everything) +(4) High (will show everything) + +How verbose should Fink be? [4] 4 + +Proxy/Firewall settings +Enter the URL of the HTTP proxy to use, or 'none' for no proxy. The URL should start with http:// and may +contain username, password, and/or port specifications. Note that this value will be visible to all users on +your computer. +Example, http://username:password@hostname:port +Your proxy: [none] +Enter the URL of the FTP proxy to use, or 'none' for no proxy. The URL should start with http:// and may +contain username, password, and/or port specifications. Note that this value will be visible to all users on +your computer. +Example, http://username:password@hostname:port +Your proxy: [none] +Use passive mode FTP transfers (to get through a firewall)? [Y/n] y + +Mirror selection +All mirrors are set. Do you want to change them? [y/N] n + +Writing updated configuration to '/sw/etc/fink.conf'... +</pre></i> +<br /> + +You need to install Ftjam which you can get from <a href="http://sourceforge.net/project/showfiles.php?group_id=3157">here.</a> You also need to install the following packages from Fink <br /> +<i class="command"> libjpeg freetype freetype-shlibs freetype2 freetype2-dev freetype2-shlibs libogg libvorbis0 libvorbis0-shlibs libmng2 libpng3 autoconf2.5 automake1.9 libtool wget curl</i><br /><br /> + +Since SVN is not always installed you need to make sure it is installed you can get it from <a href="http://metissian.com/projects/macosx/subversion/">here.</a> <br /> + +You also need to install Nvidia's Cg Toolkit from <a href="http://www.nvidia.com/object/cg_toolkit.html"> +here.</a> <p> <h3>Server Databases</h3> <i>Optional section</i> @@ -756,7 +828,7 @@ mv libmysqlclient.a .. </div></p> </div> - </div> + </div></div> <b>WordNet:</b><br> You will also need the WordNet dictionaries. Download and install the <a href="http://wordnet.princeton.edu/obtain/">WordNet binaries</a>, version 2.1. @@ -955,7 +1027,66 @@ </p> </div> <div class="MacOSX"> - No guide yet. Try the Linux version for now. + <h3>Cal3D</h3> + <p>We need to build cal3d from source before we can start on Crystal Space. Cal3d is a library that is used for + handling skeleton systems. This is a very nice system and can allow for fluid transformations between animations. + This needs to be built/installed first because when we configure Crystal Space it has to find the cal3d libraries + so it can know to build the sprcal3d plugin. Cal3D doesn't change much, so just download latest stable or checkout latest from svn:</p> + <p><a href="http://home.gna.org/cal3d/">Cal3D Home</a></p> + <p><i class="command">$HOME/development$ svn co -r CAL3D_SOURCE_REV svn://svn.gna.org/svn/cal3d/trunk/cal3d cal3d</i></p> + + <h3>Crystal Space (CS)</h3> + <p>Crystal Space 3D SDK is the engine that we use for rendering and sound.</p> + <div class="User"> + <p><i class="command">$HOME/development$ svn co -r CS_SOURCE_REV https://crystal.svn.sourceforge.net/svnroot/crystal/CS/branches/release/V1.4 cs</i></p> + </div> + <div class="Developer"> + <p><i class="command">$HOME/development$ svn co -r CS_SOURCE_REV_HEAD https://crystal.svn.sourceforge.net/svnroot/crystal/CS/branches/release/V1.4 cs</i></p> + </div> + + <h3>Crystal Entity Layer (CEL)</h3> + <p>CEL is a layer on top of Crystal Space that is used for entity and behavior control.</p> + <div class="User"> + <p><i class="command">$HOME/development$ svn co -r CEL_SOURCE_REV https://cel.svn.sourceforge.net/svnroot/cel/cel/branches/release/V1.4 cel</i></p> + </div> + <div class="Developer"> + <p><i class="command">$HOME/development$ svn co -r CEL_SOURCE_REV_HEAD https://cel.svn.sourceforge.net/svnroot/cel/cel/branches/release/V1.4 cel</i></p> + </div> + + <h3>PlaneShift</h3> + <p>Lastly, download our source:</p> + <div class="User"> + <p><i class="command">$HOME/development$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/stable planeshift</i></p> + </div> + <div class="Developer"> + <p><i class="command">$HOME/development$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/trunk planeshift</i></p> + </div> +<h3>Updating Sources</h3> + <p>From time to time, newer PlaneShift revisions will require you to upgrade your cal3d, CS, and CEL repositories to a newer revision as well. To update your supporting libraries, always be certain that you use the "-r" option keep from updating to the latest revision:</p> + + If you want to update to a new revision replace REVISON with the number of the revision you want to use: + <p><div class="commandBox"> + $HOME/development/cal3d$ svn update -r REVISION<br> + $HOME/development/cs$ svn update -r REVISION<br> + $HOME/development/cel$ svn update -r REVISION<br> + </div></p> + <p>Unlike the supporting libraries, you will generally want to use the latest PlaneShift source (or the HEAD) rather than an intermediate revision. In this case, you will omit the "-r" option like so: + <div class="commandBox"> + $HOME/development/planeshift$ svn update + </div></p><br> + If, for some reason, you wish to update any of the supporting libraries to the latest version (i.e. the HEAD), you have to remove the sticky date tag. WE DO NOT RECOMMEND THIS as it may break your build: + <p><div class="commandBox"> + $HOME/development/cal3d$ svn update -r HEAD<br> + $HOME/development/cs$ svn update -r HEAD<br> + $HOME/development/cel$ svn update -r HEAD<br> + </div></p> + + +If you update a repository, you will need to recompile that repository and each repository that depends on it. Before doing so, you should do a "jam clean" for each project you want to jam again. So, for example, if you want to rebuild PS you will do: + <p><div class="commandBox"> + $HOME/development/planeshift$ jam clean<br> + $HOME/development/planeshift$ jam -aq + </div></p> </div> <!----------------------------------------------------------------------------------------------------> @@ -1054,9 +1185,9 @@ To do this, use the prefix line that was used for Cal3d above.</p></div> <div class="Linux-Generic" > <div class="User"><i class="commandBox"> - /home/user/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> + /home/user/development/cs$ ./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> <div class="Developer"><i class="commandBox"> - /home/user/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> + /home/user/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> <div class="Normal"><i class="command"> /home/user/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"><i class="command"> @@ -1064,9 +1195,9 @@ </div></div> <div class="Linux-Debian" > <div class="User"><i class="commandBox"> - /home/user/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> + /home/user/development/cs$ ./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> <div class="Developer"><i class="commandBox"> - /home/user/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> + /home/user/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> <div class="Normal"><i class="command"> /home/user/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"><i class="command"> @@ -1121,23 +1252,23 @@ </div></p> We should export the CEL environment variable so applications outside the CEL tree know where to find the .so's. - <p><i class="command">export CEL=/home/user/development/cel</i></p> + <p><i class="commandBox">export CEL=/home/user/development/cel<br />export CSCONFPATH=/home/user/development/cel</i></p> <h3>PlaneShift</h3> <p><i class="commandBox"> /home/user/development/planeshift$ ./autogen.sh<br> - <i class="User"> + <div class="User"> /home/user/development/planeshift$ ./configure --with-cal3d=/home/user/development/cal3d<br> - </i> - <i class="Developer"> + </div> + <div class="Developer"> /home/user/development/planeshift$ ./configure --enable-debug --with-cal3d=/home/user/development/cal3d<br> - </i> - <i class="Normal"> + </div> + <div class="Normal"> /home/user/development/planeshift$ jam -aq client - </i> - <i class="Static"> + </div> + <div class="Static"> /home/user/development/planeshift$ jam -aq client_static - </i> + </div> </i></p> If you also want to build the server, do this as well: <div class="Normal"> @@ -1155,11 +1286,80 @@ /home/user/development/planeshift$ ./psclient -cfgset=PlaneShift.UserConfigPath=/home/user/.PlaneShift2</i> <p> You can also edit this in the psclient.cfg file under the game section uncomment the appropriate line and edit the path.</p> </div> -</div> +</div></div></div> <div class="MacOSX"> - No guide yet. Try the Linux version for now. + <p>If you have a dual core or better processor then you can take advantage of parallel make or jam by adding -j3 after the command. You can replace 3 with the number of jobs you want to run in parallel.</p> + <h3>Cal3D</h3> + <p>Since cal3d is a library in development we probably don't want to 'install' this one as root since there is a good + possibility it will change in the future. Instead we will 'install' it into our working directory. This is done + by using the --prefix option when we configure it.</p> + <div class="linux-Generic" > + Using a text editor open configure.in and remove the line + <p><i class="commandBox"> + AM_USE_UNITTESTCPP</i></p> + <p>Or you can use the following sed command</p> + <p> <i class="commandBox" > + mv configure.in configure-old.in<br /> +sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</i></p> +<p> Then you can build cal3d </p> + <p><i class="commandBox"> + $HOME/development/cal3d$ autoreconf --install --force<br> + $HOME/development/cal3d$ ./configure --prefix=$HOME/development/cal3d<br> + $HOME/development/cal3d$ make<br> + $HOME/development/cal3d$ make install + </i></p></div> + <h3>Crystal Space (CS)</h3> + <p>Now we can build it and use the configure line to tell it where we installed the cal3d libraries. + To do this, use the prefix line that was used for Cal3d above.</p> + <div class="User"><i class="commandBox"> + $HOME/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</i></div> + <div class="Developer"><i class="commandBox"> + $HOME/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</i></div><br> + <div class="Normal"><i class="command"> + $HOME/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> + <div class="Static"> there is no Mac static build guide at this time</div> + We should export the CRYSTAL environment variable so applications outside the Crystal Space + tree know where to find the .so's. + <p><i class="command">export CRYSTAL=$HOME/development/cs</i></p> + + <h3>Crystal Entity Layer (CEL)</h3> + <p><div class="commandBox"> + $HOME/development/cel$ ./configure --without-python<br> + <div class="Normal"> + $HOME/development/cel$ jam -aq libs plugins cel-config + </div> + <div class="Static"> there is no Mac static build guide at this time</div> + </div></p> + +We should export the CEL environment variable so applications outside the CEL tree know where to find the .so's. + <p><i class="command">export CEL=$HOME/development/cel</i></p> + +<h3>PlaneShift</h3> + <p><i class="commandBox"> + $HOME/development/planeshift$ ./autogen.sh<br> + <i class="User"> + $HOME/development/planeshift$ ./configure --with-cal3d=$HOME/development/cal3d<br> + </i> + <i class="Developer"> + $HOME/development/planeshift$ ./configure --enable-debug --with-cal3d=$HOME/development/cal3d<br> + </i> + <i class="Normal"> + $HOME/development/planeshift$ jam -aq client + </i> + <i class="Static"> there is no Mac static build guide at this time</i> +</i></p> + If you also want to build the server, do this as well: + <div class="Normal"> + <p><i class="command">$HOME/development/planeshift$ jam -aq server</i></p> + </div> + If you want to build the extra tools, just do "jam -a". +<p>If your psclient has no skin you are used to seeing launch pssetup after you have copied your art over and select a new skin</p> + <p>If you wish for your psclient to not use the same user files as your other build/install you may run ps with the following command<br /> + <i class="commandBox"> +$HOME/development/planeshift$ ./psclient.app/Contents/MacOS/psclient -cfgset=PlaneShift.UserConfigPath=$HOME/Library/Application Support/PlaneShift2</i> + <p> You can also edit this in the psclient.cfg file under the game section uncomment the appropriate line and edit the path.</p> + </div> </div> -</div> <div class="MINGW"> <div class="Windows"> @@ -1461,7 +1661,9 @@ <div class="Linux"> <p>Simply copy the dictionary files from your /usr/share/wordnet folder to the /home/user/development/planeshift/data/dict folder.</p> </div> - +<div class="MacOSX"> + <p>Simply copy the dictionary files from your /usr/share/wordnet folder to the $HOME/development/planeshift/data/dict folder.</p> +</div> <h3>Create the Database</h3> <p>Check if MySQL is running.<br> <div class="Windows"> Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2008-06-13 20:13:01 UTC (rev 1750) +++ personal/Xordan/docs/history.txt 2008-06-13 20:18:30 UTC (rev 1751) @@ -1,3 +1,10 @@ +*** 2008-06-13 by Mike Gist +- Fixed crash if more than one psAuthApprovedMessage is received. + +*** 2008-06-13 by Steven Patrick +- Adding Mac section to compiling.html by Caarrie +- Fixed FS#685, patch by Kaerli + *** 2008-06-12 by Mike Gist - Made a lot of updater fixes. Modified: personal/Xordan/src/client/gui/pawscharpick.cpp =================================================================== --- personal/Xordan/src/client/gui/pawscharpick.cpp 2008-06-13 20:13:01 UTC (rev 1750) +++ personal/Xordan/src/client/gui/pawscharpick.cpp 2008-06-13 20:18:30 UTC (rev 1751) @@ -106,6 +106,9 @@ // // character name and the factory of the mesh. case MSGTYPE_AUTHAPPROVED: { + if(charactersFound != 0) + return; + psAuthApprovedMessage msg(me); for (int i=0; i < msg.msgNumOfChars; i++) @@ -133,7 +136,7 @@ models[charactersFound].race = race; models[charactersFound].traits = traits; models[charactersFound].equipment = equipment; - charactersFound++; + charactersFound++; SelectCharacter(0,FindWidget("SelectCharacter0")); } Modified: personal/Xordan/src/server/usermanager.cpp =================================================================== --- personal/Xordan/src/server/usermanager.cpp 2008-06-13 20:13:01 UTC (rev 1750) +++ personal/Xordan/src/server/usermanager.cpp 2008-06-13 20:18:30 UTC (rev 1751) @@ -510,6 +510,13 @@ return s; } +const enum PSITEMSTATS_STAT skilltostat[6] = {PSITEMSTATS_STAT_AGILITY, + PSITEMSTATS_STAT_CHARISMA, + PSITEMSTATS_STAT_ENDURANCE, + PSITEMSTATS_STAT_INTELLIGENCE, + PSITEMSTATS_STAT_STRENGTH, + PSITEMSTATS_STAT_WILL}; + void UserManager::SendCharacterDescription(Client * client, psCharacter * charData, bool full, bool simple, const csString & requestor) { StatSet* playerAttr = client->GetCharacterData()->GetAttributes(); @@ -529,8 +536,9 @@ desc += "\n\n"; desc += "HP: "+intToStr(int(charData->GetHP()))+" Max HP: "+intToStr(int(charData->GetHitPointsMax()))+"\n"; SkillSet *sks = charData->GetSkills(); + StatSet *sts = charData->GetAttributes(); - for(int skill = 0; sks && skill < PSSKILL_COUNT; skill++) + for(int skill = 0; sks && sts && skill < PSSKILL_COUNT; skill++) { psSkillInfo *skinfo; skinfo = CacheManager::GetSingleton().GetSkillByID((PSSKILL)skill); @@ -538,9 +546,19 @@ psCharacterDetailsMessage::NetworkDetailSkill s; s.category = skinfo->category; - s.text = fmtStatLine( skinfo->name, - sks->GetSkillRank((PSSKILL)skill, false), - sks->GetSkillRank((PSSKILL)skill, true)); + if (PSSKILL_AGI <= skill && skill <= PSSKILL_WILL) + { + // handle stats specially in order to pick up buffs/debuffs + s.text = fmtStatLine(skinfo->name, + sts->GetStat(skilltostat[skill - PSSKILL_AGI], false), + sts->GetStat(skilltostat[skill - PSSKILL_AGI], true)); + } + else + { + s.text = fmtStatLine(skinfo->name, + sks->GetSkillRank(static_cast<PSSKILL>(skill), false), + sks->GetSkillRank(static_cast<PSSKILL>(skill), true)); + } skills.Push(s); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-06-17 15:56:11
|
Revision: 1769 http://planeshift.svn.sourceforge.net/planeshift/?rev=1769&view=rev Author: mgist Date: 2008-06-17 08:56:19 -0700 (Tue, 17 Jun 2008) Log Message: ----------- - Merged r1753,1755,1757,1759,1761,1763-1764,1766-1767 from trunk. Modified Paths: -------------- personal/Xordan/docs/history.txt personal/Xordan/src/client/gui/pawsglyphwindow.cpp personal/Xordan/src/client/shadowmanager.cpp personal/Xordan/src/common/engine/psregion.cpp personal/Xordan/src/common/net/messages.cpp personal/Xordan/src/common/net/messages.h personal/Xordan/src/common/util/fileutil.cpp personal/Xordan/src/common/util/mathscript.cpp personal/Xordan/src/pslaunch/download.cpp personal/Xordan/src/pslaunch/download.h personal/Xordan/src/pslaunch/updaterengine.cpp personal/Xordan/src/server/gem.cpp personal/Xordan/src/server/spellmanager.cpp personal/Xordan/src/tools/libxpnet/nsSocket.cpp Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/docs/history.txt 2008-06-17 15:56:19 UTC (rev 1769) @@ -1,3 +1,16 @@ +*** 2007-06-17 by Mike Gist +- Fixed a bug in psregion where the vfs cache manager wasn't being + updated for the dir change. + +*** 2008-06-14 by Mike Gist +- Fixed permissions bugs in the updater. +- Fixed FS#1637, patch by Vornne. +- Fixed FS#1702. +- Enabled mathscript optimisations again. + +*** 2008-06-14 by Kenny Graunke +- Commit patch for part of FS#74. + *** 2008-06-13 by Mike Gist - Fixed crash if more than one psAuthApprovedMessage is received. Modified: personal/Xordan/src/client/gui/pawsglyphwindow.cpp =================================================================== --- personal/Xordan/src/client/gui/pawsglyphwindow.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/client/gui/pawsglyphwindow.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -97,7 +97,7 @@ if ( !msgHandler ) return false; // Subscribe our message types that we are interested in. - if ( !msgHandler->Subscribe( this, MSGTYPE_GLPYH_REQUEST ) ) return false; + if ( !msgHandler->Subscribe( this, MSGTYPE_GLYPH_REQUEST ) ) return false; if ( !msgHandler->Subscribe( this, MSGTYPE_GLYPH_ASSEMBLE ) ) return false; @@ -155,7 +155,7 @@ { switch( me->GetType() ) { - case MSGTYPE_GLPYH_REQUEST: + case MSGTYPE_GLYPH_REQUEST: { HandleGlyphList(me); break; Modified: personal/Xordan/src/client/shadowmanager.cpp =================================================================== --- personal/Xordan/src/client/shadowmanager.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/client/shadowmanager.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -40,6 +40,9 @@ bool psShadowManager::WithinRange(GEMClientObject * object) const { + if (!object || !object->GetMesh().IsValid()) + return false; + if (shadowRange < 0) return true; @@ -59,9 +62,13 @@ shadowRange = cfgmgr->GetFloat("PlaneShift.Visuals.ShadowRange", -1.0f); bool result = Load(USER_FILE); - if (result == false) + if (!result) { result = Load(DEFAULT_FILE); + if(!result) + { + Error2("Could not find file: %s", DEFAULT_FILE); + } } RecreateAllShadows(); @@ -86,7 +93,6 @@ if (buff == NULL) { - Error2("Could not find file: %s", filename); return false; } Modified: personal/Xordan/src/common/engine/psregion.cpp =================================================================== --- personal/Xordan/src/common/engine/psregion.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/common/engine/psregion.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -119,6 +119,7 @@ // Now load the map into the selected region vfs->ChDir (worlddir); + engine->SetVFSCacheManager(); csTicks start = csGetTicks(); Debug2(LOG_LOAD, 0,"Loading map file %s", worlddir.GetData()); @@ -136,7 +137,7 @@ if (using3D) { engine->ShineLights(collection); - engine->PrecacheDraw (collection); + engine->PrecacheDraw(collection); Debug2(LOG_LOAD, 0,"After Precache, %dms elapsed", csGetTicks()-start); } Modified: personal/Xordan/src/common/net/messages.cpp =================================================================== --- personal/Xordan/src/common/net/messages.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/common/net/messages.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -2876,7 +2876,7 @@ //-------------------------------------------------------------------------- -PSF_IMPLEMENT_MSG_FACTORY(psRequestGlyphsMessage,MSGTYPE_GLPYH_REQUEST); +PSF_IMPLEMENT_MSG_FACTORY(psRequestGlyphsMessage,MSGTYPE_GLYPH_REQUEST); psRequestGlyphsMessage::psRequestGlyphsMessage( uint32_t client ) { @@ -2885,7 +2885,7 @@ if ( client == 0 ) { msg.AttachNew(new MsgEntry()); - msg->SetType(MSGTYPE_GLPYH_REQUEST); + msg->SetType(MSGTYPE_GLYPH_REQUEST); msg->clientnum = client; } } @@ -2913,7 +2913,7 @@ void psRequestGlyphsMessage::Construct() { msg.AttachNew(new MsgEntry( size + sizeof(int) )); - msg->SetType(MSGTYPE_GLPYH_REQUEST); + msg->SetType(MSGTYPE_GLYPH_REQUEST); msg->clientnum = client; msg->Add( (uint32_t)glyphs.GetSize() ); Modified: personal/Xordan/src/common/net/messages.h =================================================================== --- personal/Xordan/src/common/net/messages.h 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/common/net/messages.h 2008-06-17 15:56:19 UTC (rev 1769) @@ -114,7 +114,7 @@ MSGTYPE_GUIGROUP, MSGTYPE_STATDRUPDATE, MSGTYPE_SPELL_BOOK, - MSGTYPE_GLPYH_REQUEST, + MSGTYPE_GLYPH_REQUEST, MSGTYPE_GLYPH_ASSEMBLE, MSGTYPE_PURIFY_GLYPH, MSGTYPE_SPELL_CAST, Modified: personal/Xordan/src/common/util/fileutil.cpp =================================================================== --- personal/Xordan/src/common/util/fileutil.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/common/util/fileutil.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -98,20 +98,24 @@ void FileUtil::MakeDirectory (const char* directory) { - csRef<iDataBuffer> realPath = vfs->GetRealPath(directory); - while(!vfs->Exists(directory)) + csString dirAppended(directory); + dirAppended.Append("/"); + + csRef<iDataBuffer> realPath = vfs->GetRealPath(dirAppended); + while(!vfs->Exists(dirAppended)) { + #ifdef CS_PLATFORM_WIN32 - int rc = mkdir(realPath->GetData()); + int rc = mkdir(realPath->GetData()); #else - int rc = mkdir(realPath->GetData(), S_IRUSR | S_IWUSR); + int rc = mkdir(realPath->GetData(), S_IRUSR | S_IWUSR); #endif csString dir = directory; - csRef<iDataBuffer> real; + csRef<iDataBuffer> real = realPath; while(rc < 0) { - dir.Truncate(dir.FindLast('/')+1); + dir.Truncate(dir.FindLast('/')); if(vfs->Exists(directory)) { @@ -119,7 +123,7 @@ return; } - real = vfs->GetRealPath(dir); + real = vfs->GetRealPath(dir + "/"); #ifdef CS_PLATFORM_WIN32 rc = mkdir(real->GetData()); #else @@ -128,8 +132,8 @@ } #ifdef CS_PLATFORM_UNIX - dir.Truncate(dir.FindLast('/')+1); - csRef<iDataBuffer> parent = vfs->GetRealPath(dir); + dir.Truncate(dir.FindLast('/')); + csRef<iDataBuffer> parent = vfs->GetRealPath(dir + "/"); csRef<FileStat> dirStat = StatFile(parent->GetData()); SetPermissions(real->GetData(), dirStat); #endif @@ -147,7 +151,7 @@ { // Make parent dir if needed. csString parent = to; - MakeDirectory(parent.Truncate(parent.FindLast('/')+1)); + MakeDirectory(parent.Truncate(parent.FindLast('/'))); if(!buff) { Modified: personal/Xordan/src/common/util/mathscript.cpp =================================================================== --- personal/Xordan/src/common/util/mathscript.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/common/util/mathscript.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -221,6 +221,10 @@ printf( "Caller: %s", myScript->name.GetData()); Error4("Error in Col %d: %s\n Script: \"%s\" ",(int)ret,fp.ErrorMsg(),scriptLine.GetData() ); } + else + { + fp.Optimize(); + } } void MathScriptLine::Execute() Modified: personal/Xordan/src/pslaunch/download.cpp =================================================================== --- personal/Xordan/src/pslaunch/download.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/pslaunch/download.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -92,7 +92,7 @@ { } -bool Downloader::DownloadFile(const char *file, const char *dest, bool URL, bool silent) +bool Downloader::DownloadFile(const char *file, const char *dest, bool URL, bool silent, uint retries) { // Get active url, append file to get full path. Mirror* mirror; @@ -128,22 +128,33 @@ return false; } - nsHTTPConn *conn = new nsHTTPConn(url.GetData()); - int result = conn->Open(); - result = conn->ResumeOrGet(ProgressCallback, destpath.GetData()); - int httpCode = conn->GetResponseCode(); - conn->Close(); - delete conn; - conn = NULL; - + int httpCode = 200; csString error; - if (result != nsSocket::OK && !silent) + for(uint i=0; i<=retries; i++) { - if (result == nsSocket::E_INVALID_HOST) - error.Format("Couldn't connect to mirror %s\n", url.GetData()); + nsHTTPConn *conn = new nsHTTPConn(url.GetData()); + int result = conn->Open(); + result = conn->ResumeOrGet(ProgressCallback, destpath.GetData()); + httpCode = conn->GetResponseCode(); + conn->Close(); + delete conn; + conn = NULL; + + if (result != nsSocket::OK) + { + if(!silent) + { + if (result == nsSocket::E_INVALID_HOST) + error.Format("Couldn't connect to mirror %s\n", url.GetData()); + else + error.Format("Error while downloading file: %s\n", url.GetData()); + } + } else - error.Format("Error while downloading file: %s\n", url.GetData()); + { + break; + } } // Tell the user that we failed Modified: personal/Xordan/src/pslaunch/download.h =================================================================== --- personal/Xordan/src/pslaunch/download.h 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/pslaunch/download.h 2008-06-17 15:56:19 UTC (rev 1769) @@ -39,7 +39,7 @@ * If URL is true; download a file from 'file' where 'file' is the * full URL to the file, and save to 'dest' */ - bool DownloadFile (const char* file, const char* dest, bool URL, bool silent = false); + bool DownloadFile (const char* file, const char* dest, bool URL, bool silent = false, uint retries = 2); /* Set the proxy server host and port */ void SetProxy (const char* host, int port); Modified: personal/Xordan/src/pslaunch/updaterengine.cpp =================================================================== --- personal/Xordan/src/pslaunch/updaterengine.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/pslaunch/updaterengine.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -971,7 +971,8 @@ csMD5::Digest md5 = csMD5::Encode(buffer->GetData(), buffer->GetSize()); csString md5s = md5.HexString(); - if(platform.Compare(config->GetCurrentConfig()->GetPlatform()) && !md5s.Compare(md5sum)) + if((platform.Compare(config->GetCurrentConfig()->GetPlatform()) || + platform.Compare("all")) && !md5s.Compare(md5sum)) { failed.Push(node); } @@ -1013,7 +1014,7 @@ // Make parent dir if needed. csString parent = downloadpath; - fileUtil->MakeDirectory(parent.Truncate(parent.FindLast('/')+1)); + fileUtil->MakeDirectory(parent.Truncate(parent.FindLast('/'))); // Download file. if(!downloader->DownloadFile(baseurl + failed.Get(i)->GetAttributeValue("path"), @@ -1025,23 +1026,24 @@ failed.Get(i)->GetAttributeValue("path"), true, true)) { // Restore file. + fileUtil->RemoveFile(downloadpath, true); fileUtil->MoveFile(downloadpath + ".bak", downloadpath, true, false, true); PrintOutput("Failed!\n"); + continue; } } - +#ifdef CS_PLATFORM_UNIX // Restore permissions. if(fs.IsValid()) { -#ifdef CS_PLATFORM_UNIX bool failedEx = failedExec.Get(failed.Get(i), false); if(failedEx) { fs->mode = fs->mode | S_IXUSR | S_IXGRP; } -#endif fileUtil->SetPermissions(rp->GetData(), fs); } +#endif fileUtil->RemoveFile(downloadpath + ".bak", true); PrintOutput("Success!\n"); } Modified: personal/Xordan/src/server/gem.cpp =================================================================== --- personal/Xordan/src/server/gem.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/server/gem.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -3952,17 +3952,15 @@ * and fake the stack count before calling AddToContainer with the test flag; * we put it back when we're done. */ - float currentSize = 0; + uint currentSize = 0; gemContainer::psContainerIterator iter(this); while (iter.HasNext()) { psItem* child = iter.Next(); currentSize += child->GetTotalStackSize(); } - if(((item->GetItemSize())*amountToAdd + currentSize) > itemdata->GetContainerMaxSize()) - { + if (item->GetItemSize()*amountToAdd + currentSize > itemdata->GetContainerMaxSize()) return false; - } unsigned short savedCount = item->GetStackCount(); Modified: personal/Xordan/src/server/spellmanager.cpp =================================================================== --- personal/Xordan/src/server/spellmanager.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/server/spellmanager.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -60,7 +60,7 @@ randomgen = psserver->rng; - psserver->GetEventManager()->Subscribe(this,MSGTYPE_GLPYH_REQUEST,REQUIRE_READY_CLIENT|REQUIRE_ALIVE); + psserver->GetEventManager()->Subscribe(this,MSGTYPE_GLYPH_REQUEST,REQUIRE_READY_CLIENT|REQUIRE_ALIVE); psserver->GetEventManager()->Subscribe(this,MSGTYPE_GLYPH_ASSEMBLE,REQUIRE_READY_CLIENT|REQUIRE_ALIVE); psserver->GetEventManager()->Subscribe(this,MSGTYPE_SPELL_CAST,REQUIRE_READY_CLIENT|REQUIRE_ALIVE); psserver->GetEventManager()->Subscribe(this,MSGTYPE_PURIFY_GLYPH,REQUIRE_READY_CLIENT|REQUIRE_ALIVE); @@ -84,7 +84,7 @@ { if (psserver->GetEventManager()) { - psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GLPYH_REQUEST); + psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GLYPH_REQUEST); psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GLYPH_ASSEMBLE); psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_SPELL_CAST); psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_PURIFY_GLYPH); @@ -114,7 +114,7 @@ SendSpellBook( client ); break; } - case MSGTYPE_GLPYH_REQUEST: + case MSGTYPE_GLYPH_REQUEST: { SendGlyphs( client ); break; Modified: personal/Xordan/src/tools/libxpnet/nsSocket.cpp =================================================================== --- personal/Xordan/src/tools/libxpnet/nsSocket.cpp 2008-06-17 14:28:00 UTC (rev 1768) +++ personal/Xordan/src/tools/libxpnet/nsSocket.cpp 2008-06-17 15:56:19 UTC (rev 1769) @@ -314,9 +314,20 @@ if (rv == 0) return E_TIMEOUT; - rv = write(mFd, aBuf, *aBufSize); + rv = 0; + for(int i=0; i<3 && rv<=0; i++) + { +#ifdef CS_PLATFORM_WIN32 + rv = write(mFd, aBuf, *aBufSize); +#else + rv = send(mFd, aBuf, *aBufSize, MSG_NOSIGNAL); +#endif + } + if (rv <= 0) + { rv = E_WRITE; + } else { *aBufSize = rv; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-06-27 22:18:14
|
Revision: 1811 http://planeshift.svn.sourceforge.net/planeshift/?rev=1811&view=rev Author: mgist Date: 2008-06-27 15:18:18 -0700 (Fri, 27 Jun 2008) Log Message: ----------- Merged revisions 1746-1749,1753,1755,1757,1759,1761,1763-1764,1766-1767,1770-1773,1775,1777-1778,1781,1783-1806 via svnmerge from https://planeshift.svn.sourceforge.net/svnroot/planeshift/trunk ........ r1746 | aresilek | 2008-06-13 00:58:01 +0100 (Fri, 13 Jun 2008) | 1 line - Adding Mac section to compiling.html by Caarrie ........ r1747 | aresilek | 2008-06-13 03:16:17 +0100 (Fri, 13 Jun 2008) | 1 line - Fixed FS#685, patch by Kaerli ........ r1748 | aresilek | 2008-06-13 14:57:09 +0100 (Fri, 13 Jun 2008) | 1 line - Fix to compiling.html by Caarrie ........ r1749 | mgist | 2008-06-13 20:51:26 +0100 (Fri, 13 Jun 2008) | 1 line - Fixed crash is more than one psAuthApprovedMessage is received. ........ r1753 | kennygraunke | 2008-06-14 01:14:36 +0100 (Sat, 14 Jun 2008) | 2 lines - Commit patch for part of FS#74. ........ r1755 | mgist | 2008-06-14 12:36:34 +0100 (Sat, 14 Jun 2008) | 1 line - Fixed permissions bugs in the updater. ........ r1757 | mgist | 2008-06-14 13:04:16 +0100 (Sat, 14 Jun 2008) | 1 line - Fixed crash caused by last fix. ........ r1759 | mgist | 2008-06-14 13:22:53 +0100 (Sat, 14 Jun 2008) | 1 line - Fixed FS#1637, patch by Vornne. ........ r1761 | mgist | 2008-06-14 16:43:43 +0100 (Sat, 14 Jun 2008) | 2 lines - Fixed FS#1702. - Enabled mathscript optimisations again. ........ r1763 | mgist | 2008-06-14 16:53:11 +0100 (Sat, 14 Jun 2008) | 1 line - Forgot two files last commit. ........ r1764 | mgist | 2008-06-14 16:54:02 +0100 (Sat, 14 Jun 2008) | 1 line ........ r1766 | kennygraunke | 2008-06-17 02:00:56 +0100 (Tue, 17 Jun 2008) | 2 lines Fix GLPYH typo. ........ r1767 | mgist | 2008-06-17 15:26:03 +0100 (Tue, 17 Jun 2008) | 2 lines - Fixed a bug in psregion where the vfs cache manager wasn't being updated for the dir change. ........ r1770 | aresilek | 2008-06-18 03:52:51 +0100 (Wed, 18 Jun 2008) | 2 lines -Fixed FS#1572, by kougaro -DB VER BUMP to 1189 ........ r1771 | mr_dave | 2008-06-18 20:28:15 +0100 (Wed, 18 Jun 2008) | 1 line Fixed FS#1218. ........ r1772 | mr_dave | 2008-06-18 20:31:06 +0100 (Wed, 18 Jun 2008) | 1 line Fixed FS#1218 (oops). ........ r1773 | lpancallo | 2008-06-18 22:49:15 +0100 (Wed, 18 Jun 2008) | 1 line added a simple shield for testing purposes ........ r1775 | mgist | 2008-06-18 23:00:57 +0100 (Wed, 18 Jun 2008) | 1 line - Fixed a crash in psLights on sector change. ........ r1777 | mgist | 2008-06-19 21:39:06 +0100 (Thu, 19 Jun 2008) | 1 line - pslaunch fixes. ........ r1778 | psshared | 2008-06-20 05:04:43 +0100 (Fri, 20 Jun 2008) | 2 lines Visual-C++ project files: Automated Visual-C++ project file repair. ........ r1781 | lpancallo | 2008-06-20 09:40:07 +0100 (Fri, 20 Jun 2008) | 1 line made quest masters impervious, needed for WC quest function testing. ........ r1783 | eriroley | 2008-06-20 18:41:35 +0100 (Fri, 20 Jun 2008) | 2 lines Updating values provided by Kerol 2008-06-19 ........ r1784 | eriroley | 2008-06-20 19:19:04 +0100 (Fri, 20 Jun 2008) | 5 lines - Patch for FS#1699 Faction Descriptions by Zwenze - NETVER BUMP - DB BUMP ........ r1785 | kennygraunke | 2008-06-21 00:20:42 +0100 (Sat, 21 Jun 2008) | 2 lines Code cleanups and random constification. ........ r1786 | mgist | 2008-06-22 05:13:23 +0100 (Sun, 22 Jun 2008) | 3 lines - Fixed PawsManager::SetCurrentFocusedWidget to a) Work properly. b) Be sane. - Added 'alwaysontop' paws widget attribute. - Continued work on pslaunch. ........ r1787 | mgist | 2008-06-22 16:25:35 +0100 (Sun, 22 Jun 2008) | 2 lines - Bumped CS revision to 30039. ........ r1788 | mgist | 2008-06-22 17:10:41 +0100 (Sun, 22 Jun 2008) | 1 line - Added support for image changing on mouse over in pawsButton. ........ r1789 | mgist | 2008-06-22 20:43:45 +0100 (Sun, 22 Jun 2008) | 3 lines - Enhanced pawsMessageTextBox to read \n as a linebreak and make one. - Added a method to pawsMessageTextBox to append data onto the last message. - More work on pslaunch. ........ r1790 | aresilek | 2008-06-24 15:24:21 +0100 (Tue, 24 Jun 2008) | 1 line -Fixes to compiling.html by Caarrie ........ r1791 | mgist | 2008-06-26 00:33:59 +0100 (Thu, 26 Jun 2008) | 2 lines - Work on pslaunch. - Some improvements to PAWS. ........ r1792 | mgist | 2008-06-26 00:47:11 +0100 (Thu, 26 Jun 2008) | 1 line - Work on pslaunch. ........ r1793 | mgist | 2008-06-26 00:49:06 +0100 (Thu, 26 Jun 2008) | 1 line - Work on pslaunch. ........ r1794 | mgist | 2008-06-26 06:18:18 +0100 (Thu, 26 Jun 2008) | 1 line - More pslaunch work. ........ r1795 | mgist | 2008-06-26 06:26:34 +0100 (Thu, 26 Jun 2008) | 2 lines - More pslaunch work. ........ r1796 | mgist | 2008-06-26 06:31:07 +0100 (Thu, 26 Jun 2008) | 1 line - Forgotten file. ........ r1797 | mgist | 2008-06-26 06:38:59 +0100 (Thu, 26 Jun 2008) | 1 line - Forgotten file. ........ r1798 | rdschulz | 2008-06-26 07:31:17 +0100 (Thu, 26 Jun 2008) | 3 lines Fix to FS#170 by Boite: Add test for line, icon and text when moving object on the map, so dragging things outside of the sketch is not possible any more. ........ r1799 | rdschulz | 2008-06-26 07:38:52 +0100 (Thu, 26 Jun 2008) | 2 lines - commit fix to FS#215 by phenom - remove /quests command from tab completion ........ r1800 | rdschulz | 2008-06-26 08:04:07 +0100 (Thu, 26 Jun 2008) | 2 lines - commit fix to FS#686 by Boite - remember selected tab in detail window ........ r1801 | rdschulz | 2008-06-26 08:16:11 +0100 (Thu, 26 Jun 2008) | 3 lines - commit fix to FS#707 by Zwenze - /giveitem and /takeitem now allow to take or give trias as well ........ r1802 | rdschulz | 2008-06-26 19:15:01 +0100 (Thu, 26 Jun 2008) | 2 lines - commit feature request FS#1686 by peeg - show inviting member when announcing new guild member ........ r1803 | rdschulz | 2008-06-26 19:21:15 +0100 (Thu, 26 Jun 2008) | 2 lines - commit fix to FS#1705 by peeg - can't add NPCs to buddy list any more ........ r1804 | mgist | 2008-06-26 19:55:53 +0100 (Thu, 26 Jun 2008) | 1 line - pslaunch improvements. ........ r1805 | rdschulz | 2008-06-26 20:09:56 +0100 (Thu, 26 Jun 2008) | 3 lines - commit slightly modified fix to FS#1739 by Vornne - money object shouldn't overflow int any more for large coin counts. ........ r1806 | rdschulz | 2008-06-26 20:14:23 +0100 (Thu, 26 Jun 2008) | 3 lines - commit fix to FS#1584 by peeg - divorce messages should be the right way around now. ........ Modified Paths: -------------- personal/Xordan/data/gui/loadwindow.xml personal/Xordan/data/gui/pslaunch.xml personal/Xordan/data/gui/skillwindow.xml personal/Xordan/data/help.xml personal/Xordan/docs/compiling.html personal/Xordan/docs/history.txt personal/Xordan/mk/msvc/apppslaunch_static_staticuse_CRYSTAL.cpp personal/Xordan/mk/msvc7/apppslaunch_static.vcproj personal/Xordan/mk/msvc7/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc71/apppslaunch_static.vcproj personal/Xordan/mk/msvc71/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc8/apppslaunch_static.vcproj personal/Xordan/mk/msvc8/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Xordan/mk/msvc9/apppslaunch_static.vcproj personal/Xordan/mk/msvc9/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Xordan/psclient.cfg personal/Xordan/pslaunch.cfg personal/Xordan/src/client/cmdusers.cpp personal/Xordan/src/client/gui/pawscharpick.cpp personal/Xordan/src/client/gui/pawsdetailwindow.cpp personal/Xordan/src/client/gui/pawsdetailwindow.h personal/Xordan/src/client/gui/pawsglyphwindow.cpp personal/Xordan/src/client/gui/pawsilluminationwindow.cpp personal/Xordan/src/client/gui/pawsilluminationwindow.h personal/Xordan/src/client/gui/pawsskillwindow.cpp personal/Xordan/src/client/gui/pawsskillwindow.h personal/Xordan/src/client/gui/pawsspellbookwindow.cpp personal/Xordan/src/client/gui/pawsspellbookwindow.h personal/Xordan/src/client/shadowmanager.cpp personal/Xordan/src/common/effects/pseffectlight.cpp personal/Xordan/src/common/engine/psregion.cpp personal/Xordan/src/common/net/messages.cpp personal/Xordan/src/common/net/messages.h personal/Xordan/src/common/paws/pawsbutton.cpp personal/Xordan/src/common/paws/pawsbutton.h personal/Xordan/src/common/paws/pawscombo.cpp personal/Xordan/src/common/paws/pawscombo.h personal/Xordan/src/common/paws/pawsmanager.cpp personal/Xordan/src/common/paws/pawstextbox.cpp personal/Xordan/src/common/paws/pawstextbox.h personal/Xordan/src/common/paws/pawswidget.cpp personal/Xordan/src/common/paws/pawswidget.h personal/Xordan/src/common/rpgrules/factions.h personal/Xordan/src/common/rpgrules/psmoney.cpp personal/Xordan/src/common/util/fileutil.cpp personal/Xordan/src/common/util/mathscript.cpp personal/Xordan/src/pslaunch/Jamfile personal/Xordan/src/pslaunch/download.cpp personal/Xordan/src/pslaunch/download.h personal/Xordan/src/pslaunch/pawslauncherwindow.cpp personal/Xordan/src/pslaunch/pawslauncherwindow.h personal/Xordan/src/pslaunch/pslaunch.cpp personal/Xordan/src/pslaunch/pslaunch.h personal/Xordan/src/pslaunch/updaterengine.cpp personal/Xordan/src/pslaunch/updaterengine.h personal/Xordan/src/server/adminmanager.cpp personal/Xordan/src/server/bulkobjects/pscharacter.cpp personal/Xordan/src/server/bulkobjects/pscharacter.h personal/Xordan/src/server/bulkobjects/psskills.h personal/Xordan/src/server/cachemanager.cpp personal/Xordan/src/server/cachemanager.h personal/Xordan/src/server/database/mysql/characters.sql personal/Xordan/src/server/database/mysql/command_access.sql personal/Xordan/src/server/database/mysql/commonstrings.sql personal/Xordan/src/server/database/mysql/factions.sql personal/Xordan/src/server/database/mysql/guilds.sql personal/Xordan/src/server/database/mysql/item_stats.sql personal/Xordan/src/server/database/mysql/server_options.sql personal/Xordan/src/server/database/mysql/upgrade_schema.sql personal/Xordan/src/server/gem.cpp personal/Xordan/src/server/guildmanager.cpp personal/Xordan/src/server/marriagemanager.cpp personal/Xordan/src/server/progressionmanager.cpp personal/Xordan/src/server/psserver.cpp personal/Xordan/src/server/serverstatus.cpp personal/Xordan/src/server/spellmanager.cpp personal/Xordan/src/server/usermanager.cpp personal/Xordan/src/tools/libxpnet/nsSocket.cpp Property Changed: ---------------- personal/Xordan/ Property changes on: personal/Xordan ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-1744 + /trunk:1-1744,1746-1806 Modified: personal/Xordan/data/gui/loadwindow.xml =================================================================== --- personal/Xordan/data/gui/loadwindow.xml 2008-06-27 22:06:46 UTC (rev 1810) +++ personal/Xordan/data/gui/loadwindow.xml 2008-06-27 22:18:18 UTC (rev 1811) @@ -1,20 +1,20 @@ <widget_description> - <widget name="LoadWindow" factory="pawsLoadWindow" + <widget name="LoadWindow" factory="pawsLoadWindow" visible="yes" movable="no" resizable="no" resizetoscreen="yes" > <frame x="0" y="0" width="800" height="600" border="no" /> <font name="/planeshift/data/ttf/cupandtalon.ttf" r="180" g="180" b="180" size="12" shadow="yes" resizetoscreen="yes" /> <bgimage resource="Loading Background" /> - + <widget name="loadtext" factory="pawsMessageTextBox" > - <frame x="30" y="160" width="295" height="120" border="no" /> + <frame x="30" y="160" width="295" height="80" border="no" /> <font name="/planeshift/data/ttf/cupandtalon.ttf" r="180" g="180" b="180" size="10" shadow="yes" resizetoscreen="yes" /> </widget> <widget name="motd" factory="pawsMultiLineTextBox" > - <frame x="30" y="280" width="295" height="80" border="no" /> + <frame x="30" y="240" width="295" height="100" border="no" /> </widget> <widget name="guildmotd" factory="pawsMultiLineTextBox" > - <frame x="30" y="380" width="295" height="80" border="no" /> + <frame x="30" y="350" width="295" height="100" border="no" /> </widget> <widget name="tip" factory="pawsMultiLineTextBox" > <frame x="380" y="510" width="410" height="40" border="no" /> @@ -25,6 +25,6 @@ <fadecolor r="100" g="100" b="255" /> </widget> </widget> - </widget_description> + Modified: personal/Xordan/data/gui/pslaunch.xml =================================================================== --- personal/Xordan/data/gui/pslaunch.xml 2008-06-27 22:06:46 UTC (rev 1810) +++ personal/Xordan/data/gui/pslaunch.xml 2008-06-27 22:18:18 UTC (rev 1811) @@ -1,74 +1,337 @@ <widget_description> + <widget name="Launcher" factory="pawsLauncherWindow" visible="yes" savepositions="no" movable="no" resizable="no" resizetoscreen="yes" id="1"> -<widget name="launcher" factory="pawsLauncherWindow" visible="yes" savepositions="no" movable="no" resizable="no" resizetoscreen="yes" > - - <bgimage resource="SetupBackground" alpha="255" fade="false"/> - + <bgimage resource="Launcher BG1" alpha="255" fade="false"/> <frame x="0" y="0" width="850" height="600" border="no"/> <title resource="Blue Title" text="PlaneShift Launcher" align="left"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="12"/> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10"/> - <!-- Server news --> - <widget name="ServerNews" factory="pawsMultiLineTextBox"> - <frame x="280" y="350" width="400" height="120" /> + <widget name="LauncherMain" factory="pawsWidget" visible="yes" savepositions="no" movable="no" resizable="no" resizetoscreen="yes" id="11"> + + <bgimage resource="Launcher Main" alpha="255" fade="false"/> + <frame x="0" y="0" width="850" height="600" border="no"/> + + <!-- Server news --> + <widget name="NewsWindow" factory="pawsButton" id="111" alwaysontop="true"> + <bgimage resource="News Window" alpha="255" fade="false"/> + <frame x="60" y="50" width="300" height="470" /> + <widget name="ServerNews" factory="pawsMessageTextBox" id="1111"> + <frame x="20" y="40" width="280" height="220" /> + </widget> + </widget> + + <!-- Quit button --> + <widget name="QuitButton" factory="pawsButton" id="112" changeonmouseover="true"> + <buttonup resource="Quit Button"/> + <buttondown resource="Quit Button MO"/> + <frame x="58" y="516" width="95" height="50" border="no"/> + </widget> + + <!-- Repair button --> + <widget name="RepairButton" factory="pawsButton" id="113" changeonmouseover="true"> + <buttonup resource="Repair Button"/> + <buttondown resource="Repair Button MO"/> + <frame x="200" y="518" width="95" height="50" border="no"/> + </widget> + + <!-- Settings button --> + <widget name="SettingsButton" factory="pawsButton" toggle="no" id="114" changeonmouseover="true"> + <buttonup resource="Settings Button"/> + <buttondown resource="Settings Button MO"/> + <frame x="340" y="518" width="95" height="50" border="no"/> + </widget> + + <!-- Play button --> + <widget name="PlayButton" factory="pawsButton" id="115" changeonmouseover="true"> + <buttonup resource="Play Button"/> + <buttondown resource="Play Button MO"/> + <frame x="645" y="528" width="95" height="45" border="no"/> + </widget> </widget> - <!-- Update available window --> - <widget name="UpdateAvailable" factory="pawsYesNoBox" visible="no" savepositions="no" movable="no" resizable="no" > - <frame x="200" y="100" width="400" height="250" border="no" /> - <bgimage resource="YesNo" alpha="0" /> + <!-- Update output window --> + <widget name="LauncherUpdater" factory="pawsWidget" visible="no" savepositions="no" movable="no" resizable="no" resizetoscreen="yes" id="12"> + <bgimage resource="Launcher Other" alpha="255" fade="false"/> + <frame x="0" y="0" width="850" height="600" border="no"/> - <widget name="Message Box" factory="pawsMultiLineTextBox"> - <frame x="100" y="50" width="250" height="68" border="no" /> + <widget name="UpdaterOutput" factory="pawsMessageTextBox" id="121" alwaysontop="true"> + <frame x="90" y="205" width="670" height="290" /> + </widget> + + <!-- Yes button --> + <widget name="UpdaterYesButton" factory="pawsButton" id="122" changeonmouseover="true" visible="no"> + <buttonup resource="Yes Button"/> + <buttondown resource="Yes Button MO"/> + <frame x="250" y="517" width="95" height="50" border="no"/> + </widget> + + <!-- No button --> + <widget name="UpdaterNoButton" factory="pawsButton" id="123" changeonmouseover="true" visible="no"> + <buttonup resource="No Button"/> + <buttondown resource="No Button MO"/> + <frame x="400" y="517" width="95" height="55" border="no"/> + </widget> + + <!-- Ok button --> + <widget name="UpdaterOkButton" factory="pawsButton" id="124" changeonmouseover="true" visible="no"> + <buttonup resource="Ok Button"/> + <buttondown resource="Ok Button MO"/> + <frame x="645" y="528" width="95" height="45" border="no"/> + </widget> + + <!-- Cancel button --> + <widget name="UpdaterCancelButton" factory="pawsButton" id="125" changeonmouseover="true" visible="no"> + <buttonup resource="Cancel Button"/> + <buttondown resource="Cancel Button MO"/> + <frame x="58" y="515" width="95" height="60" border="no"/> + </widget> + </widget> + + <!-- Settings window --> + <widget name="LauncherSettings" factory="pawsButton" visible="no" alwaysontop="true" savepositions="no" movable="no" resizable="no" resizetoscreen="yes" id="13"> + <bgimage resource="Launcher Other" alpha="255" fade="false"/> + <frame x="0" y="0" width="850" height="600" border="no"/> + + <!-- Ok button --> + <widget name="SettingsOkButton" factory="pawsButton" id="131" changeonmouseover="true"> + <buttonup resource="Ok Button"/> + <buttondown resource="Ok Button MO"/> + <frame x="645" y="528" width="95" height="45" border="no"/> + </widget> + + <!-- Cancel button --> + <widget name="SettingsCancelButton" factory="pawsButton" id="132" changeonmouseover="true"> + <buttonup resource="Cancel Button"/> + <buttondown resource="Cancel Button MO"/> + <frame x="58" y="515" width="95" height="60" border="no"/> + </widget> + + <!-- Audio button --> + <widget name="SettingsAudioButton" factory="pawsButton" id="133" toggle="yes"> + <buttonup resource="Audio Button"/> + <buttondown resource="Audio Button MO"/> + <frame x="100" y="50" width="100" height="30" border="no"/> + </widget> + + <!-- Controls button --> + <widget name="SettingsControlsButton" factory="pawsButton" id="134" toggle="yes"> + <buttonup resource="Controls Button"/> + <buttondown resource="Controls Button MO"/> + <frame x="220" y="50" width="100" height="30" border="no"/> + </widget> + + <!-- General button --> + <widget name="SettingsGeneralButton" factory="pawsButton" id="135" toggle="yes"> + <buttonup resource="General Button"/> + <buttondown resource="General Button MO"/> + <frame x="100" y="100" width="100" height="30" border="no"/> + </widget> + + <!-- Graphics button --> + <widget name="SettingsGraphicsButton" factory="pawsButton" id="136" toggle="yes"> + <buttonup resource="Graphics Button"/> + <buttondown resource="Graphics Button MO"/> + <frame x="220" y="100" width="100" height="30" border="no"/> + </widget> + + <!-- Audio Widget --> + <widget name="SettingsAudio" factory="pawsWidget" id="137" visible="no" alwaysontop="true"> + <frame x="90" y="200" width="670" height="290" /> + + <widget name="EnableSound" factory="pawsCheckBox" id="1371"> + <frame x="0" y="0" width="101" height="15"/> + <checkbox on="radioon" off="radiooff" size="12"/> + <text string="Enable Sound:" position="left"/> </widget> - <widget name="YesButton" factory="pawsButton" id="-10" key="Y" > - <frame x="120" y="180" width="80" height="40" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="20" /> - <label text="Yes" /> + <widget name="SoundRendererText" factory="pawsTextBox" id="1372"> + <frame x="0" y="20" width="90" height="20"/> + <text string="Sound Renderer:"/> </widget> - <widget name="NoButton" factory="pawsButton" id="-20" key="N" > - <frame x="220" y="180" width="50" height="40" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="20" /> - <label text="No" /> + <widget name="SoundRenderer" factory="pawsComboBox" id="1373" alwaysontop="true"> + <frame x="90" y="17" width="60" height="20" border="no" /> + <listbox rows="2" height="25" useScrollBar="false" /> + </widget> + </widget> + + <!-- Controls Widget --> + <widget name="SettingsControls" factory="pawsWidget" id="138" visible="no" alwaysontop="true"> + <frame x="90" y="200" width="670" height="290" /> + </widget> + + <!-- General Widget --> + <widget name="SettingsGeneral" factory="pawsWidget" id="139" visible="yes" alwaysontop="true"> + <frame x="90" y="200" width="670" height="290" /> + + <widget name="GraphicsPresetText" factory="pawsTextBox" id="1391"> + <frame x="0" y="3" width="90" height="20"/> + <text string="Graphics Quality:"/> </widget> - </widget> - <!-- Quit button --> - <widget name="Quit" factory="pawsButton"> - <frame x="210" y="520" width="130" height="30" border="no"/> - <buttonup resource="SetupButtonDown"/> - <buttondown resource="SetupButtonDown"/> - <label text="Quit"/> - </widget> - - <!-- Launch Client button --> - <widget name="LaunchButton" factory="pawsButton"> - <frame x="350" y="520" width="130" height="30" border="no"/> - <buttonup resource="SetupButtonDown"/> - <buttondown resource="SetupButtonDown"/> - <label text="Launch Client"/> - </widget> + <widget name="GraphicsPreset" factory="pawsComboBox" id="1392" alwaysontop="true"> + <frame x="100" y="0" width="70" height="20" border="no" /> + <listbox rows="6" height="25" useScrollBar="false" /> + </widget> - <!-- Settings button --> - <widget name="SettingsButton" factory="pawsButton" toggle="no" shadows="yes"> - <frame x="490" y="520" width="130" height="30" border="no"/> - <buttonup resource="SetupButtonDown"/> - <buttondown resource="SetupButtonDown"/> - <label text="Settings"/> + <widget name="ScreenResolutionText" factory="pawsTextBox" id="1393"> + <frame x="0" y="23" width="90" height="20"/> + <text string="Screen Resolution:"/> + </widget> + + <widget name="ScreenResolution" factory="pawsComboBox" id="1394" alwaysontop="true"> + <frame x="100" y="20" width="70" height="20" border="no" /> + <listbox rows="9" height="25" useScrollBar="false" /> + </widget> + + <widget name="Fullscreen" factory="pawsCheckBox" id="1395"> + <frame x="0" y="40" width="110" height="15"/> + <checkbox on="radioon" off="radiooff" size="12"/> + <text string="Enable Fullscreen:" position="left"/> + </widget> + + <widget name="SkinsText" factory="pawsTextBox" id="1396"> + <frame x="0" y="83" width="90" height="20"/> + <text string="Current Skin:"/> + </widget> + + <widget name="Skins" factory="pawsComboBox" id="1397" alwaysontop="true"> + <frame x="100" y="80" width="70" height="20" border="no"/> + <listbox rows="3" height="25" useScrollBar="false" /> + </widget> + + <widget name="SkinDescription" factory="pawsMultiLineTextBox" id="1398"> + <frame x="0" y="100" width="200" height="100" border="no"/> + </widget> + + <widget name="SkinPreview" factory="pawsWidget" visible="yes" savepositions="no" movable="no" resizable="no" id="1399"> + <frame x="250" y="100" width="200" height="100" border="yes"/> + + <widget name="PreviewButton" factory="pawsButton" id="13991"> + <frame x="250" y="130" width="130" height="30" border="no"/> + <label text="Test button"/> + </widget> + + <widget name="PreviewBox" factory="pawsCheckBox" id="13981"> + <frame x="250" y="170" width="190" height="30" /> + <text string="Test checkbox"/> + </widget> + </widget> + </widget> + + <!-- Graphics Widget --> + <widget name="SettingsGraphics" factory="pawsWidget" id="1310" visible="no" alwaysontop="true"> + <frame x="90" y="200" width="670" height="290" /> + + <widget name="ScreenDepthText" factory="pawsTextBox" id="13101"> + <frame x="0" y="3" width="90" height="20"/> + <text string="Color Depth:"/> + </widget> + + <widget name="ScreenDepth" factory="pawsComboBox" id="13102" alwaysontop="true"> + <frame x="120" y="0" width="70" height="20" border="no" /> + <listbox rows="2" height="25" useScrollBar="false" /> + </widget> + + <widget name="AntiAiasingText" factory="pawsTextBox" id="13103"> + <frame x="0" y="23" width="210" height="20"/> + <text string="Anti-Aliasing:"/> + </widget> + + <widget name="AntiAiasing" factory="pawsComboBox" id="13104" alwaysontop="true"> + <frame x="120" y="20" width="70" height="20" border="no" /> + <listbox rows="9" height="25" useScrollBar="false" /> + </widget> + + <widget name="AnisotropicFilteringText" factory="pawsTextBox" id="13105"> + <frame x="0" y="43" width="210" height="20"/> + <text string="Anisotropic Filtering: "/> + </widget> + + <widget name="AnisotropicFiltering" factory="pawsComboBox" id="13106" alwaysontop="true"> + <frame x="120" y="40" width="70" height="20" border="no" /> + <listbox rows="6" height="25" useScrollBar="false" /> + </widget> + + <widget name="TextureQualityText" factory="pawsTextBox" id="13107"> + <frame x="0" y="63" width="210" height="20"/> + <text string="Texture Quality: "/> + </widget> + + <widget name="TextureQuality" factory="pawsComboBox" id="13108" alwaysontop="true"> + <frame x="120" y="60" width="70" height="20" border="no" /> + <listbox rows="4" height="25" useScrollBar="false" /> + </widget> + + <widget name="ShadersText" factory="pawsTextBox" id="13109"> + <frame x="0" y="83" width="210" height="20"/> + <text string="Shaders: "/> + </widget> + + <widget name="Shaders" factory="pawsComboBox" id="131010" alwaysontop="true"> + <frame x="120" y="80" width="70" height="20" border="no" /> + <listbox rows="2" height="25" useScrollBar="false" /> + </widget> + + <widget name="EnableGrass" factory="pawsCheckBox" id="131011"> + <frame x="0" y="103" width="130" height="15"/> + <checkbox on="radioon" off="radiooff" size="12"/> + <text string="Enable Grass:" position="left"/> + </widget> + + <widget name="VBO" factory="pawsCheckBox" id="131012"> + <frame x="0" y="123" width="130" height="15"/> + <checkbox on="radioon" off="radiooff" size="12"/> + <text string="Enable VBO:" position="left"/> + </widget> + + <widget name="LoadAllMaps" factory="pawsCheckBox" id="131013"> + <frame x="0" y="143" width="130" height="15"/> + <checkbox on="radioon" off="radiooff" size="12"/> + <text string="Load All Maps:" position="left"/> + </widget> + + <widget name="KeepMapsLoaded" factory="pawsCheckBox" id="13113"> + <frame x="0" y="163" width="130" height="15"/> + <checkbox on="radioon" off="radiooff" size="12"/> + <text string="Keep Maps Loaded:" position="left"/> + </widget> + + <widget name="PreloadModels" factory="pawsCheckBox" id="13115"> + <frame x="0" y="183" width="130" height="15"/> + <checkbox on="radioon" off="radiooff" size="12"/> + <text string="Preload Models:" position="left"/> + </widget> + + <widget name="ThreadedLoading" factory="pawsCheckBox" id="13116"> + <frame x="0" y="203" width="130" height="15"/> + <checkbox on="radioon" off="radiooff" size="12"/> + <text string="Threaded Loading:" position="left"/> + </widget> + </widget> </widget> - -</widget> -<!-- Update output window --> -<widget name="UpdateProgress" factory="pawsWidget" visible="no" savepositions="no" movable="no" resizable="no"> - <bgimage resource="UpdaterBackground" alpha="255" fade="false"/> - <frame x="0" y="0" width="850" height="600" border="no"/> + <!-- Update available window --> + <widget name="UpdateAvailable" factory="pawsYesNoBox" visible="no" savepositions="no" movable="no" resizable="no" id="14"> + <frame x="200" y="100" width="400" height="250" border="no" /> + <bgimage resource="YesNo" alpha="0" /> - <widget name="UpdaterOutput" factory="pawsMultiLineTextBox"> - <frame x="50" y="50" width="700" height="313" /> + <widget name="Message Box" factory="pawsMultiLineTextBox" id="141"> + <frame x="100" y="50" width="250" height="68" border="no" /> + </widget> + + <widget name="YesButton" factory="pawsButton" id="-10" key="Y" id="142"> + <frame x="120" y="180" width="80" height="40" border="no" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="20" /> + <label text="Yes" /> + </widget> + + <widget name="NoButton" factory="pawsButton" id="-20" key="N" id="143"> + <frame x="220" y="180" width="50" height="40" border="no" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="20" /> + <label text="No" /> + </widget> </widget> -</widget> + </widget> </widget_description> Modified: personal/Xordan/data/gui/skillwindow.xml =================================================================== --- personal/Xordan/data/gui/skillwindow.xml 2008-06-27 22:06:46 UTC (rev 1810) +++ personal/Xordan/data/gui/skillwindow.xml 2008-06-27 22:18:18 UTC (rev 1811) @@ -312,6 +312,17 @@ </column> </columns> </widget> + + <widget name="" factory="pawsTextBox" > + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="12" /> + <frame x="30" y="110" width="180" height="20" border="no"/> + <text string="Faction description:" /> + </widget> + + <widget name="FactionDescription" factory="pawsMultiLineTextBox" > + <frame x="28" y="130" width="375" height="80" border="no" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="10" /> + </widget> </widget> Modified: personal/Xordan/data/help.xml =================================================================== --- personal/Xordan/data/help.xml 2008-06-27 22:06:46 UTC (rev 1810) +++ personal/Xordan/data/help.xml 2008-06-27 22:18:18 UTC (rev 1811) @@ -457,7 +457,7 @@ value (in milliseconds). With specified sector, it starts fog with default values: density 200, fade 10 sec, soft white (r 200, g 200, w 200). Use /fog sector off or /fog sector -1 for resetting. </topic> - <topic name="/giveitem">/giveitem [target] [quantity|'all'|''] [item] + <topic name="/giveitem">/giveitem [target] [quantity|'all'|''] [item|tria] Commands used to transfer an item from you to another character. Example: "/giveitem Bob Apple"</topic> <topic name="/impersonate">/impersonate name command message @@ -637,7 +637,7 @@ With specified sector, it starts snow with default values: density 4000 flakes, length 10 minutes and 10 seconds of fade. The maximum number of flakes allowed is 8000. Use /snow sector 0 or /snow sector off for ending the event.</topic> - <topic name="/takeitem">/takeitem [target] [quantity|'all'|''] [item] + <topic name="/takeitem">/takeitem [target] [quantity|'all'|''] [item|tria] Command used to transfer an item to you from another character. Example: "/takeitem target 3 Sabre"</topic> <topic name="/teleport">/teleport <subject> <destination> Modified: personal/Xordan/docs/compiling.html =================================================================== --- personal/Xordan/docs/compiling.html 2008-06-27 22:06:46 UTC (rev 1810) +++ personal/Xordan/docs/compiling.html 2008-06-27 22:18:18 UTC (rev 1811) @@ -9,16 +9,16 @@ // Source versions are listed here and automatically updated in the body. // Standard dates (CSrev, CELrev) are the ones that are compatible with Laanx. // An additional set of CS/CEL revisions (CSrev_HEAD, CELrev_HEAD) may be specified for the latest version of PS. - var CSrev = "29846"; // CS_SOURCE_REV + var CSrev = "30039"; // CS_SOURCE_REV var CELrev = "3452"; // CEL_SOURCE_REV var CAL3Drev = "493"; // CAL3D_SOURCE_REV - var CSrev_HEAD = "29846"; // CS_SOURCE_REV_HEAD + var CSrev_HEAD = "30039"; // CS_SOURCE_REV_HEAD var CELrev_HEAD = "3452"; // CEL_SOURCE_REV_HEAD var CAL3Drev_HEAD = "493"; // CAL3D_SOURCE_REV_HEAD var csWinLibsVersionStab = "1.3_003"; // cs win32 libs version. - var csWinLibsVersion = "1.3_003"; // cs win32 libs version. + var csWinLibsVersion = "1.3_004"; // cs win32 libs version. //Update date and author, to be changed everytime and updates occurred - var UpdateDate = "11 June 2008"; //Date when the update occurred + var UpdateDate = "24 June 2008"; //Date when the update occurred var UpdateAuthor = "Caarrie"; //Author of the update --> </script> @@ -328,11 +328,19 @@ Dave Garrett, author of the new compiling guides layout;<br> Andrew Craig, author of the first Linux guides that were available on <a href="http://laanx.fragnetics.com">Laanx website</a>;<br> Platyna, author of the first compiling guide for Slackware distribution.<br> - Mike Gist, author of the static compiling guide. + Mike Gist, author of the static compiling guide.<br> +</div> + <div class="MacOSX"> + This guide gives a very basic description on how to get a working client up and + running on an Intel Mac. It gives instructions on how to get to check out the source code and configure it. At the end there you will have a + PlaneShift client and a PlaneShift updater application, and if you want also the server.<br><br> + <b>Credits</b><br> + Caarrie, Author of the first basic Mac guide with help from the <a href="http://vaalnor.mine.nu/psdoc/?q=node/38">PSDocs</a> guide and Trymm </div> <div class="MacOSX"> - <p>We have no Mac guide at this time. Check the Linux guide, or refer to <a href="http://vaalnor.mine.nu/psdoc/?q=node/38">PSDocs</a>, a user maintained guide.</p> + <p>Here is a basic Mac guide based on the linux guide, for more specifics refer to <a href="http://vaalnor.mine.nu/psdoc/?q=node/38">PSDocs</a>, a user maintained guide.</p> + <div class="Static">There is no Mac static build guide at this time</div> </div> </p> @@ -381,7 +389,7 @@ <p><i class="command">C:\development\</i></p> </div> <div class="MacOSX"> - <p><i class="command">/home/user/development</i></p> + <p><i class="command">$HOME/development</i></p> </div> <div class="Windows"><div class="MINGW"> @@ -431,9 +439,9 @@ Unzipping the tar.bz2 archives needs to be done through the MSYS command-line by changing directory with the cd command to where you downloaded the files. Then, run the following commands: -<i class="command">tar -xjf msys-autoconf-2.59.tar.bz2 -C /c/msys/1.0<br> +<div class="commandBox">tar -xjf msys-autoconf-2.59.tar.bz2 -C /c/msys/1.0<br> tar -xjf msys-automake-1.8.2.tar.bz2 -C /c/msys/1.0<br> -tar -xzf binutils-2.16.91-20060119-1.tar.gz -C /c/MinGW</i><br> +tar -xzf binutils-2.16.91-20060119-1.tar.gz -C /c/MinGW</div><br> This allows MSYS to setup the MinGW paths correctly.<br> The installation program should also add an icon for MSYS to your start menu. <br> Click the "MSYS" icon and it should open up a shell window. Type "exit" to close the shell window again.<br><br> @@ -647,13 +655,13 @@ After that we need to refresh our sources.list file like so:<br> <p><i class="command"># sudo apt-get update</i></p> Once that is complete, we can fetch all the required packages using the following command:<br> - <p><i class="commandBox"># sudo apt-get --assume-yes install libjpeg62-dev x11proto-gl-dev autoconf jam bison flex-old automake1.9 libmng-dev libmikmod2-dev libogg-dev libvorbis-dev zlib1g-dev libpng12-dev build-essential libtool libglu1-mesa-dev xserver-xorg-dev libxt-dev libopenal0a libopenal-dev subversion zlibc libttf2 libfreetype6-dev libfreetype6 libasound2-dev alsa-oss libxxf86vm-dev libxext-dev x11proto-xext-dev -</i></p> + <p><div class="commandBox"># sudo apt-get --assume-yes install libjpeg62-dev x11proto-gl-dev autoconf jam bison flex-old automake1.9 libmng-dev libmikmod2-dev libogg-dev libvorbis-dev zlib1g-dev libpng12-dev build-essential libtool libglu1-mesa-dev xserver-xorg-dev libxt-dev libopenal0a libopenal-dev subversion zlibc libttf2 libfreetype6-dev libfreetype6 libasound2-dev alsa-oss libxxf86vm-dev libxext-dev x11proto-xext-dev +</div></p> <p>If you are on Gutsy use this command</p> -<p><i class="commandBox"># sudo apt-get --assume-yes install libjpeg62-dev x11proto-gl-dev autoconf jam bison flex-old automake1.9 libmng-dev libmikmod2-dev libogg-dev libvorbis-dev zlib1g-dev libpng12-dev build-essential libtool libglu1-mesa-dev libglu1-xorg-dev xserver-xorg-dev libxt-dev libopenal0a libopenal-dev subversion zlibc libttf2 libfreetype6-dev libfreetype6 libasound2-dev alsa-oss libxxf86vm-dev libxext-dev x11proto-xext-dev -</i></p> +<p><div class="commandBox"># sudo apt-get --assume-yes install libjpeg62-dev x11proto-gl-dev autoconf jam bison flex-old automake1.9 libmng-dev libmikmod2-dev libogg-dev libvorbis-dev zlib1g-dev libpng12-dev build-essential libtool libglu1-mesa-dev libglu1-xorg-dev xserver-xorg-dev libxt-dev libopenal0a libopenal-dev subversion zlibc libttf2 libfreetype6-dev libfreetype6 libasound2-dev alsa-oss libxxf86vm-dev libxext-dev x11proto-xext-dev +</div></p> <p>If you are on Hardy use this command></p> -<p><i class="commandBox"># sudo apt-get --assume-yes install libjpeg62-dev x11proto-gl-dev autoconf jam bison flex-old automake1.9 libcurl4-openssl-dev libmng-dev libmikmod2-dev libogg-dev libvorbis-dev zlib1g-dev libpng12-dev build-essential libtool libglu1-mesa-dev libglu1-xorg-dev xserver-xorg-dev libxt-dev libopenal0a libopenal-dev subversion zlibc libttf2 libfreetype6-dev libfreetype6 libasound2-dev alsa-oss libxxf86vm-dev libxext-dev x11proto-xext-dev</i></p> +<p><div class="commandBox"># sudo apt-get --assume-yes install libjpeg62-dev x11proto-gl-dev autoconf jam bison flex-old automake1.9 libcurl4-openssl-dev libmng-dev libmikmod2-dev libogg-dev libvorbis-dev zlib1g-dev libpng12-dev build-essential libtool libglu1-mesa-dev libglu1-xorg-dev xserver-xorg-dev libxt-dev libopenal0a libopenal-dev subversion zlibc libttf2 libfreetype6-dev libfreetype6 libasound2-dev alsa-oss libxxf86vm-dev libxext-dev x11proto-xext-dev</div></p> <strong> ALL of these above commands are assuming you do not need a server if you do please follow directions in the <a href="#mysql">mysql</a> section for installing other required packages</strong> </div> @@ -707,6 +715,70 @@ <p>Via portage: <i class="command"># emerge nvidia-cg-toolkit</i></p> </div> </div> +<div class="MacOSX" > +To build on OSX you need to Install Xcode which you can get from <a href="https://connect.apple.com/">here.</a> This guide also recomends you to install fink. You can get fink from <a href="http://fink.sourceforge.net/">here.</a> +Note: Do not use darwinports if you are using fink. It can cause conflicts if +they both have the same package installed. <br /> +Open a terminal window and set the required environment variables for fink by +issuing the following command: +<br /> +<div class="commandBox" ><pre># <code>/sw/bin/pathsetup.sh</code></pre> +</div> +<div class="commandBox" ><pre># <code>source /sw/bin/init.sh</code></pre> +</div> +<br /> +<br /> +Configure fink (Optional) +We are going to configure fink to download and install packages from source only. (no binary packages)<br /> +This step is optional, but has a better success rate for installing the fink +dependencies. +<br /> +<div class="commandBox" ><pre># <code>fink configure</code></pre> +</div> +<br /> +Provided below are the questions and the standard recommended answers for the configuration: +<div class="commandBox" ><pre> +Password: +OK, I'll ask you some questions and update the configuration file in '/sw/etc/fink.conf'. +In what additional directory should Fink look for downloaded tarballs? [] +Which directory should Fink use to build packages? (If you don't know what this means, it is safe to leave it +at its default.) [] + +Should Fink try to download pre-compiled packages from the binary distribution if available? [y/N] n +(1) Quiet (do not show download statistics) +(2) Low (do not show tarballs being expanded) +(3) Medium (will show almost everything) +(4) High (will show everything) + +How verbose should Fink be? [4] 4 + +Proxy/Firewall settings +Enter the URL of the HTTP proxy to use, or 'none' for no proxy. The URL should start with http:// and may +contain username, password, and/or port specifications. Note that this value will be visible to all users on +your computer. +Example, http://username:password@hostname:port +Your proxy: [none] +Enter the URL of the FTP proxy to use, or 'none' for no proxy. The URL should start with http:// and may +contain username, password, and/or port specifications. Note that this value will be visible to all users on +your computer. +Example, http://username:password@hostname:port +Your proxy: [none] +Use passive mode FTP transfers (to get through a firewall)? [Y/n] y + +Mirror selection +All mirrors are set. Do you want to change them? [y/N] n + +Writing updated configuration to '/sw/etc/fink.conf'... +</pre></div> +<br /> + +You need to install Ftjam which you can get from <a href="http://sourceforge.net/project/showfiles.php?group_id=3157">here.</a> You also need to install the following packages from Fink <br /> +<i class="command"> libjpeg freetype freetype-shlibs freetype2 freetype2-dev freetype2-shlibs libogg libvorbis0 libvorbis0-shlibs libmng2 libpng3 autoconf2.5 automake1.9 libtool wget curl</i><br /><br /> + +Since SVN is not always installed you need to make sure it is installed you can get it from <a href="http://metissian.com/projects/macosx/subversion/">here.</a> <br /> + +You also need to install Nvidia's Cg Toolkit from <a href="http://www.nvidia.com/object/cg_toolkit.html"> +here.</a> <p> <h3>Server Databases</h3> <i>Optional section</i> @@ -721,8 +793,8 @@ <i class="command">WARNING: could not load plugin 'planeshift.database.mysql'</i> make sure you have the dev package installed, if it was not installed, ./autogen.sh, ./configure, and recompile the server again, according to the documentation below.</p> </div> <div class="Linux-Ubuntu"> - <p>for Feisty via apt-get: <i class="commandBox"># sudo apt-get --assume-yes install libdbd-mysql-perl libdbi-perl libnet-daemon-perl libplrpc-perl mysql-client-5.0 mysql-server-5.0 libmysqlclient15-dev libmysqlclient15off</i></p> - <p>for Gutsy via apt-get: <i class="commandBox"># sudo apt-get --assume-yes install libdbd-mysql-perl libdbi-perl libnet-daemon-perl libplrpc-perl mysql-client-5.0 mysql-server-5.0 libmysqlclient15-dev libmysqlclient15off </i></p> + <p>for Feisty via apt-get: <div class="commandBox"># sudo apt-get --assume-yes install libdbd-mysql-perl libdbi-perl libnet-daemon-perl libplrpc-perl mysql-client-5.0 mysql-server-5.0 libmysqlclient15-dev libmysqlclient15off</div></p> + <p>for Gutsy via apt-get: <div class="commandBox"># sudo apt-get --assume-yes install libdbd-mysql-perl libdbi-perl libnet-daemon-perl libplrpc-perl mysql-client-5.0 mysql-server-5.0 libmysqlclient15-dev libmysqlclient15off </div></p> <p>If after building if you see that mysql was not found when running the server and you get the following error: <i class="command">WARNING: could not load plugin 'planeshift.database.mysql'</i> make sure you have libmysqlclient15-dev installed, if it was not installed, ./autogen.sh, ./configure, and recompile the server again, according to the documentation below.</p> @@ -756,7 +828,7 @@ mv libmysqlclient.a .. </div></p> </div> - </div> + </div></div> <b>WordNet:</b><br> You will also need the WordNet dictionaries. Download and install the <a href="http://wordnet.princeton.edu/obtain/">WordNet binaries</a>, version 2.1. @@ -955,7 +1027,66 @@ </p> </div> <div class="MacOSX"> - No guide yet. Try the Linux version for now. + <h3>Cal3D</h3> + <p>We need to build cal3d from source before we can start on Crystal Space. Cal3d is a library that is used for + handling skeleton systems. This is a very nice system and can allow for fluid transformations between animations. + This needs to be built/installed first because when we configure Crystal Space it has to find the cal3d libraries + so it can know to build the sprcal3d plugin. Cal3D doesn't change much, so just download latest stable or checkout latest from svn:</p> + <p><a href="http://home.gna.org/cal3d/">Cal3D Home</a></p> + <p><i class="command">$HOME/development$ svn co -r CAL3D_SOURCE_REV svn://svn.gna.org/svn/cal3d/trunk/cal3d cal3d</i></p> + + <h3>Crystal Space (CS)</h3> + <p>Crystal Space 3D SDK is the engine that we use for rendering and sound.</p> + <div class="User"> + <p><i class="command">$HOME/development$ svn co -r CS_SOURCE_REV https://crystal.svn.sourceforge.net/svnroot/crystal/CS/branches/release/V1.4 cs</i></p> + </div> + <div class="Developer"> + <p><i class="command">$HOME/development$ svn co -r CS_SOURCE_REV_HEAD https://crystal.svn.sourceforge.net/svnroot/crystal/CS/branches/release/V1.4 cs</i></p> + </div> + + <h3>Crystal Entity Layer (CEL)</h3> + <p>CEL is a layer on top of Crystal Space that is used for entity and behavior control.</p> + <div class="User"> + <p><i class="command">$HOME/development$ svn co -r CEL_SOURCE_REV https://cel.svn.sourceforge.net/svnroot/cel/cel/branches/release/V1.4 cel</i></p> + </div> + <div class="Developer"> + <p><i class="command">$HOME/development$ svn co -r CEL_SOURCE_REV_HEAD https://cel.svn.sourceforge.net/svnroot/cel/cel/branches/release/V1.4 cel</i></p> + </div> + + <h3>PlaneShift</h3> + <p>Lastly, download our source:</p> + <div class="User"> + <p><i class="command">$HOME/development$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/stable planeshift</i></p> + </div> + <div class="Developer"> + <p><i class="command">$HOME/development$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/trunk planeshift</i></p> + </div> +<h3>Updating Sources</h3> + <p>From time to time, newer PlaneShift revisions will require you to upgrade your cal3d, CS, and CEL repositories to a newer revision as well. To update your supporting libraries, always be certain that you use the "-r" option keep from updating to the latest revision:</p> + + If you want to update to a new revision replace REVISON with the number of the revision you want to use: + <p><div class="commandBox"> + $HOME/development/cal3d$ svn update -r REVISION<br> + $HOME/development/cs$ svn update -r REVISION<br> + $HOME/development/cel$ svn update -r REVISION<br> + </div></p> + <p>Unlike the supporting libraries, you will generally want to use the latest PlaneShift source (or the HEAD) rather than an intermediate revision. In this case, you will omit the "-r" option like so: + <div class="commandBox"> + $HOME/development/planeshift$ svn update + </div></p><br> + If, for some reason, you wish to update any of the supporting libraries to the latest version (i.e. the HEAD), you have to remove the sticky date tag. WE DO NOT RECOMMEND THIS as it may break your build: + <p><div class="commandBox"> + $HOME/development/cal3d$ svn update -r HEAD<br> + $HOME/development/cs$ svn update -r HEAD<br> + $HOME/development/cel$ svn update -r HEAD<br> + </div></p> + + +If you update a repository, you will need to recompile that repository and each repository that depends on it. Before doing so, you should do a "jam clean" for each project you want to jam again. So, for example, if you want to rebuild PS you will do: + <p><div class="commandBox"> + $HOME/development/planeshift$ jam clean<br> + $HOME/development/planeshift$ jam -aq + </div></p> </div> <!----------------------------------------------------------------------------------------------------> @@ -972,79 +1103,79 @@ by using the --prefix option when we configure it.</p> <div class="linux-Generic" > Using a text editor open configure.in and remove the line - <p><i class="commandBox"> - AM_USE_UNITTESTCPP</i></p> + <p><div class="commandBox"> + AM_USE_UNITTESTCPP</div></p> <p>Or you can use the following sed command</p> - <p> <i class="commandBox" > + <p> <div class="commandBox" > mv configure.in configure-old.in<br /> -sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</i></p> +sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</div></p> <p> Then you can build cal3d </p> - <p><i class="commandBox"> + <p><div class="commandBox"> /home/user/development/cal3d$ autoreconf --install --force<br> /home/user/development/cal3d$ ./configure --prefix=/home/user/development/cal3d<br> /home/user/development/cal3d$ make<br> /home/user/development/cal3d$ make install - </i></p></div> + </div></p></div> <div class="linux-Debian" > Using a text editor open configure.in and remove the line - <p><i class="commandBox"> - AM_USE_UNITTESTCPP</i></p> + <p><div class="commandBox"> + AM_USE_UNITTESTCPP</div></p> <p>Or you can use the following sed command</p> - <p> <i class="commandBox" > + <p> <div class="commandBox" > mv configure.in configure-old.in<br /> -sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</i></p> +sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</div></p> <p> Then you can build cal3d </p> - <p><i class="commandBox"> + <p><div class="commandBox"> /home/user/development/cal3d$ autoreconf --install --force<br> /home/user/development/cal3d$ ./configure --prefix=/home/user/development/cal3d<br> /home/user/development/cal3d$ make<br> /home/user/development/cal3d$ make install - </i></p></div> + </div></p></div> <div class="linux-Gentoo" > Using a text editor open configure.in and remove the line - <p><i class="commandBox"> - AM_USE_UNITTESTCPP</i></p> + <p><div class="commandBox"> + AM_USE_UNITTESTCPP</div></p> <p>Or you can use the following sed command</p> - <p> <i class="commandBox" > + <p> <div class="commandBox" > mv configure.in configure-old.in<br /> -sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</i></p> +sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</div></p> <p> Then you can build cal3d </p> - <p><i class="commandBox"> + <p><div class="commandBox"> /home/user/development/cal3d$ autoreconf --install --force<br> /home/user/development/cal3d$ ./configure --prefix=/home/user/development/cal3d<br> /home/user/development/cal3d$ make<br> /home/user/development/cal3d$ make install - </i></p></div> + </div></p></div> <div class="linux-Slackware" > Using a text editor open configure.in and remove the line - <p><i class="commandBox"> - AM_USE_UNITTESTCPP</i></p> + <p><div class="commandBox"> + AM_USE_UNITTESTCPP</div></p> <p>Or you can use the following sed command</p> - <p> <i class="commandBox" > + <p> <div class="commandBox" > mv configure.in configure-old.in<br /> -sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</i></p> +sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</div></p> <p> Then you can build cal3d </p> - <p><i class="commandBox"> + <p><div class="commandBox"> /home/user/development/cal3d$ autoreconf --install --force<br> /home/user/development/cal3d$ ./configure --prefix=/home/user/development/cal3d<br> /home/user/development/cal3d$ make<br> /home/user/development/cal3d$ make install - </i></p></div> + </div></p></div> <div class="linux-Ubuntu" > Using a text editor open configure.in and remove the line - <p><i class="commandBox"> - AM_USE_UNITTESTCPP</i></p> + <p><div class="commandBox"> + AM_USE_UNITTESTCPP</div></p> <p>Or you can use the following sed command</p> - <p> <i class="commandBox" > + <p> <div class="commandBox" > mv configure.in configure-old.in<br /> -sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</i></p> +sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</div></p> <p> Then you can build cal3d </p> - <p><i class="commandBox"> + <p><div class="commandBox"> /home/user/development/cal3d$ autoreconf --install --force<br> /home/user/development/cal3d$ ./configure --prefix=/home/user/development/cal3d<br> /home/user/development/cal3d$ make<br> /home/user/development/cal3d$ make install - </i></p></div> + </div></p></div> Because we did not install cal3d we need to make sure other things can find it. This is done using the LD_LIBRARY_PATH: <p><i class="command">export LD_LIBRARY_PATH=/home/user/development/cal3d/src/cal3d/.libs/:$LD_LIBRARY_PATH</i></p> </div></div> @@ -1053,50 +1184,50 @@ <p>Now we can build it and use the configure line to tell it where we installed the cal3d libraries. To do this, use the prefix line that was used for Cal3d above.</p></div> <div class="Linux-Generic" > - <div class="User"><i class="commandBox"> - /home/user/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> - <div class="Developer"><i class="commandBox"> - /home/user/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> + <div class="User"><div class="commandBox"> + /home/user/development/cs$ ./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</div></div><br> + <div class="Developer"><div class="commandBox"> + /home/user/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</div></div><br> <div class="Normal"><i class="command"> /home/user/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"><i class="command"> /home/user/development/cs$ jam -aq libs staticplugins cs-config walktest_static</i><br> </div></div> <div class="Linux-Debian" > - <div class="User"><i class="commandBox"> - /home/user/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> - <div class="Developer"><i class="commandBox"> - /home/user/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> + <div class="User"><div class="commandBox"> + /home/user/development/cs$ ./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</div></div><br> + <div class="Developer"><div class="commandBox"> + /home/user/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</div></div><br> <div class="Normal"><i class="command"> /home/user/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"><i class="command"> /home/user/development/cs$ jam -aq libs staticplugins cs-config walktest_static</i><br> </div></div> <div class="Linux-Gentoo" > - <div class="User"><i class="commandBox"> - /home/user/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> - <div class="Developer"><i class="commandBox"> - /home/user/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</i></div><br> - <div class="Normal"><i class="commandBox"> - /home/user/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> + <div class="User"><div class="commandBox"> + /home/user/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</div></div><br> + <div class="Developer"><div class="commandBox"> + /home/user/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=/home/user/development/cal3d</div></div><br> + <div class="Normal"><div class="commandBox"> + /home/user/development/cs$ jam -aq libs plugins cs-config walktest</div></div><br> <div class="Static"><i class="command"> /home/user/development/cs$ jam -aq libs staticplugins cs-config walktest_static</i><br> </div></div> <div class="Linux-Slackware" > - <div class="User"><i class="commandBox"> - /home/user/development/cs$./configure --without-java --without-perl --without-... [truncated message content] |
From: <mg...@us...> - 2008-06-30 17:56:03
|
Revision: 1839 http://planeshift.svn.sourceforge.net/planeshift/?rev=1839&view=rev Author: mgist Date: 2008-06-30 10:56:11 -0700 (Mon, 30 Jun 2008) Log Message: ----------- Merged revisions 1815-1817,1819-1820,1822,1825,1827-1828,1832,1834,1836 via svnmerge from https://planeshift.svn.sourceforge.net/svnroot/planeshift/trunk ........ r1815 | mgist | 2008-06-28 01:53:01 +0100 (Sat, 28 Jun 2008) | 1 line - Disabled dynamic text size in pawsMessageTextBox until it works. ........ r1816 | mgist | 2008-06-28 02:17:28 +0100 (Sat, 28 Jun 2008) | 1 line - Missing header. ........ r1817 | rdschulz | 2008-06-28 04:22:20 +0100 (Sat, 28 Jun 2008) | 2 lines - change int64_t to int64, windows doesn't have the former ........ r1819 | mgist | 2008-06-28 10:47:15 +0100 (Sat, 28 Jun 2008) | 1 line - Commented out another two lines. ........ r1820 | mr_dave | 2008-06-28 22:11:59 +0100 (Sat, 28 Jun 2008) | 1 line Fixed FS#564 ........ r1822 | varslot | 2008-06-29 10:21:46 +0100 (Sun, 29 Jun 2008) | 1 line Fixed build issues on OSX ........ r1825 | eriroley | 2008-06-29 15:57:32 +0100 (Sun, 29 Jun 2008) | 1 line Fixing spelling mistake ........ r1827 | mgist | 2008-06-29 19:33:20 +0100 (Sun, 29 Jun 2008) | 1 line - Added a missing check for attacker in gemActor::DoDamage. ........ r1828 | mgist | 2008-06-29 19:34:37 +0100 (Sun, 29 Jun 2008) | 1 line - History. ........ r1832 | mgist | 2008-06-30 00:14:19 +0100 (Mon, 30 Jun 2008) | 1 line - Merged updated credits from stable. ........ r1834 | mgist | 2008-06-30 13:40:39 +0100 (Mon, 30 Jun 2008) | 1 line - Fixed a crash in the gemActor ctor. ........ r1836 | mgist | 2008-06-30 14:08:55 +0100 (Mon, 30 Jun 2008) | 1 line - Fixed items in a container failing to load. ........ Modified Paths: -------------- personal/Xordan/docs/credit.txt personal/Xordan/docs/history.txt personal/Xordan/src/common/paws/pawstextbox.cpp personal/Xordan/src/common/rpgrules/psmoney.cpp personal/Xordan/src/server/bulkobjects/pscharacter.cpp personal/Xordan/src/server/bulkobjects/psitem.cpp personal/Xordan/src/server/database/mysql/upgrade_schema.sql personal/Xordan/src/server/gem.cpp personal/Xordan/src/tools/libxpnet/nsSocket.cpp Property Changed: ---------------- personal/Xordan/ Property changes on: personal/Xordan ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-1744,1746-1806 + /trunk:1-1744,1746-1806,1815-1836 Modified: personal/Xordan/docs/credit.txt =================================================================== --- personal/Xordan/docs/credit.txt 2008-06-30 17:12:01 UTC (rev 1838) +++ personal/Xordan/docs/credit.txt 2008-06-30 17:56:11 UTC (rev 1839) @@ -1,6 +1,6 @@ -@PlaneShift Team at Steel Blue 0.4.00 Release (released February-2008) +@PlaneShift Team at Steel Blue 0.4.01 Release (released June-2008) -&Project Leader, Director and Overall Camp Counselor +&Project Leader, Director Luca "Talad" Pancallo, for building a great team to make a dream come true. @@ -51,19 +51,19 @@ Desmond "Jeraphon", for quests, npc dialogues, kas and books. +Sherry "Rizin" Heidkamp, for quests, books, NPCs, oversight of and proposals for the tutorial, internal document management, and exceptional editing Steve "Darkmoon" Scott, for maps, npcs dialogues, quests and knowledge areas. Stacy "Venae Rell" Davis, for uncompromising editing, written and artistic contributions, and superior prospect management. Fred "Steuben" Prentice, for npc paths, and engine liason duties. -Frank "Eriroley" Barton, for quests, editing, and for work on the WebConsole +Frank "Eriroley" Barton, for WebConsole utilities and special projects, quests, and editing -Sherry "Rizin" Heidkamp, for quests, books, NPCs, and exceptional editing -Melissa "Ellille" Barton for her aid in furthering settings and making the world make sense +Melissa "Ellille" Barton for cooking and baking development, and her aid in furthering settings and making the world make sense -Angela "Jyoshka" Miller, for quests, books and KAs +Angela "Oomi" Miller, for quests, books, KAs, and organization of in-progress quests @@ -101,6 +101,11 @@ Erik "Erik" Bakker, for Trepor model, Klyros model, sewers level, player animations. +&Game Masters + +Anselm "Kerol" Kiefner, GM Team Leader, oversight of and proposals for the tutorial, and settings contributor + + &Rules Michael "Xordan" Gist, for balancing progression system and new stamina rules. @@ -119,7 +124,7 @@ @Special Thanks to -Frank "res" Richter, for working on CS New Renderer and supporting directly our project. +Frank "res" Richter, for working on CS New Renderer and supporting our project directly. Marc Haseinko, for providing a 99.9% reliable testing environment. Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2008-06-30 17:12:01 UTC (rev 1838) +++ personal/Xordan/docs/history.txt 2008-06-30 17:56:11 UTC (rev 1839) @@ -1,3 +1,16 @@ +*** 2008-06-30 by Mike Gist +- Fixed a crash in the gemActor ctor. +- Fixed items in a container failing to load. + +*** 2008-06-29 by Mike Gist +- Added a missing check for attacker in gemActor::DoDamage. + +*** 2008-06-28 by Dave Bentham +- Fixed FS#564 - erroneous "..is already dead" text after kill by magic. + +*** 2008-06-27 by Roland Schulz +- change int64_t to int64, windows doesn't have the former + *** 2008-06-26 by Roland Schulz - commit fix to FS#170 by Boite Prevent objects on canvas being moved outside of the canvas area, effectively Modified: personal/Xordan/src/common/paws/pawstextbox.cpp =================================================================== --- personal/Xordan/src/common/paws/pawstextbox.cpp 2008-06-30 17:12:01 UTC (rev 1838) +++ personal/Xordan/src/common/paws/pawstextbox.cpp 2008-06-30 17:56:11 UTC (rev 1839) @@ -439,7 +439,7 @@ int oldSize = GetFont()->GetSize(); if(adjusted[x]->size) { - ChangeFontSize(adjusted[x]->size); + //ChangeFontSize(adjusted[x]->size); } graphics2D->Write( GetFont(), @@ -448,7 +448,7 @@ adjusted[x]->colour, -1, (const char*)adjusted[x]->text ); - ChangeFontSize(oldSize); + //ChangeFontSize(oldSize); yPos++; } } @@ -613,7 +613,7 @@ int oldSize = GetFont()->GetSize(); if(size) { - ChangeFontSize(size); + //ChangeFontSize(size); } GetFont()->GetMaxSize( maxWidth, maxHeight ); @@ -667,7 +667,7 @@ } } - ChangeFontSize(oldSize); + //ChangeFontSize(oldSize); delete [] head; } } Modified: personal/Xordan/src/common/rpgrules/psmoney.cpp =================================================================== --- personal/Xordan/src/common/rpgrules/psmoney.cpp 2008-06-30 17:12:01 UTC (rev 1838) +++ personal/Xordan/src/common/rpgrules/psmoney.cpp 2008-06-30 17:56:11 UTC (rev 1839) @@ -83,7 +83,7 @@ int psMoney::GetTotal() const { - size_t total = circles*CIRCLES_VALUE_TRIAS + octas*OCTAS_VALUE_TRIAS + int64 total = circles*CIRCLES_VALUE_TRIAS + octas*OCTAS_VALUE_TRIAS + hexas*HEXAS_VALUE_TRIAS + trias; if(total > INT_MAX) total = INT_MAX; Modified: personal/Xordan/src/server/bulkobjects/pscharacter.cpp =================================================================== --- personal/Xordan/src/server/bulkobjects/pscharacter.cpp 2008-06-30 17:12:01 UTC (rev 1838) +++ personal/Xordan/src/server/bulkobjects/pscharacter.cpp 2008-06-30 17:56:11 UTC (rev 1839) @@ -1103,7 +1103,6 @@ { spellCasting->Interrupt(); } - SetSpellCasting(NULL); } void psCharacter::SetTradeWork(psWorkGameEvent * event) Modified: personal/Xordan/src/server/bulkobjects/psitem.cpp =================================================================== --- personal/Xordan/src/server/bulkobjects/psitem.cpp 2008-06-30 17:12:01 UTC (rev 1838) +++ personal/Xordan/src/server/bulkobjects/psitem.cpp 2008-06-30 17:56:11 UTC (rev 1839) @@ -362,8 +362,10 @@ owningCharacterID = row.GetUInt32("char_id_owner"); guardingCharacterID = row.GetUInt32("char_id_guardian"); - if ( row.GetInt("location_in_parent") == -1 || // SLOT_NONE - (row.GetInt("location_in_parent") == 0 && row.GetInt("char_id_owner") == 0)) // No owner and no slot + if(row.GetInt("location_in_parent") == -1 || // SLOT_NONE + (row.GetInt("location_in_parent") == 0 && + row.GetInt("char_id_owner") == 0 && + row.GetInt("parent_item_id") == 0)) // No owner and no slot { float x,y,z,yrot; INSTANCE_ID instance; Modified: personal/Xordan/src/server/database/mysql/upgrade_schema.sql =================================================================== --- personal/Xordan/src/server/database/mysql/upgrade_schema.sql 2008-06-30 17:12:01 UTC (rev 1838) +++ personal/Xordan/src/server/database/mysql/upgrade_schema.sql 2008-06-30 17:56:11 UTC (rev 1839) @@ -915,7 +915,7 @@ #### 1187 - Frank Barton - changing stat_type to appropriate value for random loot an unique items UPDATE `item_stats` SET `stat_type`='R' WHERE `id`>'10000'; -UPDATE `item_stats` SET `stat_type`='U' WHERE `stat_type`='R' AND `flags` LIKE '%PERSONALIZE%'; +UPDATE `item_stats` SET `stat_type`='U' WHERE `stat_type`='R' AND `flags` LIKE '%PERSONALISE%'; UPDATE `server_options` SET `option_value`='1187' WHERE `option_name`='db_version'; #### 1188 - Steven Patrick - Adding advisor_ban field Modified: personal/Xordan/src/server/gem.cpp =================================================================== --- personal/Xordan/src/server/gem.cpp 2008-06-30 17:12:01 UTC (rev 1838) +++ personal/Xordan/src/server/gem.cpp 2008-06-30 17:56:11 UTC (rev 1839) @@ -1719,8 +1719,6 @@ SetAlive(true); - chardata->SetActor(this); - if (!InitLinMove(pos,rotangle,room)) { Error1("Could not initialize LinMove prop class, so actor not created."); @@ -1728,6 +1726,8 @@ return; } + chardata->SetActor(this); + if (!InitCharData(client)) { Error1("Could not init char data. Actor not created."); @@ -2097,7 +2097,12 @@ SetMode(PSCHARACTER_MODE_DEAD); } - psserver->combatmanager->StopAttack(attacker); + // if damage due to spell then spell is ending anyway, so no need to force + // 'stop attack.' + if (attacker && attacker->GetMode() == PSCHARACTER_MODE_COMBAT) + { + psserver->combatmanager->StopAttack(attacker); + } } // Update group stats and it's own Modified: personal/Xordan/src/tools/libxpnet/nsSocket.cpp =================================================================== --- personal/Xordan/src/tools/libxpnet/nsSocket.cpp 2008-06-30 17:12:01 UTC (rev 1838) +++ personal/Xordan/src/tools/libxpnet/nsSocket.cpp 2008-06-30 17:56:11 UTC (rev 1839) @@ -61,6 +61,7 @@ #else #include <unistd.h> #include <netdb.h> +#include <netinet/in.h> #include <sys/socket.h> #include <arpa/inet.h> #endif @@ -174,7 +175,11 @@ socklen_t newTCPWin, len; len = sizeof( newTCPWin ); - + +#ifdef SO_NOSIGPIPE + int value = 1; + setsockopt( mFd, SOL_SOCKET, SO_NOSIGPIPE, &value, sizeof( value )); +#endif setsockopt( mFd, SOL_SOCKET, SO_RCVBUF, (char*) &windowSize, sizeof( windowSize )); #ifdef DEBUG getsockopt( mFd, SOL_SOCKET, SO_RCVBUF, (char*) &newTCPWin, &len ); @@ -320,8 +325,14 @@ #ifdef CS_PLATFORM_WIN32 rv = write(mFd, aBuf, *aBufSize); #else +//MSG_NOSIGNAL is not posix compliant. In particular not defined on OSX/BSD. +//Socket option is used here instead. +#ifdef MSG_NOSIGNAL rv = send(mFd, aBuf, *aBufSize, MSG_NOSIGNAL); +#else + rv = send(mFd, aBuf, *aBufSize, 0); #endif +#endif } if (rv <= 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-07-10 10:45:39
|
Revision: 1886 http://planeshift.svn.sourceforge.net/planeshift/?rev=1886&view=rev Author: mgist Date: 2008-07-10 03:45:44 -0700 (Thu, 10 Jul 2008) Log Message: ----------- Merged revisions 1840-1841,1843,1845,1847,1849,1851-1852,1854,1856-1857,1859-1862,1868-1869,1871-1877,1879,1881-1884 via svnmerge from https://planeshift.svn.sourceforge.net/svnroot/planeshift/trunk ........ r1840 | aresilek | 2008-07-01 16:35:54 +0100 (Tue, 01 Jul 2008) | 1 line - Fix for FS#1794, patch by Caarrie. ........ r1841 | mgist | 2008-07-01 20:51:27 +0100 (Tue, 01 Jul 2008) | 2 lines - Made the integrity check in the updater more robust. - Improved the updater so it checks if you already have the correct version of a file on patch fail. ........ r1843 | mgist | 2008-07-01 23:32:05 +0100 (Tue, 01 Jul 2008) | 1 line - Patch from Arerano to fix the timout on disconnect not working. ........ r1845 | mgist | 2008-07-02 04:14:52 +0100 (Wed, 02 Jul 2008) | 3 lines - Changed ProximityList::ClearTouched() to not set 'self' to untouched, as it is guaranteed to always be touched. This also fixes an assert, although doesn't deal with the root of the issue causing it, so more investigation it needed. ........ r1847 | mgist | 2008-07-02 05:15:46 +0100 (Wed, 02 Jul 2008) | 2 lines - Added extra error checking to UserManager::HandleLoot() and refactored it a little bit. ........ r1849 | mgist | 2008-07-02 18:26:37 +0100 (Wed, 02 Jul 2008) | 1 line - Disabled material stripping from thing mesh factories and objects. ........ r1851 | kennygraunke | 2008-07-02 19:30:42 +0100 (Wed, 02 Jul 2008) | 3 lines Silence some debugging printfs...they're not very detailed anyway. If you want them back, please add a LOG_ADVICE category. ........ r1852 | mgist | 2008-07-02 21:36:25 +0100 (Wed, 02 Jul 2008) | 1 line - Applied fixes to gemNPCObject::InitMesh from gemObject::InitMesh ........ r1854 | mgist | 2008-07-02 22:15:14 +0100 (Wed, 02 Jul 2008) | 1 line - Fixed a crash in the npcclient where an item has no meshfact specified. ........ r1856 | kennygraunke | 2008-07-02 22:40:24 +0100 (Wed, 02 Jul 2008) | 2 lines Clean up some abuse of booleans. (It's already true or false, you don't need to compare it...) ........ r1857 | aresilek | 2008-07-03 16:19:42 +0100 (Thu, 03 Jul 2008) | 1 line - Fixed incompatibility in chatbubbles.xml, it now accepts both 'color' and 'colour' tags, patch by Celestar. ........ r1859 | mgist | 2008-07-04 10:29:08 +0100 (Fri, 04 Jul 2008) | 1 line - Bump main version. ........ r1860 | aresilek | 2008-07-04 16:09:00 +0100 (Fri, 04 Jul 2008) | 1 line - Fixed FS#1857, patch by Caarrie. ........ r1861 | psshared | 2008-07-04 18:19:50 +0100 (Fri, 04 Jul 2008) | 2 lines Visual-C++ project files: Automated Visual-C++ project file repair. ........ r1862 | aresilek | 2008-07-04 22:53:56 +0100 (Fri, 04 Jul 2008) | 1 line - Added /loadquest to command_access.sql ........ r1868 | mgist | 2008-07-06 09:00:40 +0100 (Sun, 06 Jul 2008) | 1 line - Reverted 1845 to attempt a proper fix. ........ r1869 | mgist | 2008-07-06 11:09:39 +0100 (Sun, 06 Jul 2008) | 1 line - Fixed unique iMeshWrappers not being created for new objects. ........ r1871 | rdschulz | 2008-07-06 22:50:43 +0100 (Sun, 06 Jul 2008) | 4 lines +- Fix to FS#1741, FS#1703 and likely FS#1130 by Zwenze. This adds an area + syntax improvment to GM commands, allowing to target all items/npcs/players + in an area. Also does not spawn items anew if a pickup didn't succeed. ........ r1872 | rdschulz | 2008-07-06 23:29:26 +0100 (Sun, 06 Jul 2008) | 2 lines - Fix to FS#1336 by Boite - use mouselook only when focussed on main widget. ........ r1873 | rdschulz | 2008-07-06 23:46:19 +0100 (Sun, 06 Jul 2008) | 2 lines - Fix to FS#1694 by Zwenze - added GM /checkitem command ........ r1874 | rdschulz | 2008-07-07 00:21:36 +0100 (Mon, 07 Jul 2008) | 2 lines - Fix to FS#1376 by Oskaris - display bug in ownership when splitting a stack in furnace ........ r1875 | rdschulz | 2008-07-07 00:25:33 +0100 (Mon, 07 Jul 2008) | 2 lines - Fix to FS#1654 by Celestar - Inconsistency with /me in different displays ........ r1876 | rdschulz | 2008-07-07 00:32:02 +0100 (Mon, 07 Jul 2008) | 2 lines - Fix to FS#1426 by Oskaris - Strafe interrupts spell casting ........ r1877 | rdschulz | 2008-07-07 01:18:16 +0100 (Mon, 07 Jul 2008) | 2 lines - Fix to FS#723 by Oskaris - ability for players to edit existion petitions ........ r1879 | Khakilord | 2008-07-08 07:52:43 +0100 (Tue, 08 Jul 2008) | 1 line Improved logging. ........ r1881 | aresilek | 2008-07-09 03:16:52 +0100 (Wed, 09 Jul 2008) | 1 line - Fix to guild window xml, patch by Caarrie. ........ r1882 | aresilek | 2008-07-10 02:52:00 +0100 (Thu, 10 Jul 2008) | 1 line - Fix to FS#774, patch by weltall. ........ r1883 | aresilek | 2008-07-10 02:53:17 +0100 (Thu, 10 Jul 2008) | 1 line - Fix typo. ........ r1884 | Khakilord | 2008-07-10 05:09:22 +0100 (Thu, 10 Jul 2008) | 1 line Disabled optimization in debug mode. O2 caused local variables to be optimized out. ........ Modified Paths: -------------- personal/Xordan/configure.ac personal/Xordan/data/gui/configmouse.xml personal/Xordan/data/gui/guildwindow.xml personal/Xordan/data/gui/inventory.xml personal/Xordan/data/gui/loadwindow.xml personal/Xordan/data/gui/petition.xml personal/Xordan/data/help.xml personal/Xordan/docs/history.txt personal/Xordan/mk/msvc/appeedit.manifest personal/Xordan/mk/msvc/appeedit.rc personal/Xordan/mk/msvc/apppsclient.manifest personal/Xordan/mk/msvc/apppsclient.rc personal/Xordan/mk/msvc/apppsclient_static.manifest personal/Xordan/mk/msvc/apppsclient_static.rc personal/Xordan/mk/msvc/apppslaunch.manifest personal/Xordan/mk/msvc/apppslaunch.rc personal/Xordan/mk/msvc/apppslaunch_static.manifest personal/Xordan/mk/msvc/apppslaunch_static.rc personal/Xordan/mk/msvc/apppsnpcclient.manifest personal/Xordan/mk/msvc/apppsnpcclient.rc personal/Xordan/mk/msvc/apppsnpcclient_static.manifest personal/Xordan/mk/msvc/apppsnpcclient_static.rc personal/Xordan/mk/msvc/apppsserver.manifest personal/Xordan/mk/msvc/apppsserver.rc personal/Xordan/mk/msvc/apppsserver_static.manifest personal/Xordan/mk/msvc/apppsserver_static.rc personal/Xordan/mk/msvc/apppssetup.manifest personal/Xordan/mk/msvc/apppssetup.rc personal/Xordan/mk/msvc/apppssetup_static.manifest personal/Xordan/mk/msvc/apppssetup_static.rc personal/Xordan/mk/msvc/apppsupdater.manifest personal/Xordan/mk/msvc/apppsupdater.rc personal/Xordan/mk/msvc/apppsupdater_static.manifest personal/Xordan/mk/msvc/apppsupdater_static.rc personal/Xordan/mk/msvc/plgdbmysql.rc personal/Xordan/src/client/charapp.cpp personal/Xordan/src/client/chatbubbles.cpp personal/Xordan/src/client/cmdusers.cpp personal/Xordan/src/client/gui/pawsactivemagicwindow.cpp personal/Xordan/src/client/gui/pawscharbirth.cpp personal/Xordan/src/client/gui/pawscharcreatemain.cpp personal/Xordan/src/client/gui/pawscharparents.cpp personal/Xordan/src/client/gui/pawschild.cpp personal/Xordan/src/client/gui/pawsgmaction.cpp personal/Xordan/src/client/gui/pawsilluminationwindow.cpp personal/Xordan/src/client/gui/pawslife.cpp personal/Xordan/src/client/gui/pawsloginwindow.cpp personal/Xordan/src/client/gui/pawspetitionwindow.cpp personal/Xordan/src/client/gui/pawspetitionwindow.h personal/Xordan/src/client/gui/pawspetstatwindow.cpp personal/Xordan/src/client/gui/pawsskillwindow.cpp personal/Xordan/src/client/gui/pawsslot.cpp personal/Xordan/src/client/gui/psmainwidget.cpp personal/Xordan/src/client/pscharcontrol.cpp personal/Xordan/src/client/psmovement.cpp personal/Xordan/src/client/psmovement.h personal/Xordan/src/client/shadowmanager.cpp personal/Xordan/src/client/sound/pssoundmngr.cpp personal/Xordan/src/common/engine/linmove.cpp personal/Xordan/src/common/engine/psregion.cpp personal/Xordan/src/common/net/messages.cpp personal/Xordan/src/common/net/messages.h personal/Xordan/src/common/paws/pawsmanager.cpp personal/Xordan/src/common/paws/pawswidget.cpp personal/Xordan/src/common/util/pscssetup.h personal/Xordan/src/npcclient/gem.cpp personal/Xordan/src/pslaunch/pslaunch.cpp personal/Xordan/src/pslaunch/updaterengine.cpp personal/Xordan/src/server/adminmanager.cpp personal/Xordan/src/server/adminmanager.h personal/Xordan/src/server/advicemanager.cpp personal/Xordan/src/server/bulkobjects/dictionary.cpp personal/Xordan/src/server/bulkobjects/psinventorycachesvr.cpp personal/Xordan/src/server/bulkobjects/psnpcdialog.cpp personal/Xordan/src/server/bulkobjects/psspell.cpp personal/Xordan/src/server/chatmanager.cpp personal/Xordan/src/server/creationmanager.cpp personal/Xordan/src/server/database/mysql/command_access.sql personal/Xordan/src/server/economymanager.cpp personal/Xordan/src/server/entitymanager.cpp personal/Xordan/src/server/exchangemanager.cpp personal/Xordan/src/server/gem.cpp personal/Xordan/src/server/guildmanager.cpp personal/Xordan/src/server/invitemanager.cpp personal/Xordan/src/server/netmanager.cpp personal/Xordan/src/server/progressionmanager.cpp personal/Xordan/src/server/spawnmanager.cpp personal/Xordan/src/server/usermanager.cpp personal/Xordan/src/server/usermanager.h Property Changed: ---------------- personal/Xordan/ Property changes on: personal/Xordan ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-1744,1746-1806,1815-1836 + /trunk:1-1744,1746-1806,1815-1836,1840-1884 Modified: personal/Xordan/configure.ac =================================================================== --- personal/Xordan/configure.ac 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/configure.ac 2008-07-10 10:45:44 UTC (rev 1886) @@ -11,7 +11,7 @@ #---------------------------------------------------------------------------- # Initialize autoconf #---------------------------------------------------------------------------- -AC_INIT([PlaneShift], [0.4.01], [pla...@li...]) +AC_INIT([PlaneShift], [0.4.02], [pla...@li...]) CS_PACKAGEINFO([PlaneShift a 3d MMORPG], [Copyright (C)2001-2008 Atomic Blue], [http://www.planeshift.it/]) @@ -255,12 +255,6 @@ [C++], [COMPILER.CFLAGS.optimize], [+], [cs_optimize_flags="$cs_optimize_flags $cs_cv_prog_cxx_optimize"]) - CS_EMIT_BUILD_FLAGS([how to enable debug optimizations], - [cs_cv_prog_cxx_debug], - [CS_CREATE_TUPLE([-O2]) CS_CREATE_TUPLE([-Os]) CS_CREATE_TUPLE([-O])], - [C++], [COMPILER.CFLAGS.debug], [+], - [cs_debug_flags="$cs_debug_flags $cs_cv_prog_cxx_debug"]) - CS_EMIT_BUILD_FLAGS([if -fomit-frame-pointer is accepted], [cs_cv_prog_cxx_omit_frame_pointer], [CS_CREATE_TUPLE([-fomit-frame-pointer])], Modified: personal/Xordan/data/gui/configmouse.xml =================================================================== --- personal/Xordan/data/gui/configmouse.xml 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/data/gui/configmouse.xml 2008-07-10 10:45:44 UTC (rev 1886) @@ -18,7 +18,16 @@ <widget factory="pawsSeqTreeNode" name="EntitySelect"> <attr name="type" value="action"/> </widget> + <widget factory="pawsSeqTreeNode" name="EntityDragDrop"> + <attr name="type" value="action"/> </widget> + <widget factory="pawsSeqTreeNode" name="EntityDragDropOne"> + <attr name="type" value="action"/> + </widget> + <widget factory="pawsSeqTreeNode" name="EntityDragDropAll"> + <attr name="type" value="action"/> + </widget> + </widget> <widget factory="pawsWidgetTreeNode"> <nodewidget> <widget factory="pawsTextBox" name="Settings label"> Modified: personal/Xordan/data/gui/guildwindow.xml =================================================================== --- personal/Xordan/data/gui/guildwindow.xml 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/data/gui/guildwindow.xml 2008-07-10 10:45:44 UTC (rev 1886) @@ -380,7 +380,7 @@ </column> - <column width="135" xmlbinding="level" > + <column width="120" xmlbinding="level" > <widget name="Level" factory="pawsTextBox"> </widget> @@ -392,7 +392,7 @@ </column> - <column width="75" xmlbinding="sector" > + <column width="95" xmlbinding="sector" > <widget name="Sector" factory="pawsTextBox"> <text horizAdjust="CENTRE" /></widget> @@ -538,7 +538,7 @@ <widget name="CreateAlliance" factory="pawsButton" id="505"> - <frame x="520" y="7" width="90" height="19" /> + <frame x="520" y="7" width="100" height="19" /> <bgimage resource="Standard Button" /> @@ -748,3 +748,4 @@ </widget_description> + Modified: personal/Xordan/data/gui/inventory.xml =================================================================== --- personal/Xordan/data/gui/inventory.xml 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/data/gui/inventory.xml 2008-07-10 10:45:44 UTC (rev 1886) @@ -182,7 +182,7 @@ <widget name="TotalTrias" factory="pawsTextBox"> <frame x="60" y="172" width="90" height="30" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="64" size="12" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="64" size="10" /> <text string="0" /> <subscriptions> <subscribe data="sigInvMoneyTotal" /> @@ -192,7 +192,7 @@ <widget name="TotalWeight" factory="pawsTextBox"> <frame x="60" y="185" width="90" height="30" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="64" size="12" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="64" size="10" /> <text string="0" /> <subscriptions> <subscribe data="sigInvWeightTotal" /> @@ -201,7 +201,7 @@ <widget name="TotalCapacity" factory="pawsTextBox"> <frame x="70" y="212" width="60" height="30"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="64" size="12" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="64" size="10" /> <text string="0" /> <subscriptions> <subscribe data="fmaxcapacity" /> @@ -210,7 +210,7 @@ <widget name="CurrCapacity" factory="pawsTextBox"> <frame x="5" y="212" width="60" height="30"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="215" g="167" b="32" size="12" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="215" g="167" b="32" size="10" /> <text string="0" /> <subscriptions> <subscribe data="fcurrcap" /> Modified: personal/Xordan/data/gui/loadwindow.xml =================================================================== --- personal/Xordan/data/gui/loadwindow.xml 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/data/gui/loadwindow.xml 2008-07-10 10:45:44 UTC (rev 1886) @@ -17,8 +17,8 @@ <frame x="30" y="350" width="295" height="100" border="no" /> </widget> <widget name="tip" factory="pawsMultiLineTextBox" > - <frame x="380" y="510" width="410" height="40" border="no" /> - <bgimage resource="Standard Background" alpha="120" /> + <frame x="460" y="470" width="310" height="80" border="no" /> + <bgimage resource="Standard Background" alpha="150" /> </widget> <widget name="Progress" factory="pawsProgressBar"> <frame x="10" y="570" height="20" width="700" border="yes" /> @@ -28,3 +28,4 @@ </widget_description> + Modified: personal/Xordan/data/gui/petition.xml =================================================================== --- personal/Xordan/data/gui/petition.xml 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/data/gui/petition.xml 2008-07-10 10:45:44 UTC (rev 1886) @@ -5,7 +5,7 @@ resizable="no" configurable="yes"> <frame x="0" y="100" width="600" height="350" border="yes" /> - <title resource="Blue Title" text="List Petitions" align="left" close_button="yes"/> + <title resource="Blue Title" text="Manage Petitions" align="left" close_button="yes"/> <bgimage resource="Petitions Background" alpha="128" /> <widget name="PetitionList" factory="pawsListBox"> @@ -49,8 +49,8 @@ <text string="Petition text:" /> </widget> - <widget name="PetitionText" factory="pawsMessageTextBox" > - <frame x="32" y="227" width="540" height="94" border="no" /> + <widget name="PetitionText" factory="pawsMultilineEditTextBox" style="textinput" > + <frame x="32" y="227" width="540" height="94" /> <font name="/planeshift/data/ttf/LiberationMono-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> @@ -77,6 +77,19 @@ <attach point="ATTACH_BOTTOM" /> </attachpoints> </widget> + + <widget name="Save Button" factory="pawsButton" toggle="no" id="3" shadows="yes" > + <frame x="265" y="324" width="94" height="22" border="no" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="10" /> + <bgimage resource="Standard Button"/> + <label text="Save" /> + + <attachpoints> + <attach point="ATTACH_LEFT" /> + <attach point="ATTACH_BOTTOM" /> + </attachpoints> + </widget> + </widget> Modified: personal/Xordan/data/help.xml =================================================================== --- personal/Xordan/data/help.xml 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/data/help.xml 2008-07-10 10:45:44 UTC (rev 1886) @@ -408,6 +408,9 @@ <topic name="/charlist">/charlist player Informs the GM of the IDs and names of all characters on the same account as the account of the given character.</topic> + <topic name="/checkitem">/checkitem [target] [quantity|''] [item|tria] + +Commands used to check the presence of an item in another character. Example: "/checkitem Bob 42 tria"</topic> <topic name="/crystal">/crystal [interval] [max random interval modifier] [amount] [range] [item] Create a new hunt location which spawns an item in interval + random secs up to a max of amount within the range. Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/docs/history.txt 2008-07-10 10:45:44 UTC (rev 1886) @@ -1,3 +1,51 @@ +*** 2008-07-10 by Steven Patrick +- Fix to FS#774, patch by weltall. + +*** 2008-07-09 by Andrew Dai +- Disabled optimization in debug mode. O2 caused local variables to be + optimized out. + +*** 2008-07-09 by Steven Patrick +- Fix to guild window xml, patch by Caarrie. + +*** 2008-07-06 by Roland Schulz +- Fix to FS#1741, FS#1703 and likely FS#1130 by Zwenze. This adds an area + syntax improvment to GM commands, allowing to target all items/npcs/players + in an area. Also does not spawn items anew if a pickup didn't succeed. +- Fix to FS#1336 by Boite - use mouselook only when focussed on main widget. +- Fix to FS#1694 by Zwenze - added GM /checkitem command. +- Fix to FS#1376 by Oskaris - display bug in ownership when splitting a stack + in furnace +- Fix to FS#1654 by Celestar - Inconsistency with /me in different displays +- Fix to FS#1426 by Oskaris - Strafe interrupts spell casting +- Fix to FS#723 by Oskaris - ability for players to edit existion petitions + +*** 2008-07-06 by Mike Gist +- Fixed unique iMeshWrappers not being created for new objects. + Thanks to Andrew Dai for debugging. + +*** 2008-07-04 by Steven Patrick +- Fixed FS#1857, patch by Caarrie. + +*** 2008-07-03 by Steven Patrick +- Fixed incompatibility in chatbubbles.xml, it now accepts both 'color' and 'colour' + tags, patch by Celestar. + +*** 2008-07-02 by Mike Gist +- Added extra error checking to UserManager::HandleLoot() and refactored it a + little bit. +- Disabled material stripping from thing mesh factories and objects. +- Fixed a crash in the npcclient where an item has no meshfact specified. + +*** 2008-07-01 by Mike Gist +- Made the integrity check in the updater more robust. +- Improved the updater so it checks if you already have the correct version of + a file on patch fail. +- Patch from Arerano to fix the timout on disconnect not working. + +*** 2008-07-01 by Steven Patrick +- Fix for FS#1794, patch by Caarrie. + *** 2008-06-30 by Mike Gist - Fixed a crash in the gemActor ctor. - Fixed items in a container failing to load. Modified: personal/Xordan/mk/msvc/appeedit.manifest =================================================================== --- personal/Xordan/mk/msvc/appeedit.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/appeedit.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.eedit" type="win32" Modified: personal/Xordan/mk/msvc/appeedit.rc =================================================================== --- personal/Xordan/mk/msvc/appeedit.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/appeedit.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "eedit" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppsclient.manifest =================================================================== --- personal/Xordan/mk/msvc/apppsclient.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsclient.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.psclient" type="win32" Modified: personal/Xordan/mk/msvc/apppsclient.rc =================================================================== --- personal/Xordan/mk/msvc/apppsclient.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsclient.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "psclient" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppsclient_static.manifest =================================================================== --- personal/Xordan/mk/msvc/apppsclient_static.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsclient_static.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.psclient_static" type="win32" Modified: personal/Xordan/mk/msvc/apppsclient_static.rc =================================================================== --- personal/Xordan/mk/msvc/apppsclient_static.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsclient_static.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "psclient_static" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppslaunch.manifest =================================================================== --- personal/Xordan/mk/msvc/apppslaunch.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppslaunch.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.pslaunch" type="win32" Modified: personal/Xordan/mk/msvc/apppslaunch.rc =================================================================== --- personal/Xordan/mk/msvc/apppslaunch.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppslaunch.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "pslaunch" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppslaunch_static.manifest =================================================================== --- personal/Xordan/mk/msvc/apppslaunch_static.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppslaunch_static.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.pslaunch_static" type="win32" Modified: personal/Xordan/mk/msvc/apppslaunch_static.rc =================================================================== --- personal/Xordan/mk/msvc/apppslaunch_static.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppslaunch_static.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "pslaunch_static" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppsnpcclient.manifest =================================================================== --- personal/Xordan/mk/msvc/apppsnpcclient.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsnpcclient.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.psnpcclient" type="win32" Modified: personal/Xordan/mk/msvc/apppsnpcclient.rc =================================================================== --- personal/Xordan/mk/msvc/apppsnpcclient.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsnpcclient.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "psnpcclient" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppsnpcclient_static.manifest =================================================================== --- personal/Xordan/mk/msvc/apppsnpcclient_static.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsnpcclient_static.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.psnpcclient_static" type="win32" Modified: personal/Xordan/mk/msvc/apppsnpcclient_static.rc =================================================================== --- personal/Xordan/mk/msvc/apppsnpcclient_static.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsnpcclient_static.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "psnpcclient_static" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppsserver.manifest =================================================================== --- personal/Xordan/mk/msvc/apppsserver.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsserver.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.psserver" type="win32" Modified: personal/Xordan/mk/msvc/apppsserver.rc =================================================================== --- personal/Xordan/mk/msvc/apppsserver.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsserver.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "psserver" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppsserver_static.manifest =================================================================== --- personal/Xordan/mk/msvc/apppsserver_static.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsserver_static.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.psserver_static" type="win32" Modified: personal/Xordan/mk/msvc/apppsserver_static.rc =================================================================== --- personal/Xordan/mk/msvc/apppsserver_static.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsserver_static.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "psserver_static" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppssetup.manifest =================================================================== --- personal/Xordan/mk/msvc/apppssetup.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppssetup.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.pssetup" type="win32" Modified: personal/Xordan/mk/msvc/apppssetup.rc =================================================================== --- personal/Xordan/mk/msvc/apppssetup.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppssetup.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "pssetup" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppssetup_static.manifest =================================================================== --- personal/Xordan/mk/msvc/apppssetup_static.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppssetup_static.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.pssetup_static" type="win32" Modified: personal/Xordan/mk/msvc/apppssetup_static.rc =================================================================== --- personal/Xordan/mk/msvc/apppssetup_static.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppssetup_static.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "pssetup_static" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppsupdater.manifest =================================================================== --- personal/Xordan/mk/msvc/apppsupdater.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsupdater.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.psupdater" type="win32" Modified: personal/Xordan/mk/msvc/apppsupdater.rc =================================================================== --- personal/Xordan/mk/msvc/apppsupdater.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsupdater.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "psupdater" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/apppsupdater_static.manifest =================================================================== --- personal/Xordan/mk/msvc/apppsupdater_static.manifest 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsupdater_static.manifest 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,7 +2,7 @@ <!-- This file is generated automatically. --> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="0.4.01.0" + version="0.4.02.0" processorArchitecture="X86" name="PlaneShift.psupdater_static" type="win32" Modified: personal/Xordan/mk/msvc/apppsupdater_static.rc =================================================================== --- personal/Xordan/mk/msvc/apppsupdater_static.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/apppsupdater_static.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "psupdater_static" #ifdef CS_DEBUG Modified: personal/Xordan/mk/msvc/plgdbmysql.rc =================================================================== --- personal/Xordan/mk/msvc/plgdbmysql.rc 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/mk/msvc/plgdbmysql.rc 2008-07-10 10:45:44 UTC (rev 1886) @@ -2,9 +2,9 @@ 1 VERSIONINFO FILEVERSION -0,4,01,0 +0,4,02,0 PRODUCTVERSION -0,4,01,0 +0,4,02,0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -16,8 +16,8 @@ BLOCK "040904E4" { VALUE "ProductName", "PlaneShift a 3d MMORPG" - VALUE "ProductVersion", "0.4.01" - VALUE "FileVersion", "0.4.01" + VALUE "ProductVersion", "0.4.02" + VALUE "FileVersion", "0.4.02" VALUE "LegalCopyright", "Copyright (C)2001-2008 Atomic Blue" VALUE "FileDescription", "dbmysql" #ifdef CS_DEBUG Modified: personal/Xordan/src/client/charapp.cpp =================================================================== --- personal/Xordan/src/client/charapp.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/charapp.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -224,24 +224,23 @@ void psCharAppearance::ShowHair(bool show) { - if ( show && hairAttached ) + if (show) { - return; + if (hairAttached) + return; + + state->AttachCoreMesh(hairMesh); + + if (colorSet) + HairColor(hairShader); + + hairAttached = true; } - else if ( show == false ) + else { state->DetachCoreMesh(hairMesh); hairAttached = false; } - else if ( show == true ) - { - state->AttachCoreMesh(hairMesh); - - if (colorSet) - HairColor(hairShader); - - hairAttached = true; - } } void psCharAppearance::SetSkinTone(csString& part, csString& material, csString& texture) Modified: personal/Xordan/src/client/chatbubbles.cpp =================================================================== --- personal/Xordan/src/client/chatbubbles.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/chatbubbles.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -45,7 +45,6 @@ //#define DISABLE_CHAT_BUBBLES // Used to set default config files if the userdata ones are not found. -#define SAVE_USER true #define DEFAULT_FILE "/planeshift/data/options/chatbubbles_def.xml" #define USER_FILE "/planeshift/userdata/options/chatbubbles.xml" @@ -66,13 +65,7 @@ msgHandler = psengine->GetMsgHandler(); msgHandler->Subscribe(this, MSGTYPE_CHAT); - bool result = Load(USER_FILE); - if ( result == false ) - { - result = Load(DEFAULT_FILE, SAVE_USER); - } - - return true; + return (Load(USER_FILE) || Load(DEFAULT_FILE, true)); } bool psChatBubbles::Load(const char * filename, bool saveAgain) @@ -172,10 +165,31 @@ else if (type == "npc_narrate") chat.chatType = CHAT_NPC_NARRATE; - // color - r = chatNode->GetAttributeValueAsInt("colourR"); - g = chatNode->GetAttributeValueAsInt("colourG"); - b = chatNode->GetAttributeValueAsInt("colourB"); + // colour + if (chatNode->GetAttribute("colorR") != 0) + { + r = chatNode->GetAttributeValueAsInt("colorR"); + } + else + { + r = chatNode->GetAttributeValueAsInt("colourR"); + } + if (chatNode->GetAttribute("colorG") != 0) + { + g = chatNode->GetAttributeValueAsInt("colorG"); + } + else + { + g = chatNode->GetAttributeValueAsInt("colourG"); + } + if (chatNode->GetAttribute("colorB") != 0) + { + b = chatNode->GetAttributeValueAsInt("colorB"); + } + else + { + b = chatNode->GetAttributeValueAsInt("colourB"); + } chat.textSettings.colour = psengine->GetG2D()->FindRGB(r, g, b); // shadow @@ -256,6 +270,24 @@ else firstName = chatMsg.sPerson; + //We don't want /me or /my messages in the chat box, change them to something nice + if (chatMsg.sText.StartsWith("/me")) + { + chatMsg.sText.DeleteAt(0, 3); + chatMsg.sText.Insert(0, firstName); + chatMsg.sText.Insert(0, "* "); + chatMsg.sText.Append(" *"); + } + if (chatMsg.sText.StartsWith("/my")) + { + csString apofirstname(firstName); + apofirstname.Append("'s"); + chatMsg.sText.DeleteAt(0, 3); + chatMsg.sText.Insert(0, apofirstname); + chatMsg.sText.Insert(0, "* "); + chatMsg.sText.Append(" *"); + } + GEMClientActor* actor = psengine->GetCelClient()->GetActorByName(firstName); if (!actor) return; Modified: personal/Xordan/src/client/cmdusers.cpp =================================================================== --- personal/Xordan/src/client/cmdusers.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/cmdusers.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -657,7 +657,19 @@ else object = FindEntityWithName(words[1]); if (object) - psengine->GetCharManager()->SetTarget(object,"pickup"); + { + psengine->GetCharManager()->SetTarget(object,"select"); + PS_ID mappedID = object->GetID(); + csString newCmd; + newCmd.Format("/pickup eid:%d", mappedID); + psUserCmdMessage cmdmsg(newCmd); + msgqueue->SendMessage(cmdmsg.msg); + } + else + { + psUserCmdMessage cmdmsg(cmd); + msgqueue->SendMessage(cmdmsg.msg); + } } else if ( words[0] == "/game" ) Modified: personal/Xordan/src/client/gui/pawsactivemagicwindow.cpp =================================================================== --- personal/Xordan/src/client/gui/pawsactivemagicwindow.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawsactivemagicwindow.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -63,7 +63,7 @@ psGUIActiveMagicMessage incoming(me); pawsListBox *list; - if ( !IsVisible() && incoming.openWindow == true && psengine->loadstate == psEngine::LS_DONE) + if (!IsVisible() && incoming.openWindow && psengine->loadstate == psEngine::LS_DONE) Show(); //buffCategories->Clear(); Modified: personal/Xordan/src/client/gui/pawscharbirth.cpp =================================================================== --- personal/Xordan/src/client/gui/pawscharbirth.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawscharbirth.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -241,8 +241,8 @@ { pawsWidget::Draw(); // Check to see if we are waiting for data from the server. Should have a waiting - // curser if this fails. - if ( dataLoaded == false && createManager->HasChildhoodData() ) + // cursor if this fails. + if (!dataLoaded && createManager->HasChildhoodData()) { PopulateFields(); dataLoaded = true; Modified: personal/Xordan/src/client/gui/pawscharcreatemain.cpp =================================================================== --- personal/Xordan/src/client/gui/pawscharcreatemain.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawscharcreatemain.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -200,14 +200,14 @@ case MSGTYPE_CHAR_CREATE_NAME: { - psNameCheckMessage msg; - msg.FromServer( me ); - if ( msg.accepted == false ) - { + psNameCheckMessage msg; + msg.FromServer(me); + if (!msg.accepted) + { PawsManager::GetSingleton().CreateWarningBox( msg.reason ); - } - else - { + } + else + { if ( newWindow.Length() > 0 ) { Hide(); Modified: personal/Xordan/src/client/gui/pawscharparents.cpp =================================================================== --- personal/Xordan/src/client/gui/pawscharparents.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawscharparents.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -150,8 +150,8 @@ pawsWidget::Draw(); // Check to see if we are waiting for data from the server. Should have a waiting - // curser if this fails. - if ( dataLoaded == false && createManager->HasParentData()) + // cursor if this fails. + if (!dataLoaded && createManager->HasParentData()) { PopulateFields(); dataLoaded = true; Modified: personal/Xordan/src/client/gui/pawschild.cpp =================================================================== --- personal/Xordan/src/client/gui/pawschild.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawschild.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -191,11 +191,11 @@ { pawsWidget::Draw(); // Check to see if we are waiting for data from the server. Should have a waiting - // curser if this fails. - if ( dataLoaded == false && createManager->HasChildhoodData() ) + // cursor if this fails. + if (!dataLoaded && createManager->HasChildhoodData()) { - PopulateFields(); - dataLoaded = true; + PopulateFields(); + dataLoaded = true; } } Modified: personal/Xordan/src/client/gui/pawsgmaction.cpp =================================================================== --- personal/Xordan/src/client/gui/pawsgmaction.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawsgmaction.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -123,7 +123,7 @@ //} break; case 103: // Use Full Mesh - if ( chkFullMesh->GetState() == true ) + if (chkFullMesh->GetState()) { txtPolygon->SetText( "0" ); txtPosX->SetText( "0" ); Modified: personal/Xordan/src/client/gui/pawsilluminationwindow.cpp =================================================================== --- personal/Xordan/src/client/gui/pawsilluminationwindow.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawsilluminationwindow.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -292,6 +292,8 @@ void pawsSketchWindow::OnStringEntered(const char *name,int param,const char *value) { + stringPending = false; + if (!value || !strlen(value)) return; @@ -308,8 +310,7 @@ sketchName = value; SetTitle(sketchName); } - - stringPending = false; + } void pawsSketchWindow::AddSketchLine() Modified: personal/Xordan/src/client/gui/pawslife.cpp =================================================================== --- personal/Xordan/src/client/gui/pawslife.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawslife.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -157,15 +157,11 @@ pawsWidget::Draw(); // Check to see if we are waiting for data from the server. Should have a waiting - // curser if this fails. - if ( dataLoaded == false ) + // cursor if this fails. + if (!dataLoaded && createManager->HasLifeEventData()) { + PopulateFields(); dataLoaded = true; - - if ( createManager->HasLifeEventData() ) - PopulateFields(); - else - dataLoaded = false; } } Modified: personal/Xordan/src/client/gui/pawsloginwindow.cpp =================================================================== --- personal/Xordan/src/client/gui/pawsloginwindow.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawsloginwindow.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -176,7 +176,7 @@ storedPasswd = cfg->GetStr(cfg_name, ""); } - if (storedPasswd.IsEmpty() == false) + if (!storedPasswd.IsEmpty()) passwd->SetText(ASTERISKS); else passwd->SetText(""); Modified: personal/Xordan/src/client/gui/pawspetitionwindow.cpp =================================================================== --- personal/Xordan/src/client/gui/pawspetitionwindow.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawspetitionwindow.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -35,7 +35,10 @@ #include "paws/pawsmainwidget.h" #include "gui/pawscontrolwindow.h" +// ByyUTTON IDs #define CANCEL_BUTTON 1 +#define NEW_BUTTON 2 +#define SAVE_BUTTON 3 ////////////////////////////////////////////////////////////////////// // Construction/Destruction @@ -70,7 +73,7 @@ // Grab the pointer to the petition listbox: petitionList = (pawsListBox*)FindWidget("PetitionList"); - petText = (pawsMessageTextBox*)FindWidget("PetitionText"); + petText = (pawsMultilineEditTextBox*)FindWidget("PetitionText"); hasPetInterest = false; @@ -190,15 +193,6 @@ // We know that the calling widget is a button. int button = widget->GetID(); - csString widgetName( widget->GetName() ); - if ( widgetName == "New Button" ) - { - pawsStringPromptWindow::Create(PawsManager::GetSingleton().Translate("Add Petition"), csString(""), - true, 500, 60, this, "petition" ); - - return true; - } - switch( button ) { case CANCEL_BUTTON: @@ -222,6 +216,60 @@ } break; } + case NEW_BUTTON: + { + // Popup Input Window + pawsStringPromptWindow::Create(PawsManager::GetSingleton().Translate("Add Petition"), csString(""), + true, 500, 60, this, "petition" ); + break; + } + case SAVE_BUTTON: + { + if (petCount > 0) + { + // Get the currently selected row: + int sel = petitionList->GetSelection(); + if (sel < 0) + { + // no petition selected, create new one + OnStringEntered (0, 0, petText->GetText()); + return true; + } + + currentRow = sel; + + // check petitions status + if (petitionMessage.petitions.Get(currentRow).status != "Open") + { + psSystemMessage error(0, MSG_INFO, "You can only change open petitions."); + msgqueue->Publish(error.msg); + return true; + } + + // save changes to selected petition + csString text(petText->GetText()); + text.Trim(); + + if (!text.IsEmpty()) + { + // Send a message to the server requesting change + psPetitionRequestMessage changeMsg(false, "change", petitionMessage.petitions.Get(currentRow).id,petText->GetText()); + msgqueue->SendMessage(changeMsg.msg); + } + else + { + // Show an error + psSystemMessage error(0, MSG_INFO, "You must enter a text for the petition."); + msgqueue->Publish(error.msg); + } + } + else + { + // no petition selected, create new one + OnStringEntered (0, 0, petText->GetText()); + } + break; + } } return true; } @@ -344,11 +392,11 @@ petText->Clear(); if( petitionMessage.petitions.Get(sel).status=="Closed" ) { - petText->AddMessage( petitionMessage.petitions.Get(sel).petition+" "+PawsManager::GetSingleton().Translate("Resolution")+": "+petitionMessage.petitions.Get(sel).resolution ); + petText->SetText( petitionMessage.petitions.Get(sel).petition+" "+PawsManager::GetSingleton().Translate("Resolution")+": "+petitionMessage.petitions.Get(sel).resolution ); } else { - petText->AddMessage( petitionMessage.petitions.Get(sel).petition ); + petText->SetText( petitionMessage.petitions.Get(sel).petition ); } } } Modified: personal/Xordan/src/client/gui/pawspetitionwindow.h =================================================================== --- personal/Xordan/src/client/gui/pawspetitionwindow.h 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawspetitionwindow.h 2008-07-10 10:45:44 UTC (rev 1886) @@ -113,7 +113,7 @@ psPetitionInfo selectedPet; /// Displays text of petition - pawsMessageTextBox * petText; + pawsMultilineEditTextBox * petText; }; Modified: personal/Xordan/src/client/gui/pawspetstatwindow.cpp =================================================================== --- personal/Xordan/src/client/gui/pawspetstatwindow.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawspetstatwindow.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -139,7 +139,7 @@ case psPetSkillMessage::SKILL_LIST: { skillString = "no"; -// if ( !IsVisible() && incoming.openWindow == true ) +// if (!IsVisible() && incoming.openWindow) // Show(); skillString = incoming.commandData; HandleSkillList(skillString); Modified: personal/Xordan/src/client/gui/pawsskillwindow.cpp =================================================================== --- personal/Xordan/src/client/gui/pawsskillwindow.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawsskillwindow.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -328,7 +328,7 @@ case psGUISkillMessage::SKILL_LIST: { skillString = "no"; - if ( !IsVisible() && incoming.openWindow == true ) + if (!IsVisible() && incoming.openWindow) { Show(); } @@ -708,7 +708,7 @@ // If this is the first time the window is open then we need to get our // full list of faction information. - if ( factRequest == false ) + if (!factRequest) { psFactionMessage factionRequest(0, psFactionMessage::MSG_FULL_LIST); factionRequest.BuildMsg(); Modified: personal/Xordan/src/client/gui/pawsslot.cpp =================================================================== --- personal/Xordan/src/client/gui/pawsslot.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/pawsslot.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -86,18 +86,23 @@ psengine->GetMsgHandler()->SendMessage( out.msg ); return true; } - else if ( dragDrop && (!empty || psengine->GetSlotManager()->IsDragging()) ) + else { - // Grab one item if shift key are used. Grab everything in the slot - // if either middle mouse button or ctrl key are used - mgr->Handle( this, modifiers==1, button==2 || modifiers==2 ); + bool grab = psengine->GetMouseBinds()->CheckBind("EntityDragDrop", button, modifiers); + bool grabAll = psengine->GetMouseBinds()->CheckBind("EntityDragDropAll", button, modifiers); + bool grabOne = psengine->GetMouseBinds()->CheckBind("EntityDragDropOne", button, modifiers); + if ( dragDrop && (grab || grabAll || grabOne) && (!empty || psengine->GetSlotManager()->IsDragging()) ) + { + // Grab one item if EntityDragDropOne modifiers key are used. Grab everything in the slot + // if EntityDragDropAll modifiers key are used + mgr->Handle( this, grabOne, grabAll ); return true; - } - else if ( parent ) + }else if ( parent ) return parent->OnButtonPressed(button, modifiers, this); else return pawsWidget::OnMouseDown(button, modifiers, x, y ); } +} void pawsSlot::SetToolTip( const char* text ) { Modified: personal/Xordan/src/client/gui/psmainwidget.cpp =================================================================== --- personal/Xordan/src/client/gui/psmainwidget.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/gui/psmainwidget.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -354,6 +354,11 @@ { GEMClientObject* over = FindMouseOverObject( x, y ); + const psControl* mouseLookTrigger = psengine->GetCharControl()->GetTrigger("MouseLook"); + if(mouseLookTrigger->button==button && mouseLookTrigger->mods==keyModifier){ + psengine->GetCharControl()->GetMovementManager()->MouseLookCanAct(true); + } + if (psengine->GetMouseBinds()->CheckBind("EntitySelect", button, keyModifier)) { if ( over ) Modified: personal/Xordan/src/client/pscharcontrol.cpp =================================================================== --- personal/Xordan/src/client/pscharcontrol.cpp 2008-07-10 04:10:06 UTC (rev 1885) +++ personal/Xordan/src/client/pscharcontrol.cpp 2008-07-10 10:45:44 UTC (rev 1886) @@ -527,7 +527,7 @@ // RS: invert mouselook status so the mouselook button can be // used to temporarily switch out of mouselook mode too movement->MouseLook(!movement->MouseLook()); - if (!movement->MouseZoom()) { // KL: No CenterMouse while in MouseZoom mode. + if (!movement->MouseZoom() && movement->MouseLook()) { // KL: No CenterMouse while in Mous... [truncated message content] |
From: <mg...@us...> - 2008-07-11 09:34:02
|
Revision: 1887 http://planeshift.svn.sourceforge.net/planeshift/?rev=1887&view=rev Author: mgist Date: 2008-07-11 02:34:10 -0700 (Fri, 11 Jul 2008) Log Message: ----------- - Fixed PS to work with the normalised camera. Modified Paths: -------------- personal/Xordan/data/effects/misc/marker.eff personal/Xordan/data/effects/misc/target.eff personal/Xordan/data/gui/charcreate.xml personal/Xordan/data/gui/charpick.xml personal/Xordan/data/gui/inventory.xml personal/Xordan/data/gui/skillwindow.xml personal/Xordan/data/races/descriptions.xml personal/Xordan/docs/history.txt personal/Xordan/src/client/gui/pawscharcreatemain.cpp personal/Xordan/src/client/gui/psmainwidget.cpp personal/Xordan/src/client/pscamera.cpp personal/Xordan/src/client/pscamera.h personal/Xordan/src/client/pscelclient.cpp personal/Xordan/src/common/effects/pseffectobj.cpp personal/Xordan/src/common/effects/pseffectobjsound.cpp personal/Xordan/src/common/effects/pseffectobjtext2d.cpp personal/Xordan/src/common/paws/pawsgenericview.cpp personal/Xordan/src/common/paws/pawsobjectview.cpp Modified: personal/Xordan/data/effects/misc/marker.eff =================================================================== --- personal/Xordan/data/effects/misc/marker.eff 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/data/effects/misc/marker.eff 2008-07-11 09:34:10 UTC (rev 1887) @@ -2,7 +2,7 @@ <library> <textures> <texture name="marker"> - <file>/this/art/effects/marker01.dds</file> + <file>/this/art/effects/marker02.dds</file> </texture> </textures> <materials> Modified: personal/Xordan/data/effects/misc/target.eff =================================================================== --- personal/Xordan/data/effects/misc/target.eff 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/data/effects/misc/target.eff 2008-07-11 09:34:10 UTC (rev 1887) @@ -2,7 +2,7 @@ <library> <textures> <texture name="marker"> - <file>/this/art/effects/marker01.dds</file> + <file>/this/art/effects/marker02.dds</file> </texture> </textures> <materials> @@ -25,7 +25,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="-90" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="360" z="0" /> @@ -41,7 +41,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="180" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="360" z="0" /> @@ -57,7 +57,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="0" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="360" z="0" /> @@ -73,7 +73,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="90" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="360" z="0" /> @@ -89,7 +89,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="270" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="-360" z="0" /> @@ -105,7 +105,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="180" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="-360" z="0" /> @@ -121,7 +121,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="0" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="-360" z="0" /> @@ -137,7 +137,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="90" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="-360" z="0" /> Modified: personal/Xordan/data/gui/charcreate.xml =================================================================== --- personal/Xordan/data/gui/charcreate.xml 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/data/gui/charcreate.xml 2008-07-11 09:34:10 UTC (rev 1887) @@ -114,7 +114,8 @@ <frame x="290" y="120" width="223" height="398" border="no" /> <mask resource="charborder" /> <map file="/planeshift/world/podium/" sector="room" /> - <distance value="4"/> + <distance value="4.5"/> + <cameramod x="-0.025" y="1.4" z="0.0"/> </widget> <!-- Name entry --> Modified: personal/Xordan/data/gui/charpick.xml =================================================================== --- personal/Xordan/data/gui/charpick.xml 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/data/gui/charpick.xml 2008-07-11 09:34:10 UTC (rev 1887) @@ -74,7 +74,8 @@ <frame x="290" y="120" width="223" height="398" border="no"/> <mask resource="charborder"/> <map file="/planeshift/world/podium" sector="room"/> - <distance value="3.5"/> + <distance value="4.5"/> + <cameramod x="-0.025" y="1.4" z="0.0"/> </widget> <!-- Join Game Button --> Modified: personal/Xordan/data/gui/inventory.xml =================================================================== --- personal/Xordan/data/gui/inventory.xml 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/data/gui/inventory.xml 2008-07-11 09:34:10 UTC (rev 1887) @@ -19,7 +19,8 @@ <frame x="200" y="86" width="175" height="293" border="no"/> <mask resource="invborder" /> <map file="/planeshift/world/podium" sector="room" /> - <distance value="4.5"/> + <distance value="5"/> + <cameramod x="0.0" y="1.1" z="0.0"/> <subscriptions> <subscribe data="sigActorUpdate" /> </subscriptions> Modified: personal/Xordan/data/gui/skillwindow.xml =================================================================== --- personal/Xordan/data/gui/skillwindow.xml 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/data/gui/skillwindow.xml 2008-07-11 09:34:10 UTC (rev 1887) @@ -107,7 +107,8 @@ <widget name="Doll" factory="pawsInventoryDollView" > <frame x="287" y="35" width="108" height="165" border="no"/> <map file="/planeshift/world/podium" sector="room" /> - <distance value="7"/> + <distance value="8"/> + <cameramod x="0.0" y="1.1" z="0.0"/> <subscriptions> <subscribe data="sigActorUpdate" /> </subscriptions> Modified: personal/Xordan/data/races/descriptions.xml =================================================================== --- personal/Xordan/data/races/descriptions.xml 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/data/races/descriptions.xml 2008-07-11 09:34:10 UTC (rev 1887) @@ -1,58 +1,52 @@ <descriptions> - <race name="Stonebreaker" - description= + <race name="Stonebreaker" description= "Physical Traits: Stonebreakers are generally shorter and less robust than other Dwarves, with blond or red hair and beard, and pale skin. They have developed an amazing strength. Abilities and fields of interest: The clan of Stonebreakers have lived for centuries digging tunnels, shafts, wells and caves in the deep of the earth until they arrived to Yliakum. They are talented engineers of machinery like winches, ventilation pipes, canals, means of transport for goods and everything that can be useful to overcome the drawbacks of underground life. They are also powerful and untiring miners; many say that they created the Stone Labyrinths. Psychology: They have a strong pride that sometimes develops into feuds with other clans or other races. They tend to be bigoted towards other races that are taller than they are. -Rules: Nothing Special for now." +Rules: Nothing Special for now." basetexture="1.png" male="stonebm" female="stonebf" male_available="yes" - female_available="yes"> + female_available="yes"> - <FollowPos x="0" y="3" z="4" /> - <LookatPos x="0" y="2" z="0" /> - <FirstPos x="0" y="1.14" z="0" /> - <ViewerPos x="0" y="-0.2" z="2"/> - <FACEPOS x="-0.05" y="1.1" z="-1.4" /> - -</race> + <FollowPos x="0" y="3" z="4" /> + <LookatPos x="0" y="2" z="0" /> + <FirstPos x="0" y="1.14" z="0" /> + <ViewerPos x="0" y="-0.2" z="2"/> + <FACEPOS x="-0.05" y="1.1" z="-1.4" /> + </race> - <race name="Enkidukai" - description= + <race name="Enkidukai" description= "Physical traits: Humanoids with feline features, the Enkidukai are smaller than humans. Their bodies are covered in short hair rather like fur, which is either striped, spotted, dark or uniform. They have small, slitted eyes, their limbs are long and lean and taper into clawed hands and feet. Abilities and fields of interest: The Enkidukai possess extraordinary acute senses, and excellent reflexes. Given the hard training and the constant competition of survival, all the Enkidukai are good warriors and valuable companions in battle. They are stronger and more resistant to disease or harm than one would guess by their slim constitution, and they have a deep determination and unshakeable will. Psychology: The Enkidukai race maintains its wild nature. They live in packs controlled by the male who is strongest and most skilful in combat. Each pack has a typical and easily recognizable look, mostly because of their habit in cutting or colouring fur in ritual or traditional ways. Enkidukai are always suspicious of strangers at the beginning, but once you gain their trust, they become faithful companions. -Rules: Nothing Special for now." +Rules: Nothing Special for now." basetexture="1.png" male="enkim" - female="enkif" + female="enkif" male_available="yes" female_available="yes"> - <FirstPos x="0" y="1.56" z="0" /> + <FirstPos x="0" y="1.56" z="0" /> </race> - <race name="Ynnwn" - description= + <race name="Ynnwn" description= "Physical Features: The Ynnwyn race is a strange but relatively frequent crossing between a Diaboli and an Elf. Two such opposite characters generate a type of giant, never shorter than two meters, with dark red skin. Ynnwn have pointed ears and white hair and rarely grow horns or tails, although in some cases these are present. Abilities and fields of interest: The Ynnwn possesses optimal physical and mental characteristics and they do not have any profession limitations, succeeding well in almost all the aspects of the Yliakumic life. However, their unusual blood gives them a harmful sensitivity to precious metals. They prefer not to use gold, silver or platinum coins; contact with such metals provokes a skin rash. The wounds that they suffer from weapons plated with these metals are very painful, slow to heal and sometimes lethal. They instead tolerate the orichalc, although they prefer not to handle it too long because of the percentage of gold it contains. Psychological traits: Contrary to what people may think, the Ynnwn don't feel diminished by their half-breed status and they face life with a positive attitude. -Rules: Nothing Special for now." +Rules: Nothing Special for now." basetexture="1.png" male="ynnwnm" female="fynnwn" male_available="yes" female_available="yes"> - <FirstPos x="0" y="1.81" z="0" /> - <FACEPOS x="0" y="1.9" z="-1.0" /> - - </race> + <FirstPos x="0" y="1.81" z="0" /> + <FACEPOS x="0" y="1.9" z="-1.0" /> + </race> - <race name="Ylian" - description= + <race name="Ylian" description= "THE FEMALE 3D MODEL FOR THIS RACE IS NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE FEMALE MODEL OF THE YNNWN RACE.Physical Traits: Their robust and well-proportioned body gives them the opportunity to excel in all arts. They can have hair from black to white, eyes with wonderful colours and skin from pale to dark brown. Abilities and fields of interest: Humans are a practical and disciplined race with fighters, sorcerers, merchants and politicians. They tend to learn a little of everything without choosing a preferred profession. Psychology: The Ylians were the first men who saw the Blue Sun. They were proud of this peculiarity and, in the early days of the civilization, they invented the name Ylians to distinguish them from the other humans that arrived later. In spite of this, they are the most inclined to mix with other races, and have friendly relations with anyone. Thanks to this ability they often cover political roles. Rules: Nothing Special for now." @@ -62,29 +56,25 @@ male_available="yes" female_available="yes"> - <FirstPos x="0" y="1.68" z="0" /> - <FACEPOS x="0" y="1.6" z="-1.1" /> - + <FirstPos x="0" y="1.68" z="0" /> + <FACEPOS x="0" y="1.6" z="-1.1" /> </race> - <race name="Xacha" - description= + <race name="Xacha" description= "THE 3D MODELS FOR THIS RACE ARE NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE MALE MODEL OF THE YLIAN RACE AND FEMALE MODEL OF THE YNNWN RACE. Physical Traits: They differ from other humans because they are taller, have a less solid and less robust body. Since they left the surface a long time ago, their skin is very pale and similar to the people who are born underground. Abilities and fields of interest: Keepers of great knowledge, the Xacha use the magic arts and study natural phenomena as a tradition that is passed from generation to generation. Many scientists of Yliakum belong to this race. Psychology: The Xacha are proud of their origins and traditions. They are the last survivors of an ancient people, almost extinct due to the crowding of the peninsula in which they lived. Generally they have a strong will, and a quite different mindset focusing on logical solutions to problems. -Rules: Nothing Special for now." +Rules: Nothing Special for now." basetexture="1.png" male="ylianm" female="fynnwn" male_available="yes" female_available="yes"> - <FirstPos x="0" y="1.68" z="0" /> - + <FirstPos x="0" y="1.68" z="0" /> </race> - <race name="Nolthrir" - description= + <race name="Nolthrir" description= "THE 3D MODELS FOR THIS RACE ARE NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE MALE MODEL OF THE DERMORIAN RACE AND FEMALE MODEL OF THE YNNWN RACE. Physical Traits: The most ancient race of Elves is the Nolthrirs, which first became part of the society as seaweed fishers and farmers, an activity it is believed they perfected before leaving the Surface. After many centuries, the great amount of time spent working underwater and the unique altering properties of the Crystal have made the Nolthrirs an amphibious race, with webbed fingers and both gilled and pulmonary respiration. Nolthrirs appear as slim elves, with skin and hair coloured from azure to green, and icy eyes coloured from light azure to light green. They tend to be beardless but both sexes have very long hair. They live mainly on the two submerged levels. Abilities and fields of interest: Almost all elves have familiarity with some form of magic, mainly elemental magic. Nolthirs have a particular disadvantage on using fire related spells, but on the other hand they master water spells. Psychology: The serenity of the underwater life with its soft rumours and dimmed lights is reflected in Nolthrir's way of life. @@ -95,85 +85,75 @@ male_available="yes" female_available="yes"> - <FirstPos x="0" y="1.55" z="0" /> - + <FirstPos x="0" y="1.55" z="0" /> </race> - <race name="Dermorian" - description= + <race name="Dermorian" description= "Physical Traits: The Dermorians have an amber-coloured or copper-coloured skin and their hair ranges from brown to red, never black, rarely blond. Abilities and fields of interest: Due to the long roaming in the Labyrinths searching for a final place to live, their race is capable of seeing in the dark. In Yliakum, the best hunters of the Labyrinths are the Dermorians, mainly due to their aptitude of surviving even in extreme situations, obtaining food and water from foraging. Psychology: They are native of a land of the Surface called Dermoria. Before the long trip to the underground, their habits were tribal and characterized by the love of nature; they were nomads in search of new pastures and hunting areas. -Rules: Nothing Special for now." +Rules: Nothing Special for now." basetexture="1.png" male="dermm" female="dermf" male_available="yes" female_available="yes"> - <FirstPos x="0" y="1.55" z="0" /> - <FACEPOS x="0" y="1.4" z="-1.0" /> - + <FirstPos x="0" y="1.55" z="0" /> + <FACEPOS x="0" y="1.6" z="-1.0" /> </race> - <race name="Hammerwielder" - description= + <race name="Hammerwielder" description= "THE 3D MODELS FOR THIS RACE ARE NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE MODELS OF THE STONEBREAKER RACE. Physical Traits: The Hammerwielders are taller and even more robust then other Dwarves (some rare individuals can reach one meter and half in height), have a darker complexion and black or brown hair. Like many Dwarves, they let their beards and moustache grow and then tie them in plaits and knots. Abilities and fields of interest: Hammerwielders have a more natural affinity with metals and gems than with granite, becoming often-clever blacksmiths and gem cutters. They tend to be skilful fighters and often put their crafted weapons to the test. Psychology: You can find them easily in taverns, because they are strong drinkers. They usually behave in a cheerful and communicative way, much more then other Dwarves, but they can become noisy and boastful when sitting in big groups at the tavern. If you hear someone using the phrase 'rough as a dwarf', you can be sure that he refers to a Hammerwielder. -Rules: Nothing Special for now." +Rules: Nothing Special for now." basetexture="1.png" male="stonebm" female="stonebf" male_available="yes" female_available="yes"> - <FirstPos x="0" y="1.23" z="0" /> - <FACEPOS x="0.05" y="1.1" z="-1.4" /> - + <FirstPos x="0" y="1.23" z="0" /> + <FACEPOS x="-0.05" y="1.1" z="-1.4" /> </race> - <race name="Diaboli" - description= + <race name="Diaboli" description= "THE 3D MODELS FOR THIS RACE ARE NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE MODELS OF THE YNNWN RACE. Physical traits: The typical Diabolo has shiny oil-black skin, a thin pointed tail and little horns. Apart from that, they have almost the same body proportions as humans, and almost identical internal organs. Both male and female have gorgeous, perfectly shaped bodies. Abilities and fields of interest: The Diaboli developed a good resistance to many elemental spells thanks to a deep knowledge in that area of magic. On the other hand, they avoid holy places as they feel uncomfortable in them. It's quite rare to meet a Diaboli inside a temple. They diligently try to avoid sacred objects: holy weapons are devastating against them. They are famous for their ability to attract and charm people, and therefore the Diaboli have a natural talent for social relations. Psychology: A popular tradition tells that their homeland was a burning land that continuously erupted black smoke (this may suggest the presence of a volcano), a dark and perpetually cloudy sky and sulphuric rivers of flowing blood. Some sages believe they originated in a distant, unexplored universe, but opinions are contradictory. Nonetheless, their race is the only one who thinks of Yliakum as a real paradise, and this says a lot about their homeland. They rarely keep a single partner, preferring to have many, and that explains the large number of half-breeds in Yliakum. Diaboli are a happy, bustling, malicious race, quite unreliable. Humility is a completely foreign concept to them. Their familiarity with some of the semi-intelligent races that dwell in the Stone Labyrinths has raised suspicion with the other races. -Rules: Nothing Special for now." +Rules: Nothing Special for now." basetexture="1.png" male="ynnwnm" female="fynnwn" male_available="yes" female_available="yes"> - <FirstPos x="0" y="1.81" z="0" /> - <FACEPOS x="0" y="1.9" z="-1.0" /> - - </race> + <FirstPos x="0" y="1.81" z="0" /> + <FACEPOS x="0" y="1.9" z="-1.0" /> + </race> - <race name="Kran" - description= + <race name="Kran" description= "Physical Traits: They belong more to the mineral kingdom than to the animal one. Their organism is the only one, amongst the known races, to be based on silicon instead of carbon. They appear as humanoids made of rock. The colour of the body is mainly grey or black and slightly wrinkled, with coloured veins different from individual to individual. Some rare Kran have a different coloured skin, like white, azure or pink, which is highly appreciated by Kran. Their head is slightly lengthened at the top, without ears and nose. They are born underground and none of them has ever seen the light of the sun. Abilities and fields of interest: Because their skin is made of silicon, the Kran are very resistant to laceration but is more easily damaged by bludgeoning weapons. Silicon still supports oxygen linkages, so Kran breathe much more slowly than other races, enabling them to happily breathe underwater. Without ears, they perceive sounds thanks to vibrations in their bodies. Strong and tireless, Kran are as resistant as the rock that they are born from. Since magic was created to act on different principles, it seems to have little effect on them. Also, the way in which they reproduce is incompatible with all other races; there are no half-breed Kran. Psychology: They are not one of most intelligent races of Yliakum, but they tend to be loyal and firm in their beliefs. -Rules: Nothing Special for now." +Rules: Nothing Special for now." basetexture="1.png" male="kran" female="kran" male_available="yes" female_available="yes"> - <FirstPos x="0" y="1.96" z="0" /> - + <FirstPos x="0" y="1.96" z="0" /> </race> - <race name="Lemur" - description= + <race name="Lemur" description= "THE 3D MODELS FOR THIS RACE ARE NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE MALE MODEL OF THE DERMORIAN RACE AND FEMALE MODEL OF THE YNNWN RACE. Physical Features: The Lemurs have an appearance similar to Humans, but their origins can't be connected unless we look at a very distant past. They have a hypoxygenated skin, which after living in dark and subterranean places with low ventilation perspires little and is almost completely without pigment. For this reason, they have a pale and azure complexion. Until two to three months of age, their children have an almost transparent skin that reveals the underlying capillary circulation. Their body is neither very robust nor resistant. They have light hair in a variety of hues. Lemur women, graceful and ethereal creatures, are amongst the most beautiful of Yliakum; male lemurs are equally beautiful but lack in masculine features like muscle. Abilities and fields of interest: They have a clever intellect, superior to the other races. The Lemurs are brilliant artists, innate aesthetes and researchers of beauty in all its forms. Psychological traits: Everyone knows that the Lemurs were the first of all races to settle in Yliakum, and they are proud of it. The legends tell that their origins of the Lemurs are connected to a huge city located in the depths of earth, abandoned from a widespread disease. No one knows how to reach this city or if anyone still lives there. All lemurs share a sense of loss for their mysterious, distant homeland. -Rules: Nothing Special for now." +Rules: Nothing Special for now." basetexture="1.png" male="dermm" female="fynnwn" @@ -183,12 +163,11 @@ - <race name="Klyros" - description= + <race name="Klyros" description= "Physical Features: The Klyros are a humanoid race with a tall, slim body (they range in height from 160cm to 180cm). Their skin is similar to reptiles, being slimy and cold, and varies from grey-green to steel dark blue. They have an oval head decorated with a multicoloured crest starting from the forehead and ends at the base of the skull that make them look like a fish. White and drop-like eyes enable them to see in the dark. Their hands have sharp and dangerous claws. Just under the shoulders they have two big wings that appear to be weak and non-functional. The skeleton is thin and flexible to flight easier, but is easily damaged. Thanks to their body structure, the Klyros are fast in three elements: air, water and earth. Abilities and fields of interest: Klyros are brave hunters, travellers and fighters, and many are rich merchants. They have a talent for fishing deep-water fishes and small underwater monsters that are used to create very peculiar Klyros' garments and light armours. They are interested in decorative arts and magic. Psychological traits: Thanks to their triple nature and their easy adaptability to environmental conditions, the Klyros are basically nomads and react quickly to new situations. The Klyros believe strongly in the concept of brotherhood with the other members of their race. Regardless of their appearance, they are not an evil race. -Rules: Nothing Special for now." +Rules: Nothing Special for now." basetexture="1.png" male="klyrosm" female="klyrosm" Modified: personal/Xordan/docs/history.txt =================================================================== --- personal/Xordan/docs/history.txt 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/docs/history.txt 2008-07-11 09:34:10 UTC (rev 1887) @@ -1,3 +1,6 @@ +*** 2008-07-11 by Mike Gist +- Fixed PS to work with the normalised camera. + *** 2008-07-10 by Steven Patrick - Fix to FS#774, patch by weltall. Modified: personal/Xordan/src/client/gui/pawscharcreatemain.cpp =================================================================== --- personal/Xordan/src/client/gui/pawscharcreatemain.cpp 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/src/client/gui/pawscharcreatemain.cpp 2008-07-11 09:34:10 UTC (rev 1887) @@ -363,8 +363,7 @@ if ( newFace < (int)race->location[PSTRAIT_LOCATION_FACE][currentGender].GetSize() ) { Trait* trait = race->location[PSTRAIT_LOCATION_FACE][currentGender][newFace]; - csVector3 at(0,0,0); - view->LockCamera(race->zoomLocations[PSTRAIT_LOCATION_FACE], at); + view->LockCamera(race->zoomLocations[PSTRAIT_LOCATION_FACE], csVector3(0, 0, 0)); charApp->FaceTexture(trait->material, trait->texture); Modified: personal/Xordan/src/client/gui/psmainwidget.cpp =================================================================== --- personal/Xordan/src/client/gui/psmainwidget.cpp 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/src/client/gui/psmainwidget.cpp 2008-07-11 09:34:10 UTC (rev 1887) @@ -445,7 +445,7 @@ cel = psengine->GetCelClient(); } - if (psengine->GetPSCamera()) + if (psengine->GetPSCamera() && psengine->GetPSCamera()->IsInitialized()) { iMeshWrapper* selectedMesh = psengine->GetPSCamera()->FindMeshUnder2D(x,y); if ( selectedMesh && selectedMesh->QueryObject()) Modified: personal/Xordan/src/client/pscamera.cpp =================================================================== --- personal/Xordan/src/client/pscamera.cpp 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/src/client/pscamera.cpp 2008-07-11 09:34:10 UTC (rev 1887) @@ -304,17 +304,16 @@ iSector* sector; actor->GetLastPosition(pos, yRot, sector); - view->GetPerspectiveCamera()->GetCamera()->SetSector(sector); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(pos); + view->GetCamera()->SetSector(sector); + view->GetCamera()->GetTransform().SetOrigin(pos); int width = psengine->GetG2D()->GetWidth(); int height = psengine->GetG2D()->GetHeight(); view->SetRectangle(0, 0, width, height); - view->GetPerspectiveCamera()->SetPerspectiveCenter(width >> 1, height >> 1); + view->GetPerspectiveCamera()->SetPerspectiveCenter(0.5, 0.5); view->SetContext(psengine->GetG3D()); - view->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), width ); for (int i=0; i<CAMERA_MODES_COUNT; i++) { @@ -704,11 +703,11 @@ } // assume the normal camera movement is good, and move the camera - view->GetPerspectiveCamera()->GetCamera()->SetSector(actorSector); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(actorPos + csVector3(0,1,0)); - view->GetPerspectiveCamera()->GetCamera()->OnlyPortals(true); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt(GetTarget(CAMERA_ACTUAL_DATA) - GetPosition(CAMERA_ACTUAL_DATA), GetUp(CAMERA_ACTUAL_DATA)); - view->GetPerspectiveCamera()->GetCamera()->MoveWorld(GetPosition(CAMERA_ACTUAL_DATA) - view->GetPerspectiveCamera()->GetCamera()->GetTransform().GetOrigin()); + view->GetCamera()->SetSector(actorSector); + view->GetCamera()->GetTransform().SetOrigin(actorPos + csVector3(0,1,0)); + view->GetCamera()->OnlyPortals(true); + view->GetCamera()->GetTransform().LookAt(GetTarget(CAMERA_ACTUAL_DATA) - GetPosition(CAMERA_ACTUAL_DATA), GetUp(CAMERA_ACTUAL_DATA)); + view->GetCamera()->MoveWorld(GetPosition(CAMERA_ACTUAL_DATA) - view->GetCamera()->GetTransform().GetOrigin()); view->Draw(); @@ -1702,7 +1701,7 @@ { csVector3 v1(0, 0, dist), v2(0, 1, dist), v3(1, 0, dist); csPlane3 p(v1, v2, v3); - view->GetPerspectiveCamera()->GetCamera()->SetFarPlane(&p); + view->GetCamera()->SetFarPlane(&p); // control distance we see shadows as well psShadowManager *shadowManager = psengine->GetCelClient()->GetShadowManager(); @@ -1712,7 +1711,7 @@ float psCamera::GetDistanceClipping() { csPlane3 *p; - p = view->GetPerspectiveCamera()->GetCamera()->GetFarPlane(); + p = view->GetCamera()->GetFarPlane(); if (p != NULL) return p->DD / sqrt(p->norm.x*p->norm.x + p->norm.y*p->norm.y + p->norm.z*p->norm.z); else Modified: personal/Xordan/src/client/pscamera.h =================================================================== --- personal/Xordan/src/client/pscamera.h 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/src/client/pscamera.h 2008-07-11 09:34:10 UTC (rev 1887) @@ -443,6 +443,8 @@ int GetFixedDistClip() { return fixedDistClip; } + bool IsInitialized() { return cameraInitialized; } + private: struct CameraData Modified: personal/Xordan/src/client/pscelclient.cpp =================================================================== --- personal/Xordan/src/client/pscelclient.cpp 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/src/client/pscelclient.cpp 2008-07-11 09:34:10 UTC (rev 1887) @@ -797,7 +797,7 @@ void psCelClient::UpdateShader(iMeshWrapper* mesh) { - if(psengine->GetGFXFeatures() & useAdvancedShaders) + if(mesh && psengine->GetGFXFeatures() & useAdvancedShaders) { csRef<iShaderVarStringSet> strings = csQueryRegistryTagInterface<iShaderVarStringSet> (object_reg, "crystalspace.shader.variablenameset"); Modified: personal/Xordan/src/common/effects/pseffectobj.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobj.cpp 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/src/common/effects/pseffectobj.cpp 2008-07-11 09:34:10 UTC (rev 1887) @@ -473,7 +473,7 @@ { if (dir == DT_CAMERA) { - csVector3 camDir = -view->GetPerspectiveCamera()->GetCamera()->GetTransform().GetO2TTranslation() + csVector3 camDir = -view->GetCamera()->GetTransform().GetO2TTranslation() + anchorMesh->GetMovable()->GetFullPosition(); csReversibleTransform rt; rt.LookAt(camDir, csVector3(0.f,1.f,0.f)); @@ -481,7 +481,7 @@ } else if (dir == DT_BILLBOARD) { - matBase = view->GetPerspectiveCamera()->GetCamera()->GetTransform().GetT2O() * billboardFix; + matBase = view->GetCamera()->GetTransform().GetT2O() * billboardFix; } if (scale != 1.0f) mesh->GetMovable()->SetTransform(matBase * (1.0f / scale)); @@ -515,7 +515,7 @@ csMatrix3 matTransform; if (dir == DT_CAMERA) { - csVector3 camDir = -view->GetPerspectiveCamera()->GetCamera()->GetTransform().GetO2TTranslation() + csVector3 camDir = -view->GetCamera()->GetTransform().GetO2TTranslation() + anchorMesh->GetMovable()->GetFullPosition() + newPos; csReversibleTransform rt; rt.LookAt(camDir, csVector3(sinf(lerpSpin.y),cosf(lerpSpin.y),0.f)); @@ -527,7 +527,7 @@ } else if (dir == DT_BILLBOARD) { - matBase = view->GetPerspectiveCamera()->GetCamera()->GetTransform().GetT2O() * billboardFix; + matBase = view->GetCamera()->GetTransform().GetT2O() * billboardFix; matTransform = matBase; } else Modified: personal/Xordan/src/common/effects/pseffectobjsound.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjsound.cpp 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/src/common/effects/pseffectobjsound.cpp 2008-07-11 09:34:10 UTC (rev 1887) @@ -225,7 +225,7 @@ sndSource->SetVolume(LERP_KEY(KA_SCALE) * volumeMultiplier); } - sndSource3d->SetPosition(view->GetPerspectiveCamera()->GetCamera()->GetTransform().Other2This(soundPos)); + sndSource3d->SetPosition(view->GetCamera()->GetTransform().Other2This(soundPos)); if (killTime <= 0) return true; Modified: personal/Xordan/src/common/effects/pseffectobjtext2d.cpp =================================================================== --- personal/Xordan/src/common/effects/pseffectobjtext2d.cpp 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/src/common/effects/pseffectobjtext2d.cpp 2008-07-11 09:34:10 UTC (rev 1887) @@ -410,14 +410,14 @@ } // transform 3D to camera - p = view->GetPerspectiveCamera()->GetCamera()->GetTransform().Other2This(p); + p = view->GetCamera()->GetTransform().Other2This(p); csVector2 sp; if (p.z <= 0.0f) sp.Set(-5000.0f, -5000.0f); else { // apply perspective - sp = view->GetPerspectiveCamera()->GetCamera()->Perspective(p); + sp = view->GetCamera()->Perspective(p); sp.y = view->GetPerspectiveCamera()->GetShiftY() * 2 - sp.y; } Modified: personal/Xordan/src/common/paws/pawsgenericview.cpp =================================================================== --- personal/Xordan/src/common/paws/pawsgenericview.cpp 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/src/common/paws/pawsgenericview.cpp 2008-07-11 09:34:10 UTC (rev 1887) @@ -102,15 +102,15 @@ if (engine->GetCameraPositions()->GetCount() > 0) { iCameraPosition * cp = engine->GetCameraPositions()->Get(0); - view->GetPerspectiveCamera()->GetCamera()->SetSector(engine->FindSector(cp->GetSector())); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(cp->GetPosition()); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt(cp->GetForwardVector(), cp->GetUpwardVector()); + view->GetCamera()->SetSector(engine->FindSector(cp->GetSector())); + view->GetCamera()->GetTransform().SetOrigin(cp->GetPosition()); + view->GetCamera()->GetTransform().LookAt(cp->GetForwardVector(), cp->GetUpwardVector()); } else { - view->GetPerspectiveCamera()->GetCamera()->SetSector(stage); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(csVector3(-33,1,-198)); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt(csVector3(0,0,4), csVector3(0,1,0)); + view->GetCamera()->SetSector(stage); + view->GetCamera()->GetTransform().SetOrigin(csVector3(-33,1,-198)); + view->GetCamera()->GetTransform().LookAt(csVector3(0,0,4), csVector3(0,1,0)); } view->SetRectangle(screenFrame.xmin, screenFrame.ymin, Modified: personal/Xordan/src/common/paws/pawsobjectview.cpp =================================================================== --- personal/Xordan/src/common/paws/pawsobjectview.cpp 2008-07-10 10:45:44 UTC (rev 1886) +++ personal/Xordan/src/common/paws/pawsobjectview.cpp 2008-07-11 09:34:10 UTC (rev 1887) @@ -76,6 +76,14 @@ if (!resizeToScreen) distance *= float(graphics2D->GetWidth())/800.0f; + csRef<iDocumentNode> cameraModNode = node->GetNode( "cameramod" ); + if ( cameraModNode ) + { + cameraMod = csVector3(cameraModNode->GetAttributeValueAsFloat("x"), + cameraModNode->GetAttributeValueAsFloat("y"), + cameraModNode->GetAttributeValueAsFloat("z")); + } + csRef<iDocumentNode> mapNode = node->GetNode( "map" ); if ( mapNode ) { @@ -167,20 +175,18 @@ meshSector->ShineLights(); meshView = csPtr<iView> (new csView( engine, PawsManager::GetSingleton().GetGraphics3D() )); - meshView->GetPerspectiveCamera()->GetCamera()->SetSector(meshSector); - meshView->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(csVector3(0,1,-distance)); + meshView->GetCamera()->SetSector(meshSector); + meshView->GetCamera()->GetTransform().SetOrigin(csVector3(0,1,-distance)); meshView->SetRectangle(screenFrame.xmin, screenFrame.ymin, screenFrame.Width(),screenFrame.Height()); view = csPtr<iView> (new csView( engine, PawsManager::GetSingleton().GetGraphics3D() )); - view->GetPerspectiveCamera()->GetCamera()->SetSector(stage); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(csVector3(0,1,-distance)); + view->GetCamera()->SetSector(stage); + view->GetCamera()->GetTransform().SetOrigin(csVector3(0,1,-distance)); + view->SetRectangle(screenFrame.xmin, screenFrame.ymin, screenFrame.Width(), screenFrame.Height()); - view->SetRectangle(screenFrame.xmin, screenFrame.ymin, - screenFrame.Width(),screenFrame.Height()); - loadedMap = true; return true; } @@ -286,41 +292,36 @@ void pawsObjectView::DrawNoRotate() { - if ( screenFrame.xmin > graphics2D->GetWidth() || - screenFrame.ymin > graphics2D->GetHeight() || - screenFrame.xmax < 0 || - screenFrame.ymax < 0 ) - return; + if(screenFrame.xmin > graphics2D->GetWidth() || screenFrame.ymin > graphics2D->GetHeight() || + screenFrame.xmax < 0 || screenFrame.ymax < 0) + { + return; + } - graphics2D->SetClipRect( 0,0, graphics2D->GetWidth(), graphics2D->GetHeight()); - if ( !PawsManager::GetSingleton().GetGraphics3D()->BeginDraw(CSDRAW_3DGRAPHICS) ) + graphics2D->SetClipRect(0, 0, graphics2D->GetWidth(), graphics2D->GetHeight()); + if(!PawsManager::GetSingleton().GetGraphics3D()->BeginDraw(CSDRAW_3DGRAPHICS)) + { return; + } - if ( !view ) + if(!view) + { return; + } iGraphics3D* og3d = view->GetContext(); view->SetContext(PawsManager::GetSingleton().GetGraphics3D()); - view->SetRectangle( screenFrame.xmin, + view->SetRectangle(screenFrame.xmin, PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.ymax , - screenFrame.Width(), - screenFrame.Height() ); + screenFrame.Width(), screenFrame.Height()); - view->GetPerspectiveCamera()->SetPerspectiveCenter( - screenFrame.xmin + (screenFrame.Width() >> 1), - PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.Height() - - screenFrame.ymin + (screenFrame.Height() >> 1) ); - - view->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), screenFrame.Width() ); - + view->GetPerspectiveCamera()->SetPerspectiveCenter((float)(screenFrame.xmin+(screenFrame.Width() >> 1))/graphics2D->GetWidth(), + 1-(float)(screenFrame.ymin+(screenFrame.Height() >> 1))/graphics2D->GetHeight()); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(cameraPosition); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt( - lookingAt, - csVector3(0,1,0) - ); + view->GetCamera()->GetTransform().SetOrigin(cameraPosition); + view->GetCamera()->GetTransform().LookAt(lookingAt, csVector3(0, 1, 0)); view->Draw(); @@ -330,24 +331,15 @@ meshView->SetContext(PawsManager::GetSingleton().GetGraphics3D()); - meshView->SetRectangle( screenFrame.xmin, - PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.ymax , - screenFrame.Width(), - screenFrame.Height() ); + meshView->SetRectangle(screenFrame.xmin, + PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.ymax , + screenFrame.Width(), screenFrame.Height()); - meshView->GetPerspectiveCamera()->SetPerspectiveCenter( - screenFrame.xmin + (screenFrame.Width() >> 1), - PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.Height() - - screenFrame.ymin + (screenFrame.Height() >> 1) ); + meshView->GetPerspectiveCamera()->SetPerspectiveCenter((float)(screenFrame.xmin+(screenFrame.Width() >> 1))/graphics2D->GetWidth(), + 1-(float)(screenFrame.ymin+(screenFrame.Height() >> 1))/graphics2D->GetHeight()); - - meshView->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), screenFrame.Width() ); - - meshView->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(cameraPosition); - meshView->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt( - lookingAt, - csVector3(0,1,0) - ); + meshView->GetCamera()->GetTransform().SetOrigin(cameraPosition); + meshView->GetCamera()->GetTransform().LookAt(lookingAt, csVector3(0, 1, 0)); meshView->Draw(); } @@ -427,27 +419,16 @@ screenFrame.Width(), screenFrame.Height() ); - view->GetPerspectiveCamera()->SetPerspectiveCenter( - screenFrame.xmin + (screenFrame.Width() >> 1), - PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.Height() - - screenFrame.ymin + (screenFrame.Height() >> 1) ); + view->GetPerspectiveCamera()->SetPerspectiveCenter((float)(screenFrame.xmin+(screenFrame.Width() >> 1))/graphics2D->GetWidth(), + 1-(float)(screenFrame.ymin+(screenFrame.Height() >> 1))/graphics2D->GetHeight()); - view->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), screenFrame.Width() ); - - csBox3 bbox; - if(object) - bbox = object->GetWorldBoundingBox(); - csVector3 camera; camera.x = objectPos.x + sin((double)camRotate)*((-distance)-1); camera.y = 1; camera.z = objectPos.z + cos((double)camRotate)*((-distance)-1); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(camera); - view->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt( - objectPos + csVector3(0,bbox.GetCenter().y,0) - camera + cameraMod, - csVector3(0,1,0) - ); + view->GetCamera()->GetTransform().SetOrigin(camera); + view->GetCamera()->GetTransform().LookAt(objectPos - camera + cameraMod, csVector3(0, 1, 0)); view->Draw(); @@ -457,24 +438,15 @@ meshView->SetContext(PawsManager::GetSingleton().GetGraphics3D()); - meshView->SetRectangle( screenFrame.xmin, - PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.ymax , - screenFrame.Width(), - screenFrame.Height() ); + meshView->SetRectangle(screenFrame.xmin, + PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.ymax , + screenFrame.Width(), screenFrame.Height()); - meshView->GetPerspectiveCamera()->SetPerspectiveCenter( - screenFrame.xmin + (screenFrame.Width() >> 1), - PawsManager::GetSingleton().GetGraphics3D()->GetHeight() - screenFrame.Height() - - screenFrame.ymin + (screenFrame.Height() >> 1) ); + meshView->GetPerspectiveCamera()->SetPerspectiveCenter((float)(screenFrame.xmin+(screenFrame.Width() >> 1))/graphics2D->GetWidth(), + 1-(float)(screenFrame.ymin+(screenFrame.Height() >> 1))/graphics2D->GetHeight()); - - meshView->GetPerspectiveCamera()->SetFOV( view->GetPerspectiveCamera()->GetFOV(), screenFrame.Width() ); - - meshView->GetPerspectiveCamera()->GetCamera()->GetTransform().SetOrigin(camera); - meshView->GetPerspectiveCamera()->GetCamera()->GetTransform().LookAt( - objectPos + csVector3(0,bbox.GetCenter().y,0) - camera, - csVector3(0,1,0) - ); + meshView->GetCamera()->GetTransform().SetOrigin(camera); + meshView->GetCamera()->GetTransform().LookAt(objectPos - camera + cameraMod, csVector3(0, 1, 0)); meshView->Draw(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |