kg: src/Network/Client.cc@e6cfc44266af (annotated)

185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	1
186 0738f2949a2b move src/Network% to src/Network/% terom parents: 185 diff changeset	2	#include "Client.hh"
187 f41f894213ca restructure network code a bit terom parents: 186 diff changeset	3	#include "Protocol.hh"
f41f894213ca restructure network code a bit terom parents: 186 diff changeset	4	#include "Config.hh"
186 0738f2949a2b move src/Network% to src/Network/% terom parents: 185 diff changeset	5	#include "../Engine.hh"
0738f2949a2b move src/Network% to src/Network/% terom parents: 185 diff changeset	6	#include "../Logger.hh"
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	7
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	8	#include <cassert>
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	9
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	10	/*
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	11	* NetworkClientConnect
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	12	*/
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	13	NetworkClientConnect::NetworkClientConnect (Engine &engine, const NetworkEndpoint &connect_to) :
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	14	engine(engine), netsession(NETWORK_MAGIC_ID)
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	15	{
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	16	// connect NetworkSession to get server node (this is still blocking)
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	17	server = netsession.connect(connect_to);
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	18
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	19	// connect slots
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	20	slots.connect(netsession.sig_chan_message(NETCHAN_TERRAIN_ARRAY), this, &NetworkClientConnect::on_terrain_array);
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	21	slots.connect(server->sig_disconnected(), this, &NetworkClientConnect::on_disconnected);
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	22
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	23	// then we must wait for the terrain data
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	24	}
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	25
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	26	void NetworkClientConnect::on_disconnected (void) {
332 78657bf06302 handle NetworkClient server-disconnect by logging an error and stopping the engine terom parents: 330 diff changeset	27	Engine::log(ERROR, "client.on_disconnect") << "Disconnected from server";
78657bf06302 handle NetworkClient server-disconnect by logging an error and stopping the engine terom parents: 330 diff changeset	28	engine.stop();
78657bf06302 handle NetworkClient server-disconnect by logging an error and stopping the engine terom parents: 330 diff changeset	29	}
78657bf06302 handle NetworkClient server-disconnect by logging an error and stopping the engine terom parents: 330 diff changeset	30
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	31	void NetworkClientConnect::on_terrain_array (NetworkPacketInput &pkt, NetworkNode *node) {
203 3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	32	// ignore if not from server
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	33	if (node != server)
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	34	return;
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	35
203 3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	36	// read map width/height
282 e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	37	PixelDimension map_w = pkt.read_uint32();
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	38	PixelDimension map_h = pkt.read_uint32();
203 3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	39
387 294ce7ae8140 dirty implementation of compressed terrain array data terom parents: 381 diff changeset	40	// the terrain byte array
294ce7ae8140 dirty implementation of compressed terrain array data terom parents: 381 diff changeset	41	size_t terrain_size = map_w * map_h;
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	42	TerrainPixel terrain_buf = new TerrainPixel[map_w map_h];
391 59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client Tero Marttila <terom@fixme.fi> parents: 387 diff changeset	43
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client Tero Marttila <terom@fixme.fi> parents: 387 diff changeset	44	// read uncompressed terrain data
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client Tero Marttila <terom@fixme.fi> parents: 387 diff changeset	45	size_t inflate_size = pkt.read_uncompressed(terrain_buf, terrain_size);
387 294ce7ae8140 dirty implementation of compressed terrain array data terom parents: 381 diff changeset	46
294ce7ae8140 dirty implementation of compressed terrain array data terom parents: 381 diff changeset	47	// invalid data?
294ce7ae8140 dirty implementation of compressed terrain array data terom parents: 381 diff changeset	48	if (inflate_size != terrain_size)
294ce7ae8140 dirty implementation of compressed terrain array data terom parents: 381 diff changeset	49	throw Error("Corrupt terrain data");
294ce7ae8140 dirty implementation of compressed terrain array data terom parents: 381 diff changeset	50
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	51	// create the terrain object that we then use, and hand over terrain_buf to it
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	52	Terrain *terrain = new Terrain(map_w, map_h, terrain_buf);
203 3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	53
408 e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	54	// execute connectDone
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	55	connectDone(terrain);
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	56	}
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	57
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	58	void NetworkClientConnect::connectDone (Terrain *terrain) {
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	59	// pass Terrain to engine to create game
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	60	GameState &gs = engine.setupGame(terrain);
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	61
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	62	// create our new NetworkClient object
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	63	client = new NetworkClient(engine, gs, netsession, server);
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	64	}
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	65
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	66	/*
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	67	* NetworkClient
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	68	*/
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	69	NetworkClient::NetworkClient (Engine &engine, GameState &state, NetworkSession &netsession, NetworkNode *server) :
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	70	engine(engine), state(state), netsession(netsession), server(server),
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	71	controller(*this)
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	72	{
e6cfc44266af reorganize Terrain/PhysicsWorld/GameState/Engine to use NetworkClientConnect, and hence handle the connection process asynchronously, and finally properly implement receiving the terrain data from the server Tero Marttila <terom@fixme.fi> parents: 406 diff changeset	73
203 3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	74	}
3ec7ab40755f send initial terrain data to clients using a new NETCHAN_TERRAIN_ARRAY channel using raw BigNetworkPacket terom parents: 200 diff changeset	75
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	76	void NetworkClient::player_quit (NetworkClientRemotePlayer *player) {
294 fd58e7d01bec finish network documentation terom parents: 282 diff changeset	77	(void) player;
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	78	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	79
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	80	/*
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	81	* NetworkClientController
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	82	*/
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	83	NetworkClientController::NetworkClientController (NetworkClient &client) :
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	84	NetworkObject_ClientController(client.netsession, NETCHAN_CORE, client.server), client(client)
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	85	{
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	86
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	87	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	88
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	89	void NetworkClientController::handle_create (NetworkObjectID obj_id, NetworkMessageID msg_id, NetworkPacketInput &pkt, NetworkNode *node) {
282 e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	90	// XXX: should be server
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	91	(void) node;
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	92
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	93	switch (msg_id) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	94	case NETMSG_SERVER_HELLO:
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	95	on_server_hello(obj_id, pkt);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	96	break;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	97
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	98	case NETMSG_PLAYER_INFO:
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	99	on_player_info(obj_id, pkt);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	100	break;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	101
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	102	case NETMSG_PLAYER_JOIN:
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	103	on_player_join(obj_id, pkt);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	104	break;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	105
276 87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	106	case NETMSG_PROJECTILE_PLAYER_FIRED:
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	107	on_projectile_player_fired(obj_id, pkt);
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	108	break;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	109
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	110	default:
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	111	Engine::log(WARN, "client.handle_create") << "Unknown object create message: obj_id=" << obj_id << ", msg_id=" << msg_id;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	112	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	113	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	114
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	115	void NetworkClientController::on_server_hello (NetworkObjectID obj_id, NetworkPacketInput &pkt) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	116	// read the packet
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	117	Vector position = pkt.read_vector();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	118
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	119	Engine::log(INFO, "client.on_server_hello") << this << ": pos=" << position;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	120
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	121	// create the LocalPlayer object
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	122	new NetworkClientLocalPlayer(client, obj_id, position);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	123	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	124
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	125	void NetworkClientController::on_player_info (NetworkObjectID obj_id, NetworkPacketInput &pkt) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	126	// read the packet
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	127	Vector position = pkt.read_vector();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	128
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	129	Engine::log(INFO, "client.on_player_info") << this << ": pos=" << position;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	130
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	131	// create the LocalPlayer object
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	132	new NetworkClientRemotePlayer(client, obj_id, position);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	133	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	134
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	135	void NetworkClientController::on_player_join (NetworkObjectID obj_id, NetworkPacketInput &pkt) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	136	// read the packet
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	137	Vector position = pkt.read_vector();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	138
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	139	Engine::log(INFO, "client.on_player_join") << this << ": pos=" << position;
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	140
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	141	// create the RemotePlayer object
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	142	new NetworkClientRemotePlayer(client, obj_id, position);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	143	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	144
276 87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	145	void NetworkClientController::on_projectile_player_fired (NetworkObjectID obj_id, NetworkPacketInput &pkt) {
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	146	// read the packet
276 87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	147	NetworkObject *player_obj = client.controller.read_object(pkt);
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	148	Vector position = pkt.read_vector();
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	149	Vector velocity = pkt.read_vector();
276 87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	150	WeaponID weapon_id = pkt.read_uint8();
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	151
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	152	NetworkClientPlayerBase *player;
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	153
276 87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	154	// ignore for invalid players
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	155	if ((player = dynamic_cast<NetworkClientPlayerBase*>(player_obj)) == NULL) {
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	156	Engine::log(ERROR, "client.on_projectile_player_fired") << this << ": Unknown player object";
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	157	return;
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	158	}
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	159
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	160	Weapon *weapon;
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	161
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	162	// try and get the weapon
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	163	if ((weapon = player->getWeapon(weapon_id)) == NULL) {
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	164	Engine::log(ERROR, "client.on_projectile_player_fired") << this << ": Unknown weapon id: player=" << player << ", weapon_id=" << weapon_id;
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	165	}
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	166
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	167	Engine::log(INFO, "client.on_projectile_create") << this << ": player=" << player << ", pos=" << position << ", velocity=" << velocity << ", weapon=" << weapon;
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	168
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	169	// create the NetworkClientPorjectile object
276 87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	170	new NetworkClientProjectile(client, obj_id, player, position, velocity, weapon);
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	171	}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	172
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	173	/*
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	174	* NetworkClientObject
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	175	*/
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	176	NetworkClientObject::NetworkClientObject (NetworkClient &client, NetworkObjectID obj_id) :
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	177	NetworkObject_Client(client.controller, obj_id), client(client)
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	178	{
2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	179
2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	180	}
2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	181
2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	182	/*
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	183	* NetworkClientPlayerBase
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	184	*/
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	185	NetworkClientPlayerBase::NetworkClientPlayerBase (NetworkClient &client, NetworkObjectID obj_id, Vector position) :
282 e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	186	Player(client.state, position, true),
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	187	NetworkClientObject(client, obj_id)
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	188	{
302 e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	189	slots.connect(sig_message(NETMSG_PLAYER_POSITION), this, &NetworkClientPlayerBase::on_position );
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	190	slots.connect(sig_message(NETMSG_PLAYER_DIG), this, &NetworkClientPlayerBase::on_dig );
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	191	slots.connect(sig_message(NETMSG_PLAYER_WEAPON_CHANGE), this, &NetworkClientPlayerBase::on_weapon_change );
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	192	slots.connect(sig_message(NETMSG_PLAYER_ROPE_THROW), this, &NetworkClientPlayerBase::on_rope_throw );
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	193	slots.connect(sig_message(NETMSG_PLAYER_ROPE_FIXED), this, &NetworkClientPlayerBase::on_rope_fixed );
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	194	slots.connect(sig_message(NETMSG_PLAYER_ROPE_RELEASED), this, &NetworkClientPlayerBase::on_rope_released );
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	195	slots.connect(sig_message(NETMSG_PLAYER_ROPE_LENGTH), this, &NetworkClientPlayerBase::on_rope_length );
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	196	slots.connect(sig_message(NETMSG_PLAYER_SPAWN), this, &NetworkClientPlayerBase::on_spawn );
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	197	slots.connect(sig_message(NETMSG_PLAYER_DIE), this, &NetworkClientPlayerBase::on_die );
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	198	}
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	199
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	200	void NetworkClientPlayerBase::spawn (Vector position) {
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	201	(void) position;
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	202
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	203	throw Error("NetworkClientPlayerBase::spawn called");
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	204	}
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	205
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	206	void NetworkClientPlayerBase::respawn (TimeMS dt) {
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	207	(void) dt;
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	208
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	209	throw Error("NetworkClientPlayerBase::respawn called");
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	210	}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	211
303 36a502a0023f just ignore NetworkClientPlayerBase::die terom parents: 302 diff changeset	212	void NetworkClientPlayerBase::die (bool start_timer) {
36a502a0023f just ignore NetworkClientPlayerBase::die terom parents: 302 diff changeset	213	(void) start_timer;
36a502a0023f just ignore NetworkClientPlayerBase::die terom parents: 302 diff changeset	214
36a502a0023f just ignore NetworkClientPlayerBase::die terom parents: 302 diff changeset	215	// ignore :>
36a502a0023f just ignore NetworkClientPlayerBase::die terom parents: 302 diff changeset	216	}
36a502a0023f just ignore NetworkClientPlayerBase::die terom parents: 302 diff changeset	217
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	218	void NetworkClientPlayerBase::on_position (NetworkPacketInput &pkt) {
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	219	Vector position = pkt.read_vector();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	220	Vector velocity = pkt.read_vector();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	221	int flags = pkt.read_uint8();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	222	float aim = pkt.read_float32();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	223
255 99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code terom parents: 241 diff changeset	224	// Engine::log(INFO, "client_player.on_position") << "obj=" << obj << ", position=" << position << ", velocity=" << velocity << ", aim=" << aim << ", [" << flags << "]";
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	225
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	226	// just update...
264 215de3d4de60 change facingRight from a bool to an terom parents: 263 diff changeset	227	updatePhysics(position, velocity,
215de3d4de60 change facingRight from a bool to an terom parents: 263 diff changeset	228	flags & NETWORK_PHYSICS_INAIR,
215de3d4de60 change facingRight from a bool to an terom parents: 263 diff changeset	229	flags & NETWORK_PHYSICS_FACE_RIGHT ? FACING_RIGHT : FACING_LEFT,
215de3d4de60 change facingRight from a bool to an terom parents: 263 diff changeset	230	aim
215de3d4de60 change facingRight from a bool to an terom parents: 263 diff changeset	231	);
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	232	}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	233
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	234	void NetworkClientPlayerBase::on_dig (NetworkPacketInput &pkt) {
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	235	Vector position = pkt.read_vector();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	236	float radius = pkt.read_float32();
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	237
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	238	Engine::log(INFO, "client_player.on_dig") << this << ": position=" << position << ", radius=" << radius;
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	239
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	240	// just update...
209 68cc4248a508 sneak in some ugly ugly ugly Multiple Inheritance that hopefully nobody ever notices terom parents: 203 diff changeset	241	handleDig(position, radius);
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	242	}
239 550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	243
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	244	void NetworkClientPlayerBase::on_weapon_change (NetworkPacketInput &pkt) {
239 550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	245	uint8_t weapon_index = pkt.read_uint8();
550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	246
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	247	Engine::log(INFO, "client_player.on_weapon_change") << this << ": weapon_index=" << weapon_index;
239 550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	248
550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	249	handleChangeWeapon(weapon_index);
550397d9d479 implement network weapon changes and fix weapon firing terom parents: 224 diff changeset	250	}
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	251
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	252	void NetworkClientPlayerBase::on_rope_throw (NetworkPacketInput &pkt) {
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	253	Vector position = pkt.read_vector();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	254	Vector velocity = pkt.read_vector();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	255	float length = pkt.read_float32();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	256
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	257	Engine::log(INFO, "client_player.on_rope_throw") << this << ": position=" << position << ", velocity=" << velocity << ", length=" << length;
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	258
328 51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	259	rope.updateState(ROPE_FLYING, position, velocity, length, NULL);
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	260	}
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	261
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	262	void NetworkClientPlayerBase::on_rope_fixed (NetworkPacketInput &pkt) {
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	263	Vector position = pkt.read_vector();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	264	float length = pkt.read_float32();
328 51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	265	NetworkObject *player_obj = controller.read_object(pkt);
51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	266
51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	267	NetworkClientPlayerBase *player = NULL;
51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	268
51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	269	if (player_obj != NULL && (player = dynamic_cast<NetworkClientPlayerBase*>(player_obj)) == NULL) {
51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	270	Engine::log(ERROR, "client.on_rope_fixed") << this << ": Unknown player object";
51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	271	return;
51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	272	}
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	273
328 51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	274	Engine::log(INFO, "client_player.on_rope_fixed") << this << ": position=" << position << ", length=" << length
51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	275	<< ", player=" << player;
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	276
328 51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	277	rope.updateState(ROPE_FIXED, position, Vector(0, 0), length, player);
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	278	}
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	279
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	280	void NetworkClientPlayerBase::on_rope_released (NetworkPacketInput &pkt) {
282 e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	281	(void) pkt;
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	282
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	283	Engine::log(INFO, "client_player.on_rope_released") << this;
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	284
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	285	// use rope.getPosition() instead of e.g. Vector(0, 0) because it will collide there...
328 51d644c8d5a2 fix player-pivoted rope terom parents: 308 diff changeset	286	rope.updateState(ROPE_FOLDED, rope.getPosition(), Vector(0, 0), 0, NULL);
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	287	}
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	288
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	289	void NetworkClientPlayerBase::on_rope_length (NetworkPacketInput &pkt) {
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	290	float length = pkt.read_float32();
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	291
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	292	Engine::log(INFO, "client_player.on_rope_length") << this << ": length=" << length;
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	293
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	294	rope.updateLength(length);
e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	295	}
302 e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	296
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	297	void NetworkClientPlayerBase::on_spawn (NetworkPacketInput &pkt) {
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	298	// read packet
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	299	Vector position = pkt.read_vector();
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	300
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	301	Engine::log(INFO, "client_player.on_spawn") << this << ": position=" << position;
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	302
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	303	// super
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	304	Player::spawn(position);
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	305	}
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	306
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	307	void NetworkClientPlayerBase::on_die (NetworkPacketInput &pkt) {
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	308	(void) pkt;
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	309
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	310	Engine::log(INFO, "client_player.on_die") << this;
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	311
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	312	// super, but don't start the respawn_timer
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	313	Player::die(false);
e734d8e9bbb5 make spawn/die work over the network terom parents: 296 diff changeset	314	}
241 e95b1602d836 implement the ROT (Rope Over TCP) protocol terom parents: 239 diff changeset	315
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	316	/*
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	317	* NetworkClientLocalPlayer
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	318	*/
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	319	NetworkClientLocalPlayer::NetworkClientLocalPlayer (NetworkClient &client, NetworkObjectID obj_id, Vector position) :
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	320	Player(client.state, position, true), NetworkClientPlayerBase(client, obj_id, position)
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	321	{
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	322	// set ourselves as the local player
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	323	state.setLocalPlayer(this);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	324	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	325
277 40f4a03917e2 fix NetworkClient handleInput terom parents: 276 diff changeset	326	void NetworkClientLocalPlayer::handleInput (PlayerInput input, TimeMS dt) {
334 0cf3f2be51eb transmit handleInput dt terom parents: 332 diff changeset	327	NetworkPacket pkt;
277 40f4a03917e2 fix NetworkClient handleInput terom parents: 276 diff changeset	328
334 0cf3f2be51eb transmit handleInput dt terom parents: 332 diff changeset	329	// write packet
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	330	pkt.write_uint16(input);
334 0cf3f2be51eb transmit handleInput dt terom parents: 332 diff changeset	331	pkt.write_uint32(dt);
0cf3f2be51eb transmit handleInput dt terom parents: 332 diff changeset	332
0cf3f2be51eb transmit handleInput dt terom parents: 332 diff changeset	333	// send
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	334	send(NETMSG_CLIENT_INPUT, pkt, false);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	335
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	336	// do not handle locally
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	337	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	338
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	339	/*
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	340	* NetworkClientRemotePlayer
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	341	*/
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	342	NetworkClientRemotePlayer::NetworkClientRemotePlayer (NetworkClient &client, NetworkObjectID obj_id, Vector position) :
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	343	Player(client.state, position, true), NetworkClientPlayerBase(client, obj_id, position) {
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	344
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	345	// receive messages
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	346	slots.connect(sig_message(NETMSG_PLAYER_QUIT), this, &NetworkClientRemotePlayer::on_quit);
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	347	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	348
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	349	void NetworkClientRemotePlayer::on_quit (NetworkPacketInput &pkt) {
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	350	// pkt is empty
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	351	(void) pkt;
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	352
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	353	Engine::log(INFO, "client_player.on_quit") << this;
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	354
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	355	client.player_quit(this);
294 fd58e7d01bec finish network documentation terom parents: 282 diff changeset	356
fd58e7d01bec finish network documentation terom parents: 282 diff changeset	357	// delete
fd58e7d01bec finish network documentation terom parents: 282 diff changeset	358	// XXX: leak because deleting the slot while it's being called breaks ClanLib
fd58e7d01bec finish network documentation terom parents: 282 diff changeset	359	// delete this;
185 25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	360	}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be terom parents: diff changeset	361
294 fd58e7d01bec finish network documentation terom parents: 282 diff changeset	362	/*
fd58e7d01bec finish network documentation terom parents: 282 diff changeset	363	* NetworkClientProjectile
fd58e7d01bec finish network documentation terom parents: 282 diff changeset	364	*/
276 87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	365	NetworkClientProjectile::NetworkClientProjectile (NetworkClient &client, NetworkObjectID obj_id, Player *player,
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	366	Vector position, Vector velocity, Weapon *weapon) :
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	367	NetworkClientObject(client, obj_id), Projectile(player, position, velocity, weapon)
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	368	{
224 e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	369	// hook up signals
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	370	slots.connect(sig_message(NETMSG_PROJECTILE_DESTROY), this, &NetworkClientProjectile::on_destroy);
296 4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	371	slots.connect(sig_message(NETMSG_PROJECTILE_HIT_PLAYER), this, &NetworkClientProjectile::on_hit_player);
276 87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	372
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	373	// tell Player
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading terom parents: 274 diff changeset	374	player->weaponFired(weapon);
223 2fcaf54ed37b basic network-projectiles terom parents: 221 diff changeset	375	}
200 2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes terom parents: 187 diff changeset	376
224 e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	377	void NetworkClientProjectile::onDestroy (Vector position, bool removeGround) {
282 e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	378	(void) position;
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	379	(void) removeGround;
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :) terom parents: 277 diff changeset	380
224 e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	381	// ignore :>
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	382	}
296 4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	383
330 dcc47278e5ab fix Network Projectile::onHitPlayer terom parents: 328 diff changeset	384	void NetworkClientProjectile::onHitPlayer (Player *player) {
296 4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	385	(void) player;
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	386
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	387	// ignore :>
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	388	}
224 e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	389
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	390	void NetworkClientProjectile::on_destroy (NetworkPacketInput &pkt) {
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	391	Vector position = pkt.read_vector();
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	392	uint8_t flags = pkt.read_uint8();
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	393
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	394	Engine::log(INFO, "client_projectile.on_destroy") << this << ": position=" << position << ", flags=" << flags;
224 e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	395
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	396	// pass on to super
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	397	Projectile::onDestroy(position, flags & NETWORK_PROJECTILE_REMOVE_GROUND);
e6faefba2ec1 fixed logger, and network projectiles should work reasonably well now terom parents: 223 diff changeset	398	}
274 c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject terom parents: 264 diff changeset	399
296 4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	400	void NetworkClientProjectile::on_hit_player (NetworkPacketInput &pkt) {
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	401	// read packet
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	402	NetworkObject *player_obj = controller.read_object(pkt);
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	403
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	404	NetworkClientPlayerBase *player;
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	405
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	406	// ignore for invalid players
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	407	if ((player = dynamic_cast<NetworkClientPlayerBase*>(player_obj)) == NULL) {
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	408	Engine::log(ERROR, "client.on_hit_player") << this << ": Unknown player object";
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	409	return;
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	410	}
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	411
330 dcc47278e5ab fix Network Projectile::onHitPlayer terom parents: 328 diff changeset	412	Engine::log(INFO, "client_projectile.hit_player") << this << ": player=" << player;
296 4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	413
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	414	// pass on to super
308 60f4b55d5713 Calculates kills and deaths. You get frags by killing yourself \o/ saiam parents: 303 diff changeset	415	Projectile::onHitPlayer(player);
296 4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	416	}
4d3ebaa29430 add separate Types.hh, and fix projectile-worm collisions on network terom parents: 294 diff changeset	417

author	Tero Marttila <terom@fixme.fi>
	Tue, 20 Jan 2009 23:30:18 +0200
changeset 408	e6cfc44266af
parent 406	a2e35ca66c74
child 417	c503e0c6a740
permissions	-rw-r--r--