Commit Graph

49 Commits

Author SHA1 Message Date
Kayne Ruse cd06ccc1a5 Room system now uses CharacterData instead of Entity 2015-01-13 00:42:16 +11:00
Kayne Ruse 9f3721247d Replaced a block of code in setup_server.lua with one line 2015-01-11 20:12:50 +11:00
Kayne Ruse d0b2f8e12f Removed MonsterManager's Singleton status, RoomData now has mgr members
RoomData now has monsterMgr and waypointMgr members, so that it can
compare it's characters to the monster & waypoints, etc.

RoomManager has been updated. It now has a database reference, which is
passed to the monsterMgr of new rooms. The room API also has functions
which expose these managers to lua.
2015-01-11 19:47:42 +11:00
Kayne Ruse 3322783d95 Merge branch 'develop' into rooms 2015-01-03 03:27:34 +11:00
Kayne Ruse 877c0f59d3 Removed preprocessor switch surrounding library headers 2015-01-03 03:20:13 +11:00
Kayne Ruse d815f17442 Reimplemented the push/pop entity methods in RoomManager
Some accessors in Entity had to be made const, as they were being called
from lambdas with const parameters.
2015-01-02 23:25:59 +11:00
Kayne Ruse eb897c81e8 Tentative solution for bug #38 2015-01-02 07:09:04 +11:00
Kayne Ruse 8e50be24d4 Updated room system and room API, more to come
There's a lot of verbosity in the scripts, so it might be beneficial to
redice that at some point.
2014-12-31 04:52:10 +11:00
Kayne Ruse 78c04718e0 Removed ManagerInterface, it was a bad idea 2014-12-31 03:05:19 +11:00
Kayne Ruse 7e5a7f8183 Updated the copyright headers about a week ahead 2014-12-27 13:29:16 +11:00
Kayne Ruse 01461deaa5 Set the values for packets, and added getRoom() 2014-11-26 07:11:27 +11:00
Kayne Ruse fa0d232727 Removed one parameter from RoomManager::Create() 2014-11-26 06:41:29 +11:00
Kayne Ruse 6485839dcf Replaced RoomData's hooks with Initialize API function 2014-11-26 06:33:02 +11:00
Kayne Ruse 5eeda8235d Fixed the scripts struggling with nested API tables
I actually don't remember what the RoomData's lua references where for,
but I'm pretty srue it wasn't this. I'll figure something out when I've
had a sleep.
2014-11-23 06:40:31 +11:00
Kayne Ruse ecd0b43abe Corrected comments
Because this file was originally copied from the map API, there were references to the map. I've corrected this.
2014-11-14 10:05:00 +11:00
Kayne Ruse d35ab24e15 Added TODO 2014-11-14 10:02:15 +11:00
Kayne Ruse 100c4f6522 Added TODO 2014-11-14 10:01:24 +11:00
Kayne Ruse a1c20959fe The server builds using the new packet types; incomplete
Most of this was achieved by dummying out calls in HandlePacket(), so the
server's actual logic is incomplete.
2014-11-09 23:15:09 +11:00
Kayne Ruse 06e027710f Created the room system's API, and tweaked some other APIs 2014-11-06 22:42:03 +11:00
Kayne Ruse 73d9095604 Minor comment tweaks 2014-11-06 02:00:13 +11:00
Kayne Ruse f2d79225a3 Created '*_data.cpp' files, modified API files a bit 2014-11-06 01:54:27 +11:00
Kayne Ruse daa38413f3 temp script changes 2014-11-06 01:22:08 +11:00
Kayne Ruse cfdc61c357 Tweaked TODO comments 2014-11-06 00:04:42 +11:00
Kayne Ruse 77b47b4634 Merge branch 'mingw-fix' into server-expansion 2014-11-05 23:55:38 +11:00
Kayne Ruse 0f139562c3 Theoretically resolved jenky cross-compiler compatability 2014-11-05 23:54:10 +11:00
Kayne Ruse fc2bc06992 Made a few tweaks to various managers 2014-11-05 23:43:36 +11:00
Kayne Ruse 8eefdd71b5 Moved the API files back again 2014-11-05 23:07:34 +11:00
Kayne Ruse 5327d91917 Moved API files to their own directory 2014-11-02 20:42:26 +11:00
fro_ozen de7167e830 Added unix compatability 2014-10-18 20:10:17 +02:00
Kayne Ruse 869780589f finished rewriting the room API 2014-10-07 02:08:00 +11:00
Kayne Ruse 254b97aa80 Implemented ManagerInterface in AccountManager and CharacterManager
ManagerInterface was already designed for those two anyway. The only thing
left to do is to rewrite the room API, and the whole thing should work
fine again.

I still think map data should be saved and loaded by lua code, so the
rooms will still implement lua hooks. There may be other things that can
be loaded from SQL, but I don't know what.
2014-10-07 01:23:55 +11:00
Kayne Ruse 5a42a7e36c Wrote ManagerInterface, implemented it in RoomManager
ManagerInterface is a server-side pure abstract class; all of it's methods
are defined as pure virtual methods, and as such should be defined in the
derived classes. It works correctly along side the Singleton class, but
does not implement it directly as originally planned. It should also
support variadic parameters, which still need testing.

I've implemented ManagerInterface in RoomManager, but I've also disabled a
number of the RoomManager's features, including the lua interface. The
project as a whole should build, but it won't run correctly. The variadic
parameters will be tested using the other managers.

It feels good just playing around instead of pushing forward all the time.
2014-10-07 00:55:55 +11:00
Kayne Ruse db40f198be Moved heartbeat code to ServerApplication::CheckClientConnections() 2014-09-30 02:01:56 +10:00
Kayne Ruse e7ba097e6a Converted the server's managers to singletons 2014-08-17 10:06:29 +10:00
Kayne Ruse 52ab9f0087 Minor tweaks 2014-08-15 08:53:41 +10:00
Kayne Ruse 98ffcb8cd3 Encapsulated RoomData, did some other refactoring 2014-08-14 00:13:19 +10:00
Kayne Ruse 28d083cba4 Hammered out server-side issues, read more
* Removed the client-only code from CharacterData, including the .cpp file
* Removed CombatManager and EnemyManager instanciation
2014-07-03 01:41:58 +10:00
Kayne Ruse 4dd4b37fc0 It now builds cleanly, but I cut a few code stubs 2014-07-03 00:56:30 +10:00
Kayne Ruse 95362286f8 Committing the island generator script, and a bugfix
region_api.cpp had a bug, where a glue function's name was used twice. It
was an easy catch, but there was an issue in the new script, where I was
counting from 0 instead of 1. As a result, I was chasing a segfault for 5
hours.
2014-06-23 10:29:39 +10:00
Kayne Ruse f5c58bf5ad Minor tweaks after a failed attempt at metatables 2014-06-23 05:58:54 +10:00
Kayne Ruse 316db43b0a Fixed CreateRoom()'s return type 2014-06-23 04:54:01 +10:00
Kayne Ruse 46ed196bf4 All current lua hooks are being called 2014-06-23 04:10:21 +10:00
Kayne Ruse 64baa63d12 Changed the naming conventions (read more)
I've changed some naming concentions in the lua APIs. I've also made a few
other tweaks, like region_pager_api.cpp delegating to the passed
RegionPager object. This won't explicitly run, becuase there's still a few
more changes needed.
2014-06-23 03:45:30 +10:00
Kayne Ruse e19b6fbc23 Updated RoomManager and the API 2014-06-21 19:02:43 +10:00
Kayne Ruse a64411a567 Filled out the APIs a bit 2014-06-21 18:24:58 +10:00
Kayne Ruse 8afd0e7c8a Created a separate API for the RoomManager class 2014-06-21 07:19:51 +10:00
Kayne Ruse 82c776df83 Moved the generators into a subdirectory 2014-06-21 07:00:48 +10:00
Kayne Ruse 924ebc2ee9 Created the generator hierarchy 2014-06-21 06:47:30 +10:00
Kayne Ruse d3bf099a98 Arranged server's source into directories 2014-06-21 05:52:27 +10:00