bye bye WON ..

This commit is contained in:
Lukasz Wlasinksi
2004-07-28 17:06:01 +00:00
parent 2fb9a5d4b5
commit 7801cde7f0
11 changed files with 41 additions and 131 deletions

View File

@ -315,16 +315,6 @@ void CPlayer::killPlayer(){
pEdict->v.weapons = 0;
}
void CPlayer::setTeamName( char *szName ){
for (int i=0;i<16;i++){
if ( bSteam )
*( (char*)pEdict->pvPrivateData + STEAM_PDOFFSET_TEAMNAME + i ) = szName[i];
else
*( (char*)pEdict->pvPrivateData + WON_PDOFFSET_TEAMNAME + i ) = szName[i];
}
}
// *****************************************************
// class CMapInfo
// *****************************************************

View File

@ -45,20 +45,6 @@
#define DOD_VERSION "0.1"
#define STEAM_PDOFFSET_WDEPLOY 229 + LINUXOFFSET // weapon deploy
#define STEAM_PDOFFSET_CLASS 366 + LINUXOFFSET // player class
#define STEAM_PDOFFSET_RCLASS 367 + LINUXOFFSET // random class
#define STEAM_PDOFFSET_SCORE 475 + LINUXOFFSET // score
#define STEAM_PDOFFSET_DEATHS 476 + LINUXOFFSET // deaths
#define STEAM_PDOFFSET_TEAMNAME 1396 + LINUXOFFSET // team name
#define WON_PDOFFSET_DEATHS 456 + LINUXOFFSET // deaths
#define WON_PDOFFSET_CLASS 511 + LINUXOFFSET // player class
#define WON_PDOFFSET_RCLASS 512 + LINUXOFFSET // random class
#define WON_PDOFFSET_WDEPLOY 605 + LINUXOFFSET // weapon deploy
#define WON_PDOFFSET_SCORE 626 + LINUXOFFSET // score
#define WON_PDOFFSET_TEAMNAME 1896 + LINUXOFFSET // team name
#define MAX_TRACE 6
struct traceVault {
@ -120,7 +106,6 @@ public:
void updateScore(int weapon, int score);
void restartStats(bool all = true);
void killPlayer();
void setTeamName( char *szName );
inline bool IsBot(){
const char* auth= (*g_engfuncs.pfnGetPlayerAuthId)(pEdict);

View File

@ -55,7 +55,6 @@ struct weapon_t {
};
extern bool rankBots;
extern bool bSteam;
extern int mState;
extern int mPlayerIndex;
@ -83,8 +82,6 @@ extern cvar_t* dodstats_reset;
extern cvar_t* dodstats_rankbots;
extern cvar_t* dodstats_pause;
extern cvar_t* dodstats_steam;
extern weapon_t weaponData[DODMAX_WEAPONS];
extern traceVault traceData[MAX_TRACE];

View File

@ -41,7 +41,6 @@ CPlayer players[33];
CMapInfo g_map;
bool rankBots;
bool bSteam;
int mState;
int mPlayerIndex;
@ -76,9 +75,6 @@ cvar_t *dodstats_rank;
cvar_t *dodstats_rankbots;
cvar_t *dodstats_pause;
cvar_t *dodstats_steam;
cvar_t init_dodstats_steam = {"dodstats_steam","1"};
struct sUserMsg {
const char *name;
int* id;
@ -128,7 +124,6 @@ int RegUserMsg_Post(const char *pszName, int iSize){
void ServerActivate_Post( edict_t *pEdictList, int edictCount, int clientMax ){
rankBots = (int)dodstats_rankbots->value ? true:false;
bSteam = (int)dodstats_steam->value ? true:false;
for( int i = 1; i <= gpGlobals->maxClients; ++i )
GET_PLAYER_POINTER_I(i)->Init( i , pEdictList + i );
@ -181,23 +176,28 @@ void ServerDeactivate() {
BOOL ClientConnect_Post( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] ){
GET_PLAYER_POINTER(pEntity)->Connect(pszName,pszAddress);
RETURN_META_VALUE(MRES_IGNORED, TRUE);
}
void ClientDisconnect( edict_t *pEntity ) {
CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
if (pPlayer->ingame)
if (pPlayer->ingame)
pPlayer->Disconnect();
RETURN_META(MRES_IGNORED);
}
void ClientPutInServer_Post( edict_t *pEntity ) {
GET_PLAYER_POINTER(pEntity)->PutInServer();
RETURN_META(MRES_IGNORED);
}
void ClientUserInfoChanged_Post( edict_t *pEntity, char *infobuffer ) {
CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
const char* name = INFOKEY_VALUE(infobuffer,"name");
const char* oldname = STRING(pEntity->v.netname);
@ -346,10 +346,6 @@ void OnMetaAttach() {
dodstats_rank=CVAR_GET_POINTER(init_dodstats_rank.name);
dodstats_rankbots = CVAR_GET_POINTER(init_dodstats_rankbots.name);
dodstats_pause = CVAR_GET_POINTER(init_dodstats_pause.name);
CVAR_REGISTER (&init_dodstats_steam);
dodstats_steam = CVAR_GET_POINTER(init_dodstats_steam.name);
}
void OnAmxxAttach() {

View File

@ -108,7 +108,7 @@ void Client_CurWeapon(void* mValue){
iId = get_weaponid(mPlayer);
}
if (iClip > -1) {
if ( mPlayer->current == 17 && bSteam ){
if ( mPlayer->current == 17 ){
if ( iClip+2 == mPlayer->weapons[iId].clip)
mPlayer->saveShot(iId);
}