vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Physics: define stand-in values for non CSTRIKE and VALVE defined games

Browse source
This commit is contained in:
Marco Cawthorne 2020-05-08 07:44:40 +02:00
parent 674206349a
commit fe251faf81
21 changed files with 102 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/prints.c
View file

@ -58,7 +58,7 @@ Print_DrawCenterprint(void)
for (int i = 0; i < (pSeat->m_iCenterprintLines); i++) { for (int i = 0; i < (pSeat->m_iCenterprintLines); i++) {
vecPos[0] = g_hudmins[0] + (g_hudres[0] / 2) - (stringwidth(pSeat->m_strCenterprintBuffer[i], TRUE, '12 12') / 2); vecPos[0] = g_hudmins[0] + (g_hudres[0] / 2) - (stringwidth(pSeat->m_strCenterprintBuffer[i], TRUE, '12 12') / 2);
drawstring(vecPos, pSeat->m_strCenterprintBuffer[i], '12 12', '1 1 1', pSeat->m_flCenterprintAlpha, 0); drawstring(vecPos, pSeat->m_strCenterprintBuffer[i], '12 12', [1,1,1], pSeat->m_flCenterprintAlpha, 0);
vecPos[1] += 8; vecPos[1] += 8;
} }
} }

4
src/gs-entbase/server/env_fade.cpp
View file

@ -57,9 +57,9 @@ void env_fade::Trigger (void)
msg_entity = eActivator; msg_entity = eActivator;
if (spawnflags & EVF_ONLYUSER) { if (spawnflags & EVF_ONLYUSER) {
multicast('0 0 0', MULTICAST_ONE_R); multicast([0,0,0], MULTICAST_ONE_R);
} else { } else {
multicast('0 0 0', MULTICAST_ALL); multicast([0,0,0], MULTICAST_ALL);
} }
} }

2
src/gs-entbase/server/env_shake.cpp
View file

@ -50,7 +50,7 @@ void env_shake::Trigger (void)
WriteFloat(MSG_MULTICAST, m_flDuration); WriteFloat(MSG_MULTICAST, m_flDuration);
WriteFloat(MSG_MULTICAST, m_flFrequency); WriteFloat(MSG_MULTICAST, m_flFrequency);
msg_entity = e; msg_entity = e;
multicast('0 0 0', MULTICAST_ONE_R); multicast([0,0,0], MULTICAST_ONE_R);
} }
} }

4
src/gs-entbase/server/func_breakable.cpp
View file

@ -132,7 +132,7 @@ void func_breakable::Explode(void)
vWorldPos[0] = absmin[0] + (0.5 * (absmax[0] - absmin[0])); vWorldPos[0] = absmin[0] + (0.5 * (absmax[0] - absmin[0]));
vWorldPos[1] = absmin[1] + (0.5 * (absmax[1] - absmin[1])); vWorldPos[1] = absmin[1] + (0.5 * (absmax[1] - absmin[1]));
vWorldPos[2] = absmin[2] + (0.5 * (absmax[2] - absmin[2])); vWorldPos[2] = absmin[2] + (0.5 * (absmax[2] - absmin[2]));
FX_BreakModel(vlen(size) / 10, absmin, absmax, '0 0 0', m_iMaterial); FX_BreakModel(vlen(size) / 10, absmin, absmax, [0,0,0], m_iMaterial);
FX_Explosion(vWorldPos); FX_Explosion(vWorldPos);
Damage_Radius(vWorldPos, this, m_flExplodeMag, m_flExplodeMag * 2.5f, TRUE, 0); Damage_Radius(vWorldPos, this, m_flExplodeMag, m_flExplodeMag * 2.5f, TRUE, 0);
CBaseTrigger::UseTargets(); CBaseTrigger::UseTargets();
@ -157,7 +157,7 @@ void func_breakable::Death(int body)
think = Explode; think = Explode;
nextthink = time + random(0.0,0.5); nextthink = time + random(0.0,0.5);
} else { } else {
FX_BreakModel(vlen(size) / 10, absmin, absmax, '0 0 0', m_iMaterial); FX_BreakModel(vlen(size) / 10, absmin, absmax, [0,0,0], m_iMaterial);
CBaseTrigger::UseTargets(); CBaseTrigger::UseTargets();
CBaseEntity::Hide(); CBaseEntity::Hide();
} }

4
src/gs-entbase/server/func_button.cpp
View file

@ -307,7 +307,7 @@ void func_button::MoveToDestination(vector vecDest, void(void) func)
think = MoveToDestination_End; think = MoveToDestination_End;
if (vecDest == origin) { if (vecDest == origin) {
velocity = '0 0 0'; velocity = [0,0,0];
nextthink = (ltime + 0.1); nextthink = (ltime + 0.1);
return; return;
} }
@ -317,7 +317,7 @@ void func_button::MoveToDestination(vector vecDest, void(void) func)
fTravelTime = (flTravel / m_flSpeed); fTravelTime = (flTravel / m_flSpeed);
if (fTravelTime < 0.1) { if (fTravelTime < 0.1) {
velocity = '0 0 0'; velocity = [0,0,0];
nextthink = ltime + 0.1; nextthink = ltime + 0.1;
return; return;
} }

2
src/gs-entbase/server/func_wall.cpp
View file

@ -30,7 +30,7 @@ class func_wall:CBaseTrigger
void func_wall::func_wall(void) void func_wall::func_wall(void)
{ {
precache_model(model); precache_model(model);
//angles = '0 0 0'; //angles = [0,0,0];
movetype = MOVETYPE_PUSH; movetype = MOVETYPE_PUSH;
solid = SOLID_BSP; solid = SOLID_BSP;
SetModel(model); SetModel(model);

2
src/gs-entbase/server/light.cpp
View file

@ -21,7 +21,7 @@ Infinitely small point of light illuminating the scene.
idTech 3 BSP relevant keys: idTech 3 BSP relevant keys:
"light" Light intensity value. Default is '300'. "light" Light intensity value. Default is '300'.
"_color" Normalized RGB color value. Default is '1 1 1'. "_color" Normalized RGB color value. Default is [1,1,1].
"radius" Sets the light cone radius. Default is '64'. "radius" Sets the light cone radius. Default is '64'.
"target" When set, targets an enity instead, becoming a spotlight. "target" When set, targets an enity instead, becoming a spotlight.

6
src/server/cstrike/radio.c
View file

@ -12,7 +12,7 @@ Radio_BroadcastMessage(float fMessage)
WriteByte(MSG_MULTICAST, EV_RADIOMSG); WriteByte(MSG_MULTICAST, EV_RADIOMSG);
WriteByte(MSG_MULTICAST, fMessage); WriteByte(MSG_MULTICAST, fMessage);
msg_entity = self; msg_entity = self;
multicast('0 0 0', MULTICAST_ALL); multicast([0,0,0], MULTICAST_ALL);
} }
/* /*
@ -30,7 +30,7 @@ Radio_TeamMessage(float fMessage, float fTeam)
WriteByte(MSG_MULTICAST, EV_RADIOMSG); WriteByte(MSG_MULTICAST, EV_RADIOMSG);
WriteByte(MSG_MULTICAST, fMessage); WriteByte(MSG_MULTICAST, fMessage);
msg_entity = eEnt; msg_entity = eEnt;
multicast('0 0 0', MULTICAST_ONE); multicast([0,0,0], MULTICAST_ONE);
} }
for (entity eFind = world; (eFind = find(eFind, classname, "player"));) { for (entity eFind = world; (eFind = find(eFind, classname, "player"));) {
@ -100,7 +100,7 @@ CSEv_Radio_f(float fMessage)
WriteByte(MSG_MULTICAST, num_for_edict(eEnt) - 1); WriteByte(MSG_MULTICAST, num_for_edict(eEnt) - 1);
WriteByte(MSG_MULTICAST, fMessage); WriteByte(MSG_MULTICAST, fMessage);
msg_entity = eEnt; msg_entity = eEnt;
multicast('0 0 0', MULTICAST_ONE); multicast([0,0,0], MULTICAST_ONE);
} }
// Don't allow spamming // Don't allow spamming

32
src/server/entry.c
View file

@ -135,24 +135,26 @@ void initents(void)
Sound_Init(); Sound_Init();
// Let's load materials.txt because someone thought this was the best idea if (serverkeyfloat("*bspversion") != 30) {
filestream fileMaterial = fopen("sound/materials.txt", FILE_READ); // Let's load materials.txt because someone thought this was the best idea
hashMaterials = __NULL__; filestream fileMaterial = fopen("sound/materials.txt", FILE_READ);
hashMaterials = hash_createtab(2, HASH_ADD); hashMaterials = __NULL__;
hashMaterials = hash_createtab(2, HASH_ADD);
if (fileMaterial >= 0) { if (fileMaterial >= 0) {
string sTemp; string sTemp;
while ((sTemp = fgets(fileMaterial))) { while ((sTemp = fgets(fileMaterial))) {
// Tokenize and just parse this stuff in // Tokenize and just parse this stuff in
if (tokenize_console(sTemp) == 2) { if (tokenize_console(sTemp) == 2) {
hash_add(hashMaterials, strtolower(argv(1)), str2chr(argv(0), 0)); hash_add(hashMaterials, strtolower(argv(1)), str2chr(argv(0), 0));
}
} }
fclose(fileMaterial);
g_hlbsp_materials = TRUE;
} else {
print("Failed to load sound/materials.txt!\n");
g_hlbsp_materials = FALSE;
} }
fclose(fileMaterial);
g_hlbsp_materials = TRUE;
} else {
error("Failed to load sound/materials.txt!\n");
g_hlbsp_materials = FALSE;
} }
PMove_Init(); PMove_Init();

2
src/shared/cstrike/fx_flashbang.c
View file

@ -54,7 +54,7 @@ FX_Flashbang(vector org)
WriteFloat(MSG_MULTICAST, fade); WriteFloat(MSG_MULTICAST, fade);
WriteByte(MSG_MULTICAST, EVF_FADEDROM); WriteByte(MSG_MULTICAST, EVF_FADEDROM);
msg_entity = e; msg_entity = e;
multicast('0 0 0', MULTICAST_ONE_R); multicast([0,0,0], MULTICAST_ONE_R);
} }
} }
#endif #endif

8
src/shared/pmove.c
View file

@ -42,12 +42,14 @@ PMove_Init(void) {
#ifdef VALVE #ifdef VALVE
localcmd("serverinfo phy_accelerate 8\n"); localcmd("serverinfo phy_accelerate 8\n");
localcmd("serverinfo phy_maxspeed 270\n"); localcmd("serverinfo phy_maxspeed 270\n");
#endif #elif CSTRIKE
#ifdef CSTRIKE
localcmd("serverinfo phy_accelerate 4\n"); localcmd("serverinfo phy_accelerate 4\n");
localcmd("serverinfo phy_maxspeed 250\n"); localcmd("serverinfo phy_maxspeed 250\n");
#else
localcmd("serverinfo phy_accelerate 8\n");
localcmd("serverinfo phy_maxspeed 270\n");
#endif #endif
#endif #endif
} }

2
src/vgui/font.cpp
View file

@ -46,7 +46,7 @@ Font_Load (string strFile, font_s &fntNew)
filestream fileFont = fopen(strFile, FILE_READ); filestream fileFont = fopen(strFile, FILE_READ);
fntNew.iID = 0; fntNew.iID = 0;
fntNew.iScale = 8; fntNew.iScale = 8;
fntNew.vecColor = '1 1 1'; fntNew.vecColor = [1,1,1];
fntNew.flAlpha = 1.0f; fntNew.flAlpha = 1.0f;
fntNew.iFlags = 0; fntNew.iFlags = 0;

18
src/vgui/ui_list.cpp
View file

@ -67,14 +67,14 @@ void CUIList::Draw(void)
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], UI_MAINCOLOR, 1.0f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], UI_MAINCOLOR, 1.0f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], UI_MAINCOLOR, 1.0f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], UI_MAINCOLOR, 1.0f);
#else #else
drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, '0 0 0', 0.25f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, [0,0,0], 0.25f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], [1,1,1], 0.5f);
#endif #endif
vector vecOffset = '8 8'; vector vecOffset = [8,8];
iMaxDisplay = bound(0, m_iItemCount, floor(m_vecSize[1] / 20)); iMaxDisplay = bound(0, m_iItemCount, floor(m_vecSize[1] / 20));
@ -85,9 +85,9 @@ void CUIList::Draw(void)
} }
if (m_iSelected == i) { if (m_iSelected == i) {
drawfill(m_parent.m_vecOrigin + m_vecOrigin + vecOffset + '-7 -3', [m_vecSize[0] - 2, 18], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + vecOffset + [-7,-3], [m_vecSize[0] - 2, 18], [1,1,1], 0.5f);
} else if (i & 1) { } else if (i & 1) {
drawfill(m_parent.m_vecOrigin + m_vecOrigin + vecOffset + '-7 -3', [m_vecSize[0] - 2, 18], '1 1 1', 0.1f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + vecOffset + [-7,-3], [m_vecSize[0] - 2, 18], [1,1,1], 0.1f);
} }
Font_DrawText(m_parent.m_vecOrigin + m_vecOrigin + vecOffset, m_strItems[i], g_fntDefault); Font_DrawText(m_parent.m_vecOrigin + m_vecOrigin + vecOffset, m_strItems[i], g_fntDefault);
@ -102,7 +102,7 @@ void CUIList::Input (float flEVType, float flKey, float flChar, float flDevID)
int iMouseOver = Util_MouseAbove(getmousepos(), m_parent.m_vecOrigin + m_vecOrigin, m_vecSize); int iMouseOver = Util_MouseAbove(getmousepos(), m_parent.m_vecOrigin + m_vecOrigin, m_vecSize);
iMaxDisplay = bound(0, m_iItemCount, floor(m_vecSize[1] / 20)); iMaxDisplay = bound(0, m_iItemCount, floor(m_vecSize[1] / 20));
vector vecOffset = '8 8'; vector vecOffset = [8,8];
if (flEVType == IE_KEYDOWN) { if (flEVType == IE_KEYDOWN) {
if (flKey == K_MOUSE1) { if (flKey == K_MOUSE1) {
for (int i = m_iDrawOffset; i < iMaxDisplay + m_iDrawOffset; i++) { for (int i = m_iDrawOffset; i < iMaxDisplay + m_iDrawOffset; i++) {

16
src/vgui/ui_listbox.cpp
View file

@ -92,13 +92,13 @@ void CUIListBox::Draw(void)
return; return;
} }
drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], [1,1,1], 0.5f);
vector vecOffset = '8 8'; vector vecOffset = [8,8];
iMaxDisplay = bound(0, m_iItemCount, floor(m_vecSize[1] / 20)); iMaxDisplay = bound(0, m_iItemCount, floor(m_vecSize[1] / 20));
for (int i = m_iDrawOffset; i < iMaxDisplay + m_iDrawOffset; i++) { for (int i = m_iDrawOffset; i < iMaxDisplay + m_iDrawOffset; i++) {
@ -107,7 +107,7 @@ void CUIListBox::Draw(void)
} }
if (m_iSelected == i) { if (m_iSelected == i) {
drawfill(m_parent.m_vecOrigin + m_vecOrigin + vecOffset + '-7 -3', [m_vecSize[0] - 2, 18], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + vecOffset + [-7,-3], [m_vecSize[0] - 2, 18], [1,1,1], 0.5f);
} }
Font_DrawText(m_parent.m_vecOrigin + m_vecOrigin + vecOffset, m_strItems[i], g_fntDefault); Font_DrawText(m_parent.m_vecOrigin + m_vecOrigin + vecOffset, m_strItems[i], g_fntDefault);
@ -120,7 +120,7 @@ void CUIListBox::Input (float flEVType, float flKey, float flChar, float flDevID
int iMaxDisplay; int iMaxDisplay;
iMaxDisplay = bound(0, m_iItemCount, floor(m_vecSize[1] / 20)); iMaxDisplay = bound(0, m_iItemCount, floor(m_vecSize[1] / 20));
vector vecOffset = '8 8'; vector vecOffset = [8,8];
if (flEVType == IE_KEYDOWN) { if (flEVType == IE_KEYDOWN) {
if (flKey == K_MOUSE1) { if (flKey == K_MOUSE1) {
for (int i = m_iDrawOffset; i < iMaxDisplay + m_iDrawOffset; i++) { for (int i = m_iDrawOffset; i < iMaxDisplay + m_iDrawOffset; i++) {

18
src/vgui/ui_menubutton.cpp
View file

@ -68,15 +68,15 @@ void CUIMenuButton::Draw(void)
drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, m_vecColor, m_flAlpha); drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, m_vecColor, m_flAlpha);
if (m_iFlags & BUTTON_DOWN) { if (m_iFlags & BUTTON_DOWN) {
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], [1,1,1], 0.5f);
} else { } else {
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], [0,0,0], 0.5f);
} }
#else #else
if (m_iFlags & BUTTON_DOWN) { if (m_iFlags & BUTTON_DOWN) {
@ -90,7 +90,7 @@ void CUIMenuButton::Draw(void)
if (m_strIcon) { if (m_strIcon) {
drawpic(m_parent.m_vecOrigin + m_vecOrigin + [4, 4], m_strIcon, '16 16', '1 1 1', 1.0f); drawpic(m_parent.m_vecOrigin + m_vecOrigin + [4, 4], m_strIcon, [16,16], [1,1,1], 1.0f);
if (m_strTitle) { if (m_strTitle) {
Font_DrawText(m_parent.m_vecOrigin + m_vecOrigin + [26, 8], m_strTitle, g_fntDefault); Font_DrawText(m_parent.m_vecOrigin + m_vecOrigin + [26, 8], m_strTitle, g_fntDefault);
} }

2
src/vgui/ui_pic.cpp
View file

@ -45,7 +45,7 @@ void CUIPic::CUIPic(void)
void CUIPic::Draw(void) void CUIPic::Draw(void)
{ {
if (m_strImage) { if (m_strImage) {
drawpic(m_parent.m_vecOrigin + m_vecOrigin, m_strImage, m_vecSize, '1 1 1', 1.0f, 0); drawpic(m_parent.m_vecOrigin + m_vecOrigin, m_strImage, m_vecSize, [1,1,1], 1.0f, 0);
} }
} }

16
src/vgui/ui_radio.cpp
View file

@ -83,15 +83,15 @@ void CUIRadio::Draw(void)
drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, m_vecColor, m_flAlpha); drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, m_vecColor, m_flAlpha);
if (m_iFlags & RADIO_DOWN) { if (m_iFlags & RADIO_DOWN) {
drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], [1,1,1], 0.5f);
} }
if (m_iFlags & RADIO_ACTIVE) { if (m_iFlags & RADIO_ACTIVE) {
drawpic(m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiosel", '16 16', '1 1 1', 1.0f, 0); drawpic(m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiosel", [16,16], [1,1,1], 1.0f, 0);
} else { } else {
drawpic(m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiounsel", '16 16', '1 1 1', 1.0f, 0); drawpic(m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiounsel", [16,16], [1,1,1], 1.0f, 0);
} }
#else #else
if (m_iFlags & RADIO_DOWN) { if (m_iFlags & RADIO_DOWN) {
@ -101,9 +101,9 @@ void CUIRadio::Draw(void)
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f, 0); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f, 0);
} }
if (m_iFlags & RADIO_ACTIVE) { if (m_iFlags & RADIO_ACTIVE) {
drawpic(m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiosel", '16 16', m_vecColor, 1.0f, 0); drawpic(m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiosel", [16,16], m_vecColor, 1.0f, 0);
} else { } else {
drawpic(m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiounsel", '16 16', m_vecColor, 1.0f, 0); drawpic(m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiounsel", [16,16], m_vecColor, 1.0f, 0);
} }
#endif #endif

20
src/vgui/ui_slider.cpp
View file

@ -36,7 +36,7 @@ class CUISlider:CUIWidget
void CUISlider::CUISlider(void) void CUISlider::CUISlider(void)
{ {
m_vecColor = '76 88 68' / 255; m_vecColor = [76,88,68] / 255;
m_flAlpha = 1.0f; m_flAlpha = 1.0f;
m_vecSize = [96,24]; m_vecSize = [96,24];
m_iFlags = BUTTON_VISIBLE; m_iFlags = BUTTON_VISIBLE;
@ -47,22 +47,22 @@ void CUISlider::Draw(void)
drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, m_vecColor, m_flAlpha); drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, m_vecColor, m_flAlpha);
if (m_iFlags & BUTTON_DOWN) { if (m_iFlags & BUTTON_DOWN) {
drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], [1,1,1], 0.5f);
} else { } else {
drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], [0,0,0], 0.5f);
} }
if (m_strTitle) { if (m_strTitle) {
Font_DrawText(m_parent.m_vecOrigin + m_vecOrigin + [8, 8], m_strTitle, g_fntDefault); Font_DrawText(m_parent.m_vecOrigin + m_vecOrigin + [8, 8], m_strTitle, g_fntDefault);
} }
if (m_strIcon) { if (m_strIcon) {
drawpic(m_parent.m_vecOrigin + m_vecOrigin + '2 2', m_strIcon, '16 16', '1 1 1', 1.0f); drawpic(m_parent.m_vecOrigin + m_vecOrigin + [2,2], m_strIcon, [16,16], [1,1,1], 1.0f);
} }
} }

8
src/vgui/ui_tabview.cpp
View file

@ -65,10 +65,10 @@ void CUITabView::SetTitle (string strName)
void CUITabView::Draw(void) void CUITabView::Draw(void)
{ {
//drawfill(m_parent.m_vecOrigin + m_vecOutlinePos, [m_vecOutlineSize[0], 1], '1 1 1', 0.5f); //drawfill(m_parent.m_vecOrigin + m_vecOutlinePos, [m_vecOutlineSize[0], 1], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOutlinePos + [0, m_vecOutlineSize[1] - 1], [m_vecOutlineSize[0], 1], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOutlinePos + [0, m_vecOutlineSize[1] - 1], [m_vecOutlineSize[0], 1], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOutlinePos + [0, 1], [1, m_vecOutlineSize[1] - 2], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOutlinePos + [0, 1], [1, m_vecOutlineSize[1] - 2], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOutlinePos + [m_vecOutlineSize[0] - 1, 1], [1, m_vecOutlineSize[1] - 2], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOutlinePos + [m_vecOutlineSize[0] - 1, 1], [1, m_vecOutlineSize[1] - 2], [0,0,0], 0.5f);
//Font_DrawText(m_parent.m_vecOrigin + m_vecOrigin + [8, 8], m_strTitle, g_fntDefault); //Font_DrawText(m_parent.m_vecOrigin + m_vecOrigin + [8, 8], m_strTitle, g_fntDefault);
} }

10
src/vgui/ui_textbox.cpp
View file

@ -68,11 +68,11 @@ void CUITextBox::Draw(void)
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f);
#else #else
drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, '0 0 0', 0.25f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, [0,0,0], 0.25f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], [1,1,1], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], '0 0 0', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], [0,0,0], 0.5f);
drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '1 1 1', 0.5f); drawfill(m_parent.m_vecOrigin + m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], [1,1,1], 0.5f);
#endif #endif
m_flTime += frametime * 2; m_flTime += frametime * 2;

22
src/vgui/ui_window.cpp
View file

@ -74,7 +74,7 @@ void CUIWindow::CUIWindow(void)
m_flAlpha = 1.0f; m_flAlpha = 1.0f;
m_vecMinSize = [64,64]; m_vecMinSize = [64,64];
m_vecMaxSize = '640 480'; // TODO: Make this the screen res m_vecMaxSize = [640,480]; // TODO: Make this the screen res
m_strTitle = "Window"; m_strTitle = "Window";
@ -82,9 +82,9 @@ void CUIWindow::CUIWindow(void)
m_btnClose.SetTitle(__NULL__); m_btnClose.SetTitle(__NULL__);
m_btnClose.m_strIcon = "textures/ui/steam/icon_close"; m_btnClose.m_strIcon = "textures/ui/steam/icon_close";
m_btnClose.SetFunc(WindowButtonClose); m_btnClose.SetFunc(WindowButtonClose);
m_btnClose.SetSize('20 20'); m_btnClose.SetSize([20,20]);
Add(m_btnClose); Add(m_btnClose);
SetSize('320 240'); SetSize([320,240]);
} }
void CUIWindow::SetTitle (string strName) void CUIWindow::SetTitle (string strName)
@ -173,24 +173,24 @@ void CUIWindow::Draw(void)
drawfill(m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f); drawfill(m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f);
if (m_iFlags & WINDOW_CANRESIZE) { if (m_iFlags & WINDOW_CANRESIZE) {
drawpic(m_vecOrigin + m_vecSize - '16 16', "textures/ui/steam/icon_resizer", '16 16', m_vecColor, 1.0f, 0); drawpic(m_vecOrigin + m_vecSize - [16,16], "textures/ui/steam/icon_resizer", [16,16], m_vecColor, 1.0f, 0);
} }
#else #else
drawfill(m_vecOrigin, m_vecSize, m_vecColor, m_flAlpha); drawfill(m_vecOrigin, m_vecSize, m_vecColor, m_flAlpha);
drawfill(m_vecOrigin, [m_vecSize[0], 1], '1 1 1', 0.5f); drawfill(m_vecOrigin, [m_vecSize[0], 1], [1,1,1], 0.5f);
drawfill(m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], '0 0 0', 0.5f); drawfill(m_vecOrigin + [0, m_vecSize[1] - 1], [m_vecSize[0], 1], [0,0,0], 0.5f);
drawfill(m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], '1 1 1', 0.5f); drawfill(m_vecOrigin + [0, 1], [1, m_vecSize[1] - 2], [1,1,1], 0.5f);
drawfill(m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '0 0 0', 0.5f); drawfill(m_vecOrigin + [m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], [0,0,0], 0.5f);
if (m_iFlags & WINDOW_CANRESIZE) { if (m_iFlags & WINDOW_CANRESIZE) {
drawpic(m_vecOrigin + m_vecSize - '16 16', "textures/ui/steam/icon_resizer", '16 16', '1 1 1', 1.0f, 0); drawpic(m_vecOrigin + m_vecSize - [16,16], "textures/ui/steam/icon_resizer", [16,16], [1,1,1], 1.0f, 0);
} }
#endif #endif
if (m_strTitle) { if (m_strTitle) {
if (m_strIcon) { if (m_strIcon) {
Font_DrawText(m_vecOrigin + [26, 8], m_strTitle, g_fntDefault); Font_DrawText(m_vecOrigin + [26, 8], m_strTitle, g_fntDefault);
drawpic(m_vecOrigin + [4, 4], m_strIcon, '16 16', '1 1 1', 1.0f, 0); drawpic(m_vecOrigin + [4, 4], m_strIcon, [16,16], [1,1,1], 1.0f, 0);
} else { } else {
Font_DrawText(m_vecOrigin + [8, 8], m_strTitle, g_fntDefault); Font_DrawText(m_vecOrigin + [8, 8], m_strTitle, g_fntDefault);
} }
@ -210,7 +210,7 @@ void CUIWindow::Input (float flEVType, float flKey, float flChar, float flDevID)
{ {
if (flEVType == IE_KEYDOWN) { if (flEVType == IE_KEYDOWN) {
if (flKey == K_MOUSE1) { if (flKey == K_MOUSE1) {
if (m_iFlags & WINDOW_CANRESIZE && Util_MouseAbove(getmousepos(), m_vecOrigin + (m_vecSize - '16 16'), '16 16')) { if (m_iFlags & WINDOW_CANRESIZE && Util_MouseAbove(getmousepos(), m_vecOrigin + (m_vecSize - [16,16]), [16,16])) {
m_iFlags |= WINDOW_RESIZING; m_iFlags |= WINDOW_RESIZING;
} else if (Util_MouseAbove(getmousepos(), m_vecOrigin, [m_vecSize[0] - 32, 16])) { } else if (Util_MouseAbove(getmousepos(), m_vecOrigin, [m_vecSize[0] - 32, 16])) {
m_iFlags |= WINDOW_DRAGGING; m_iFlags |= WINDOW_DRAGGING;