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