src/Player.cc
author nireco
Mon, 08 Dec 2008 16:14:23 +0000
changeset 289 2130e9f4aab4
parent 282 e0e4dfc3e528
child 293 d40fbf8ba13b
permissions -rw-r--r--
added Player.takeDamage(), but does nothing
218
86d22fe82b30 add static Engine::graphicsEnabled function and disable player graphics loading when false
terom
parents: 217
diff changeset
     1
236
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
     2
#include "Player.hh"
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
     3
#include "Weapons.hh"
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
     4
#include "Engine.hh"
233
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics*, implment even better input handling, and draw weapon names
terom
parents: 231
diff changeset
     5
#include "Graphics.hh"
198
8698cbb101df ja viel? lis??
ekku
parents:
diff changeset
     6
209
68cc4248a508 sneak in some ugly ugly ugly Multiple Inheritance that hopefully nobody ever notices
terom
parents: 208
diff changeset
     7
#include <cstdlib>
215
69de8d9fcc0a image is working.. well.. run it from build/src folder.
nireco
parents: 213
diff changeset
     8
#include <ClanLib/display.h>
216
a384bf0634f0 a bit better image_drawing
nireco
parents: 215
diff changeset
     9
#include <string>
218
86d22fe82b30 add static Engine::graphicsEnabled function and disable player graphics loading when false
terom
parents: 217
diff changeset
    10
#include <cassert>
215
69de8d9fcc0a image is working.. well.. run it from build/src folder.
nireco
parents: 213
diff changeset
    11
220
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
    12
// player static state
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
    13
bool Player::skin_loaded = false;
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
    14
CL_Surface Player::skin_surface;
215
69de8d9fcc0a image is working.. well.. run it from build/src folder.
nireco
parents: 213
diff changeset
    15
220
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
    16
// XXX: give these better names and move elsewhere
248
e40ef56dc62c scrolling looks like it works
nireco
parents: 241
diff changeset
    17
const int img_num_aim = 2;
219
ec472f8ac482 fixed walkingspeed and improved drawing
nireco
parents: 218
diff changeset
    18
const int img_num_step = 4;
248
e40ef56dc62c scrolling looks like it works
nireco
parents: 241
diff changeset
    19
const int img_height = 20;
e40ef56dc62c scrolling looks like it works
nireco
parents: 241
diff changeset
    20
const int img_width = 17;
216
a384bf0634f0 a bit better image_drawing
nireco
parents: 215
diff changeset
    21
198
8698cbb101df ja viel? lis??
ekku
parents:
diff changeset
    22
Player::Player(GameState &state, Vector position, bool visible) : 
282
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    23
    PhysicsObject(state.world, PLAYER_MASS, position, Vector(0, 0), PLAYER, PLAYER_COLLISION_ELASTICITY), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    24
    state(state), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    25
    visible(visible), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    26
    weapons(buildWeaponsList()), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    27
    selectedWeapon(0), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    28
    rope(*this),
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    29
    animation_step(0)
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
    30
{
236
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
    31
    // XXX: populate weapons from somewhere else
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
    32
220
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
    33
    // build the player's shape
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
    34
    // XXX: these dimensions are incorrect...
198
8698cbb101df ja viel? lis??
ekku
parents:
diff changeset
    35
    std::vector<Vector> shape(4);
8698cbb101df ja viel? lis??
ekku
parents:
diff changeset
    36
    shape[0] = Vector(0,-9);
8698cbb101df ja viel? lis??
ekku
parents:
diff changeset
    37
    shape[1] = Vector(6,0);
8698cbb101df ja viel? lis??
ekku
parents:
diff changeset
    38
    shape[2] = Vector(0,9); 
8698cbb101df ja viel? lis??
ekku
parents:
diff changeset
    39
    shape[3] = Vector(-6,0);
220
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
    40
198
8698cbb101df ja viel? lis??
ekku
parents:
diff changeset
    41
    // Initialize the shape of the player (salmiakki shape)
8698cbb101df ja viel? lis??
ekku
parents:
diff changeset
    42
    setShape(shape);
220
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
    43
274
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject
terom
parents: 272
diff changeset
    44
    // add to GameState players list
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject
terom
parents: 272
diff changeset
    45
    state.addPlayer(this);
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject
terom
parents: 272
diff changeset
    46
}
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject
terom
parents: 272
diff changeset
    47
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject
terom
parents: 272
diff changeset
    48
Player::~Player (void) {
c35307e8645c add comments, move addPlayer/removePlayer to Player.cc, and refactor Network code to inherit from NetworkObject
terom
parents: 272
diff changeset
    49
    state.removePlayer(this);
198
8698cbb101df ja viel? lis??
ekku
parents:
diff changeset
    50
}
236
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
    51
272
97de051edbcf Added PhysicsObject* attribute to onCollision
saiam
parents: 271
diff changeset
    52
void Player::handleDig (Vector pos, float radius) {
250
84c553d61291 fixed digging, now bugs differently. Changed image_drawing to draw image 1:1
nireco
parents: 248
diff changeset
    53
    // calculate new position and velocity
272
97de051edbcf Added PhysicsObject* attribute to onCollision
saiam
parents: 271
diff changeset
    54
    Vector digPosition = pos + getDirection() * PROJECTILE_START_DISTANCE;
271
bf6784a95b08 touch up weapon/projectile with comments and slight tweaking
terom
parents: 270
diff changeset
    55
    
bf6784a95b08 touch up weapon/projectile with comments and slight tweaking
terom
parents: 270
diff changeset
    56
    // remove directly
270
d17126e20de7 Changed dig to use removeGround again. The problem with the digging is the fact that input isn't handled properly.
saiam
parents: 265
diff changeset
    57
    world.removeGround(digPosition, radius);
209
68cc4248a508 sneak in some ugly ugly ugly Multiple Inheritance that hopefully nobody ever notices
terom
parents: 208
diff changeset
    58
}
68cc4248a508 sneak in some ugly ugly ugly Multiple Inheritance that hopefully nobody ever notices
terom
parents: 208
diff changeset
    59
276
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    60
void Player::handleFireWeapon (Weapon *weapon, Vector position, Vector velocity) {
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    61
    weaponFired(weapon);
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    62
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    63
    new Projectile(this, position, velocity, weapon);
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
    64
}
237
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
    65
        
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
    66
void Player::handleChangeWeapon (unsigned int weaponIndex) {
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
    67
    assert(weaponIndex < weapons.size());
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
    68
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
    69
    selectedWeapon = weaponIndex;
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
    70
}
276
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    71
    
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    72
void Player::weaponFired (Weapon *weapon) {
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    73
    // apply recoil
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    74
    applyForce(-getDirection() * weapon->getRecoil());
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    75
    
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    76
    // reload weapon
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    77
    weapon->reload();
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
    78
}
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
    79
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
    80
void Player::printDebugInfo (void) {
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
    81
    Engine::log(DEBUG, "layer.debug") << "In air: " << this->inAir;
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
    82
}
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
    83
        
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
    84
void Player::tick (TimeMS dt) {
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
    85
    // let PhysicsObject execute
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
    86
    PhysicsObject::tick(dt);
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
    87
    
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
    88
    // tick current weapon reload
236
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
    89
    if (getCurrentWeapon())
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
    90
        getCurrentWeapon()->tickReload(dt);
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
    91
}
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 239
diff changeset
    92
        
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 239
diff changeset
    93
void Player::handleRopeState (RopeState state) {
282
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    94
    (void) state;
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 239
diff changeset
    95
}
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 239
diff changeset
    96
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 239
diff changeset
    97
void Player::handleRopeLength (float length) {
282
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    98
    (void) length;
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 239
diff changeset
    99
}
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   100
236
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
   101
void LocalPlayer::fireWeapon (Weapon *weapon) {
235
0a0c729365ee code cleanup
terom
parents: 233
diff changeset
   102
    // calculate new position and velocity
0a0c729365ee code cleanup
terom
parents: 233
diff changeset
   103
    Vector shotPosition = position + getDirection() * PROJECTILE_START_DISTANCE;
236
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
   104
    Vector shotVelocity = velocity + getDirection() * weapon->getSpeed();
258
833ad8d7db8b The first weapon now has a recoil so that you can fly. There is a bug with facing when you are flying with recoil.
saiam
parents: 257
diff changeset
   105
    
223
2fcaf54ed37b basic network-projectiles
terom
parents: 222
diff changeset
   106
    // execute
276
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
   107
    handleFireWeapon(weapon, shotPosition, shotVelocity);
223
2fcaf54ed37b basic network-projectiles
terom
parents: 222
diff changeset
   108
}
237
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   109
        
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   110
void LocalPlayer::changeWeapon (int delta) {
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   111
    // need to handle negative deltas
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   112
    handleChangeWeapon((weapons.size() + selectedWeapon + delta) % weapons.size());
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   113
}
223
2fcaf54ed37b basic network-projectiles
terom
parents: 222
diff changeset
   114
275
fa44b905bc2e Tried to take input tick into account in updatePosition but it still doesn't seem to work
saiam
parents: 274
diff changeset
   115
void LocalPlayer::handleInput (PlayerInput input, TimeMS dt) {
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   116
    // Movement force, vertical is always zero
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   117
    Vector move_force = Vector(0, 0); 
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   118
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   119
    // Crosshair angle change
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   120
    float aim_delta = 0; 
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   121
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   122
    // handle movement left/right by applying a horizontal force, but limit the player's speed
235
0a0c729365ee code cleanup
terom
parents: 233
diff changeset
   123
    // also update facing if needed
262
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   124
    if (!((input & INPUT_MOVE_LEFT) && (input & INPUT_MOVE_RIGHT))) {
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   125
        if (input & INPUT_MOVE_LEFT) {
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   126
            if (velocity.x > -PLAYER_MAX_SPEED)
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   127
                move_force.x -= PLAYER_MOVE_FORCE;
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   128
264
215de3d4de60 change facingRight from a bool to an
terom
parents: 263
diff changeset
   129
            setFacing(FACING_LEFT);
262
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   130
        }
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   131
262
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   132
        if (input & INPUT_MOVE_RIGHT) {
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   133
            if (velocity.x < PLAYER_MAX_SPEED)
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   134
                move_force.x += PLAYER_MOVE_FORCE;
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   135
264
215de3d4de60 change facingRight from a bool to an
terom
parents: 263
diff changeset
   136
            setFacing(FACING_RIGHT);
262
fbc9ce4950de Turning improved
ekku
parents: 261
diff changeset
   137
        }
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   138
    }
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   139
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   140
    // handle aim by creating a aim angle delta
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   141
    if (input & INPUT_AIM_UP)
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   142
        aim_delta += CROSSHAIR_ANGLE_SPEED;
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   143
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   144
    if (input & INPUT_AIM_DOWN)
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   145
        aim_delta -= CROSSHAIR_ANGLE_SPEED;
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   146
    
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   147
    // handle jumping by invoking the jump method
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   148
    // XXX: the direction should ideally be given using some other method
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   149
    if (input & INPUT_JUMP) {
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   150
        if (input & INPUT_MOVE_LEFT)
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   151
            jump(-1);
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   152
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   153
        else if (input & INPUT_MOVE_RIGHT)
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   154
            jump(1);
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   155
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   156
        else
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   157
            jump(0);
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   158
    }
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   159
    
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   160
    // outsource digging to Player::handleDig, since this modifies the Terrain and Network needs to know
235
0a0c729365ee code cleanup
terom
parents: 233
diff changeset
   161
    if (input & INPUT_DIG)
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   162
        handleDig(position, 15);
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   163
    
237
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   164
    // change weapon back/forth
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   165
    if (input & INPUT_CHANGE_PREV)
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   166
        changeWeapon(-1);
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   167
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   168
    if (input & INPUT_CHANGE_NEXT)
3d5465bcb67d tweak weapon params and improve weapon changing
terom
parents: 236
diff changeset
   169
        changeWeapon(+1);
213
5bd5afab4673 some stuff to Weapon and shoot
nireco
parents: 212
diff changeset
   170
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   171
    // validate shoot events, and then outsource to handleShoot so Network can intercept it
236
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
   172
    if ((input & INPUT_SHOOT) && getCurrentWeapon()->canShoot())
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
   173
        fireWeapon(getCurrentWeapon());
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   174
    
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 239
diff changeset
   175
    // rope throw+release+changeLength, but supress spurious events
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   176
    if (input & INPUT_ROPE)
235
0a0c729365ee code cleanup
terom
parents: 233
diff changeset
   177
        rope.throwRope();
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   178
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 239
diff changeset
   179
    if (input & INPUT_UNROPE && rope.getState() != ROPE_FOLDED)
229
355e46effa41 Rope works
ekku
parents: 225
diff changeset
   180
        rope.release();
355e46effa41 Rope works
ekku
parents: 225
diff changeset
   181
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 239
diff changeset
   182
    if (input & INPUT_ROPE_UP && rope.getState() == ROPE_FIXED)
235
0a0c729365ee code cleanup
terom
parents: 233
diff changeset
   183
        rope.changeLength(-ROPE_GROWTH_RATE);
231
5085764e1dbb Rope length changing possible
ekku
parents: 229
diff changeset
   184
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 239
diff changeset
   185
    if (input & INPUT_ROPE_DOWN && rope.getState() == ROPE_FIXED)
235
0a0c729365ee code cleanup
terom
parents: 233
diff changeset
   186
        rope.changeLength(ROPE_GROWTH_RATE);
231
5085764e1dbb Rope length changing possible
ekku
parents: 229
diff changeset
   187
235
0a0c729365ee code cleanup
terom
parents: 233
diff changeset
   188
    // XXX: how should this be written? What does this do? Probably broken under network play
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   189
    if (move_force.x != 0) 
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   190
        animation_step = (animation_step + 1) % img_num_step;
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   191
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   192
    // apply aim delta
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   193
    if (aim_delta)
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   194
        changeAim(aim_delta);
219
ec472f8ac482 fixed walkingspeed and improved drawing
nireco
parents: 218
diff changeset
   195
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   196
    // apply force
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   197
    if (!move_force.zero())
275
fa44b905bc2e Tried to take input tick into account in updatePosition but it still doesn't seem to work
saiam
parents: 274
diff changeset
   198
        applyForce(move_force, dt);
199
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   199
}
f5c86420facd Jeejee, hirvee hinaus ohi toistaseks.
saiam
parents: 198
diff changeset
   200
236
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
   201
Weapon* Player::getCurrentWeapon() {
235
0a0c729365ee code cleanup
terom
parents: 233
diff changeset
   202
    return weapons[selectedWeapon % weapons.size()];
212
4389c1e6b9b8 Weapon.cc&hh
nireco
parents: 211
diff changeset
   203
}
215
69de8d9fcc0a image is working.. well.. run it from build/src folder.
nireco
parents: 213
diff changeset
   204
276
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
   205
Weapon* Player::getWeapon (WeaponID id) {
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
   206
    if (id < weapons.size())
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
   207
        return weapons[id];
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
   208
    else
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
   209
        return NULL;
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
   210
}
87434abc1ba1 ability to send NetworkObjectID's via packets, modify Network Projectiles to use this and fix recoil/reloading
terom
parents: 275
diff changeset
   211
289
2130e9f4aab4 added Player.takeDamage(), but does nothing
nireco
parents: 282
diff changeset
   212
void Player::takeDamage(int damage) {
2130e9f4aab4 added Player.takeDamage(), but does nothing
nireco
parents: 282
diff changeset
   213
2130e9f4aab4 added Player.takeDamage(), but does nothing
nireco
parents: 282
diff changeset
   214
}
2130e9f4aab4 added Player.takeDamage(), but does nothing
nireco
parents: 282
diff changeset
   215
255
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   216
void Player::draw (Graphics *g, PixelCoordinate camera) {
233
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics*, implment even better input handling, and draw weapon names
terom
parents: 231
diff changeset
   217
    CL_GraphicContext *gc = g->get_gc();
255
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   218
    
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   219
    // animation indexes
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   220
    int aim_img_idx = (int)((1 - (getAim() + KG_PI / 2) / KG_PI) * img_num_aim);
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   221
    int step_img_idx = animation_step % img_num_step;
217
de56d9d16705 and yet better image drawing
nireco
parents: 216
diff changeset
   222
220
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
   223
    // load skin image if not yet loaded
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
   224
    if (!skin_loaded) {
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
   225
        skin_surface = CL_Surface(PLAYER_SKIN_PATH);
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
   226
        skin_loaded = true;
1c92222af6d3 use Player static vars for texture loading, and load from the PROJECT_DATA_DIR path
terom
parents: 219
diff changeset
   227
    }
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   228
    
255
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   229
    // calulate where to draw the worm
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   230
    CL_Rectf destination(
264
215de3d4de60 change facingRight from a bool to an
terom
parents: 263
diff changeset
   231
        position.x + (facing == FACING_RIGHT ? -1 : 1) * img_width / 2  - camera.x, 
215de3d4de60 change facingRight from a bool to an
terom
parents: 263
diff changeset
   232
        position.y - img_height / 2                                     - camera.y, 
215de3d4de60 change facingRight from a bool to an
terom
parents: 263
diff changeset
   233
        position.x + (facing == FACING_RIGHT ? 1 : -1) * img_width / 2  - camera.x, 
215de3d4de60 change facingRight from a bool to an
terom
parents: 263
diff changeset
   234
        position.y + img_height / 2                                     - camera.y
221
fbc5db6fce45 reorganize the weapons code and input handling code
terom
parents: 220
diff changeset
   235
    );
217
de56d9d16705 and yet better image drawing
nireco
parents: 216
diff changeset
   236
    
255
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   237
    // draw the correct animation frame from the skin
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   238
    skin_surface.draw_subpixel(
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   239
        CL_Rectf(
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   240
            step_img_idx * img_width, 
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   241
            aim_img_idx * img_height, 
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   242
            (1 + step_img_idx) * img_width, 
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   243
            (aim_img_idx + 1) * img_height
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   244
        ), destination, gc
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   245
    );
218
86d22fe82b30 add static Engine::graphicsEnabled function and disable player graphics loading when false
terom
parents: 217
diff changeset
   246
    
261
91f769d490a6 a better crosshair
terom
parents: 260
diff changeset
   247
    // draw a proper crosshair-box
91f769d490a6 a better crosshair
terom
parents: 260
diff changeset
   248
    PixelCoordinate crosshair = getCoordinate() + world.getPixelCoordinate(getDirection() * PLAYER_CROSSHAIR_DISTANCE) - camera;
255
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   249
    
261
91f769d490a6 a better crosshair
terom
parents: 260
diff changeset
   250
    gc->draw_rect(
91f769d490a6 a better crosshair
terom
parents: 260
diff changeset
   251
        CL_Rectf(
91f769d490a6 a better crosshair
terom
parents: 260
diff changeset
   252
            crosshair.x - PLAYER_CROSSHAIR_WIDTH / 2,
91f769d490a6 a better crosshair
terom
parents: 260
diff changeset
   253
            crosshair.y - PLAYER_CROSSHAIR_WIDTH / 2,
91f769d490a6 a better crosshair
terom
parents: 260
diff changeset
   254
            crosshair.x + PLAYER_CROSSHAIR_WIDTH / 2,
91f769d490a6 a better crosshair
terom
parents: 260
diff changeset
   255
            crosshair.y + PLAYER_CROSSHAIR_WIDTH / 2
91f769d490a6 a better crosshair
terom
parents: 260
diff changeset
   256
        ), CL_Color::red
91f769d490a6 a better crosshair
terom
parents: 260
diff changeset
   257
    );
255
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   258
    
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   259
    // draw rope
248
e40ef56dc62c scrolling looks like it works
nireco
parents: 241
diff changeset
   260
    rope.draw(g, camera);
215
69de8d9fcc0a image is working.. well.. run it from build/src folder.
nireco
parents: 213
diff changeset
   261
}
69de8d9fcc0a image is working.. well.. run it from build/src folder.
nireco
parents: 213
diff changeset
   262
255
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   263
void LocalPlayer::draw (Graphics *g, bool displayWeapon, PixelCoordinate camera) {
233
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics*, implment even better input handling, and draw weapon names
terom
parents: 231
diff changeset
   264
    // superclass draw
248
e40ef56dc62c scrolling looks like it works
nireco
parents: 241
diff changeset
   265
    Player::draw(g, camera);
219
ec472f8ac482 fixed walkingspeed and improved drawing
nireco
parents: 218
diff changeset
   266
233
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics*, implment even better input handling, and draw weapon names
terom
parents: 231
diff changeset
   267
    // display weapon name?
236
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
   268
    if (displayWeapon && getCurrentWeapon()) {
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
   269
        const std::string weaponName = getCurrentWeapon()->getName();
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
   270
257
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 255
diff changeset
   271
        PixelCoordinate pc = getCoordinate() - camera;
255
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   272
        
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   273
        // XXX: fix magic constants once we know how big the worm is
233
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics*, implment even better input handling, and draw weapon names
terom
parents: 231
diff changeset
   274
        g->getSimpleFont().draw(
255
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   275
                pc.x - g->getSimpleFont().get_width(weaponName) / 2,
99431fdb0dc8 add PixelDimension/PixelCoordinate types, convert Terrain to use them, and convert/clean up drawing code
terom
parents: 250
diff changeset
   276
                pc.y - 20,
236
0048ba274152 move weapons definition out to Weapons.cc
terom
parents: 235
diff changeset
   277
                weaponName,
233
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics*, implment even better input handling, and draw weapon names
terom
parents: 231
diff changeset
   278
                g->get_gc()
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics*, implment even better input handling, and draw weapon names
terom
parents: 231
diff changeset
   279
        );
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics*, implment even better input handling, and draw weapon names
terom
parents: 231
diff changeset
   280
    }
ff4ecea83cf5 start using CL_ResourceManager, change most draw methods to take a Graphics*, implment even better input handling, and draw weapon names
terom
parents: 231
diff changeset
   281
}
235
0a0c729365ee code cleanup
terom
parents: 233
diff changeset
   282