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

Fixed makefiles for 64bit error, clean error, and output error

Browse Source 
ADDED NEWLINES!! OMG
Corrected some AMD64 casts on ns_amxx
This commit is contained in:
David Anderson
2004-08-22 12:40:24 +00:00
parent c392f3cbbc
commit d966983354
37 changed files with 267 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ns/ns/CPlayer.h
View File

@ -38,4 +38,5 @@ public:
int iclass;
};
#endif
#endif

3
dlls/ns/ns/CSpawn.h
View File

@ -17,4 +17,5 @@ public:
float getnum(int type);
vec3_t getpoint(int type, int num);
};
#endif
#endif

5
dlls/ns/ns/Makefile.pl
View File

@ -72,7 +72,7 @@ if ($OPTIONS{"debug"})
if ($OPTIONS{"amd64"})
{
$cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags";
$cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags";
}
if ($OPTIONS{"debug"})
@ -98,10 +98,10 @@ if ($OPTIONS{"amd64"})
}
}
unlink("$outdir/$bin");
if ($OPTIONS{"clean"})
{
`rm $outdir/*.o`;
`rm $outdir/$bin`;
die("Project cleaned.\n");
}
@ -173,4 +173,5 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
}
$gcc = "g++ $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
print "$gcc\n";
`$gcc`;

25
dlls/ns/ns/NPData.cpp
View File

@ -116,7 +116,7 @@ static cell AMX_NATIVE_CALL ns_set_points(AMX *amx, cell *params)
CPlayer *player = GET_PLAYER_I(id);
if (!player->connected || player->edict->pvPrivateData == NULL)
return 0;
set_private(player->edict,OFFSET_WIN_POINTS,OFFSET_LIN_POINTS,params[2]);
set_private(player->edict,OFFSET_WIN_POINTS,OFFSET_LIN_POINTS,(int)params[2]);
return 1;
}
static cell AMX_NATIVE_CALL ns_set_weapon_dmg(AMX *amx, cell *params)
@ -172,7 +172,7 @@ static cell AMX_NATIVE_CALL ns_set_weapon_ammo(AMX *amx, cell *params)
edict_t *pEntity = INDEXENT2(id);
if (pEntity->pvPrivateData == NULL)
return 0;
set_private(pEntity,OFFSET_WIN_WEAPCLIP,OFFSET_LIN_WEAPCLIP,params[2]);
set_private(pEntity,OFFSET_WIN_WEAPCLIP,OFFSET_LIN_WEAPCLIP,(int)params[2]);
return 1;
}
static cell AMX_NATIVE_CALL ns_get_weapon_ammo(AMX *amx, cell *params)
@ -221,19 +221,19 @@ static cell AMX_NATIVE_CALL ns_set_weap_reserve(AMX *amx, cell *params)
switch (params[2])
{
case WEAPON_PISTOL:
set_private(player->edict,OFFSET_WIN_AMMO_PISTOL,OFFSET_LIN_AMMO_PISTOL,params[3]);
set_private(player->edict,OFFSET_WIN_AMMO_PISTOL,OFFSET_LIN_AMMO_PISTOL,(int)params[3]);
return 1;
case WEAPON_LMG:
set_private(player->edict,OFFSET_WIN_AMMO_LMG,OFFSET_LIN_AMMO_LMG,params[3]);
set_private(player->edict,OFFSET_WIN_AMMO_LMG,OFFSET_LIN_AMMO_LMG,(int)params[3]);
return 1;
case WEAPON_HMG:
set_private(player->edict,OFFSET_WIN_AMMO_HMG,OFFSET_LIN_AMMO_HMG,params[3]);
set_private(player->edict,OFFSET_WIN_AMMO_HMG,OFFSET_LIN_AMMO_HMG,(int)params[3]);
return 1;
case WEAPON_GRENADE_GUN:
set_private(player->edict,OFFSET_WIN_AMMO_GL,OFFSET_LIN_AMMO_GL,params[3]);
set_private(player->edict,OFFSET_WIN_AMMO_GL,OFFSET_LIN_AMMO_GL,(int)params[3]);
return 1;
case WEAPON_GRENADE:
set_private(player->edict,OFFSET_WIN_AMMO_HG,OFFSET_LIN_AMMO_HG,params[3]);
set_private(player->edict,OFFSET_WIN_AMMO_HG,OFFSET_LIN_AMMO_HG,(int)params[3]);
return 1;
default:
return 0;
@ -258,7 +258,7 @@ static cell AMX_NATIVE_CALL ns_set_score(AMX *amx, cell *params)
CPlayer *player = GET_PLAYER_I(id);
if (!player->connected || player->edict->pvPrivateData == NULL)
return 0;
set_private(player->edict,OFFSET_WIN_SCORE,OFFSET_LIN_SCORE,params[2]);
set_private(player->edict,OFFSET_WIN_SCORE,OFFSET_LIN_SCORE,(int)params[2]);
return 1;
}
static cell AMX_NATIVE_CALL ns_set_hive_trait(AMX *amx, cell *params)
@ -269,7 +269,7 @@ static cell AMX_NATIVE_CALL ns_set_hive_trait(AMX *amx, cell *params)
edict_t *pEntity = INDEXENT2(id);
if (pEntity->pvPrivateData == NULL)
return 0;
set_private(pEntity,OFFSET_WIN_HIVE_TRAIT,OFFSET_LIN_HIVE_TRAIT,params[2]);
set_private(pEntity,OFFSET_WIN_HIVE_TRAIT,OFFSET_LIN_HIVE_TRAIT,(int)params[2]);
return 1;
}
static cell AMX_NATIVE_CALL ns_get_hive_trait(AMX *amx, cell *params)
@ -296,7 +296,7 @@ static cell AMX_NATIVE_CALL ns_set_deaths(AMX *amx, cell *params)
if (id < 1 || id > gpGlobals->maxClients)
return 0;
CPlayer *player = GET_PLAYER_I(id);
set_private(player->edict,OFFSET_WIN_DEATHS,OFFSET_LIN_DEATHS,params[2]);
set_private(player->edict,OFFSET_WIN_DEATHS,OFFSET_LIN_DEATHS,(int)params[2]);
return 1;
}
static cell AMX_NATIVE_CALL ns_get_icon(AMX *amx, cell *params)
@ -313,7 +313,7 @@ static cell AMX_NATIVE_CALL ns_set_icon(AMX *amx, cell *params)
if (id < 1 || id > gpGlobals->maxClients)
return 0;
CPlayer *player = GET_PLAYER_I(id);
set_private(player->edict,OFFSET_WIN_ICON,OFFSET_LIN_ICON,params[2]);
set_private(player->edict,OFFSET_WIN_ICON,OFFSET_LIN_ICON,(int)params[2]);
return 1;
}
@ -353,4 +353,5 @@ AMX_NATIVE_INFO ns_pdata_natives[] = {
{ "ns_set_hive_trait", ns_set_hive_trait },
{ NULL, NULL }
};
};

1
dlls/ns/ns/moduleconfig.h
View File

@ -458,3 +458,4 @@
#endif // USE_METAMOD
#endif // __MODULECONFIG_H__

3
dlls/ns/ns/ns.h
View File

@ -33,4 +33,5 @@ extern int BuiltForward;
#endif // NS_H
#endif // NS_H

3
dlls/ns/ns/ns_const.h
View File

@ -274,4 +274,5 @@ enum classes
#define MENUDEFAULT_HOLDTIME 30.0;
#endif
#endif

3
dlls/ns/ns/utilfunctions.h
View File

@ -68,4 +68,5 @@ inline BOOL isValidEntity(int x)
#define CHECK_PARAMS(x) if (*params/sizeof(cell) < x) return 0;
#endif // UTILFUNCTIONS_H
#endif // UTILFUNCTIONS_H