diff --git a/source/games/duke/src/zz_premap.cpp b/source/games/duke/src/zz_premap.cpp index 385815ff5..e00c84a8a 100644 --- a/source/games/duke/src/zz_premap.cpp +++ b/source/games/duke/src/zz_premap.cpp @@ -805,189 +805,6 @@ void P_ResetPlayer(int playerNum) pPlayer->movement_lock = 0; } -#if 0 -void P_ResetStatus(int playerNum) -{ - DukePlayer_t *const pPlayer = g_player[playerNum].ps; - - gFullMap = 0; - pPlayer->dead_flag = 0; - pPlayer->wackedbyactor = -1; - pPlayer->falling_counter = 0; - pPlayer->quick_kick = 0; - pPlayer->subweapon = 0; - pPlayer->last_full_weapon = 0; - pPlayer->ftq = 0; - pPlayer->fta = 0; - pPlayer->tipincs = 0; - pPlayer->buttonpalette = 0; - pPlayer->actorsqu = -1; - pPlayer->invdisptime = 0; - pPlayer->refresh_inventory = 0; - pPlayer->last_pissed_time = 0; - pPlayer->holster_weapon = 0; - pPlayer->pycount = 0; - pPlayer->pyoff = 0; - pPlayer->opyoff = 0; - pPlayer->loogcnt = 0; - pPlayer->weapon_sway = 0; - pPlayer->extra_extra8 = 0; - pPlayer->show_empty_weapon = 0; - pPlayer->dummyplayersprite = -1; - pPlayer->crack_time = 0; - pPlayer->hbomb_hold_delay = 0; - pPlayer->transporter_hold = 0; - //pPlayer->clipdist = 164; - pPlayer->wantweaponfire = -1; - pPlayer->hurt_delay = 0; - if (RRRA) - pPlayer->hurt_delay2 = 0; - pPlayer->footprintcount = 0; - pPlayer->footprintpal = 0; - pPlayer->footprintshade = 0; - pPlayer->jumping_toggle = 0; - pPlayer->q16horizoff = 0; - pPlayer->bobcounter = 0; - pPlayer->on_ground = 0; - pPlayer->player_par = 0; - pPlayer->return_to_center = 9; - pPlayer->airleft = 15 * GAMETICSPERSEC; - pPlayer->rapid_fire_hold = 0; - pPlayer->toggle_key_flag = 0; - pPlayer->access_spritenum = -1; - pPlayer->got_access = ((g_netServer || ud.multimode > 1) && (g_gametypeFlags[ud.coop] & GAMETYPE_ACCESSATSTART)) ? 7 : 0; - pPlayer->random_club_frame = 0; - pus = 1; - pPlayer->on_warping_sector = 0; - pPlayer->spritebridge = 0; - //pPlayer->sbs = 0; - pPlayer->palette = BASEPAL; - - if (pPlayer->inv_amount[GET_STEROIDS] < 400) - { - pPlayer->inv_amount[GET_STEROIDS] = 0; - pPlayer->inven_icon = ICON_NONE; - } - - pPlayer->heat_on = 0; - pPlayer->jetpack_on = 0; - pPlayer->holoduke_on = -1; - pPlayer->look_ang = 512 - ((ud.level_number & 1) << 10); - pPlayer->rotscrnang = 0; - pPlayer->orotscrnang = 1; // JBF 20031220 - pPlayer->newowner = -1; - pPlayer->jumping_counter = 0; - pPlayer->hard_landing = 0; - pPlayer->vel.x = 0; - pPlayer->vel.y = 0; - pPlayer->vel.z = 0; - pPlayer->fric.x = 0; - pPlayer->fric.y = 0; - pPlayer->somethingonplayer = -1; - pPlayer->one_eighty_count = 0; - pPlayer->cheat_phase = 0; - pPlayer->on_crane = -1; - - pPlayer->kickback_pic = (pPlayer->curr_weapon == PISTOL_WEAPON) ? (RR ? 22 : 5) : 0; - - pPlayer->weapon_pos = WEAPON_POS_START; - pPlayer->walking_snd_toggle = 0; - pPlayer->weapon_ang = 0; - pPlayer->knuckle_incs = 1; - pPlayer->fist_incs = 0; - pPlayer->knee_incs = 0; - //pPlayer->reloading = 0; - pPlayer->movement_lock = 0; - pPlayer->frag_ps = playerNum; - - P_UpdateScreenPal(pPlayer); - - if (RR) - { - pPlayer->stairs = 0; - pPlayer->noise_x = 0; - pPlayer->noise_y = 0; - pPlayer->make_noise = 0; - pPlayer->noise_radius = 0; - if ((g_netServer || ud.multimode > 1) && (g_gametypeFlags[ud.coop] & GAMETYPE_ACCESSATSTART)) - { - pPlayer->keys[0] = 1; - pPlayer->keys[1] = 1; - pPlayer->keys[2] = 1; - pPlayer->keys[3] = 1; - pPlayer->keys[4] = 1; - } - else - { - pPlayer->keys[0] = 0; - pPlayer->keys[1] = 0; - pPlayer->keys[2] = 0; - pPlayer->keys[3] = 0; - pPlayer->keys[4] = 0; - } - - wupass = 0; - pPlayer->drunkang = pPlayer->eatang = 1647; - pPlayer->drink_amt = pPlayer->eat = 0; - pPlayer->drink_timer = pPlayer->eat_timer = 4096; - pPlayer->shotgun_state[0] = pPlayer->shotgun_state[1] = 0; - pPlayer->detonate_time = 0; - pPlayer->detonate_count = 0; - pPlayer->recoil = 0; - pPlayer->yehaa_timer = 0; - if (RRRA) - { - chickenphase = 0; - if (pPlayer->OnMotorcycle) - { - pPlayer->OnMotorcycle = 0; - pPlayer->gotweapon.Clear(MOTORCYCLE_WEAPON); - pPlayer->curr_weapon = SLINGBLADE_WEAPON; - } - pPlayer->lotag800kill = 0; - pPlayer->moto_do_bump = 0; - pPlayer->MotoOnGround = 1; - pPlayer->moto_underwater = 0; - pPlayer->MotoSpeed = 0; - pPlayer->TiltStatus = 0; - pPlayer->moto_drink = 0; - pPlayer->VBumpTarget = 0; - pPlayer->VBumpNow = 0; - pPlayer->moto_bump_fast = 0; - pPlayer->TurbCount = 0; - pPlayer->moto_on_mud = 0; - pPlayer->moto_on_oil = 0; - if (pPlayer->OnBoat) - { - pPlayer->OnBoat = 0; - pPlayer->gotweapon.Clear(BOAT_WEAPON); - pPlayer->curr_weapon = SLINGBLADE_WEAPON; - } - pPlayer->NotOnWater = 0; - pPlayer->sea_sick = 0; - pPlayer->nocheat = 0; - pPlayer->DrugMode = 0; - pPlayer->drug_stat[0] = 0; - pPlayer->drug_stat[1] = 0; - pPlayer->drug_stat[2] = 0; - pPlayer->drug_aspect = 0; - } - resetlanepics(); - if (!g_netServer && numplayers < 2) - { - g_ufoSpawn = min(RRRA ? 3 : (ud.m_player_skill*4+1), 32); - g_ufoCnt = 0; - g_hulkSpawn = ud.m_player_skill + 1; - } - else - { - g_ufoSpawn = 32; - g_ufoCnt = 0; - g_hulkSpawn = 2; - } - } -} -#endif void P_ResetWeapons(int playerNum) { DukePlayer_t *const pPlayer = g_player[playerNum].ps;