diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-17 21:16:23 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-17 21:16:23 +0000 |
| commit | a91fecae920e1b6d9ca3dbdbf6251c11bd751d7c (patch) | |
| tree | b65cc2df8ee5ad78fb819c0f985497528c5521db /src/game/server | |
| parent | eb47aa385bb02d977c9ee759c2b7987951c16953 (diff) | |
| download | zcatch-a91fecae920e1b6d9ca3dbdbf6251c11bd751d7c.tar.gz zcatch-a91fecae920e1b6d9ca3dbdbf6251c11bd751d7c.zip | |
fixed fetching of server info and corrected some spelling errors
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/entities/character.cpp | 6 | ||||
| -rw-r--r-- | src/game/server/entities/character.hpp | 2 | ||||
| -rw-r--r-- | src/game/server/player.cpp | 4 | ||||
| -rw-r--r-- | src/game/server/player.hpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 539e250d..4ef7cc78 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -833,9 +833,9 @@ bool CHARACTER::take_damage(vec2 force, int dmg, int from, int weapon) return true; } -void CHARACTER::snap(int snaping_client) +void CHARACTER::snap(int snapping_client) { - if(networkclipped(snaping_client)) + if(networkclipped(snapping_client)) return; NETOBJ_CHARACTER *character = (NETOBJ_CHARACTER *)snap_new_item(NETOBJTYPE_CHARACTER, player->client_id, sizeof(NETOBJ_CHARACTER)); @@ -862,7 +862,7 @@ void CHARACTER::snap(int snaping_client) character->direction = input.direction; - if(player->client_id == snaping_client) + if(player->client_id == snapping_client) { character->health = health; character->armor = armor; diff --git a/src/game/server/entities/character.hpp b/src/game/server/entities/character.hpp index 818cebdf..bfb9d8c2 100644 --- a/src/game/server/entities/character.hpp +++ b/src/game/server/entities/character.hpp @@ -118,7 +118,7 @@ public: virtual void tick(); virtual void tick_defered(); - virtual void snap(int snaping_client); + virtual void snap(int snapping_client); bool increase_health(int amount); bool increase_armor(int amount); diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index b31c4d2f..cc12c48a 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -61,7 +61,7 @@ void PLAYER::tick() try_respawn(); } -void PLAYER::snap(int snaping_client) +void PLAYER::snap(int snapping_client) { NETOBJ_CLIENT_INFO *client_info = (NETOBJ_CLIENT_INFO *)snap_new_item(NETOBJTYPE_CLIENT_INFO, client_id, sizeof(NETOBJ_CLIENT_INFO)); str_to_ints(&client_info->name0, 6, server_clientname(client_id)); @@ -79,7 +79,7 @@ void PLAYER::snap(int snaping_client) info->score = score; info->team = team; - if(client_id == snaping_client) + if(client_id == snapping_client) info->local = 1; } diff --git a/src/game/server/player.hpp b/src/game/server/player.hpp index e88ce858..a1aed594 100644 --- a/src/game/server/player.hpp +++ b/src/game/server/player.hpp @@ -64,7 +64,7 @@ public: void set_team(int team); void tick(); - void snap(int snaping_client); + void snap(int snapping_client); void on_direct_input(NETOBJ_PLAYER_INPUT *new_input); void on_predicted_input(NETOBJ_PLAYER_INPUT *new_input); |