Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

attempted merge at 1.77 back into trunk... Oh MY GOD

Browse Source
This commit is contained in:
David Anderson
2007-03-09 03:04:40 +00:00
parent 7adc49c541
commit 71065a65dd
90 changed files with 16915 additions and 1824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dod2/dodfun/amxxmodule.cpp
View File

@ -2773,7 +2773,7 @@ void ValidateMacros_DontCallThis_Smiley()
MF_FindLibrary(NULL, LibType_Class);
MF_AddLibraries(NULL, LibType_Class, NULL);
MF_RemoveLibraries(NULL);
MF_OverrideNatives(NULL);
MF_OverrideNatives(NULL, "");
}
#endif

1
dlls/dod2/dodfun/dodfun.h
View File

@ -57,6 +57,7 @@ extern int gmsgInitObj;
extern int gmsgSetObj;
extern int iFGrenade;
extern int iFRocket;
extern int iFInitCP;
extern CPlayer players[33];

150
dlls/dod2/dodfun/moduleconfig.cpp
View File

@ -29,6 +29,7 @@
*
*/
#include <string.h>
#include "amxxmodule.h"
#include "dodfun.h"
@ -37,6 +38,7 @@ funEventCall modMsgs[MAX_REG_MSGS];
void (*function)(void*);
void (*endfunction)(void*);
CPlayer* mPlayer;
CPlayer* gPlayerRocket;
CPlayer players[33];
CObjective mObjects;
@ -46,6 +48,7 @@ int mDest;
int mPlayerIndex;
int iFGrenade;
int iFRocket;
int iFInitCP;
int gmsgCurWeapon;
@ -96,20 +99,6 @@ void ServerActivate_Post( edict_t *pEdictList, int edictCount, int clientMax ){
RETURN_META(MRES_IGNORED);
}
void PlayerPreThink_Post( edict_t *pEntity ) {
CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
if ( pPlayer->staminaSet ) {
if ( (int)pEntity->v.fuser4 > pPlayer->staminaMax )
pEntity->v.fuser4 = (float)pPlayer->staminaMax;
else if ( (int)pEntity->v.fuser4 < pPlayer->staminaMin )
pEntity->v.fuser4 = (float)pPlayer->staminaMin;
}
RETURN_META(MRES_IGNORED);
}
void ServerDeactivate() {
for(int i = 1;i<=gpGlobals->maxClients; ++i){
CPlayer *pPlayer = GET_PLAYER_POINTER_I(i);
@ -208,55 +197,108 @@ void WriteEntity_Post(int iValue) {
RETURN_META(MRES_IGNORED);
}
void SetModel_Post(edict_t *e, const char *m){
if ( !e->v.owner || !e->v.dmgtime )
RETURN_META(MRES_IGNORED);
void PlayerPreThink_Post(edict_t *pEntity)
{
CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
int owner = ENTINDEX(e->v.owner);
if ( owner && owner<33 && m[7]=='w' && m[8]=='_' ){
// Stamina
if(pPlayer->staminaSet)
{
if ( (int)pEntity->v.fuser4 > pPlayer->staminaMax)
pEntity->v.fuser4 = (float)pPlayer->staminaMax;
int w_id = 0;
CPlayer* pPlayer = GET_PLAYER_POINTER_I(owner);
bool newNade = ( pPlayer->current == 13 || pPlayer->current == 14 ) ? true:false;
if ( m[9]=='g' && m[10]=='r' && m[11]=='e' && m[12]=='n' )
newNade ? w_id = 13 : w_id = 16; // grenade
else if ( m[9]=='m' && m[10]=='i' )
newNade ? w_id = 36 : w_id = 16 ; // mills ; should I add mills_grenade_ex weapon ?
else if ( m[9]=='s' && m[10]=='t' && m[11]=='i')
newNade ? w_id = 14 : w_id = 15; // stick
if ( !w_id )
RETURN_META(MRES_IGNORED);
MF_ExecuteForward( iFGrenade, pPlayer->index, ENTINDEX(e) ,w_id );
/* fuse start */
if ( pPlayer->fuseSet ){
if ( newNade ){
if ( pPlayer->fuseType & 1<<0 ){
e->v.dmgtime += pPlayer->nadeFuse - 5.0;
}
}
else{ // cought
bool ownNade = ( (pPlayer->pEdict->v.team == 1 && pPlayer->current == 16) || (pPlayer->pEdict->v.team == 2 && pPlayer->current == 15) ) ? true:false;
if ( ownNade ){
float fExp = e->v.dmgtime - gpGlobals->time;
e->v.dmgtime += pPlayer->nadeFuse - fExp;
}
}
}
/* fuse end */
else if ( (int)pEntity->v.fuser4 < pPlayer->staminaMin)
pEntity->v.fuser4 = (float)pPlayer->staminaMin;
}
if(pPlayer->current == 29 || pPlayer->current == 30 || pPlayer->current == 31)
{
if(!(pPlayer->pEdict->v.oldbuttons&IN_ATTACK) && (pPlayer->pEdict->v.button&IN_ATTACK))
gPlayerRocket = GET_PLAYER_POINTER(pEntity);
}
RETURN_META(MRES_IGNORED);
}
void OnAmxxAttach() {
void SetModel_Post(edict_t *e, const char *m)
{
int w_id = 0;
if(!e->v.owner || !e->v.dmgtime)
{
int owner = ENTINDEX(e->v.owner);
if(owner && owner < 33 && m[7]=='w' && m[8]=='_')
{
CPlayer* pPlayer = GET_PLAYER_POINTER_I(owner);
bool newNade = (pPlayer->current == 13 || pPlayer->current == 14) ? true : false;
if(m[9]=='g' && m[10]=='r' && m[11]=='e' && m[12]=='n')
w_id = newNade ? 13 : 16; // grenade
else if(m[9]=='m' && m[10]=='i')
w_id = newNade ? 36 : 16 ; // mills ; should I add mills_grenade_ex weapon ?
else if(m[9]=='s' && m[10]=='t' && m[11]=='i')
w_id = newNade ? 14 : 15; // stick
if(!w_id)
RETURN_META(MRES_IGNORED);
if(w_id == 13 || w_id == 14 || w_id == 15 || w_id == 16 || w_id == 36)
{
MF_ExecuteForward(iFGrenade, pPlayer->index, ENTINDEX(e), w_id);
/* fuse start */
if(pPlayer->fuseSet)
{
if(newNade)
{
if(pPlayer->fuseType & 1<<0)
{
e->v.dmgtime += pPlayer->nadeFuse - 5.0;
}
}
else
{
float fExp = e->v.dmgtime - gpGlobals->time;
e->v.dmgtime += pPlayer->nadeFuse - fExp;
}
}
/* fuse end */
}
}
else if(strstr(m, "rocket") && gPlayerRocket)
{
if(strstr(m, "bazooka"))
w_id = 29;
else if(strstr(m, "piat"))
w_id = 30;
else if(strstr(m, "pschreck"))
w_id = 31;
MF_ExecuteForward(iFRocket, gPlayerRocket->index, ENTINDEX(e), w_id);
gPlayerRocket = NULL;
}
}
RETURN_META(MRES_IGNORED);
}
void OnAmxxAttach()
{
MF_AddNatives( base_Natives );
MF_AddNatives( pd_Natives );
}
void OnPluginsLoaded(){
iFGrenade = MF_RegisterForward("grenade_throw",ET_IGNORE,FP_CELL,FP_CELL,FP_CELL,FP_DONE);
void OnPluginsLoaded()
{
iFGrenade = MF_RegisterForward("grenade_throw",ET_IGNORE,FP_CELL/*id*/,FP_CELL/*Grenade Ent*/,FP_CELL/*Weapon ID*/,FP_DONE);
iFRocket = MF_RegisterForward("rocket_shoot",ET_IGNORE,FP_CELL/*id*/,FP_CELL/*Rocket Ent*/,FP_CELL/*Weapon ID*/,FP_DONE);
iFInitCP = MF_RegisterForward("controlpoints_init",ET_IGNORE,FP_DONE);
}

2
dlls/dod2/dodfun/moduleconfig.h
View File

@ -5,7 +5,7 @@
// Module info
#define MODULE_NAME "DoD Fun"
#define MODULE_VERSION "1.76b"
#define MODULE_VERSION "1.76c_beta_a"
#define MODULE_AUTHOR "AMX Mod X Dev Team"
#define MODULE_URL "http://www.amxmodx.org"
#define MODULE_LOGTAG "DODFUN"