ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2025-02-16 17:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

use QDECL instead of __cdecl

Browse source
This commit is contained in:
Jonathan Gray 2013-04-22 20:42:14 +10:00
parent 118f3df648
commit 0c24fcdbfb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/cgame/cg_weapons.cpp
View file

@ -227,11 +227,11 @@ void CG_RegisterWeapon( int weaponNum ) {
// give ourselves the functions if we can // give ourselves the functions if we can
if (weaponData[weaponNum].func) if (weaponData[weaponNum].func)
{ {
weaponInfo->missileTrailFunc = (void (__cdecl *)(struct centity_s *,const struct weaponInfo_s *))weaponData[weaponNum].func; weaponInfo->missileTrailFunc = (void (QDECL *)(struct centity_s *,const struct weaponInfo_s *))weaponData[weaponNum].func;
} }
if (weaponData[weaponNum].altfunc) if (weaponData[weaponNum].altfunc)
{ {
weaponInfo->alt_missileTrailFunc = (void (__cdecl *)(struct centity_s *,const struct weaponInfo_s *))weaponData[weaponNum].altfunc; weaponInfo->alt_missileTrailFunc = (void (QDECL *)(struct centity_s *,const struct weaponInfo_s *))weaponData[weaponNum].altfunc;
} }
switch ( weaponNum ) //extra client only stuff switch ( weaponNum ) //extra client only stuff

2
code/renderer/tr_terrain.cpp
View file

@ -791,7 +791,7 @@ void CTRLandScape::CalculateShaders(void)
// Cleanup our temporary array // Cleanup our temporary array
delete[] shaders; delete[] shaders;
qsort(mSortedPatches, mSortedCount, sizeof(*mSortedPatches), (int (__cdecl *)(const void *,const void *))ComparePatchInfo); qsort(mSortedPatches, mSortedCount, sizeof(*mSortedPatches), (int (QDECL *)(const void *,const void *))ComparePatchInfo);
#endif // PRE_RELEASE_DEMO #endif // PRE_RELEASE_DEMO
} }