fix a merge resolution failure in a previous cherry-pick: Sys_SysOpenFD -> FS_SysOpenFD

[xonotic/darkplaces.git] / prvm_offsets.h

diff --git a/prvm_offsets.h b/prvm_offsets.h
index bc69ad2499674426eb14bc0000ef24fe269a8db7..39f5d363be1ba7cfea5db6f121a40de04e2979d6 100644 (file)
--- a/prvm_offsets.h
+++ b/prvm_offsets.h
@@ -29,6 +29,8 @@ PRVM_DECLARE_clientfieldfloat(lerpfrac)
 PRVM_DECLARE_clientfieldfloat(lerpfrac3)
 PRVM_DECLARE_clientfieldfloat(lerpfrac4)
 PRVM_DECLARE_clientfieldfloat(mass)
+PRVM_DECLARE_clientfieldvector(massofs)
+PRVM_DECLARE_clientfieldfloat(friction)
 PRVM_DECLARE_clientfieldfloat(modelindex)
 PRVM_DECLARE_clientfieldfloat(movetype)
 PRVM_DECLARE_clientfieldfloat(nextthink)
@@ -68,6 +70,9 @@ PRVM_DECLARE_clientfieldvector(oldorigin)
 PRVM_DECLARE_clientfieldvector(origin)
 PRVM_DECLARE_clientfieldvector(size)
 PRVM_DECLARE_clientfieldvector(velocity)
+PRVM_DECLARE_clientfieldvector(modellight_ambient)
+PRVM_DECLARE_clientfieldvector(modellight_diffuse)
+PRVM_DECLARE_clientfieldvector(modellight_dir)
 PRVM_DECLARE_clientfunction(CSQC_ConsoleCommand)
 PRVM_DECLARE_clientfunction(CSQC_Ent_Remove)
 PRVM_DECLARE_clientfunction(CSQC_Ent_Spawn)
@@ -83,7 +88,6 @@ PRVM_DECLARE_clientfunction(CSQC_Parse_TempEntity)
 PRVM_DECLARE_clientfunction(CSQC_Shutdown)
 PRVM_DECLARE_clientfunction(CSQC_UpdateView)
 PRVM_DECLARE_clientfunction(GameCommand)
-PRVM_DECLARE_clientfunction(Gecko_Query)
 PRVM_DECLARE_clientfunction(URI_Get_Callback)
 PRVM_DECLARE_clientglobaledict(other)
 PRVM_DECLARE_clientglobaledict(self)
@@ -97,6 +101,9 @@ PRVM_DECLARE_clientglobalfloat(dmg_take)
 PRVM_DECLARE_clientglobalfloat(drawfont)
 PRVM_DECLARE_clientglobalfloat(frametime)
 PRVM_DECLARE_clientglobalfloat(gettaginfo_parent)
+PRVM_DECLARE_clientglobalvector(getlight_ambient)
+PRVM_DECLARE_clientglobalvector(getlight_diffuse)
+PRVM_DECLARE_clientglobalvector(getlight_dir)
 PRVM_DECLARE_clientglobalfloat(input_buttons)
 PRVM_DECLARE_clientglobalfloat(input_timelength)
 PRVM_DECLARE_clientglobalfloat(intermission)
@@ -299,6 +306,8 @@ PRVM_DECLARE_field(lerpfrac4)
 PRVM_DECLARE_field(light_lev)
 PRVM_DECLARE_field(ltime)
 PRVM_DECLARE_field(mass)
+PRVM_DECLARE_field(massofs)
+PRVM_DECLARE_field(friction)
 PRVM_DECLARE_field(max_health)
 PRVM_DECLARE_field(maxs)
 PRVM_DECLARE_field(message)
@@ -353,6 +362,7 @@ PRVM_DECLARE_field(team)
 PRVM_DECLARE_field(teleport_time)
 PRVM_DECLARE_field(think)
 PRVM_DECLARE_field(touch)
+PRVM_DECLARE_field(traileffectnum)
 PRVM_DECLARE_field(use)
 PRVM_DECLARE_field(userwavefunc_param0)
 PRVM_DECLARE_field(userwavefunc_param1)
@@ -360,6 +370,9 @@ PRVM_DECLARE_field(userwavefunc_param2)
 PRVM_DECLARE_field(userwavefunc_param3)
 PRVM_DECLARE_field(v_angle)
 PRVM_DECLARE_field(velocity)
+PRVM_DECLARE_field(modellight_ambient)
+PRVM_DECLARE_field(modellight_diffuse)
+PRVM_DECLARE_field(modellight_dir)
 PRVM_DECLARE_field(view_ofs)
 PRVM_DECLARE_field(viewmodelforclient)
 PRVM_DECLARE_field(viewzoom)
@@ -388,7 +401,6 @@ PRVM_DECLARE_function(ClientDisconnect)
 PRVM_DECLARE_function(ClientKill)
 PRVM_DECLARE_function(EndFrame)
 PRVM_DECLARE_function(GameCommand)
-PRVM_DECLARE_function(Gecko_Query)
 PRVM_DECLARE_function(PlayerPostThink)
 PRVM_DECLARE_function(PlayerPreThink)
 PRVM_DECLARE_function(PutClientInServer)
@@ -431,6 +443,9 @@ PRVM_DECLARE_global(gettaginfo_offset)
 PRVM_DECLARE_global(gettaginfo_parent)
 PRVM_DECLARE_global(gettaginfo_right)
 PRVM_DECLARE_global(gettaginfo_up)
+PRVM_DECLARE_global(getlight_ambient)
+PRVM_DECLARE_global(getlight_diffuse)
+PRVM_DECLARE_global(getlight_dir)
 PRVM_DECLARE_global(input_angles)
 PRVM_DECLARE_global(input_buttons)
 PRVM_DECLARE_global(input_movevalues)
@@ -544,7 +559,6 @@ PRVM_DECLARE_global(world)
 PRVM_DECLARE_global(worldstatus)
 PRVM_DECLARE_menufieldstring(classname)
 PRVM_DECLARE_menufunction(GameCommand)
-PRVM_DECLARE_menufunction(Gecko_Query)
 PRVM_DECLARE_menufunction(URI_Get_Callback)
 PRVM_DECLARE_menufunction(m_draw)
 PRVM_DECLARE_menufunction(m_init)
@@ -648,6 +662,8 @@ PRVM_DECLARE_serverfieldfloat(lerpfrac4)
 PRVM_DECLARE_serverfieldfloat(light_lev)
 PRVM_DECLARE_serverfieldfloat(ltime)
 PRVM_DECLARE_serverfieldfloat(mass)
+PRVM_DECLARE_serverfieldvector(massofs)
+PRVM_DECLARE_serverfieldfloat(friction)
 PRVM_DECLARE_serverfieldfloat(max_health)
 PRVM_DECLARE_serverfieldfloat(modelflags)
 PRVM_DECLARE_serverfieldfloat(modelindex)
@@ -672,6 +688,7 @@ PRVM_DECLARE_serverfieldfloat(tag_index)
 PRVM_DECLARE_serverfieldfloat(takedamage)
 PRVM_DECLARE_serverfieldfloat(team)
 PRVM_DECLARE_serverfieldfloat(teleport_time)
+PRVM_DECLARE_serverfieldfloat(traileffectnum)
 PRVM_DECLARE_serverfieldfloat(viewzoom)
 PRVM_DECLARE_serverfieldfloat(waterlevel)
 PRVM_DECLARE_serverfieldfloat(watertype)