diff --git a/src/console.c b/src/console.c index 2757b22e7..6f9579bef 100644 --- a/src/console.c +++ b/src/console.c @@ -1485,7 +1485,7 @@ static void CON_DrawConsole(void) // draw console background if (cons_backpic.value || con_forcepic) { - patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_PATCH_LOWPRIORITY); + patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_PATCH); // Jimita: CON_DrawBackpic just called V_DrawScaledPatch V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, con_backpic, NULL); diff --git a/src/d_main.c b/src/d_main.c index 039fc5c01..32528d285 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -166,38 +166,6 @@ UINT8 ctrldown = 0; // 0x1 left, 0x2 right UINT8 altdown = 0; // 0x1 left, 0x2 right boolean capslock = 0; // gee i wonder what this does. -static UINT8 curcolor[MAXSPLITSCREENPLAYERS] = {}; - -static void D_DeviceLEDTick(void) -{ - UINT8 i; - static UINT8 newcolor = UINT8_MAX; - - if (numcontrollers == 0) - { - return; - } - - for (i = 0; i <= splitscreen; i++) - { - if (!cv_usejoystick[i].value || !cv_gamepadled[i].value) - continue; - - newcolor = G_GetSkinColorForGamepad(i); - - if (curcolor[i] == newcolor) // dont update if same colour - continue; - - G_SetPlayerGamepadIndicatorColor(i, newcolor); - curcolor[i] = newcolor; - } -} - -void D_ResetDeviceLED(void) -{ - memset(curcolor, 0, sizeof(curcolor)); -} - // // D_ProcessEvents // Send all the events of the given timestamp down the responder chain @@ -704,7 +672,7 @@ void D_SRB2Loop(void) COM_ImmedExecute("cls;version"); if (rendermode == render_soft) - V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, W_CachePatchNum(W_GetNumForName("KARTKREW"), PU_PATCH_LOWPRIORITY), NULL); + V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, W_CachePatchNum(W_GetNumForName("KARTKREW"), PU_PATCH), NULL); I_FinishUpdate(); // page flip or blit buffer precision = I_GetPrecisePrecision(); @@ -795,7 +763,7 @@ void D_SRB2Loop(void) if (!dedicated) { - D_DeviceLEDTick(); + G_DeviceLEDTick(); } } @@ -973,7 +941,7 @@ void D_ClearState(void) M_ClearMenus(true); // map palettes affect this - D_ResetDeviceLED(); + G_ResetDeviceLED(); } // diff --git a/src/d_main.h b/src/d_main.h index d9954a5b0..8f1475706 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -80,8 +80,6 @@ void D_ProcessEvents(void); const char *D_Home(void); -void D_ResetDeviceLED(void); - // // BASE LEVEL // diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 6d90e4d4e..ed94e66f0 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -997,6 +997,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_usejoystick[i]); CV_RegisterVar(&cv_joyscale[i]); CV_RegisterVar(&cv_rumble[i]); + CV_RegisterVar(&cv_rumblestrength[i]); CV_RegisterVar(&cv_gamepadled[i]); } diff --git a/src/f_finale.c b/src/f_finale.c index 450910021..d1d32285f 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -166,8 +166,8 @@ static void F_SkyScroll(INT32 scrollspeed) patch_t *pat, *pat2; INT32 anim2 = 0; - pat = W_CachePatchName("TITLEBG1", PU_PATCH_LOWPRIORITY); - pat2 = W_CachePatchName("TITLEBG2", PU_PATCH_LOWPRIORITY); + pat = W_CachePatchName("TITLEBG1", PU_PATCH); + pat2 = W_CachePatchName("TITLEBG2", PU_PATCH); w = (vid.scaledwidth << FRACBITS); @@ -257,26 +257,21 @@ void F_StartIntro(void) // void F_IntroDrawer(void) { - boolean highres = false; INT32 cx = 8, cy = 128; patch_t *background = NULL; INT32 bgxoffs = 0; + V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120); + // DRAW A FULL PIC INSTEAD OF FLAT! if (intro_scenenum == 0) { - background = W_CachePatchName("KARTKREW", PU_PATCH_LOWPRIORITY); - highres = true; - } + background = W_CachePatchName("KARTKREW", PU_PATCH); - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120); - - if (background) - { - if (highres) + if (background) + { V_DrawSmallScaledPatch(bgxoffs, 0, 0, background); - else - V_DrawScaledPatch(bgxoffs, 0, 0, background); + } } W_UnlockCachedPatch(background); @@ -652,7 +647,7 @@ void F_CreditDrawer(void) sc = FRACUNIT; // quick hack so I don't have to add another field to credits_pics } - V_DrawFixedPatch(credits_pics[i].x<>FRACBITS > -20) - V_DrawCreditString((160 - (V_CreditStringWidth(&credits[i][1])>>1))<>FRACBITS > -10) - V_DrawStringAtFixed(32<>FRACBITS > -20) + V_DrawCreditString((160 - (V_CreditStringWidth(&credits[i][1])>>1))<>FRACBITS > -10) + V_DrawStringAtFixed(32<>FRACBITS) * vid.dup) > vid.height) break; } @@ -979,10 +975,10 @@ void F_StartTitleScreen(void) demoDelayLeft = demoDelayTime; demoIdleLeft = demoIdleTime; - ttbanner = W_CachePatchName("TTKBANNR", PU_PATCH_LOWPRIORITY); - ttkart = W_CachePatchName("TTKART", PU_PATCH_LOWPRIORITY); - ttcheckers = W_CachePatchName("TTCHECK", PU_PATCH_LOWPRIORITY); - ttkflash = W_CachePatchName("TTKFLASH", PU_PATCH_LOWPRIORITY); + ttbanner = W_CachePatchName("TTKBANNR", PU_PATCH); + ttkart = W_CachePatchName("TTKART", PU_PATCH); + ttcheckers = W_CachePatchName("TTCHECK", PU_PATCH); + ttkflash = W_CachePatchName("TTKFLASH", PU_PATCH); } // (no longer) De-Demo'd Title Screen diff --git a/src/g_input.c b/src/g_input.c index 4a303009d..08f3e2298 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -58,12 +58,21 @@ static void led_off_handle3(void); static void led_off_handle4(void); consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = { - {"rumble", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle, 0, NULL, NULL, 0, 0, NULL}, + {"rumble", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle, 0, NULL, NULL, 0, 0, NULL}, {"rumble2", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle2, 0, NULL, NULL, 0, 0, NULL}, {"rumble3", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle3, 0, NULL, NULL, 0, 0, NULL}, {"rumble4", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle4, 0, NULL, NULL, 0, 0, NULL} }; +static CV_PossibleValue_t rumblestrength_cons_t[] = {{FRACUNIT/4, "MIN"}, {FRACUNIT*4, "MAX"}, {0, NULL}}; + +consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS] = { + {"rumblestrength", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"rumblestrength2", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"rumblestrength3", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"rumblestrength4", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL} +}; + static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}}; consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = { {"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL}, @@ -947,6 +956,39 @@ static void G_ResetPlayerGamepadIndicatorColor(INT32 playernum) } } +static UINT8 curcolor[MAXSPLITSCREENPLAYERS] = {}; + +void G_DeviceLEDTick(void) +{ + UINT8 i; + static UINT8 newcolor = UINT8_MAX; + + if (numcontrollers == 0) + { + return; + } + + for (i = 0; i <= splitscreen; i++) + { + if (!cv_usejoystick[i].value || !cv_gamepadled[i].value) + continue; + + newcolor = G_GetSkinColorForGamepad(i); + + if (curcolor[i] == newcolor) // dont update if same colour + continue; + + G_SetPlayerGamepadIndicatorColor(i, newcolor); + curcolor[i] = newcolor; + } +} + +// ensures next call to G_DeviceLEDTick will refresh the gamepad led +void G_ResetDeviceLED(void) +{ + memset(curcolor, 0, sizeof(curcolor)); +} + static void G_ResetPlayerDeviceRumble(INT32 playernum) { I_GamepadRumble(playernum, 0, 0, 0); @@ -971,9 +1013,135 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre return; } + // doesent need to be super precise + // but ensure this is within range (0-65535) + // placed here so it applies to lua aswell + low_strength = (UINT16)min(FixedMul(low_strength, cv_rumblestrength[playernum].value), UINT16_MAX); + high_strength = (UINT16)min(FixedMul(high_strength, cv_rumblestrength[playernum].value), UINT16_MAX); + I_GamepadRumble(playernum, low_strength, high_strength, duration); } +// rumble strengths +enum +{ + RUMBLE_VERYSTRONG = FRACUNIT / 4, // 16384 + RUMBLE_STRONG = FRACUNIT / 8, // 8192 + RUMBLE_MODERATE = FRACUNIT / 64, // 1024 + RUMBLE_WEAK = FRACUNIT / 128, // 512 + RUMBLE_VERYWEAK = FRACUNIT / 256, // 256 +}; + +// Controller rumble! +// this keeps track of a bunch of things +// and makes your controller rumble accordingly +void G_DeviceRumbleTick(void) +{ + UINT8 i; + + if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL) + { + return; + } + + for (i = 0; i <= splitscreen; i++) + { + if (!cv_usejoystick[i].value || !cv_rumble[i].value) + { + continue; + } + + if (camera[i].freecam) + { + continue; + } + + // SDL rumble strength goes from a range or 0-65535 respectively + // the higher, the stronger it is + UINT16 low = 0, high = 0; + // for how long the action should rumble, in ms + UINT16 lenght = 57; // 57ms is a short pulse, matches super well with this updating once per tic + + const player_t *player = P_GetLocalPlayerForNum(i); + + // allow lua to do some crap for spectators + if (player->spectator || !player->mo) + { + continue; + } + + // reset the rumble if you exit or are ded lel + if (player->exiting || + player->playerstate == PST_DEAD || + player->kartstuff[k_respawn] > 1) + { + G_PlayerDeviceRumble(i, low, high, 0); + continue; + } + + if (player->kartstuff[k_spinouttimer]) + { + //low = high = FRACUNIT / 6; + low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time + } + else if (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))) + { + low = high = RUMBLE_STRONG; + } + else if ((player->kartstuff[k_offroad]) + && player->speed != 0 + && P_IsObjectOnGround(player->mo)) + { + // weaken this depending on if you got hyu or invinc + if (player->kartstuff[k_hyudorotimer]) + { + high = RUMBLE_WEAK; + } + else if (player->kartstuff[k_invincibilitytimer]) + { + high = RUMBLE_MODERATE; + } + else + { + low = high = RUMBLE_MODERATE; + } + } + else if ((player->kartstuff[k_bananadrag] > TICRATE) + && player->speed != 0 + && P_IsObjectOnGround(player->mo)) + { + if (leveltime & 1) // this is actually funny lel + high = RUMBLE_MODERATE; + } + + if (player->kartstuff[k_brakedrift]) + { + high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX); + } + + // pulse when gettin new driftlevel + // let this come last + if (player->kartstuff[k_driftcharge] + && player->driftlevel) + { + high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX); + + if (player->driftlevel == 2) + lenght = 114; + else if (player->driftlevel == 3) + lenght = 174; + } + + // hack alert! i just dont want this thing constantly resetting the rumble lol + if (low == 0 && high == 0) + { + continue; + } + + G_PlayerDeviceRumble(i, low, high, lenght); + } +} + // // Detach any keys associated to the given game control // - pass the pointer to the gamecontrol table for the player being edited diff --git a/src/g_input.h b/src/g_input.h index dbc7c6c95..7e3258360 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -113,6 +113,7 @@ extern consvar_t cv_mousesens, cv_mouseysens; extern consvar_t cv_controlperkey; extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS]; extern INT32 mousex, mousey; @@ -133,8 +134,12 @@ extern INT32 gamecontrol[MAXSPLITSCREENPLAYERS][num_gamecontrols][2]; UINT8 G_GetSkinColorForGamepad(INT32 playernum); void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color); +void G_DeviceLEDTick(void); +void G_ResetDeviceLED(void); + void G_ResetAllDeviceRumbles(void); void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration); +void G_DeviceRumbleTick(void); // peace to my little coder fingers! // check a gamecontrol being active or not diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index f099e8a99..3eb680413 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -1251,6 +1251,8 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf) case 256: if (gl_linedef->blendmode) blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf); + else + blendmode = PF_Translucent; break; default: if (gl_linedef->blendmode) @@ -1262,6 +1264,8 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf) } else if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT) blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf); + else + blendmode = PF_Masked; break; } } diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 8819d63b4..c3012a586 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -96,8 +96,7 @@ static boolean headsupactive = false; boolean hu_showscores = false; // draw rankings static char hu_tick; static tic_t hu_emoteanim = 0; -#define MAXEMOTESUGGESTIONS 8 -static emote_t *emote_suggestions[MAXEMOTESUGGESTIONS] = {0}; +emote_autocomplete_t emote_autocomplete = {0}; static huddrawlist_h luahuddrawlist_scores; @@ -1334,6 +1333,7 @@ boolean HU_Responder(event_t *ev) chat_on = true; w_chat_buf[0] = 0; M_TextInputInit(&w_chat, w_chat_buf, sizeof w_chat_buf); + memset(&emote_autocomplete, 0, sizeof(emote_autocomplete)); teamtalk = false; chat_scrollmedown = true; typelines = 1; @@ -1346,6 +1346,7 @@ boolean HU_Responder(event_t *ev) chat_on = true; w_chat_buf[0] = 0; M_TextInputInit(&w_chat, w_chat_buf, sizeof w_chat_buf); + memset(&emote_autocomplete, 0, sizeof(emote_autocomplete)); teamtalk = G_GametypeHasTeams(); // Don't teamtalk if we don't have teams. chat_scrollmedown = true; typelines = 1; @@ -1371,7 +1372,7 @@ boolean HU_Responder(event_t *ev) && ev->data1 != gamecontrol[0][gc_talkkey][1])) return false; - M_TextInputHandleEmotes(&w_chat, c, emote_suggestions, MAXEMOTESUGGESTIONS); + M_TextInputHandleEmotes(&w_chat, c, &emote_autocomplete); if (c == KEY_ENTER) { @@ -1901,17 +1902,37 @@ static void HU_DrawChat(void) } } - if (emote_suggestions[0]) + if (emote_autocomplete.emotestart != -1 && (emote_autocomplete.complete[0] || (w_chat.cursor - emote_autocomplete.emotestart) > 0)) { + emote_t *suggest; + int skip = 0; + + const char *complete; + int complete_len; + + if (emote_autocomplete.complete[0]) + { + complete = emote_autocomplete.complete; + complete_len = strlen(complete); + } + else + { + complete = &w_chat_buf[emote_autocomplete.emotestart]; + complete_len = w_chat.cursor - emote_autocomplete.emotestart; + } + // A bit of copy-paste from /pm code :p INT32 suggesty = chaty - charheight - 1; size_t longest_suggestion_length = 0; - for (i = 0; i < MAXEMOTESUGGESTIONS && emote_suggestions[i]; ++i) + while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL) { - longest_suggestion_length = max(longest_suggestion_length, strlen(emote_suggestions[i]->name)); + longest_suggestion_length = max(longest_suggestion_length, strlen(suggest->name)); + ++skip; } + skip = 0; + #ifdef NETSPLITSCREEN if (splitscreen) { @@ -1923,11 +1944,19 @@ static void HU_DrawChat(void) #endif suggesty -= (cv_kartspeedometer.value ? 16 : 0); - for (i = 0; i < MAXEMOTESUGGESTIONS && emote_suggestions[i]; ++i) + while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL) { - V_DrawFillConsoleMap(chatx + boxw + 2, suggesty - (7*i), (longest_suggestion_length+2)*4 + EMOTEWIDTH, 6, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); - V_DrawSmallString(chatx + boxw + 4 + EMOTEWIDTH, suggesty - (7*i), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", emote_suggestions[i]->name)); - HU_DrawEmote(chatx + boxw + 2, suggesty - i*7, emote_suggestions[i], V_SNAPTOBOTTOM|V_SNAPTOLEFT); + V_DrawFillConsoleMap(chatx + boxw + 2, suggesty - (7*skip), (longest_suggestion_length+2)*4 + EMOTEWIDTH, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT); + + // Highlight currently suggested emote + int hlflag = 0; + if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0]) + hlflag = V_YELLOWMAP; + + V_DrawSmallString(chatx + boxw + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name)); + HU_DrawEmote(chatx + boxw + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT); + + ++skip; } } diff --git a/src/m_menudefs.c b/src/m_menudefs.c index fc1d7679d..4a539f139 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -735,26 +735,27 @@ static menuitem_t OP_AllControlsMenu[] = #define OP_JOYMENU(pnum) \ {IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \ - {IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \ - {IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis[pnum] , 20}, \ - {IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis[pnum] , 25}, \ - {IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis[pnum] , 30}, \ - {IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis[pnum] , 35}, \ - {IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis[pnum] , 40}, \ - {IT_STRING | IT_CVAR, NULL, "Look Backward" , &cv_lookbackaxis[pnum] , 45}, \ - {IT_STRING | IT_CVAR, NULL, "Custom Button 1" , &cv_custom1axis[pnum] , 50}, \ - {IT_STRING | IT_CVAR, NULL, "Custom Button 2" , &cv_custom2axis[pnum] , 55}, \ - {IT_STRING | IT_CVAR, NULL, "Custom Button 3" , &cv_custom3axis[pnum] , 60}, \ + {IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \ + {IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis[pnum] , 20}, \ + {IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis[pnum] , 25}, \ + {IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis[pnum] , 30}, \ + {IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis[pnum] , 35}, \ + {IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis[pnum] , 40}, \ + {IT_STRING | IT_CVAR, NULL, "Look Backward" , &cv_lookbackaxis[pnum] , 45}, \ + {IT_STRING | IT_CVAR, NULL, "Custom Button 1" , &cv_custom1axis[pnum] , 50}, \ + {IT_STRING | IT_CVAR, NULL, "Custom Button 2" , &cv_custom2axis[pnum] , 55}, \ + {IT_STRING | IT_CVAR, NULL, "Custom Button 3" , &cv_custom3axis[pnum] , 60}, \ {IT_HEADER, NULL, "Camera Controls", NULL, 67}, \ - {IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis[pnum] , 75}, \ - {IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_camturnaxis[pnum] , 80}, \ - {IT_STRING | IT_CVAR, NULL, "Strafe Left/Right" , &cv_camstrafeaxis[pnum] , 85}, \ + {IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis[pnum] , 75}, \ + {IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_camturnaxis[pnum] , 80}, \ + {IT_STRING | IT_CVAR, NULL, "Strafe Left/Right" , &cv_camstrafeaxis[pnum] , 85}, \ {IT_HEADER, NULL, "Deadzones", NULL, 92}, \ - {IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \ - {IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \ + {IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \ + {IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \ {IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \ - {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 120}, \ - {IT_STRING | IT_CVAR, NULL, "Set LED to Player color", &cv_gamepadled[pnum] , 125}, + {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 120}, \ + {IT_STRING | IT_CVAR, NULL, "Controller Rumble Strength" , &cv_rumblestrength[pnum] , 125}, \ + {IT_STRING | IT_CVAR, NULL, "Set LED to Player color" , &cv_gamepadled[pnum] , 130}, static menuitem_t OP_Joystick1Menu[] = { diff --git a/src/m_textinput.c b/src/m_textinput.c index 32ff15282..2e88948a6 100644 --- a/src/m_textinput.c +++ b/src/m_textinput.c @@ -411,21 +411,13 @@ boolean M_TextInputHandle(textinput_t *input, INT32 key) return M_TextInputHandleBase(input, key, false); } -boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_t *suggestions[], int maxsuggestions) +static int M_TextInputEmoteStart(textinput_t *input) { - boolean ret = M_TextInputHandleBase(input, key, true); + if (input->cursor == 0) + return -1; - // After this handled key we ended up inside an emote, lets fix that - if (M_TextInputCheckEmote(input)) - M_TextInputToWordEnd(input, !shiftdown); + int emotestart = -1; - // Always clear the first entry - suggestions[0] = NULL; - - // For autocomplete - int emotestart = 0; - - // Try find suggestions for emote names for (int i = input->cursor-1; i >= 0 && input->cursor-i <= MAXEMOTENAME; --i) { // Space can't be part of emote name @@ -436,71 +428,90 @@ boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_t *suggesti if (input->buffer[i] == ':') { emotestart = i+1; - // ...But only if we typed at least something - if ((int)input->cursor-(i-1) < 3) - break; - - for (int skip = 0; skip < maxsuggestions; ++skip) - { - suggestions[skip] = M_FindEmote(input->buffer+i+1, input->cursor-i-1, skip); - - // No more suggestions - if (!suggestions[skip]) - break; - } - - // In any case, we found what we wanted, can exit the loop now break; } } - const boolean single_suggestion = suggestions[0] && (maxsuggestions == 1 || !suggestions[1]); + return emotestart; +} - // If we suggest emotes, try autocomplete - if ((key == '\t' && suggestions[0]) || (key == KEY_ENTER && single_suggestion)) +static void M_TextInputCompleteEmote(textinput_t *input, emote_autocomplete_t *autocomplete) +{ + if (input->cursor == 0) + return; + + // If we're in "autocomplete" state, delete ':' for latest autocompleted emote + if (autocomplete->complete[0]) { - int pos = 0; - const int insertpos = (input->cursor-emotestart); // Only insert after that index (including it) - boolean autocomplete = true; - - while (autocomplete) + if (input->buffer[input->cursor-1] == ':') { - // Check if current character matches for all suggestions - char c = suggestions[0]->name[pos]; - - // End of string reached - if (!c) - break; - - for (int i = 1; i < maxsuggestions && suggestions[i]; ++i) - { - if (suggestions[i]->name[pos] != c) - { - autocomplete = false; - break; - } - } - - ++pos; - - if (autocomplete && pos > insertpos) - M_TextInputAddChar(input, c); + M_TextInputDelChar(input); } - // This was the only suggestion, finish autocomplete with a ':' and clear suggestions - if (single_suggestion) + autocomplete->skip++; + } + else + { + // Try to find emote to autocomplete + + int emotestart = autocomplete->emotestart; + + // No emote - no autocomplete + if (emotestart == -1 || (size_t)emotestart == input->cursor) + return; + + strlcpy(autocomplete->complete, &input->buffer[emotestart], input->cursor-emotestart+1); + } + + emote_t *completed = M_FindEmote(autocomplete->complete, strlen(autocomplete->complete), autocomplete->skip); + + // We hit end of list of suggested emotes + if (completed == NULL) + { + autocomplete->skip = 0; + completed = M_FindEmote(autocomplete->complete, strlen(autocomplete->complete), autocomplete->skip); + + // NULL again, list was empty to begin with + if (completed == NULL) { - memcpy(&input->buffer[emotestart], suggestions[0]->name, strlen(suggestions[0]->name)); - M_TextInputAddChar(input, ':'); - suggestions[0] = NULL; - } - else if (pos > emotestart) - { - // Otherwise make sure beginning of emote matches - memcpy(&input->buffer[emotestart], suggestions[0]->name, pos-emotestart); + // Clear autocompletion state + autocomplete->complete[0] = 0; + return; } } + // Erase previously typed emote. Not really efficent but too lazy to count chars and do M_TextInputDel() + while (input->buffer[input->cursor-1] != ':') + { + M_TextInputDelChar(input); + } + + M_TextInputAddString(input, completed->name); + M_TextInputAddChar(input, ':'); +} + +boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_autocomplete_t *autocomplete) +{ + boolean ret = M_TextInputHandleBase(input, key, true); + + // After this handled key we ended up inside an emote, lets fix that + if (M_TextInputCheckEmote(input)) + M_TextInputToWordEnd(input, !shiftdown); + + // Always update it + autocomplete->emotestart = M_TextInputEmoteStart(input); + + if (key == '\t' || (autocomplete->complete[0] == 0 && key == KEY_ENTER)) + { + M_TextInputCompleteEmote(input, autocomplete); + } + else + { + // Reset state just in case + autocomplete->complete[0] = 0; + autocomplete->skip = 0; + } + return ret; } diff --git a/src/m_textinput.h b/src/m_textinput.h index 512a47b7c..ce296ffde 100644 --- a/src/m_textinput.h +++ b/src/m_textinput.h @@ -26,6 +26,12 @@ typedef struct textinput_s { unsigned skull; } textinput_t; +typedef struct emote_autocomplete_s { + char complete[MAXEMOTENAME+1]; + int skip; + int emotestart; +} emote_autocomplete_t; + void M_TextInputInit(textinput_t *input, char *buffer, size_t buffer_size); void M_TextInputClear(textinput_t *input); @@ -36,7 +42,7 @@ boolean M_TextInputHandle(textinput_t *input, INT32 key); // Does everything same as M_TextInputHandle, but also handles emotes in input string // If currently typing something that looks like an existing emote, return suggestions for it -boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_t *suggestions[], int maxsuggestions); +boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_autocomplete_t *autocomplete); #define M_DrawTextInput(x, y, input, flags) M_DrawTextInputScroll((x), (y), (input), (flags), ((input)->buffer_size-1)*8) void M_DrawTextInputScroll(INT32 x, INT32 y, textinput_t *input, INT32 flags, INT32 MAXINPUTWIDTH); diff --git a/src/p_saveg.c b/src/p_saveg.c index 31827dc62..7a2883068 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -2109,10 +2109,14 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) mobj->player->mo = mobj; // added for angle prediction - if (i == P_GetLocalPlayerNumForNum(i)) - { - localangle[i] = mobj->angle; - } + if (consoleplayer == i) + localangle[0] = mobj->angle; + else if (displayplayers[1] == i) + localangle[1] = mobj->angle; + else if (displayplayers[2] == i) + localangle[2] = mobj->angle; + else if (displayplayers[3] == i) + localangle[3] = mobj->angle; } if (diff & MD_MOVEDIR) mobj->movedir = READANGLE(save->p); diff --git a/src/p_setup.c b/src/p_setup.c index a5bd70b64..6cf68ec78 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -15,6 +15,7 @@ #include "d_main.h" #include "byteptr.h" #include "g_game.h" +#include "g_input.h" #include "p_local.h" #include "p_setup.h" @@ -2983,7 +2984,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) G_AddMapToBuffer(gamemap-1); - D_ResetDeviceLED(); + G_ResetDeviceLED(); return true; } diff --git a/src/p_tick.c b/src/p_tick.c index d8b21aa86..bda09969d 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -457,113 +457,6 @@ static inline void P_RunThinkers(void) } } -// Controller rumble! -// this keeps track of a bunch of things -// and makes your controller rumble accordingly -static void P_DeviceRumbleTick(void) -{ - UINT8 i; - - if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL) - { - return; - } - - for (i = 0; i <= splitscreen; i++) - { - if (!cv_usejoystick[i].value || !cv_rumble[i].value) - { - continue; - } - - if (camera[i].freecam) - { - continue; - } - - UINT16 low = 0, high = 0; - UINT16 lenght = 57; // in ms - - const player_t *player = P_GetLocalPlayerForNum(i); - - // allow lua to do some crap for spectators - if (player->spectator || !player->mo) - { - continue; - } - - // reset the rumble if you exit or are ded lel - if (player->exiting || - player->playerstate == PST_DEAD || - player->kartstuff[k_respawn] > 1) - { - G_PlayerDeviceRumble(i, low, high, 0); - continue; - } - - if (player->kartstuff[k_spinouttimer]) - { - //low = high = FRACUNIT / 6; - low = high = FixedMul((FRACUNIT / 4), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout - } - else if (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))) - { - low = high = FRACUNIT / 8; - } - else if ((player->kartstuff[k_offroad]) - && player->speed != 0 - && P_IsObjectOnGround(player->mo)) - { - // weaken this depending on if you got hyu or invinc - if (player->kartstuff[k_hyudorotimer]) - { - high = FRACUNIT / 128; - } - else if (player->kartstuff[k_invincibilitytimer]) - { - high = FRACUNIT / 64; - } - else - { - low = high = FRACUNIT / 64; - } - } - else if ((player->kartstuff[k_bananadrag] > TICRATE) - && player->speed != 0 - && P_IsObjectOnGround(player->mo)) - { - if (leveltime & 1) // this is actually funny lel - high = FRACUNIT / 64; - } - - if (player->kartstuff[k_brakedrift]) - { - high = CLAMP((high + FRACUNIT / 256), 0, UINT16_MAX); - } - - // pulse when gettin new driftlevel - // let this come last - if (player->kartstuff[k_driftcharge] - && player->driftlevel) - { - high = CLAMP((high + FRACUNIT / 256), 0, UINT16_MAX); - - if (player->driftlevel == 2) - lenght = 114; - else if (player->driftlevel == 3) - lenght = 174; - } - - // hack alert! i just dont want this thing constantly resetting the rumble lol - if (low == 0 && high == 0) - { - continue; - } - - G_PlayerDeviceRumble(i, low, high, lenght); - } -} - void P_RunChaseCameras(void) { UINT8 i; @@ -763,7 +656,7 @@ void P_Ticker(boolean run) // Apply rumble to local players if (!demo.playback) { - P_DeviceRumbleTick(); + G_DeviceRumbleTick(); } PS_START_TIMING(ps_lua_thinkframe_time);