summaryrefslogtreecommitdiff
path: root/src/strife/p_dialog.c
AgeCommit message (Collapse)Author
2014-12-15Upstream fix from SVE: Missing break statementJames Haley
This caused Rowan to fail to take Beldin's ring from you, if and only if you had full bullet ammo. Transcription error from the disassembly.
2014-09-13Add vld_ prefix for vldoor_e enum values.Simon Howard
It was pointed out to me recently that vldoor_e has enum values named 'open' and 'close'. These can potentially conflict with POSIX standard functions that have the same names, if the right header files are included. This doesn't currently cause any problems. However, to avoid any possibility of a conflict occurring if a different compiler is used, add a vld_ prefix to all the enum values, to namespace them.
2014-05-05Clean up file headers.Simon Howard
This change rewrites and simplifies the copyright headers at the top of all source files: * Remove "Emacs style mode select" line; this line was included in the headers for the originally released source files and appears to be to set the file type for old versions of Emacs. I'm not sure entirely why it was required but I don't think it is any more. * Remove "You should have received a copy of..." text from copyright header. This refers to the old 59 Temple Place address where the FSF headquarters used to be located and is no longer correct. Rather than change to the new address, just remove the paragraph as it is superfluous anyway. This fixes #311. * Remove ---- separator lines so that the file headers are barer and more simplified.
2014-03-29strife: Eliminate use of unsafe string functions.Simon Howard
Eliminate use of strcpy, strcat, strncpy, and use the new safe alternatives.
2013-03-02Noticed another non-authentic error in a built-in dialog message for theJames Haley
Acolyte. Subversion-branch: /branches/v2-branch Subversion-revision: 2562
2013-03-02Complete support for v1.31 behaviors in addition to v1.2, including theJames Haley
ability to save on multiple save slots. Subversion-branch: /branches/v2-branch Subversion-revision: 2561
2012-12-24Fix compiler warnings by removing variables that are set but not used.Simon Howard
Subversion-branch: /branches/v2-branch Subversion-revision: 2555
2012-04-02Fix to undefined sprintf behavior in the dialog engine (thanks toJames Haley
MP2E!). Other changes are to comments only. Subversion-branch: /branches/v2-branch Subversion-revision: 2509
2012-02-12* Correct an error in one of the beta-like Beggar internal dialogueJames Haley
strings (was missing a doubled space). These messages are used by only one guy in the game, and, as in vanilla, most of them don't appear correctly when output. * Correct HUD behavior: do not reinit the HUD at the start of each map. Subversion-branch: /branches/v2-branch Subversion-revision: 2503
2011-06-04Resolved some TODOs and fixed a couple of problem spots that wereJames Haley
forgotten. Subversion-branch: /branches/strife-branch Subversion-revision: 2344
2011-03-02Fixed automap background color, size of plrkilledmsg buffer, a bug whichJames Haley
caused the scanner to never be depleted from the inventory, and emulation of seemingly inconsequential undefined behavior in P_XYMovement via use of negative numspechit is currently addressed by changing the branch condition to > 0. Subversion-branch: /branches/strife-branch Subversion-revision: 2286
2011-02-20Removed ability to disable messages, and replaced with configurationJames Haley
variable to control dialogue text messages, as in vanilla. Also, absence of voices.wad, or use of the -novoices parameter, will now properly both disable voices AND enable dialogue text. Subversion-branch: /branches/strife-branch Subversion-revision: 2268
2011-02-13Added note about authentic typo copied from the binary in p_dialog.James Haley
Also, fixed display of total play times > 1 hr in the objective popup, and added display of ammo and max ammo widgets to the stats popup. Subversion-branch: /branches/strife-branch Subversion-revision: 2264
2011-02-13Stop Macil's planes from falling :)James Haley
Subversion-branch: /branches/strife-branch Subversion-revision: 2263
2011-02-06Numerous fixes/adjustments: removed bodyque, restored "is turbo" (foundJames Haley
it in there after all), removed some dead code in p_dialog, added a 'default: break;' case in EV_VerticalDoor, initialize player_t::allegiance in P_SetupLevel, minor changes to EV_Teleport, 2nd-pass verification for p_tick, and big fixes in p_user.c including noclip cheat, viewz clipping against floor, air control thrust amount, and missing/incorrect else's. Subversion-branch: /branches/strife-branch Subversion-revision: 2250
2010-09-28Fix compile warnings.Simon Howard
Subversion-branch: /branches/strife-branch Subversion-revision: 2149
2010-09-28Enable useyfont parameter of M_DialogDimMsg for proper dimensioning ofJames Haley
mission objective text. Fix for implicit declaration warning on HUlib_drawYellowText in m_menu.c. Subversion-branch: /branches/strife-branch Subversion-revision: 2147
2010-09-22Rewrote P_GiveItemToPlayer to exactly match binary, particularly withJames Haley
treatment of SPR_TOKN objects, and playing proper sounds for different item types. Fixed most S_StartSound calls in the menu engine. Removed call to S_StopSound in S_StartSound, as Strife doesn't do it. Added call to P_DialogDoChoice(-1) in M_Responder when menuindialog is asserted and the menu exit key is pressed. Subversion-branch: /branches/strife-branch Subversion-revision: 2130
2010-09-19Functional inventory status bar cursor and item rendering. Fix forJames Haley
P_GiveInventoryItem to return proper value at end of function. Subversion-branch: /branches/strife-branch Subversion-revision: 2124
2010-09-19+ Renaming MF_INCOMBAT to MF_NODIALOGSamuel Villareal
Subversion-branch: /branches/strife-branch Subversion-revision: 2116
2010-09-18More use of DEH_String and DEH_snprintf, especially in the dialogJames Haley
engine. Also more use of new GiveVoiceObjective macro. Subversion-branch: /branches/strife-branch Subversion-revision: 2111
2010-09-18Tons of warnings fixed - now only 7 warnings at warning level 3, andJames Haley
most of those are outside of our own code (get on those signed/unsigned mismatches in the midi code, fraggle ;) Subversion-branch: /branches/strife-branch Subversion-revision: 2110
2010-09-18Upped warning level and started fixing warnings - can't believe someJames Haley
genius had them completely disabled... Also, a bug fix to EV_ClearForceFields so that it continues running on all tagged sectors even if sec->linecount is 0, and so that it returns a value. Made dialogtext and M_WriteText's 3rd parameter const for safety. Subversion-branch: /branches/strife-branch Subversion-revision: 2108
2010-09-18+ healthamounts array addedSamuel Villareal
Subversion-branch: /branches/strife-branch Subversion-revision: 2105
2010-09-14Fully implemented all finale code, including "intermission" speeches byJames Haley
Macil and all three endings. Subversion-branch: /branches/strife-branch Subversion-revision: 2086
2010-09-13Use DEH_snprintf where appropriate.Simon Howard
Subversion-branch: /branches/strife-branch Subversion-revision: 2083
2010-09-11Added code (some possibly temporary?) to load voices.wad. Fixed severalJames Haley
problems with playing of voice sounds - especially had to add a dynamic hashtable of voice sfxinfo_t's because Choco won't tolerate overwriting them once they've been used (see channel_playing array in i_sdlsound.c) - PROBLEM: Random Z_Malloc failures when trying to play sounds. Cannot catch in debugger so far. Subversion-branch: /branches/strife-branch Subversion-revision: 2065
2010-09-11+ P_GivePower updateSamuel Villareal
+ Power tics implemented + Power enums implemented + More inventory functions implemented Subversion-branch: /branches/strife-branch Subversion-revision: 2061
2010-09-11+ Comments addedSamuel Villareal
Subversion-branch: /branches/strife-branch Subversion-revision: 2059
2010-09-10+ P_GiveItemToPlayer fleshed outSamuel Villareal
+ Key enumerations added Subversion-branch: /branches/strife-branch Subversion-revision: 2057
2010-09-09+ More codepointers implementedSamuel Villareal
+ Converted some while loops to for loops in dialog functions Subversion-branch: /branches/strife-branch Subversion-revision: 2049
2010-09-09Changed mobj_t::allegiance to mobj_t::miscdata due to the fact it hasJames Haley
two completely different uses. Finished P_DialogDoChoice; dialog is now virtually 100% functional (just needs finished inventory to really do much beyond initial dialogs or getting "no" messages from everybody). Subversion-branch: /branches/strife-branch Subversion-revision: 2048
2010-09-08Work on P_DialogDoChoice.James Haley
Subversion-branch: /branches/strife-branch Subversion-revision: 2047
2010-09-08Fix static function mismatch build error.Simon Howard
Subversion-branch: /branches/strife-branch Subversion-revision: 2045
2010-09-08Functional menupause/menupausetime, fix to wait when there's not aJames Haley
background pic, and elimination of more dead code in the menu system Subversion-branch: /branches/strife-branch Subversion-revision: 2042
2010-09-08+ Converting needamountx and needitemx to arrays in choice structSamuel Villareal
+ Dialog drawer updated to draw choices Subversion-branch: /branches/strife-branch Subversion-revision: 2041
2010-09-08Proper dialog jumptoconv logic, and more commenting in P_DialogStart.James Haley
Subversion-branch: /branches/strife-branch Subversion-revision: 2040
2010-09-08+ Update to mapdialog structSamuel Villareal
+ P_StartDialog updated Subversion-branch: /branches/strife-branch Subversion-revision: 2038
2010-09-08+ Added check if linetarget is null in P_StartDialogSamuel Villareal
+ More codepointers implemented Subversion-branch: /branches/strife-branch Subversion-revision: 2037
2010-09-07+ P_DialogStart implementedSamuel Villareal
+ Dialogs are now loaded through G_DoLoadLevel Subversion-branch: /branches/strife-branch Subversion-revision: 2033
2010-09-07+ P_DialogStart implementedSamuel Villareal
+ Initial dialog interaction implemented Subversion-branch: /branches/strife-branch Subversion-revision: 2031
2010-09-05Corrections to some of Kaiser's previous commits. Also, significant workJames Haley
on dialog engine, p_enemy code, and support for all new mapthing_t flag values in P_SpawnMapThing. Subversion-branch: /branches/strife-branch Subversion-revision: 2015
2010-09-03Code to read dialog lump field-by-field to avoid any possible problemsJames Haley
with structure packing. Also a minor fix to Kaiser's key look code. Subversion-branch: /branches/strife-branch Subversion-revision: 2004
2010-09-02Added p_dialog module and header. Started work on dialog engine.James Haley
Subversion-branch: /branches/strife-branch Subversion-revision: 2002
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 19:41:33 +0000