Changeset 8dad966 in network-game for common

Timestamp:

Jun 3, 2013, 11:05:20 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

d03ec0f

Parents:

8a4ed74

Message:

Added server support for player attack animations and cooldowns and firing projectiles for ranged attacks

Location:

common

Files:

• Message.h (modified) (1 diff)
• Player.cpp (modified) (8 diffs)
• Player.h (modified) (2 diffs)

common/Message.h

@@ -2 +2 @@
 #define _MESSAGE_H
 
-#define MSG_TYPE_REGISTER      1
-#define MSG_TYPE_LOGIN         2
-#define MSG_TYPE_LOGOUT        3
-#define MSG_TYPE_CHAT          4
-#define MSG_TYPE_PLAYER        5  // server sends this to update player positions
-#define MSG_TYPE_PLAYER_MOVE   6  // client sends this when a player wants to move
-#define MSG_TYPE_OBJECT        7
-#define MSG_TYPE_REMOVE_OBJECT 8
-#define MSG_TYPE_PICKUP_FLAG   9
-#define MSG_TYPE_DROP_FLAG     10
-#define MSG_TYPE_SCORE         11
-#define MSG_TYPE_START_ATTACK  12
-#define MSG_TYPE_ATTACK        13
+#define MSG_TYPE_REGISTER          1
+#define MSG_TYPE_LOGIN             2
+#define MSG_TYPE_LOGOUT            3
+#define MSG_TYPE_CHAT              4
+#define MSG_TYPE_PLAYER            5  // server sends this to update player positions
+#define MSG_TYPE_PLAYER_MOVE       6  // client sends this when a player wants to move
+#define MSG_TYPE_OBJECT            7
+#define MSG_TYPE_REMOVE_OBJECT     8
+#define MSG_TYPE_PICKUP_FLAG       9
+#define MSG_TYPE_DROP_FLAG         10
+#define MSG_TYPE_SCORE             11
+#define MSG_TYPE_START_ATTACK      12
+#define MSG_TYPE_ATTACK            13
+#define MSG_TYPE_PROJECTILE        14
+#define MSG_TYPE_REMOVE_PROJECTILE 14
 
 typedef struct

common/Player.cpp

@@ -16 +16 @@
    this->pos.y = this->target.y = 0;
    this->timeLastUpdated = 0;
+   this->timeAttackStarted = 0;
+   this->isAttacking = false;
 
    this->playerClass = CLASS_NONE;
@@ -22 +24 @@
    this->attackType = ATTACK_NONE;
    this->damage = 0;
+   this->attackCooldown = 0;
    this->team = 0;   // blue team by default
    this->hasBlueFlag = false;
@@ -38 +41 @@
    this->target.y = p.target.y;
    this->timeLastUpdated = p.timeLastUpdated;
+   this->timeAttackStarted = p.timeAttackStarted;
+   this->isAttacking = p.isAttacking;
 
    this->playerClass = p.playerClass;
@@ -44 +49 @@
    this->attackType = p.attackType;
    this->damage = p.damage;
+   this->attackCooldown = p.attackCooldown;
    this->team = p.team;
    this->hasBlueFlag = p.hasBlueFlag;
@@ -57 +63 @@
    this->pos.x = this->target.x = 200;
    this->pos.y = this->target.y = 200;
+   this->timeLastUpdated = 0;
+   this->timeAttackStarted = 0;
+   this->isAttacking = false;
 
    this->playerClass = CLASS_NONE;
@@ -63 +72 @@
    this->attackType = ATTACK_NONE;
    this->damage = 0;
+   this->attackCooldown = 0;
    this->team = 0;   // blue team by default
    this->hasBlueFlag = false;
@@ -87 +97 @@
       case CLASS_WARRIOR:
          this->playerClass = CLASS_WARRIOR;
-         this->maxHealth = this->health = 100;
+         this->maxHealth = this->health = 120;
          this->attackType = ATTACK_MELEE;
          this->damage = 10;
+         this->attackCooldown = 800;
          break;
       case CLASS_RANGER:
@@ -96 +107 @@
          this->attackType = ATTACK_RANGED;
          this->damage = 6;
+         this->attackCooldown = 1000;
          break;
       case CLASS_NONE:

common/Player.h

@@ -58 +58 @@
    POSITION target;
    unsigned long long timeLastUpdated;
+   unsigned long long timeAttackStarted;
+   bool isAttacking;
+   int targetPlayer;
 
    int playerClass;
@@ -64 +67 @@
    int attackType;
    int damage;
+   unsigned long long attackCooldown;
    int team; // 0 is blue, 1 is red
    bool hasBlueFlag;