summaryrefslogtreecommitdiffstats
path: root/src/utils
Commit message (Collapse)AuthorAgeFilesLines
* Added Debug class for more convenient debugging outputThorbjørn Lindeijer2013-02-241-0/+34
| | | | | Inspired by the QDebug class and qDebug() function from Qt. Actually it might be nice if the LOG macro would also use this.
* Small documentation updates for Point and RectangleThorbjørn Lindeijer2013-01-101-3/+2
| | | | | | | This documentation used to be accurate, until Point was merged with the Position class in commit 8ff3e6674c1d4fc05fc1ba87f42484689fca0879. Also fixed a typo.
* Removed unused functor obj_name_isThorbjørn Lindeijer2013-01-091-20/+0
|
* Replaced 'unsigned int' with 'unsigned'Thorbjørn Lindeijer2013-01-094-8/+8
| | | | Same thing, but shorter.
* Small GCC 4.7 compile fixThorbjørn Lindeijer2012-05-051-0/+1
| | | | | | Not entirely according to the standards since this is a C99 header, but that's better than not having it compile at all, or switching it entirely over to C++11 mode just now.
* Use callbacks for items, monsters and status effectsThorbjørn Lindeijer2012-03-031-0/+5
| | | | | | | | | | | | | Previously, global function names were defined in the respective XML definitions of items, monsters and status effects. This was reasonable when they all had the same state, but now they're sharing the single global Lua state. Now the Lua API provides access to the ItemClass, MonsterClass and StatusEffect instances, on which callbacks for both standard and custom events can be explicitly set. Reviewed-by: Erik Schilling
* Clear the gid flags before processing themThorbjørn Lindeijer2012-02-031-1/+1
| | | | | | | Also read the gids as unsigned integers since that's how Tiled writes them to prevent the number going negative when the highest flag is used. Reviewed-by: Yohann Ferreira
* Removed unused createRandomPassword functionThorbjørn Lindeijer2012-01-292-97/+0
| | | | Reviewed-by: Erik Schilling
* Removed unused singleton templateThorbjørn Lindeijer2011-11-071-71/+0
| | | | | | | Looks unlikely that we'll be using this. Anyway, it can be found in the git history if so. Reviewed-by: Yohann Ferreira
* Small cleanups in utils::TimerThorbjørn Lindeijer2011-11-072-20/+17
| | | | | | | | * Not nice to pass boolean parameter to constructor for preventing the timer from running on creation. Just call 'start' on it explicitly. * getTimeInMillisec could be made static. Reviewed-by: Yohann Ferreira
* Return a const & from NameMap to avoid potential deep copiesThorbjørn Lindeijer2011-10-201-2/+8
| | | | | | | | | | | | | When I introduced NameMap it was only used with pointers, but now it is also used with std::string so it probably makes sense to keep a default- constructed value around so that a reference can be returned rather than a copy. NameMap::find was renamed to NameMap::value to make it more clear that it doesn't return an iterator, like std::map::find. Reviewed-by: Yohann Ferreira Reviewed-by: Ben Longbons
* Have one place where the Logger is initializedThorbjørn Lindeijer2011-10-192-2/+19
| | | | | | | log_accountToStandardOutput and log_gameToStandardOutput have been merged together as log_toStandardOutput. Reviewed-by: Yohann Ferreira
* Fixed the trigger area declared within map files.Yohann Ferreira2011-09-281-2/+2
| | | | | | | | | | | | The bug was pretty generic, as the contains() method of the Rectangle class wasn't checking against left and top sides according to the client view point. I also documented the call site. Resolves: Mana-Mantis #317. Reviewed-by: o11c.
* Use a map to quickly find items and monsters by their nameThorbjørn Lindeijer2011-03-241-1/+36
| | | | | | | | | | | Introduced a template class NameMap, which provides a nice API for mapping any custom types by their name. This change also makes any duplicate item or monster definitions be complete ignored, rather than being merged into the first definition. Reviewed-by: Philipp Sehmisch Reviewed-by: Yohann Ferreira
* Fixed problems with loading XML files containing Windows newlinesThorbjørn Lindeijer2011-03-232-53/+17
| | | | | | | | | | | | | | By using xmlParseFile instead of xmlParseMemory, the system-dependent newlines should be handled automatically. The .tmx.gz files should still be supported, but instead of manually decompressing them the xmlParseFile function should take care of that. It also fixes the leaking of XML documents in both the SkillManager as well as the PermissionManager, since they now rely on XML::Document, which cleans up automatically. Reviewed-by: Stefan Dombrowski
* Moved defines.h and manaserv_protocol.h into 'common'Thorbjørn Lindeijer2011-03-201-1/+1
| | | | Just seems a bit more organized to me.
* General cleanups and code style fixesThorbjørn Lindeijer2011-03-201-2/+0
| | | | | | | A bunch of variables that were continuously requested from the configuration are now members of the AccountHandler. Reviewed-by: Freeyorp
* Micro-optimizations related to std::stringThorbjørn Lindeijer2011-03-174-12/+10
| | | | | | | | * Rely on the fact that a std::string is empty by default * Use std::string::empty() rather than comparing to "" * Construct with std::string() rather than from "" Reviewed-by: Bertram
* For streaming things to cout better implement stream operatorThorbjørn Lindeijer2011-03-131-9/+14
| | | | | More convenient since it doesn't require calling any methods, and a bit faster. Also added stream operator for Rectangle.
* Added a simple function to easily cout point coordinates.Yohann Ferreira2011-03-121-1/+10
| | | | Reviewed-by: Jaxad0127.
* Removed a bunch of silly documentationThorbjørn Lindeijer2011-03-122-3/+3
| | | | | | A C++ developer should be able to recognize a constructor and a destructor by just looking at it, so let's stop writing down the obvious. :)
* Removed two superfluous semicolonsThorbjørn Lindeijer2011-03-101-1/+1
|
* Add an heartbeat time flag in the statistics file.Yohann Ferreira2011-01-262-56/+87
| | | | | | | | | | | | | | | | | | This way, any kind of external service can know about the running state of each servers, even if only the account server is updating the statistics because: 1. When the account server is running, each <gameserver> tag is a running game server. Otherwise, it's not listed. 2. Whenever the account server stops running, the stat file isn't updated anymore and so the <heartbeat> tag isn't. 3. Game servers without any contact with an account server will try to reconnect to the account server and kick out every players so they aren't considered as running in that case. Reviewed-by: Crush. Resolves: Mana-mantis #270.
* Removed the superfluous point struct.Yohann Ferreira2011-01-091-0/+90
| | | | | | | | It was too close from the Position class and it leads to making the server handle one or another type through the code. Still bugged me many times while making changes. Reviewed-by: Jaxad.
* Get rid of the server tick magic number.Yohann Ferreira2011-01-061-6/+5
| | | | Reviewed-by: CodyMartin.
* Cleaned up and document a bit more the speed conversion functions.Yohann Ferreira2011-01-032-10/+24
| | | | Trivial fix.
* Standardized the current errors thrown.Yohann Ferreira2010-12-161-0/+53
| | | | Reviewed-by: Jaxad0127.
* Fix compareStrI functionJared Adams2010-12-151-1/+7
| | | | | | It now takes length into consideration. Reviewed-by: Chuck Miller
* Finally fix the logPerDay log option.Yohann Ferreira2010-11-141-6/+17
| | | | | | | | | | | | | The static std::string date variable had two nasty problems. Would it have been static or be named 'date', and it would have not worked right. I also made the logger add the proper date on the archived log when changing the current day. Resolved: TMW-Mantis #530. Reviewed-by: Jaxad0127.
* Renamed .hpp files into .h for consistency.Yohann Ferreira2010-11-1416-26/+26
| | | | | | Also added an header to the autoattack.{h,cpp} files. Big but trivial fix.
* Fixed the append behaviour of logger::setLogFile().Yohann Ferreira2010-10-201-1/+2
| | | | | | | | | Also made both servers appends on the main log at start if they aren't empty. This permits not to lose the previous logs when quicky restarting the servers. Trivial fix.
* Dehardcode the tileWidth and height, except for the speed conversion.Yohann Ferreira2010-10-171-1/+1
| | | | | | | | The speed conversion needs a standard tile length anyway and can be improved later once the movement code will start to handle beings size. Reviewed-by: Crush.
* Hopefully fix the logging rotation this time.Yohann Ferreira2010-10-141-23/+23
| | | | | | | Added an extension to the ResMan::exist() function in order to get file existence even not in search path. Reviewed-by: CodyMartin.
* Add log file rotation support based on ExceptionFault's work.Yohann Ferreira2010-09-293-19/+192
| | | | | | | | | This patch adds options to enable log rotations base on files size and or change of date. Note: Zip support will be added in a second commit. Reviewed-by: CodyMartin, Thorbjorn.
* Centralized stringToBool conversion.Yohann Ferreira2010-09-084-61/+70
| | | | | | | Also moved the trim() function into the utils namespace where it belongs more, and made some random code cleanups. Reviewed-by: Thorbjorn.
* Merge branch 'master' of gitorious.org:mana/manaservYohann Ferreira2010-07-302-0/+39
|\ | | | | | | | | Conflicts: src/game-server/itemmanager.cpp
| * Upgraded Skill Map loading.Yohann Ferreira2010-07-222-0/+39
| | | | | | | | | | | | | | | | | | | | | | - Added a new 'default' boolean parameter in mana-skills.xml. If set to true, unknown weapon types will be defaulted to the given value. - Added better checks on skill id and names and improved error reporting. - Corrected minor typos, and made small cleanups. Reviewed-by: jaxad0127
* | New attribute system and major changes to many low-level areas.Freeyorp2010-07-103-0/+81
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attribute system: Structure is no longer completely hardcoded. Attributes and structure is defined by new xml file (defaulting to stats.xml) Structure defines non-base modifications to an attribute, to be used by modifiers from items, effects, etc. Calculating the base value for core attributes is still done in C++ (and for such fundamental elements the only reason I can think of to do it any other way is perhaps being able to quickly change scripts without a compile could be useful for testing, but such things are a low priority anyway) Item structure: Modifiers are now through triggers rather than single events. This also removes hardcoded types - an item could be both able to be equipped and be able to be activated. Item activation no longer consumes by default, this must be specified by the property <consumes /> inside the trigger. Currently only attribute modifications, autoattacks, and consumes are defined as effects, but stubs for others do exist. Autoattacks are currently non-functional, and this should be rectified with some urgency. Auto Attacks: AutoAttacks are now separate entities, though not fully complete, nor fully integrated with all beings yet. Integration with the Character class is urgent, integration with other Being children less so. When fully integrated this will allow for multiple autoattacks, through equipping multiple items with this as an equip effect or even through other means if needed. Equipment structure: As ItemClass types are no longer hardcoded, so too are equip types. An item have multiple ways to be equipped across multiple equipment slots with any number in each slot. Character maximums are global but configurable. Miscellaneous: Speed, money, and weight are now attributes. Some managers have been changed into classes such that their associated classes can have them as friends, to avoid (ab)use of public accessors. The serialise procedure should also be set as a friend of Character (both in the account- and game- server) as well; having public accessors returning iterators is simply ridiculous. Some start for such cleanups have been made, but this is not the primary focus here. Significant work will need to be done before this is resolved completely, but the start is there. BuySell::registerPlayerItems() has been completely disabled temporarily. The previous function iterated through equipment, yet in the context I think it is intended to fill items? I have been unable to update this function to fit the modifications made to the Inventory/Equipment/Possessions, as I am unsure what exactly what it should be doing. ItemClass::mSpriteId was previously unused, so had been removed, but I notice that it was used when transmitting equipment to nearby clients. Experimentation showed that this value was never set to anything other than 0, and so has been left out of the ItemManager rewrite. I am not entirely sure what is happening here, but it should be worth looking into at a later time, as I am not sure how equipment appearences would be sent otherwise.
* Random cleanups, adding const, removing unnecessary clear callsThorbjørn Lindeijer2010-05-162-21/+12
| | | | Reviewed-by: Jared Adams
* Changed and split up the default location for loading dataThorbjørn Lindeijer2010-05-162-36/+168
| | | | | | | | | | | | | | | | | Instead of loading data from a 'data' directory in the current working directory, the server now uses clientDataPath and serverDataPath as specified in the configuration. This removes the need to set up symbolic links in order to merge these two types of data. The default values point to example/clientdata and example/serverdata, where a minimal example world can be developed to make setting up an initial server quick and easy. The XML::Document convenience class was copied over from the client. Also, the ResourceManager is now shared between both servers, since the account client is reading items.xml. Reviewed-by: Jared Adams
* Update Copyright date for Manaserv.Bertram2010-02-0727-27/+27
|
* Rename enum elements to avoid clashing with macrosBernd Wachter2010-01-292-17/+17
|
* Fix detecting collision layer for mapsJared Adams2009-12-092-3/+34
|
* Fixed name of the project in copyright headersThorbjørn Lindeijer2009-12-0627-298/+282
| | | | | | Also updated the headers to refer to the GPL by URL instead of suggesting to contact the FSF by snail mail, as per the latest GPL usage instructions.
* Removed "TMW" and "TMWSERV" from header guardsThorbjørn Lindeijer2009-12-0615-39/+39
|
* A host of code style changesThorbjørn Lindeijer2009-12-062-22/+8
| | | | | | Removed pointless void in method parameter lists, fixed methods and variables that started with upper case, removed pointless 'const' for stuff passed by value, made some getters const, etc.
* Moved rectangle intersection to the Rectangle classThorbjørn Lindeijer2009-12-062-35/+39
| | | | Also a bit of pointless cleanup in the math utils.
* Synced the protocol file with client in protocol.h, letting other defines in ↵Bertram2009-10-092-2/+0
| | | | defines.h, and removing some overheading along the way.
* Limit login attempt frequency based on IP addressThorbjørn Lindeijer2009-10-031-1/+1
| | | | | | | | | | | | The previous method was broken because it set the "last time" to the current time when the client connected. So login would fail when the username and password were sent within a second from connecting, which is not desirable. If I'd have fixed this by setting the "last time" to login time minus one second, then an attacker would just need to reconnect for each login attempt. So now it uses an IP address based approach, where each IP can only try to log in once per second.
* Fixed compilation problem with GCC 4.4Bjørn Lindeijer2009-05-242-5/+9
| | | | Fix ported from the client.
generated by cgit (git 2.34.1) at 2024-11-13 06:51:54 +0000