diff --git a/dlls/dod2/dodfun/makefile b/dlls/dod2/dodfun/makefile index 2fcf3914..9971e887 100755 --- a/dlls/dod2/dodfun/makefile +++ b/dlls/dod2/dodfun/makefile @@ -1,5 +1,5 @@ -MODNAME = dodx_amxx -SRCFILES = amxxmodule.cpp CMisc.cpp CRank.cpp Utils.cpp moduleconfig.cpp NBase.cpp NRank.cpp NPD.cpp usermsg.cpp +MODNAME = dodfun_amxx +SRCFILES = amxxmodule.cpp CMisc.cpp Utils.cpp moduleconfig.cpp NBase.cpp NPD.cpp usermsg.cpp EXTRA_LIBS_LINUX = EXTRA_LIBS_WIN32 = diff --git a/dlls/dod2/dodx/CMisc.cpp b/dlls/dod2/dodx/CMisc.cpp index ce6c9a14..2a2b3f4e 100755 --- a/dlls/dod2/dodx/CMisc.cpp +++ b/dlls/dod2/dodx/CMisc.cpp @@ -89,7 +89,7 @@ void Grenades::clear() // ***************************************************** void CPlayer::Disconnect(){ - ingame = staminaSet = fuseSet = false; + ingame = false; savedScore = 0; if ( ignoreBots(pEdict) || !isModuleActive() ) // ignore if he is bot and bots rank is disabled or module is paused @@ -149,7 +149,7 @@ void CPlayer::Init( int pi, edict_t* pe ) index = pi; current = 0; clearStats = 0.0f; - ingame = staminaSet = false; + ingame = false; savedScore = 0; } diff --git a/dlls/dod2/dodx/CMisc.h b/dlls/dod2/dodx/CMisc.h index 6534e596..d5519bb5 100755 --- a/dlls/dod2/dodx/CMisc.h +++ b/dlls/dod2/dodx/CMisc.h @@ -89,13 +89,6 @@ public: int wpnModel; int savedScore; - int staminaMin; - int staminaMax; - bool staminaSet; - - bool fuseSet; - int fuseType; // 1<<0 - for new , 1<<1 - for catched - float nadeFuse; bool ingame; bool bot; diff --git a/dlls/dod2/dodx/makefile b/dlls/dod2/dodx/makefile index 2fcf3914..3ea59d21 100755 --- a/dlls/dod2/dodx/makefile +++ b/dlls/dod2/dodx/makefile @@ -1,5 +1,5 @@ MODNAME = dodx_amxx -SRCFILES = amxxmodule.cpp CMisc.cpp CRank.cpp Utils.cpp moduleconfig.cpp NBase.cpp NRank.cpp NPD.cpp usermsg.cpp +SRCFILES = amxxmodule.cpp CMisc.cpp CRank.cpp Utils.cpp moduleconfig.cpp NBase.cpp NRank.cpp usermsg.cpp EXTRA_LIBS_LINUX = EXTRA_LIBS_WIN32 = diff --git a/dlls/dod2/dodx/moduleconfig.cpp b/dlls/dod2/dodx/moduleconfig.cpp index 6d0bbe55..86021576 100755 --- a/dlls/dod2/dodx/moduleconfig.cpp +++ b/dlls/dod2/dodx/moduleconfig.cpp @@ -138,19 +138,11 @@ void ServerActivate_Post( edict_t *pEdictList, int edictCount, int clientMax ){ } void PlayerPreThink_Post( edict_t *pEntity ) { + if ( !isModuleActive() ) + return; CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity); - if ( pPlayer->staminaSet ) { - if ( pEntity->v.iuser4 > pPlayer->staminaMax ) - pEntity->v.iuser4 = pPlayer->staminaMax; - else if ( pEntity->v.iuser4 < pPlayer->staminaMin ) - pEntity->v.iuser4 = pPlayer->staminaMin; - } - - if ( !isModuleActive() ) // stats only - return; - if (pPlayer->clearStats && pPlayer->clearStats < gpGlobals->time && pPlayer->ingame){ if ( !ignoreBots(pEntity) ){ diff --git a/dlls/dod2/dodx/moduleconfig.h b/dlls/dod2/dodx/moduleconfig.h index fa7ce239..fac54f2c 100755 --- a/dlls/dod2/dodx/moduleconfig.h +++ b/dlls/dod2/dodx/moduleconfig.h @@ -113,7 +113,7 @@ // #define FN_DispatchBlocked_Post DispatchBlocked_Post #define FN_DispatchKeyValue_Post DispatchKeyValue_Post // #define FN_DispatchSave_Post DispatchSave_Post -// #define FN_DispatchRestore_Post DispatchRestore_Post +// #define FN_DispatchRestore_Post DispatchRestore_Post // #define FN_DispatchObjectCollsionBox_Post DispatchObjectCollsionBox_Post // #define FN_SaveWriteFields_Post SaveWriteFields_Post // #define FN_SaveReadFields_Post SaveReadFields_Post