diff --git a/resource/SA/CheatMenu/json/teleport.json b/resource/SA/CheatMenu/json/teleport.json index 4f5836a..4264887 100644 --- a/resource/SA/CheatMenu/json/teleport.json +++ b/resource/SA/CheatMenu/json/teleport.json @@ -419,55 +419,7 @@ "Oyster 8": "0, 1249, -2687, -1", "Oyster 9": "0, 725, -1849, -5" }, - "Radar": { - "Cj sprite, Ganton, LS": "0, 2495.214355, -1687.029785, 12.514400", - "No sprite, Blueberry Acres, LS": "0, 0.000000, 0.000000, 0.000000", - "Propertyg sprite, Jefferson, LS": "0, 2103.345947, -1288.338867, 23.816799", - "Propertyg sprite, Mulholland, LS": "0, 1331.185547, -630.496216, 108.634903", - "Propertyg sprite, Santa Maria Beach, LS": "0, 316.069611, -1772.568848, 4.189300", - "Propertyg sprite, Verdant Bluffs, LS": "0, 1687.980469, -2100.643066, 13.334300", - "Propertyg sprite, Verona Beach, LS": "0, 892.666199, -1639.713867, 14.456700", - "Propertyg sprite, Willowfield, LS": "0, 2483.023682, -2001.074097, 13.054000", - "Propertyr sprite, Angel Pine, LS": "0, -2079.096924, -2309.898682, 30.117201", - "Propertyr sprite, Blueberry, LS": "0, 206.800003, -112.099998, 4.396500", - "Propertyr sprite, Calton Heights, LS": "0, -2106.639160, 900.553711, 76.203201", - "Propertyr sprite, Chinatown, LS": "0, -2213.864258, 723.558716, 48.914001", - "Propertyr sprite, Creek, LS": "0, 2819.125488, 2149.371826, 10.320300", - "Propertyr sprite, Dillimore, LS": "0, 793.562317, -514.411621, 16.397301", - "Propertyr sprite, Doherty, LS": "0, -2027.829956, -44.045399, 38.769199", - "Propertyr sprite, Downtown, LS": "0, -1969.270020, 282.470001, 34.599998", - "Propertyr sprite, El Quebrados, LS": "0, -1534.170288, 2650.300049, 55.343700", - "Propertyr sprite, Fort Carson, LS": "0, -366.184906, 1166.030518, 19.242201", - "Propertyr sprite, Garcia, LS": "0, -2243.620117, 133.199997, 34.799999", - "Propertyr sprite, Hashbury, LS": "0, -2456.925537, -131.329193, 25.537600", - "Propertyr sprite, Old Venturas Strip, LS": "0, 2370.477295, 2165.474365, 10.326900", - "Propertyr sprite, Palomino Creek, LS": "0, 2236.927979, 162.805695, 26.846201", - "Propertyr sprite, Paradiso, LS": "0, -2695.745117, 818.471802, 49.484402", - "Propertyr sprite, Pirates in Men's Pants, LS": "0, 1969.932495, 1623.242920, 12.361900", - "Propertyr sprite, Prickle Pine, LS": "0, 1283.843872, 2528.702881, 10.320300", - "Propertyr sprite, Queens, LS": "0, -2419.676758, 334.162109, 34.679600", - "Propertyr sprite, Redsands West, LS": "0, 1402.317383, 1901.978271, 10.844900", - "Propertyr sprite, Rockshore West, LS": "0, 2441.002197, 695.108887, 10.664600", - "Propertyr sprite, The Camel's Toe, LS": "0, 2234.908691, 1285.698120, 10.320300", - "Propertyr sprite, The Clown's Pocket, LS": "0, 2220.625732, 1837.347534, 10.320300", - "Propertyr sprite, Tierra Robada, LS": "0, -1045.775146, 1552.976318, 32.798000", - "Propertyr sprite, Verdant Meadows, LS": "0, 426.497192, 2530.688965, 16.100000", - "Propertyr sprite, Whetstone, LS": "0, -1439.014038, -1540.590088, 101.257896", - "Propertyr sprite, Whitewood Estates, LS": "0, 922.364685, 2011.898438, 10.766000", - "Race sprite, Blackfield, LS": "0, 1099.551270, 1601.497437, 11.554600", - "Race sprite, East Beach, LS": "0, 2695.624268, -1704.688477, 10.843700", - "Race sprite, Foster Valley, LS": "0, -2120.041748, -444.283813, 34.531200", - "Sprayshop sprite, Dillimore, LS": "0, 720.015991, -454.625000, 15.328000", - "Sprayshop sprite, Downtown, LS": "0, -1908.900024, 292.299988, 40.000000", - "Sprayshop sprite, El Quebrados, LS": "0, -1420.546997, 2583.945068, 58.030998", - "Sprayshop sprite, Fort Carson, LS": "0, -103.599998, 1112.400024, 18.700001", - "Sprayshop sprite, Idlewood, LS": "0, 2067.399902, -1831.199951, 13.500000", - "Sprayshop sprite, Juniper Hollow, LS": "0, -2425.459961, 1020.830017, 49.389999", - "Sprayshop sprite, Redsands East, LS": "0, 1966.531982, 2162.649902, 10.995000", - "Sprayshop sprite, Santa Maria Beach, LS": "0, 488.000000, -1734.000000, 34.400002", - "Sprayshop sprite, Temple, LS": "0, 1021.799988, -1018.700012, 30.900000", - "Waypoint sprite, Los Flores, LS": "0, 2623.328613, -1228.941040, 0.000000" - }, + "Radar": null, "Snapshots": { "Snapshot 1": "0, -2511.28, -672.99, 195.75", "Snapshot 10": "0, -2773.04, 783.45, 67.66", diff --git a/resource/SA/CheatMenu/json/weapon.json b/resource/SA/CheatMenu/json/weapon.json index 6c8cf8d..b8b8368 100644 --- a/resource/SA/CheatMenu/json/weapon.json +++ b/resource/SA/CheatMenu/json/weapon.json @@ -1,4 +1,5 @@ { + "-2": "Cell phone", "-1": "Jetpack", "0": "Unarmed", "1": "Brass knuckles", diff --git a/resource/SA/CheatMenu/ped.txd b/resource/SA/CheatMenu/ped.txd new file mode 100644 index 0000000..e6b36f0 Binary files /dev/null and b/resource/SA/CheatMenu/ped.txd differ diff --git a/resource/SA/CheatMenu/weapon.txd b/resource/SA/CheatMenu/weapon.txd new file mode 100644 index 0000000..75ea178 Binary files /dev/null and b/resource/SA/CheatMenu/weapon.txd differ diff --git a/src/weapon.cpp b/src/weapon.cpp index cae7195..0d3bfcd 100644 --- a/src/weapon.cpp +++ b/src/weapon.cpp @@ -147,6 +147,15 @@ void Weapon::GiveWeaponToPlayer(std::string& weapon_type) { Command(hplayer); } + if (weapon_type == "-2") // CellPhone + { + CStreaming::RequestModel(330, PRIORITY_REQUEST); + CStreaming::LoadAllRequestedModels(false); + player->ClearWeaponTarget(); + player->SetCurrentWeapon(WEAPON_UNARMED); + player->AddWeaponModel(330); + Command(330); + } else { int iweapon_type = std::stoi(weapon_type); @@ -231,7 +240,6 @@ void Weapon::Draw() ClearPlayerWeapon(pPlayer->m_aWeapons[pPlayer->m_nActiveWeaponSlot].m_nType); #endif } - ImGui::Spacing(); if (ImGui::BeginTabBar("Ped", ImGuiTabBarFlags_NoTooltip + ImGuiTabBarFlags_FittingPolicyScroll))