X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fsv_vehicles.qh;h=165ae07e6d92a7bb4eb4e0a3ec8ca9494237dcfa;hp=27df7fac69f26aa190e31da16d396b41d684fea4;hb=507f4d978401667d7b218e4c9b1ca0777d05c6ae;hpb=153e558088db2813f7f7dd5367244b5470f4d425 diff --git a/qcsrc/common/vehicles/sv_vehicles.qh b/qcsrc/common/vehicles/sv_vehicles.qh index 27df7fac69..165ae07e6d 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qh +++ b/qcsrc/common/vehicles/sv_vehicles.qh @@ -2,23 +2,22 @@ #define VEHICLES_DEF_H #ifdef SVQC -#include "../server/tturrets/include/turrets_early.qh" -#include "sv_vehicles.qh" - -// #define VEHICLES_USE_ODE +#include +#include "vehicle.qh" // vehicle cvars -float autocvar_g_vehicles; -float autocvar_g_vehicles_enter; -float autocvar_g_vehicles_enter_radius; -float autocvar_g_vehicles_steal; -float autocvar_g_vehicles_steal_show_waypoint; -float autocvar_g_vehicles_crush_dmg; -float autocvar_g_vehicles_crush_force; -float autocvar_g_vehicles_delayspawn; -float autocvar_g_vehicles_delayspawn_jitter; +bool autocvar_g_vehicles = true; +AUTOCVAR(g_vehicles_enter, bool, false, "require pressing use key to enter a vehicle"); +float autocvar_g_vehicles_enter_radius = 250; +AUTOCVAR(g_vehicles_steal, bool, true, "allow stealing enemy vehicles in teamplay modes"); +AUTOCVAR(g_vehicles_steal_show_waypoint, bool, true, "show a waypoint above the thief"); +float autocvar_g_vehicles_crush_dmg = 70; +float autocvar_g_vehicles_crush_force = 50; +bool autocvar_g_vehicles_delayspawn = true; +float autocvar_g_vehicles_delayspawn_jitter = 10; float autocvar_g_vehicles_allow_bots; -float autocvar_g_vehicles_teams; + +AUTOCVAR(g_vehicles_teams, bool, true, "allow team specific vehicles"); float autocvar_g_vehicles_teleportable; float autocvar_g_vehicles_vortex_damagerate = 0.5; float autocvar_g_vehicles_machinegun_damagerate = 0.5; @@ -27,6 +26,8 @@ float autocvar_g_vehicles_vaporizer_damagerate = 0.001; float autocvar_g_vehicles_tag_damagerate = 5; float autocvar_g_vehicles_weapon_damagerate = 1; +.float vehicle_last_trace; + // flags: .int vehicle_flags; @@ -43,14 +44,14 @@ float autocvar_g_vehicles_weapon_damagerate = 1; .entity gunner1; .entity gunner2; -.float vehicle_health; /// If self is player this is 0..100 indicating precentage of health left on vehicle. If self is vehile, this is the real health value. -.float vehicle_energy; /// If self is player this is 0..100 indicating precentage of energy left on vehicle. If self is vehile, this is the real energy value. -.float vehicle_shield; /// If self is player this is 0..100 indicating precentage of shield left on vehicle. If self is vehile, this is the real shield value. +.float vehicle_health = _STAT(VEHICLESTAT_HEALTH); /// If self is player this is 0..100 indicating precentage of health left on vehicle. If self is vehile, this is the real health value. +.float vehicle_energy = _STAT(VEHICLESTAT_ENERGY); /// If self is player this is 0..100 indicating precentage of energy left on vehicle. If self is vehile, this is the real energy value. +.float vehicle_shield = _STAT(VEHICLESTAT_SHIELD); /// If self is player this is 0..100 indicating precentage of shield left on vehicle. If self is vehile, this is the real shield value. -.float vehicle_ammo1; /// If self is player this field's use depends on the individual vehile. If self is vehile, this is the real ammo1 value. -.float vehicle_reload1; /// If self is player this field's use depends on the individual vehile. If self is vehile, this is the real reload1 value. -.float vehicle_ammo2; /// If self is player this field's use depends on the individual vehile. If self is vehile, this is the real ammo2 value. -.float vehicle_reload2; /// If self is player this field's use depends on the individual vehile. If self is vehile, this is the real reload2 value. +.float vehicle_ammo1 = _STAT(VEHICLESTAT_AMMO1); /// If self is player this is 0..100 indicating percentage of primary ammo left UNLESS value is already stored in vehicle_energy. If self is vehile, this is the real ammo1 value. +.float vehicle_reload1 = _STAT(VEHICLESTAT_RELOAD1); /// If self is player this is 0..100 indicating percentage of primary reload status. If self is vehile, this is the real reload1 value. +.float vehicle_ammo2 = _STAT(VEHICLESTAT_AMMO2); /// If self is player this is 0..100 indicating percentage of secondary ammo left. If self is vehile, this is the real ammo2 value. +.float vehicle_reload2 = _STAT(VEHICLESTAT_RELOAD2); /// If self is player this is 0..100 indicating percentage of secondary reload status. If self is vehile, this is the real reload2 value. .float sound_nexttime; const float VOL_VEHICLEENGINE = 1; @@ -62,7 +63,7 @@ const float SVC_UPDATEENTITY = 128; // Net.Protocol 0x80 const float VHSF_NORMAL = 0; const float VHSF_FACTORY = 2; -.int hud; +.int hud = _STAT(HUD); .float dmg_time; .int volly_counter; @@ -81,9 +82,9 @@ const float DAMAGE_TARGETDRONE = 10; // vehicle functions .void(int _spawnflag) vehicle_spawn; /// Vehicles custom fucntion to be efecuted when vehicle (re)spawns .bool(int _imp) vehicles_impulse; -.int vehicle_weapon2mode; +.int vehicle_weapon2mode = _STAT(VEHICLESTAT_W2MODE); .void(int exit_flags) vehicle_exit; -.bool() vehicle_enter; +.bool(entity this, entity player) vehicle_enter; const int VHEF_NORMAL = 0; /// User pressed exit key const int VHEF_EJECT = 1; /// User pressed exit key 3 times fast (not implemented) or vehile is dying const int VHEF_RELEASE = 2; /// Release ownership, client possibly allready dissconnected / went spec / changed team / used "kill" (not implemented) @@ -95,14 +96,15 @@ vector force_fromtag_origin; float vehicles_exit_running; // macros -#define VEHICLE_UPDATE_PLAYER(ply,fld,vhname) \ - ply.vehicle_##fld = (self.vehicle_##fld / autocvar_g_vehicle_##vhname##_##fld) * 100 +#define VEHICLE_UPDATE_PLAYER(ply,vehi,fld,vhname) \ + ply.vehicle_##fld = (vehi.vehicle_##fld / autocvar_g_vehicle_##vhname##_##fld) * 100 .float vehicle_enter_delay; // prevent players jumping to and from vehicles instantly void vehicles_exit(float eject); -float vehicle_initialize(float vehicle_id, float nodrop); +bool vehicle_initialize(entity this, Vehicle info, float nodrop); +bool vehicle_impulse(entity this, int imp); +bool vehicles_crushable(entity e); #endif - #endif