diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-03-29 12:04:14 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-03-29 12:04:14 +0000 |
| commit | 68b3c9843acb9ddf2e96d625fbb4db6ddbbfc02a (patch) | |
| tree | 162de60c51479d4f8042b86a2c7050a0f73d537a /src/game/server | |
| parent | 6349abcbdd211fc21d0d7bacf21265a0121fb2a9 (diff) | |
| download | zcatch-68b3c9843acb9ddf2e96d625fbb4db6ddbbfc02a.tar.gz zcatch-68b3c9843acb9ddf2e96d625fbb4db6ddbbfc02a.zip | |
fixed the extra *** in when changing name. fixed so that sv_powerups works
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/gs_game.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/gs_server.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game/server/gs_game.cpp b/src/game/server/gs_game.cpp index 833bad4a..c94a1417 100644 --- a/src/game/server/gs_game.cpp +++ b/src/game/server/gs_game.cpp @@ -70,7 +70,7 @@ bool gameobject::on_entity(int index, vec2 pos) type = POWERUP_WEAPON; subtype = WEAPON_RIFLE; } - else if(index == ENTITY_POWERUP_NINJA) + else if(index == ENTITY_POWERUP_NINJA && config.sv_powerups) { type = POWERUP_NINJA; subtype = WEAPON_NINJA; diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp index fcb03f02..d41ffd9c 100644 --- a/src/game/server/gs_server.cpp +++ b/src/game/server/gs_server.cpp @@ -2154,7 +2154,7 @@ void mods_message(int msgtype, int client_id) if(msgtype == NETMSGTYPE_CL_CHANGEINFO && strcmp(oldname, server_clientname(client_id)) != 0) { char chattext[256]; - str_format(chattext, sizeof(chattext), "*** %s changed name to %s", oldname, server_clientname(client_id)); + str_format(chattext, sizeof(chattext), "%s changed name to %s", oldname, server_clientname(client_id)); send_chat(-1, -1, chattext); } |