Commit Graph

581 Commits

Author SHA1 Message Date
Braden Obrzut 9cd0e48ea3 - Fixed: Forgot to initialize inventoryItem to NULL in DrawBar.
SVN r3370 (trunk)
2012-02-18 02:01:28 +00:00
Braden Obrzut da974c3444 - Allow any parameterized SBarInfo value to use parentheses to help make the syntax a little more consistent.
SVN r3361 (trunk)
2012-02-16 05:01:17 +00:00
Braden Obrzut 25b73ac023 - Added ability to use a constant for the maximum comparator for health and armor drawbars.
SVN r3360 (trunk)
2012-02-16 04:21:43 +00:00
Braden Obrzut 3b8f5e0d39 - Fixed: levellump for drawstring should be all uppercase for consistency.
SVN r3330 (trunk)
2011-12-09 00:59:38 +00:00
Randy Heit f00f5d2304 - Allow subclasses when checking for PowerWeaponLevel2.
SVN r3314 (trunk)
2011-11-07 00:43:41 +00:00
Christoph Oelckers 3c47a30249 - added Gez's submission for inventory restrictions but changed the added checks to be in the main CallTryPickup function.
SVN r3296 (trunk)
2011-09-23 08:23:51 +00:00
Christoph Oelckers a0bb1c2546 - added Gez's patch for proper splash checks with 3D-floors.
SVN r3295 (trunk)
2011-09-21 19:39:12 +00:00
Christoph Oelckers 5747406776 - fixed some more potential NULL pointer accesses.
SVN r3286 (trunk)
2011-08-31 06:14:28 +00:00
Braden Obrzut ba4630f0df - Added ammo1capacity and ammo2capacity to drawnumber.
SVN r3277 (trunk)
2011-08-13 20:30:59 +00:00
Braden Obrzut c8b8cdd13b - Fixed: SBarInfo string center alignment didn't work with non-monospace fonts.
SVN r3271 (trunk)
2011-07-14 09:31:39 +00:00
Christoph Oelckers f08188b0e5 - removed unneeded includes of r_local.h.
SVN r3261 (trunk)
2011-07-06 18:12:16 +00:00
Christoph Oelckers 463c276014 - removed more r_ header dependencies from the rest of the code.
SVN r3260 (trunk)
2011-07-06 15:31:05 +00:00
Christoph Oelckers 163301dcd5 - took all includes of farchive.h out of headers. This file will have to be included explicitly in each source file that needs it.
SVN r3259 (trunk)
2011-07-06 14:20:54 +00:00
Christoph Oelckers 42091b1bb3 - changed AlterWeaponSprite so that it doesn't take a full vissprite as parameter.
- FCoverageBuffer is only used in r_things.cpp, so its declaration does not need to be in a global header that's included everywhere.


SVN r3258 (trunk)
2011-07-06 13:00:51 +00:00
Christoph Oelckers 03177090c0 - removed some unnecessary r_ header #includes.
SVN r3257 (trunk)
2011-07-06 10:55:04 +00:00
Christoph Oelckers fbff5ca932 - moved r_interpolate.cpp and r_translate.cpp to r_data.
- merged r_jpeg.h into jpegtexture.cpp because that's the only place where it's ever used.


SVN r3255 (trunk)
2011-07-06 08:50:15 +00:00
Christoph Oelckers 5c6fd66ed5 - rename src/resources to src/r_data.
SVN r3254 (trunk)
2011-07-06 07:35:36 +00:00
Christoph Oelckers 5bf6398d85 - moved render style and border drawing code out of r_draw.cpp.
SVN r3251 (trunk)
2011-07-05 20:41:53 +00:00
Christoph Oelckers 17ed7aaabd - moved the code from r_data.cpp to some better fitting places and deleted this file and r_data.h because the remaining parts of it were just a random collection of unrelated functions.
SVN r3248 (trunk)
2011-07-05 10:02:38 +00:00
Christoph Oelckers 4626492f50 - separated all colormap related code from v_palette.cpp and r_data.cpp into its own file.
SVN r3245 (trunk)
2011-07-03 10:47:35 +00:00
Christoph Oelckers 6748432014 - fixed: The compatibility savegame handling for the lightning code did not read the obsolete LightningLightLevels data from the savegame.
SVN r3244 (trunk)
2011-06-21 07:28:48 +00:00
Randy Heit 2dd4ea8400 - Fixed: LightningLightLevels[] was not just an array of light levels. The latter part was also
a bitmask describing which sectors had lightning. When this was expanded to shorts, the
  result was that random sectors would have their lighting zero'ed after a lightning flash. I
  really have to wonder what I was thinking when I decided to cram two completely unrelated
  things into the same array. Since a short is wide enough, I did away with the bitmask and
  just use SHRT_MAX to mark sectors that weren't lightninged.

SVN r3243 (trunk)
2011-06-21 03:38:32 +00:00
Randy Heit ee8ca0de87 Fixed: Light levels outside the range [0,255] really do matter.
SVN r3223 (trunk)
2011-06-11 23:58:33 +00:00
Christoph Oelckers 2e4e5bdb28 - added DavidPH's damage type specific damage color submission.
SVN r3220 (trunk)
2011-06-06 22:23:43 +00:00
Randy Heit 2effba9504 - Add NULL pointer to check to FWeaponSlot::PickWeapon() (for when this is called outside of a game).
SVN r3186 (trunk)
2011-04-17 17:10:47 +00:00
Braden Obrzut c8e8edb1c5 - Added a prefix option to drawnumber.
- Added a flag to remove the cap on drawnumber (this means on the lower length numbers will be drawn).

SVN r3165 (trunk)
2011-03-12 02:20:31 +00:00
Christoph Oelckers 1ea5cc8bd8 - added a function to execute action specials and changed all calls to use this function. This was done to make it easier to check such calls.
SVN r3152 (trunk)
2011-02-13 10:18:28 +00:00
Christoph Oelckers 898b0d679d - added a new 'playertype' command for SBARINFO that checks by class type not display name.
- fixed: Status bar display for Hexen's fourth weapons only worked when they were obtained by picking up the weapon pieces.


SVN r3080 (trunk)
2010-12-27 16:14:26 +00:00
Christoph Oelckers 231e7a1c6d - added a new render style 'Shadow'. Essentially it's just a black translucent stencil with an alpha of 0.3. The purpose of this style is to be used as a software renderer approximation of GZDoom's spectre effect.
- allow setting 'Shadow' as default fuzz effect
- changed CVAR conversion that strings 'false' and 'true' get evaluated as integers 0 and 1 respectively so that changing boolean CVARs to int does not destroy their values.


SVN r3076 (trunk)
2010-12-25 23:27:26 +00:00
Braden Obrzut bada44a291 - Fixed: The background on some bars was cliped incorrectly.
SVN r3065 (trunk)
2010-12-20 22:29:15 +00:00
Christoph Oelckers bd0378a44b - added Gez's Hexenarmor on AltHud submission.
SVN r3061 (trunk)
2010-12-20 10:07:44 +00:00
Christoph Oelckers c7c4377600 - clamp parameter to P_GiveBody to prevent overflows.
SVN r3058 (trunk)
2010-12-17 22:30:47 +00:00
Christoph Oelckers a06b88fa50 - added new IF_UNTOSSABLE flag for items that should be removable by any inventory function but not be droppable by the 'drop' CCMD.
SVN r3049 (trunk)
2010-12-16 08:21:38 +00:00
Christoph Oelckers b42952b85c - added a 'restart' CCMD that allows restarting the engine with different WADs being loaded without quitting first
SVN r3042 (trunk)
2010-12-15 11:45:39 +00:00
Christoph Oelckers 770a879f6a - fixed: The TouchedActors array in the Dehacked parser was not freed after parsing was done.
- Initialize the alt HUD explicitly in D_DoomMain.
- don't let S_UnloadReverbDef leave a broken list of sound environments behind.
- Added more code to explicitly delete data before initializing it.

SVN r3039 (trunk)
2010-12-15 00:09:31 +00:00
Braden Obrzut ee20d0ea7a - Fixed: GCC compiler warnings.
- zipdir will no longer store files ending in '~' on Linux.
- Added st_oldouch which restores the old ouch face behavior of only showing when health increases by 20 while taking damage.

SVN r3035 (trunk)
2010-12-13 17:09:35 +00:00
Christoph Oelckers c6525a2271 - changed some data init code to delete the data it wants to initialize first.
- The 'savebuffer' variable still existed?
- Changed AInventory::Destroy to NULL SendItemUse and SendItemDrop if they point to the destroyed object. Although unlikely it can't be ruled out completely that this can happen with delayed CCMDs.
- fixed: Starting a new game did not clear the hub statistics array.


SVN r3034 (trunk)
2010-12-13 10:02:45 +00:00
Christoph Oelckers 0715b7dfc6 - cleaned up switch code and fixed several problems:
* savegames stored an index in the switch table and performed no validation when loading a savegame.
  * setting of a random switch animation duration was broken.
  * separated the 2 values stored in the Time variable into 2 separate variables.
  * defining a switch with one texture already belonging to another switch could leave broken definitions in the switch table.
- added function for serializing switch and door animation pointers.
- bumped min. savegame versions due to changes to DButtonThinker and removed all current savegame compatibility code.


SVN r3030 (trunk)
2010-12-12 15:43:35 +00:00
Christoph Oelckers ef133dc682 - changed skybox code to use the alpha from the sector plane.
- removed alpha from skybox viewpoints.


SVN r2993 (trunk)
2010-11-07 17:05:21 +00:00
Christoph Oelckers 7dd8a0fce9 - replaced all calls to sqrtf with sqrt. Also changed P_RadiusAttack to use doubles for all floating point calculations.
SVN r2989 (trunk)
2010-11-07 14:39:09 +00:00
Randy Heit 18205c82a6 - Modify AimingCamera so that it can pick up targets after spawning, since this is the only way
for it to aim at players, who cannot be spawned with TIDs.

SVN r2973 (trunk)
2010-11-03 02:27:46 +00:00
Christoph Oelckers 2a0c4b9f32 - added a CVAR to decide when to show the map label (ExMy, MAPxx) on the automap HUD. Available settings are Never, Always and Only for hubs.
- made all crosshair related CVARs game specific. They were all global to all supportesd games.


SVN r2964 (trunk)
2010-10-24 07:31:39 +00:00
Braden Obrzut 9e2e9262a4 - Fixed: Crash in Linux due to passing FStrings as character arrays.
- Fixed: More places where SBarInfo used the unscaled information from graphics.

SVN r2948 (trunk)
2010-10-16 17:04:18 +00:00
Christoph Oelckers 650da24364 - fixed: The alternative HUD's number printing function did not take texture scaling into account when calculating the printing position.
SVN r2947 (trunk)
2010-10-16 16:21:19 +00:00
Christoph Oelckers 352a926ddf - made all references to the GameNames array an inline function call to allow easier modification later
- changed all parsers that check for the current game to use the same function for the game check.
- fixed: The TEAMINFO parser handled 'game Any' incorrectly.


SVN r2934 (trunk)
2010-10-12 07:14:31 +00:00
Braden Obrzut 45f3ef91d3 - Fixed: If a log popup is defined, it should not draw the default log message.
- Fixed: The counters in draw(selected)inventory(bar) should not have been limited to 3 characters.
- Added: drawshadow() to drawinventorybar.
- Added: itemflash to drawselectedinventory to use Strife's cursor fade.
- Added: time and logtext to drawstring.  In addition a linebreaks(size) flag was added.

SVN r2928 (trunk)
2010-10-09 15:57:04 +00:00
Braden Obrzut 5f8c2f6310 - Added: keys, accuracy, stamina, and savepercent to drawnumber. (Savepercent is also available for drawbar.)
SVN r2924 (trunk)
2010-10-08 23:09:27 +00:00
Christoph Oelckers 16fa8cc249 - Am I the only one who thinks that static_casts can create really clunky code? (Thanks, GCC, for your overly paranoid warning settings that necessitate such ugliness. :( )
SVN r2844 (trunk)
2010-09-22 06:52:48 +00:00
Braden Obrzut 1e83634089 - Fixed: The aspectratio SBarInfo command never ticked its contents.
SVN r2842 (trunk)
2010-09-21 20:07:03 +00:00
Christoph Oelckers 583cbd49a6 - try to encapsulate access to the player class's display name for printing purposes.
SVN r2839 (trunk)
2010-09-21 09:43:54 +00:00
Braden Obrzut 0619a2677e - Fixed: SBarInfo couldn't print extended ASCII characters.
SVN r2838 (trunk)
2010-09-20 23:00:27 +00:00
Christoph Oelckers 74525ab1d6 - moved some info into the GAMEINFO section:
* the sprite used for 'pause'.
 * the factor with which a monster's health is multiplied to decide if it's supposed to be gibbed,
 * the decision to make monsters run faster in nightmare mode.
- moved the hard coded lock messages for lock types 102 and 103 into the language lump.
- fixed: Raven's fast monsters could become slower in Nightmare if they had very short walking states.


SVN r2834 (trunk)
2010-09-19 10:39:34 +00:00
Christoph Oelckers e1de9f0633 - fixed: The newly accelerated mousewheel scrolling code did not check for the end of the list and could scroll one item too far. It also incremented VisBottom by 3 instead of 2.
- changed lock failsound lookup so that for each sound it tries to resolve it as a player sound before deciding if it is valid.

SVN r2830 (trunk)
2010-09-19 06:34:15 +00:00
Randy Heit 94ce4d5d69 - Remove extra *usefail definition for the pig player.
- Locks can now define more than one LockedSound by separating them with commas. The default setting
  for this property is now "*keytry", "misc/keytry". The first sound that is defined is the one that will
  be played for the lock. Thus, for standard locks, if the player class defines *keytry, that will be
  played. Otherwise, misc/keytry will be played as before.



SVN r2827 (trunk)
2010-09-19 03:30:31 +00:00
Christoph Oelckers df138fe4f9 - added a ClearCounters function to AActor that handles everything necessary to un-count an item that is not supposed to be counted but has some of the COUNT* flags set.
- merged all places where secrets are credited into one common function.
- added the Doom64 COUNTSECRET actor flag.
- fixed: AInventory::CreateCopy did not clear the COUNTITEM flag.
- fixed: Dropping an item did not increase the item count but the dropped item could still have the COUNTITEM flag. Now this flag gets cleared when the item gets picked up so that dropped items don't count a second time.

SVN r2826 (trunk)
2010-09-19 00:06:45 +00:00
Braden Obrzut 31754a582d - Fixed: when using the border property of drawbar, interpolation didn't work quite right.
SVN r2705 (trunk)
2010-09-06 20:12:44 +00:00
Braden Obrzut 241e09c271 - Fixed: font monospacing didn't apply to the space character.
SVN r2666 (trunk)
2010-09-01 22:26:07 +00:00
Randy Heit a2573e4bb3 - Fixes to compile with GCC 4.5.0.
SVN r2660 (trunk)
2010-09-01 03:30:18 +00:00
Braden Obrzut 230178bf98 - Added drawshadow flag to drawstring.
SVN r2656 (trunk)
2010-08-31 21:36:30 +00:00
Christoph Oelckers eb3340e872 - fixed: Clearing a pickup message for inventory items was not possible. Changed it so that "You got a pickup" is AInventory's pickup message and not a default returned when nothing valid is set.
SVN r2625 (trunk)
2010-08-28 19:20:14 +00:00
Christoph Oelckers 5647fed0cf - fixed: armor factor application was done wrong.
- fixed: APROP_Invulnerable could only be set and unset but not checked.
- fixed: Two sided polyobjects applied thrust to sctors in a way that did not work.


SVN r2620 (trunk)
2010-08-28 12:57:23 +00:00
Christoph Oelckers 9102200771 - added: Let the kill CCMD also kill replacements of the monster that is specified.
- add a GetReplacement method to PClass to clean up some really ugly code
- Who wrote the 'kill' CCMD? The way it checked if two classes were identical was horrendously overcomplicated.

SVN r2601 (trunk)
2010-08-26 20:59:15 +00:00
Christoph Oelckers 06a35dea11 - added: offset the trail actors spawned by AFastProjectile by missileheight.
SVN r2599 (trunk)
2010-08-26 18:03:15 +00:00
Christoph Oelckers b452bec0ee - merge USDF branch into trunk.
- add USDF spexs.


SVN r2561 (trunk)
2010-08-20 12:20:51 +00:00
Christoph Oelckers f9523a01e3 - Added Gez's patch for moving tag strings into the language file and adding tags for all weapons and inventory items.
SVN r2552 (trunk)
2010-08-18 20:26:25 +00:00
Braden Obrzut a0d16bc99a - Fixed: The center flag for drawimage didn't work.
- Fixed: GCC didn't like casting from seg_t* to unsigned int on 64-bit systems.

SVN r2542 (trunk)
2010-08-14 21:01:49 +00:00
Christoph Oelckers b288a7a416 - added option to set item pickup color through MAPINFO's GAMEINFO block.
SVN r2539 (trunk)
2010-08-14 06:25:38 +00:00
Christoph Oelckers e0bd67de5a - added: If a PowerFlight item got a valid icon don't use the spinning wings for the HUD display
SVN r2504 (trunk)
2010-08-10 19:22:43 +00:00
Christoph Oelckers 79ff9ae3ae - fixed: FNodeBuilder::ExtractMini needs to check for segs that were created from minisegs.
- made polyobject node building code more update friendly for GZDoom by making R_BuildPolyBSP public.


SVN r2500 (trunk)
2010-08-10 08:13:23 +00:00
Randy Heit b2d018eccd - Made SBARINFO more tolerant of certain error conditions. (Why is there so much duplication of
code? It felt like I was changing the same lines over and over and over.)

SVN r2486 (trunk)
2010-08-01 20:05:52 +00:00
Christoph Oelckers 6f4ed40496 - added TIHan's ArmorFactor submission.
SVN r2465 (trunk)
2010-07-27 18:32:10 +00:00
Christoph Oelckers 35ba99ed31 - Added Gez's automap enhancements but made the new key icon optional.
SVN r2462 (trunk)
2010-07-25 21:46:51 +00:00
Braden Obrzut 006fb343b0 - Added Pink Silver's DrawString/Number alignment patch (with one minor change).
SVN r2460 (trunk)
2010-07-25 20:46:14 +00:00
Christoph Oelckers bc47f7133b - Added DavidPH's A_Teleport submission but removed the now redundant GetSpotWithMinDistance functions.
SVN r2451 (trunk)
2010-07-23 21:55:01 +00:00
Randy Heit 5b63fd0675 - Added an optional parameter to DamageScreenColor to scale the amount of damage for pain
flash calculations. This can range from 0.0 to 1.0.

SVN r2435 (trunk)
2010-07-16 03:46:20 +00:00
Randy Heit a401779715 - Fixed: FMugShotFrame::GetTexture() needs to NULL-check skin_face. (default_face might also be
empty. I don't know if that deserves special handling, but it doesn't crash, so I'll let blzut3
  worry about it.)

SVN r2419 (trunk)
2010-07-09 03:04:43 +00:00
Christoph Oelckers e1e7cebd01 - fixed: The SBARINFO parser insisted that all player classes being specified have to exist. This, however, made it impossible to redefine the player classes in Hexen.
SVN r2401 (trunk)
2010-07-01 20:57:11 +00:00
Christoph Oelckers 6df5e6f9cb - added Gez's anti-crossinclude submission but made some changes. Cross-includes overriding core files will produce fatal errors but cross-includes between PWADs will be tolerated. For DECORATE a command line override switch exists so that for testing the error can be disabled.
SVN r2400 (trunk)
2010-07-01 09:35:39 +00:00
Christoph Oelckers e2ce20a445 - fixed: A_Print and related functions should not make a use state chain succeed.
- fixed: APowerIronFeet must continuously reset the player's air supply.


SVN r2370 (trunk)
2010-06-13 10:38:38 +00:00
Braden Obrzut 2aa7cdc5a8 - Fixed: drawbar didn't work right when scaled.
SVN r2361 (trunk)
2010-06-08 23:32:01 +00:00
Braden Obrzut afd9bcb59a - Fixed: drawstring didn't properly align itself when variable strings were used.
SVN r2360 (trunk)
2010-06-07 15:45:09 +00:00
Braden Obrzut d7686d0c26 - Added optional offset parameters to the drawshadow flag.
- Added character alignment parameter to font monospacing.
- Fixed: character shadows were not scaled.
- Heretic keys now have an icon associated with them so that they can be drawn through drawkeybar.
- Replaced the built in Heretic and Hexen status bars with SBarInfo equivalents.

SVN r2353 (trunk)
2010-06-02 20:26:27 +00:00
Braden Obrzut d29123c511 - Added a HexenStrict DrawInventoryBar style due to some alignment errors I noticed with the Hexen style.
SVN r2352 (trunk)
2010-05-31 20:04:49 +00:00
Braden Obrzut b8cb1f0cfb - Fixed: The alpha property of status bars didn't work anymore.
- Added: alpha command to SBarInfo which allows you to increase the translucency for certain parts of the status bar.
- Added: reverse flag for drawkeybar which reverses the order in which rows are filled with keys.
- Changed a gamemode statement to an else in the Doom hud since the frag count and keys should never be shown at the same time.

SVN r2351 (trunk)
2010-05-31 07:01:04 +00:00
Braden Obrzut 9716e1aea7 - Changed DrawSelectedInventory's alternateonempty flag to draw the subblock before itself. This allows an else statement to be more useful in practice.
- Fixed: Added offsets to the wrong variable in SBarInfo.

SVN r2348 (trunk)
2010-05-30 18:34:59 +00:00
Christoph Oelckers bdd2ebfe14 - added a new dmflag for allowing switching to weapons without ammo.
SVN r2346 (trunk)
2010-05-30 07:47:08 +00:00
Braden Obrzut e848fa3c4c - Switched SBarInfo to floating point math.
SVN r2345 (trunk)
2010-05-30 00:12:46 +00:00
Braden Obrzut 9dfdf2ecdd - Fixed some issues with high resolution status bars.
SVN r2339 (trunk)
2010-05-26 00:51:06 +00:00
Braden Obrzut adcf26d2b5 - Fixed MSVC compiler warnings in sbarinfo.cpp
SVN r2333 (trunk)
2010-05-22 14:00:36 +00:00
Braden Obrzut 9611e7310a - Added resolution setting to SBarInfo.
- Fixed: Mug shot was not reset at the start of a new game.

SVN r2332 (trunk)
2010-05-21 19:56:13 +00:00
Braden Obrzut 24aa1abf14 - Added: else statements to SBarInfo. In addition braces are no longer required for blocks consisting of a single statement.
SVN r2313 (trunk)
2010-05-11 22:27:50 +00:00
Braden Obrzut b7cb3ffa88 - Fixed: If a weapon didn't use ammo the result of weaponammo was accidentally negated.
SVN r2309 (trunk)
2010-05-01 21:17:11 +00:00
Randy Heit 4e693e1c98 - Added Gez's RandomSpawner patch: If a randomspawner is given a Z-height in the map editor, and the spawned object has a spawn height flag, it is ignored by the spawned object. This little patch fixes that.
SVN r2304 (trunk)
2010-04-26 01:49:29 +00:00
Christoph Oelckers 674c63d66c - fixed: A_KeenDie should not drop items.
SVN r2300 (trunk)
2010-04-23 08:12:47 +00:00
Braden Obrzut bd40bba37c - Added levellump, skillname, playerclass, playername, ammo1tag, ammo2tag, weapontag, inventorytag, globalvar <int>, and globalarray <int> to drawstring.
- String constants starting in '$' will cause drawstring to reference the language lump.
- Added pushup transition for strife popups.  This elulates the stats screen from hexen 2.  This behaves identical to slideinbottom if the primary statusbar has fullscreenoffsets set.

SVN r2299 (trunk)
2010-04-22 23:38:11 +00:00
Braden Obrzut d719671579 - Added levelname to drawstring.
SVN r2292 (trunk)
2010-04-20 02:16:06 +00:00
Randy Heit 87a7ff7b6d - Add blzut3's morphed status bar patch.
SVN r2283 (trunk)
2010-04-17 02:06:26 +00:00
Christoph Oelckers 18d58ef1c5 - fixed: APowerup::EndEffect could crash if the item was not owned by a valid player actor.
SVN r2256 (trunk)
2010-03-29 06:08:22 +00:00
Randy Heit b3005ab16c - Fixed: APowerup::EndEffect() needs to cancel any special colormaps applied by the powerup.
This means all subclasses also need to call their superclass's EndEffect(), which they were
  not doing. For consistency, all the subclasses now do the same for InitEffect(), though
  APowerup::InitEffect() is still a no-op.

SVN r2252 (trunk)
2010-03-28 04:02:57 +00:00
Christoph Oelckers 7f2ab00abe - fixed: IDBEHOLD altered the item counter.
SVN r2247 (trunk)
2010-03-26 22:26:50 +00:00