diff --git a/src/gs-entbase/shared/func_tankmortar.qc b/src/gs-entbase/shared/func_tankmortar.qc index ba3dd6ba..8a0b21a8 100644 --- a/src/gs-entbase/shared/func_tankmortar.qc +++ b/src/gs-entbase/shared/func_tankmortar.qc @@ -111,17 +111,17 @@ func_tankmortar::UpdateView(void) void func_tankmortar::PredictPreFrame(void) { - SAVE_STATE(angles); - SAVE_STATE(origin); - SAVE_STATE(velocity); + SAVE_STATE(angles) + SAVE_STATE(origin) + SAVE_STATE(velocity) } void func_tankmortar::PredictPostFrame(void) { - ROLL_BACK(angles); - ROLL_BACK(origin); - ROLL_BACK(velocity); + ROLL_BACK(angles) + ROLL_BACK(origin) + ROLL_BACK(velocity) } void @@ -193,9 +193,9 @@ func_tankmortar::EvaluateEntity(void) SetSendFlags(VEHFL_CHANGED_VELOCITY); } - SAVE_STATE(origin); - SAVE_STATE(angles); - SAVE_STATE(velocity); + SAVE_STATE(origin) + SAVE_STATE(angles) + SAVE_STATE(velocity) } float diff --git a/src/gs-entbase/shared/func_vehicle.qc b/src/gs-entbase/shared/func_vehicle.qc index ddd82cdf..3b4d82f3 100644 --- a/src/gs-entbase/shared/func_vehicle.qc +++ b/src/gs-entbase/shared/func_vehicle.qc @@ -163,17 +163,17 @@ func_vehicle_wheel::func_vehicle_wheel(void) void func_vehicle_wheel::PredictPreFrame(void) { - SAVE_STATE(angles); - SAVE_STATE(origin); - SAVE_STATE(velocity); + SAVE_STATE(angles) + SAVE_STATE(origin) + SAVE_STATE(velocity) } void func_vehicle_wheel::PredictPostFrame(void) { - ROLL_BACK(angles); - ROLL_BACK(origin); - ROLL_BACK(velocity); + ROLL_BACK(angles) + ROLL_BACK(origin) + ROLL_BACK(velocity) } #endif @@ -409,13 +409,13 @@ func_vehicle::UpdateView(void) void func_vehicle::PredictPreFrame(void) { - SAVE_STATE(modelindex); - SAVE_STATE(origin); - SAVE_STATE(angles); - SAVE_STATE(velocity); - SAVE_STATE(m_flTurn); - SAVE_STATE(flags); - SAVE_STATE(driver_entnum); + SAVE_STATE(modelindex) + SAVE_STATE(origin) + SAVE_STATE(angles) + SAVE_STATE(velocity) + SAVE_STATE(m_flTurn) + SAVE_STATE(flags) + SAVE_STATE(driver_entnum) m_wlFL.PredictPreFrame(); m_wlFR.PredictPreFrame(); @@ -426,13 +426,13 @@ func_vehicle::PredictPreFrame(void) void func_vehicle::PredictPostFrame(void) { - ROLL_BACK(modelindex); - ROLL_BACK(angles); - ROLL_BACK(origin); - ROLL_BACK(velocity); - ROLL_BACK(m_flTurn); - ROLL_BACK(flags); - ROLL_BACK(driver_entnum); + ROLL_BACK(modelindex) + ROLL_BACK(angles) + ROLL_BACK(origin) + ROLL_BACK(velocity) + ROLL_BACK(m_flTurn) + ROLL_BACK(flags) + ROLL_BACK(driver_entnum) m_wlFL.PredictPostFrame(); m_wlFR.PredictPostFrame(); diff --git a/src/gs-entbase/shared/prop_vehicle_driveable.qc b/src/gs-entbase/shared/prop_vehicle_driveable.qc index 71bbe373..5a8ec654 100644 --- a/src/gs-entbase/shared/prop_vehicle_driveable.qc +++ b/src/gs-entbase/shared/prop_vehicle_driveable.qc @@ -231,17 +231,17 @@ prop_vehicle_driveable::UpdateView(void) void prop_vehicle_driveable_wheel::PredictPreFrame(void) { - SAVE_STATE(angles); - SAVE_STATE(origin); - SAVE_STATE(velocity); + SAVE_STATE(angles) + SAVE_STATE(origin) + SAVE_STATE(velocity) } void prop_vehicle_driveable_wheel::PredictPostFrame(void) { - ROLL_BACK(angles); - ROLL_BACK(origin); - ROLL_BACK(velocity); + ROLL_BACK(angles) + ROLL_BACK(origin) + ROLL_BACK(velocity) } #endif @@ -518,13 +518,13 @@ prop_vehicle_driveable_wheel::prop_vehicle_driveable_wheel(void) void prop_vehicle_driveable::PredictPreFrame(void) { - SAVE_STATE(modelindex); - SAVE_STATE(origin); - SAVE_STATE(angles); - SAVE_STATE(velocity); - SAVE_STATE(m_flTurn); - SAVE_STATE(flags); - SAVE_STATE(driver_entnum); + SAVE_STATE(modelindex) + SAVE_STATE(origin) + SAVE_STATE(angles) + SAVE_STATE(velocity) + SAVE_STATE(m_flTurn) + SAVE_STATE(flags) + SAVE_STATE(driver_entnum) m_wlFL.PredictPreFrame(); m_wlFR.PredictPreFrame(); @@ -535,13 +535,13 @@ prop_vehicle_driveable::PredictPreFrame(void) void prop_vehicle_driveable::PredictPostFrame(void) { - ROLL_BACK(modelindex); - ROLL_BACK(angles); - ROLL_BACK(origin); - ROLL_BACK(velocity); - ROLL_BACK(m_flTurn); - ROLL_BACK(flags); - ROLL_BACK(driver_entnum); + ROLL_BACK(modelindex) + ROLL_BACK(angles) + ROLL_BACK(origin) + ROLL_BACK(velocity) + ROLL_BACK(m_flTurn) + ROLL_BACK(flags) + ROLL_BACK(driver_entnum) m_wlFL.PredictPostFrame(); m_wlFR.PredictPostFrame(); diff --git a/src/menu-fn/entry.qc b/src/menu-fn/entry.qc index 4ccd0a2d..6c73a863 100644 --- a/src/menu-fn/entry.qc +++ b/src/menu-fn/entry.qc @@ -15,6 +15,7 @@ */ var bool g_initialized = false; +var bool g_input_received = false; #define FN_UPDATE_PKGLIST "http://www.frag-net.com/dl/%s_packages" @@ -203,6 +204,11 @@ void m_draw(vector screensize) { static float oldtime; + + if (!g_input_received) { + return; + } + frametime = time - oldtime; /* don't attempt to draw unless we're done loading everything */ @@ -316,6 +322,8 @@ m_drawloading(vector screensize, float opaque) float Menu_InputEvent(float evtype, float scanx, float chary, float devid) { + g_input_received = true; + switch (evtype) { case IE_KEYDOWN: if (chary == K_ESCAPE) { diff --git a/src/menu-fn/m_intro.qc b/src/menu-fn/m_intro.qc index 847f672a..a7ebff37 100644 --- a/src/menu-fn/m_intro.qc +++ b/src/menu-fn/m_intro.qc @@ -23,7 +23,7 @@ enum }; #define INTRO_TIME 8 -float g_intro_progress; +var float g_intro_progress = 0.0f; int g_intro_stage; void @@ -37,6 +37,7 @@ void m_intro_draw(void) { float alpha; + if (clientstate() == 2) { g_intro_progress = INTRO_TIME; g_intro_stage = INTRO_DONE; diff --git a/src/shared/NSClientPlayer.qc b/src/shared/NSClientPlayer.qc index 4c4a3f04..82819764 100644 --- a/src/shared/NSClientPlayer.qc +++ b/src/shared/NSClientPlayer.qc @@ -467,35 +467,35 @@ at the top of player::PredictPreFrame void NSClientPlayer::PredictPreFrame(void) { - SAVE_STATE(modelindex); - SAVE_STATE(origin); - SAVE_STATE(v_angle); - SAVE_STATE(angles); - SAVE_STATE(colormap); - SAVE_STATE(velocity); - SAVE_STATE(flags); - SAVE_STATE(gflags); - SAVE_STATE(pmove_flags); - SAVE_STATE(activeweapon); - SAVE_STATE(weaponframe); - SAVE_STATE(g_items); - SAVE_STATE(health); - SAVE_STATE(armor); - SAVE_STATE(mins); - SAVE_STATE(maxs); - SAVE_STATE(view_ofs); - SAVE_STATE(movetype); - SAVE_STATE(solid); - SAVE_STATE(punchangle); - SAVE_STATE(viewzoom); - SAVE_STATE(teleport_time); - SAVE_STATE(weapontime); - SAVE_STATE(w_attack_next); - SAVE_STATE(w_idle_next); - SAVE_STATE(vehicle_entnum); - SAVE_STATE(spec_ent); - SAVE_STATE(spec_mode); - SAVE_STATE(spec_flags); + SAVE_STATE(modelindex) + SAVE_STATE(origin) + SAVE_STATE(v_angle) + SAVE_STATE(angles) + SAVE_STATE(colormap) + SAVE_STATE(velocity) + SAVE_STATE(flags) + SAVE_STATE(gflags) + SAVE_STATE(pmove_flags) + SAVE_STATE(activeweapon) + SAVE_STATE(weaponframe) + SAVE_STATE(g_items) + SAVE_STATE(health) + SAVE_STATE(armor) + SAVE_STATE(mins) + SAVE_STATE(maxs) + SAVE_STATE(view_ofs) + SAVE_STATE(movetype) + SAVE_STATE(solid) + SAVE_STATE(punchangle) + SAVE_STATE(viewzoom) + SAVE_STATE(teleport_time) + SAVE_STATE(weapontime) + SAVE_STATE(w_attack_next) + SAVE_STATE(w_idle_next) + SAVE_STATE(vehicle_entnum) + SAVE_STATE(spec_ent) + SAVE_STATE(spec_mode) + SAVE_STATE(spec_flags) } /* @@ -511,35 +511,35 @@ at the top of player::PredictPostFrame void NSClientPlayer::PredictPostFrame(void) { - ROLL_BACK(modelindex); - ROLL_BACK(origin); - ROLL_BACK(v_angle); - ROLL_BACK(angles); - ROLL_BACK(colormap); - ROLL_BACK(velocity); - ROLL_BACK(flags); - ROLL_BACK(gflags); - ROLL_BACK(pmove_flags); - ROLL_BACK(activeweapon); - ROLL_BACK(weaponframe); - ROLL_BACK(g_items); - ROLL_BACK(health); - ROLL_BACK(armor); - ROLL_BACK(mins); - ROLL_BACK(maxs); - ROLL_BACK(view_ofs); - ROLL_BACK(movetype); - ROLL_BACK(solid); - ROLL_BACK(punchangle); - ROLL_BACK(viewzoom); - ROLL_BACK(teleport_time); - ROLL_BACK(weapontime); - ROLL_BACK(w_attack_next); - ROLL_BACK(w_idle_next); - ROLL_BACK(vehicle_entnum); - ROLL_BACK(spec_ent); - ROLL_BACK(spec_mode); - ROLL_BACK(spec_flags); + ROLL_BACK(modelindex) + ROLL_BACK(origin) + ROLL_BACK(v_angle) + ROLL_BACK(angles) + ROLL_BACK(colormap) + ROLL_BACK(velocity) + ROLL_BACK(flags) + ROLL_BACK(gflags) + ROLL_BACK(pmove_flags) + ROLL_BACK(activeweapon) + ROLL_BACK(weaponframe) + ROLL_BACK(g_items) + ROLL_BACK(health) + ROLL_BACK(armor) + ROLL_BACK(mins) + ROLL_BACK(maxs) + ROLL_BACK(view_ofs) + ROLL_BACK(movetype) + ROLL_BACK(solid) + ROLL_BACK(punchangle) + ROLL_BACK(viewzoom) + ROLL_BACK(teleport_time) + ROLL_BACK(weapontime) + ROLL_BACK(w_attack_next) + ROLL_BACK(w_idle_next) + ROLL_BACK(vehicle_entnum) + ROLL_BACK(spec_ent) + ROLL_BACK(spec_mode) + ROLL_BACK(spec_flags) } #else void diff --git a/src/shared/NSClientSpectator.qc b/src/shared/NSClientSpectator.qc index 5526d381..20b08f59 100644 --- a/src/shared/NSClientSpectator.qc +++ b/src/shared/NSClientSpectator.qc @@ -363,11 +363,11 @@ NSClientSpectator::PreFrame(void) { #ifdef CLIENT /* base player attributes/fields we're going to roll back */ - SAVE_STATE(origin); - SAVE_STATE(velocity); - SAVE_STATE(spec_ent); - SAVE_STATE(spec_mode); - SAVE_STATE(spec_flags); + SAVE_STATE(origin) + SAVE_STATE(velocity) + SAVE_STATE(spec_ent) + SAVE_STATE(spec_mode) + SAVE_STATE(spec_flags) /* run physics code for all the input frames which we've not heard back * from yet. This continues on in Player_ReceiveEntity! */ @@ -449,11 +449,11 @@ NSClientSpectator::EvaluateEntity(void) if (spec_flags != spec_flags_net) SetSendFlags(SPECFL_FLAGS); - SAVE_STATE(origin); - SAVE_STATE(velocity); - SAVE_STATE(spec_ent); - SAVE_STATE(spec_mode); - SAVE_STATE(spec_flags); + SAVE_STATE(origin) + SAVE_STATE(velocity) + SAVE_STATE(spec_ent) + SAVE_STATE(spec_mode) + SAVE_STATE(spec_flags) } #endif @@ -461,11 +461,11 @@ void NSClientSpectator::PostFrame(void) { #ifdef CLIENT - ROLL_BACK(origin); - ROLL_BACK(velocity); - ROLL_BACK(spec_ent); - ROLL_BACK(spec_mode); - ROLL_BACK(spec_flags); + ROLL_BACK(origin) + ROLL_BACK(velocity) + ROLL_BACK(spec_ent) + ROLL_BACK(spec_mode) + ROLL_BACK(spec_flags) #endif } diff --git a/src/shared/NSVehicle.qc b/src/shared/NSVehicle.qc index b3b9999d..1bcf396b 100644 --- a/src/shared/NSVehicle.qc +++ b/src/shared/NSVehicle.qc @@ -149,27 +149,27 @@ NSVehicle::UpdateView(void) void NSVehicle::PredictPreFrame(void) { - SAVE_STATE(angles); - SAVE_STATE(origin); - SAVE_STATE(velocity); - SAVE_STATE(size); - SAVE_STATE(modelindex); - SAVE_STATE(solid); - SAVE_STATE(movetype); - SAVE_STATE(m_eDriver); + SAVE_STATE(angles) + SAVE_STATE(origin) + SAVE_STATE(velocity) + SAVE_STATE(size) + SAVE_STATE(modelindex) + SAVE_STATE(solid) + SAVE_STATE(movetype) + SAVE_STATE(m_eDriver) } void NSVehicle::PredictPostFrame(void) { - ROLL_BACK(angles); - ROLL_BACK(origin); - ROLL_BACK(velocity); - ROLL_BACK(size); - ROLL_BACK(modelindex); - ROLL_BACK(solid); - ROLL_BACK(movetype); - ROLL_BACK(m_eDriver); + ROLL_BACK(angles) + ROLL_BACK(origin) + ROLL_BACK(velocity) + ROLL_BACK(size) + ROLL_BACK(modelindex) + ROLL_BACK(solid) + ROLL_BACK(movetype) + ROLL_BACK(m_eDriver) } void @@ -326,14 +326,14 @@ NSVehicle::EvaluateEntity(void) if (ATTR_CHANGED(m_eDriver)) SetSendFlags(VEHFL_CHANGED_DRIVER); - SAVE_STATE(origin); - SAVE_STATE(angles); - SAVE_STATE(velocity); - SAVE_STATE(modelindex); - SAVE_STATE(solid); - SAVE_STATE(movetype); - SAVE_STATE(size); - SAVE_STATE(m_eDriver); + SAVE_STATE(origin) + SAVE_STATE(angles) + SAVE_STATE(velocity) + SAVE_STATE(modelindex) + SAVE_STATE(solid) + SAVE_STATE(movetype) + SAVE_STATE(size) + SAVE_STATE(m_eDriver) } float diff --git a/src/shared/decalgroups.qc b/src/shared/decalgroups.qc index b57cc8a7..50a397d3 100644 --- a/src/shared/decalgroups.qc +++ b/src/shared/decalgroups.qc @@ -145,7 +145,6 @@ void DecalGroups_PlaceGroupID(int index, vector org) { /* on the client we only need to go ahead and place the final decal */ - string material; int r; /* get all materials of the group */ diff --git a/src/shared/materials.h b/src/shared/materials.h index d62353e8..82adb481 100644 --- a/src/shared/materials.h +++ b/src/shared/materials.h @@ -15,7 +15,6 @@ */ hashtable g_hashMaterials; -hashtable hashMaterials; void Materials_Init(void); diff --git a/src/shared/materials.qc b/src/shared/materials.qc index b9d3423b..21702bc7 100644 --- a/src/shared/materials.qc +++ b/src/shared/materials.qc @@ -88,7 +88,7 @@ Materials_Mapper_Init(void) string sTemp; int c = 0; filestream fileLUT; - string spname; + string spname = ""; bool inbrace = false; fileLUT = fopen("scripts/surfaceproperties.txt", FILE_READ);