Clean up some areas where float logic happens to prepare for the compiler flag 'assumeint'
This commit is contained in:
parent
db74cf6ffa
commit
2526751db1
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte
|
||||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma progs_dat "../../csprogs.dat"
|
||||
|
||||
#define CSQC
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma progs_dat "../../menu.dat"
|
||||
#define MENU
|
||||
#define GAME_DIR "base"
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte
|
||||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma progs_dat "../../progs.dat"
|
||||
|
||||
#define QWSSQC
|
||||
|
|
|
@ -17,29 +17,14 @@
|
|||
/* all potential SendFlags bits we can possibly send */
|
||||
enumflags
|
||||
{
|
||||
PLAYER_KEEPALIVE,
|
||||
PLAYER_MODELINDEX,
|
||||
PLAYER_ORIGIN,
|
||||
PLAYER_ORIGIN_Z,
|
||||
PLAYER_ANGLES_X,
|
||||
PLAYER_ANGLES_Y,
|
||||
PLAYER_COLORMAP,
|
||||
PLAYER_VELOCITY,
|
||||
PLAYER_VELOCITY_Z,
|
||||
PLAYER_FLAGS,
|
||||
PLAYER_WEAPON,
|
||||
PLAYER_ITEMS,
|
||||
PLAYER_HEALTH,
|
||||
PLAYER_ARMOR,
|
||||
PLAYER_MOVETYPE,
|
||||
PLAYER_VIEWOFS,
|
||||
PLAYER_UNUSED1,
|
||||
PLAYER_UNUSED2,
|
||||
PLAYER_UNUSED3,
|
||||
PLAYER_UNUSED4,
|
||||
PLAYER_AMMO1 = PLAYER_CUSTOMFIELDSTART,
|
||||
PLAYER_AMMO2,
|
||||
PLAYER_AMMO3,
|
||||
PLAYER_UNUSED5,
|
||||
PLAYER_UNUSED6,
|
||||
PLAYER_UNUSED7
|
||||
PLAYER_UNUSED7,
|
||||
PLAYER_UNUSED7,
|
||||
PLAYER_UNUSED8
|
||||
};
|
||||
|
||||
class player:NSClientPlayer
|
||||
|
@ -120,13 +105,7 @@ player::SendEntity(entity ePEnt, float fChanged)
|
|||
if (!GetModelindex() && ePEnt != this)
|
||||
return (0);
|
||||
|
||||
/* other players don't need to know about these attributes */
|
||||
if (ePEnt != self) {
|
||||
fChanged &= ~PLAYER_ITEMS;
|
||||
fChanged &= ~PLAYER_HEALTH;
|
||||
fChanged &= ~PLAYER_ARMOR;
|
||||
fChanged &= ~PLAYER_VIEWOFS;
|
||||
}
|
||||
fChanged = OptimiseChangedFlags(ePEnt, fChanged);
|
||||
|
||||
WriteByte(MSG_ENTITY, ENT_PLAYER);
|
||||
WriteFloat(MSG_ENTITY, fChanged);
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
int
|
||||
Route_RoundDistance(float flDist)
|
||||
{
|
||||
float r = fabs(flDist) % 2;
|
||||
float r = fabs(flDist) % 2.0f;
|
||||
|
||||
if (r == 0)
|
||||
return (flDist);
|
||||
|
@ -32,7 +32,7 @@ Route_RoundDistance(float flDist)
|
|||
if (flDist < 0)
|
||||
return -(fabs(flDist) - r);
|
||||
else
|
||||
return (flDist + 2 - r);
|
||||
return (flDist + 2.0f - r);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -180,9 +180,9 @@ NSInteractiveSurface::RenderScene(void)
|
|||
|
||||
clearscene();
|
||||
|
||||
setviewprop(VF_RT_DESTCOLOUR, m_strSurfaceMat, 1, m_vecUIRes);
|
||||
setviewprop(VF_RT_DESTCOLOUR, m_strSurfaceMat, (float)1, m_vecUIRes);
|
||||
setviewprop(VF_SIZE, m_vecUIRes);
|
||||
setviewprop(VF_DRAWENGINESBAR, 0);
|
||||
setviewprop(VF_DRAWENGINESBAR, (float)0);
|
||||
setviewprop(VF_ORIGIN, [0,0,0]);
|
||||
setviewprop(VF_ANGLES, [0,0,0]);
|
||||
setviewprop(VF_AFOV, 90.0f);
|
||||
|
|
|
@ -17,9 +17,9 @@
|
|||
void
|
||||
NSView::SetupView(void)
|
||||
{
|
||||
setproperty(VF_DRAWENGINESBAR, 0);
|
||||
setproperty(VF_DRAWCROSSHAIR, 0);
|
||||
setproperty(VF_DRAWWORLD, 1);
|
||||
setproperty(VF_DRAWENGINESBAR, (float)0);
|
||||
setproperty(VF_DRAWCROSSHAIR, (float)0);
|
||||
setproperty(VF_DRAWWORLD, (float)1);
|
||||
setproperty(VF_ACTIVESEAT, (float)m_iSeat);
|
||||
setproperty(VF_MIN, m_vecPosition);
|
||||
setproperty(VF_SIZE, m_vecSize);
|
||||
|
|
|
@ -245,16 +245,16 @@ CSQC_UpdateView(float w, float h, float focus)
|
|||
|
||||
/* this is running whenever we're doing 'buildcubemaps' */
|
||||
if (g_iCubeProcess == TRUE) {
|
||||
setproperty(VF_DRAWENGINESBAR, 0);
|
||||
setproperty(VF_DRAWCROSSHAIR, 0);
|
||||
setproperty(VF_DRAWWORLD, 1);
|
||||
setproperty(VF_DRAWENGINESBAR, (float)0);
|
||||
setproperty(VF_DRAWCROSSHAIR, (float)0);
|
||||
setproperty(VF_DRAWWORLD, (float)1);
|
||||
setproperty(VF_MIN, [0,0]);
|
||||
setproperty(VF_VIEWENTITY, player_localentnum);
|
||||
setproperty(VF_ORIGIN, g_vecCubePos);
|
||||
setproperty(VF_ANGLES, [0,0,0]);
|
||||
setproperty(VF_SIZE_X, g_dCubeSize);
|
||||
setproperty(VF_SIZE_Y, g_dCubeSize);
|
||||
setproperty(VF_AFOV, 90);
|
||||
setproperty(VF_AFOV, 90.0f);
|
||||
CSQC_RenderScene();
|
||||
} else {
|
||||
/* now render each player seat */
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
vector g_vecSunDir;
|
||||
|
||||
/* TODO: Find a better way to figure out what's a NSEntity at heart */
|
||||
.float isCSQC;
|
||||
.bool isCSQC;
|
||||
|
||||
/* things we don't have in CSQC normally and oughta be global */
|
||||
.string target;
|
||||
|
|
|
@ -45,9 +45,9 @@ RenderTarget_Monitor_Update(void)
|
|||
}
|
||||
|
||||
clearscene();
|
||||
setviewprop(VF_RT_DESTCOLOUR, "base", 1, g_iRenderTargetSize);
|
||||
setviewprop(VF_RT_DESTCOLOUR, "base", (float)1, g_iRenderTargetSize);
|
||||
setviewprop(VF_SIZE, g_iRenderTargetSize);
|
||||
setviewprop(VF_DRAWENGINESBAR, 0);
|
||||
setviewprop(VF_DRAWENGINESBAR, (float)0);
|
||||
setviewprop(VF_ORIGIN, g_vecRenderTargetPos);
|
||||
setviewprop(VF_ANGLES, g_vecRenderTargetAngles);
|
||||
setviewprop(VF_AFOV, g_flRenderTargetFOV);
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma progs_dat "../../platform/menu.dat"
|
||||
#define MENU
|
||||
|
||||
|
|
|
@ -111,7 +111,7 @@ CUI3DView::Draw(void)
|
|||
|
||||
clearscene();
|
||||
setproperty(VF_VIEWPORT, [m_x + g_menuofs[0],m_y + g_menuofs[1]], m_vecSize);
|
||||
setproperty(VF_AFOV, 90);
|
||||
setproperty(VF_AFOV, 90.0f);
|
||||
setproperty(VF_ORIGIN, m_vec3DPos);
|
||||
setproperty(VF_ANGLES, m_vec3DAngles);
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte
|
||||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma progs_dat "../../platform/menu.dat"
|
||||
#define MENU
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte
|
||||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma PROGS_DAT "../../platform/plugins/banner.dat"
|
||||
#define QWSSQC
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte
|
||||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma PROGS_DAT "../../platform/plugins/chatfilter.dat"
|
||||
#define QWSSQC
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte
|
||||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma PROGS_DAT "../../platform/plugins/chatsounds.dat"
|
||||
#define QWSSQC
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte
|
||||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma PROGS_DAT "../../platform/plugins/connectsounds.dat"
|
||||
#define QWSSQC
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte
|
||||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma PROGS_DAT "../../platform/plugins/ircbridge.dat"
|
||||
#define QWSSQC
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma target fte
|
||||
#pragma target fte_5768
|
||||
//#pragma flag enable assumeint
|
||||
#pragma PROGS_DAT "../../platform/plugins/voxannouncer.dat"
|
||||
#define QWSSQC
|
||||
|
||||
|
|
|
@ -302,7 +302,7 @@ NSEntity::ReceiveEntity(float flNew, float flChanged)
|
|||
READENTITY_COORD(maxs[1], BASEFL_CHANGED_SIZE)
|
||||
READENTITY_COORD(maxs[2], BASEFL_CHANGED_SIZE)
|
||||
READENTITY_BYTE(frame, BASEFL_CHANGED_FRAME)
|
||||
READENTITY_BYTE(skin, BASEFL_CHANGED_SKIN)
|
||||
READENTITY_FLOAT(skin, BASEFL_CHANGED_SKIN)
|
||||
READENTITY_FLOAT(effects, BASEFL_CHANGED_EFFECTS)
|
||||
READENTITY_FLOAT(scale, BASEFL_CHANGED_SCALE)
|
||||
READENTITY_COORD(velocity[0], BASEFL_CHANGED_VELOCITY_X)
|
||||
|
@ -382,7 +382,7 @@ NSEntity::SendEntity(entity ePEnt, float flChanged)
|
|||
SENDENTITY_COORD(maxs[1], BASEFL_CHANGED_SIZE)
|
||||
SENDENTITY_COORD(maxs[2], BASEFL_CHANGED_SIZE)
|
||||
SENDENTITY_BYTE(frame, BASEFL_CHANGED_FRAME)
|
||||
SENDENTITY_BYTE(skin, BASEFL_CHANGED_SKIN)
|
||||
SENDENTITY_FLOAT(skin, BASEFL_CHANGED_SKIN)
|
||||
SENDENTITY_FLOAT(effects, BASEFL_CHANGED_EFFECTS)
|
||||
SENDENTITY_FLOAT(scale, BASEFL_CHANGED_SCALE)
|
||||
SENDENTITY_COORD(velocity[0], BASEFL_CHANGED_VELOCITY_X)
|
||||
|
|
|
@ -199,7 +199,7 @@ void
|
|||
NSIO::SaveBool(float handle, string key, bool value)
|
||||
{
|
||||
//if (value)
|
||||
fputs(handle, sprintf("%S \"%f\"\n", key, value));
|
||||
fputs(handle, sprintf("%S \"%d\"\n", key, value));
|
||||
}
|
||||
void
|
||||
NSIO::SaveFloat(float handle, string key, float value)
|
||||
|
@ -234,7 +234,7 @@ NSIO::SaveEntity(float handle, string key, entity targ)
|
|||
fputs(handle, sprintf("%S \"%f\"\n", key, value));
|
||||
}
|
||||
|
||||
float
|
||||
bool
|
||||
NSIO::ReadBool(string strValue)
|
||||
{
|
||||
if (strValue && strValue != "")
|
||||
|
|
|
@ -940,7 +940,7 @@ NSMonster::SendEntity(entity ePEnt, float flChanged)
|
|||
SENDENTITY_COORD(maxs[1], MONFL_CHANGED_SIZE)
|
||||
SENDENTITY_COORD(maxs[2], MONFL_CHANGED_SIZE)
|
||||
SENDENTITY_BYTE(frame, MONFL_CHANGED_FRAME)
|
||||
SENDENTITY_BYTE(skin, MONFL_CHANGED_SKIN)
|
||||
SENDENTITY_FLOAT(skin, MONFL_CHANGED_SKIN)
|
||||
SENDENTITY_FLOAT(effects, MONFL_CHANGED_EFFECTS)
|
||||
SENDENTITY_BYTE(m_iBody, MONFL_CHANGED_BODY)
|
||||
SENDENTITY_FLOAT(scale, MONFL_CHANGED_SCALE)
|
||||
|
@ -1012,7 +1012,7 @@ NSMonster::ReceiveEntity(float flNew, float flChanged)
|
|||
READENTITY_COORD(maxs[1], MONFL_CHANGED_SIZE)
|
||||
READENTITY_COORD(maxs[2], MONFL_CHANGED_SIZE)
|
||||
READENTITY_BYTE(frame, MONFL_CHANGED_FRAME)
|
||||
READENTITY_BYTE(skin, MONFL_CHANGED_SKIN)
|
||||
READENTITY_FLOAT(skin, MONFL_CHANGED_SKIN)
|
||||
READENTITY_FLOAT(effects, MONFL_CHANGED_EFFECTS)
|
||||
READENTITY_BYTE(m_iBody, MONFL_CHANGED_BODY)
|
||||
READENTITY_FLOAT(scale, MONFL_CHANGED_SCALE)
|
||||
|
@ -1042,7 +1042,7 @@ NSMonster::ReceiveEntity(float flNew, float flChanged)
|
|||
|
||||
#ifdef CLIENT
|
||||
void
|
||||
NSMonster_ReadEntity(float new)
|
||||
NSMonster_ReadEntity(bool new)
|
||||
{
|
||||
NSMonster me = (NSMonster)self;
|
||||
if (new) {
|
||||
|
|
|
@ -264,7 +264,7 @@ NSSurfacePropEntity::SendEntity(entity ePEnt, float flChanged)
|
|||
SENDENTITY_COORD(maxs[1], SRFENT_CHANGED_SIZE)
|
||||
SENDENTITY_COORD(maxs[2], SRFENT_CHANGED_SIZE)
|
||||
SENDENTITY_BYTE(frame, SRFENT_CHANGED_FRAME)
|
||||
SENDENTITY_BYTE(skin, SRFENT_CHANGED_SKIN)
|
||||
SENDENTITY_FLOAT(skin, SRFENT_CHANGED_SKIN)
|
||||
SENDENTITY_FLOAT(effects, SRFENT_CHANGED_EFFECTS)
|
||||
SENDENTITY_BYTE(m_iBody, SRFENT_CHANGED_BODY)
|
||||
SENDENTITY_FLOAT(scale, SRFENT_CHANGED_SCALE)
|
||||
|
@ -313,7 +313,7 @@ NSSurfacePropEntity::ReceiveEntity(float flNew, float flChanged)
|
|||
READENTITY_COORD(maxs[1], SRFENT_CHANGED_SIZE)
|
||||
READENTITY_COORD(maxs[2], SRFENT_CHANGED_SIZE)
|
||||
READENTITY_BYTE(frame, SRFENT_CHANGED_FRAME)
|
||||
READENTITY_BYTE(skin, SRFENT_CHANGED_SKIN)
|
||||
READENTITY_FLOAT(skin, SRFENT_CHANGED_SKIN)
|
||||
READENTITY_FLOAT(effects, SRFENT_CHANGED_EFFECTS)
|
||||
READENTITY_BYTE(m_iBody, SRFENT_CHANGED_BODY)
|
||||
READENTITY_FLOAT(scale, SRFENT_CHANGED_SCALE)
|
||||
|
|
|
@ -671,7 +671,7 @@ NSTalkMonster::SendEntity(entity ePEnt, float flChanged)
|
|||
SENDENTITY_COORD(maxs[1], MONFL_CHANGED_SIZE)
|
||||
SENDENTITY_COORD(maxs[2], MONFL_CHANGED_SIZE)
|
||||
SENDENTITY_BYTE(frame, MONFL_CHANGED_FRAME)
|
||||
SENDENTITY_BYTE(skin, MONFL_CHANGED_SKIN)
|
||||
SENDENTITY_FLOAT(skin, MONFL_CHANGED_SKIN)
|
||||
SENDENTITY_FLOAT(effects, MONFL_CHANGED_EFFECTS)
|
||||
SENDENTITY_BYTE(m_iBody, MONFL_CHANGED_BODY)
|
||||
SENDENTITY_FLOAT(scale, MONFL_CHANGED_SCALE)
|
||||
|
@ -831,7 +831,7 @@ NSTalkMonster::ReceiveEntity(float flNew, float flChanged)
|
|||
READENTITY_COORD(maxs[1], MONFL_CHANGED_SIZE)
|
||||
READENTITY_COORD(maxs[2], MONFL_CHANGED_SIZE)
|
||||
READENTITY_BYTE(frame, MONFL_CHANGED_FRAME)
|
||||
READENTITY_BYTE(skin, MONFL_CHANGED_SKIN)
|
||||
READENTITY_FLOAT(skin, MONFL_CHANGED_SKIN)
|
||||
READENTITY_FLOAT(effects, MONFL_CHANGED_EFFECTS)
|
||||
READENTITY_BYTE(m_iBody, MONFL_CHANGED_BODY)
|
||||
READENTITY_FLOAT(scale, MONFL_CHANGED_SCALE)
|
||||
|
@ -888,7 +888,7 @@ NSTalkMonster_ParseSentence(void)
|
|||
|
||||
#ifdef CLIENT
|
||||
void
|
||||
NSTalkMonster_ReadEntity(float new)
|
||||
NSTalkMonster_ReadEntity(bool new)
|
||||
{
|
||||
NSTalkMonster me = (NSTalkMonster)self;
|
||||
if (new) {
|
||||
|
|
|
@ -188,11 +188,11 @@ noref float input_sequence;
|
|||
float
|
||||
pseudorandom()
|
||||
{
|
||||
float seed = (float)input_sequence % 5;
|
||||
seed += (float)input_sequence % 8;
|
||||
seed += (float)input_sequence % 4;
|
||||
seed += (float)input_sequence % 13;
|
||||
seed += (float)input_sequence % 70;
|
||||
float seed = (float)input_sequence % 5.0f;
|
||||
seed += (float)input_sequence % 8.0f;
|
||||
seed += (float)input_sequence % 4.0f;
|
||||
seed += (float)input_sequence % 13.0f;
|
||||
seed += (float)input_sequence % 70.0f;
|
||||
|
||||
/* like the engine its random(), never return 0, never return 1 */
|
||||
return bound(0.01, (seed) / 100.0f, 0.99f);
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
float
|
||||
Math_LerpAngle(float fStart, float fEnd, float fAmount)
|
||||
{
|
||||
float shortest_angle = ((((fEnd - fStart) % 360) + 540) % 360) - 180;
|
||||
float shortest_angle = ((((fEnd - fStart) % 360.0f) + 540.0f) % 360.0f) - 180.0f;
|
||||
return shortest_angle * fAmount;
|
||||
}
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ class CUITabView:CUIWidget
|
|||
virtual void(vector) SetSize;
|
||||
virtual vector() GetSize;
|
||||
virtual void(string) SetTitle;
|
||||
virtual float(float, float, float, float) Input;
|
||||
virtual bool(float, float, float, float) Input;
|
||||
};
|
||||
|
||||
void CUITabView::CUITabView(void)
|
||||
|
|
Loading…
Reference in New Issue