Randy Heit
5d65b10aec
Better bad save checking
...
- Move invalid save condition checks from save CCMD into G_SaveGame().
- Add a gamestate != GS_LEVEL check to G_DoSaveGame().
2015-02-24 20:18:41 -06:00
Randy Heit
c7842a8de8
Fix not-Windows
2015-02-24 20:13:03 -06:00
Randy Heit
e4a041cb4c
When changing maps, print map name in console in lower case
2015-02-24 20:12:08 -06:00
Randy Heit
a41af2de73
Make SBARINFO's HasWeaponPiece recognize removed pieces
...
- Fixed: HasWeaponPiece assumed that once a piece was given, it would not
be removed. The easiest way to break this assumption is by loading an
earlier save where you had fewer pieces. (The catch being that if you
removed all pieces, it would notice that.)
2015-02-24 20:01:39 -06:00
Randy Heit
5f43e5b4ea
Don't use finesine table when offseting for plane rotation
...
- This table isn't precise enough, so the result is noticeably off if
you're far enough from the origin.
2015-02-20 22:52:30 -06:00
Randy Heit
a5f8c4ead2
Fixed: UDMF loader did not set the index for sides
2015-02-20 21:51:14 -06:00
Randy Heit
9721c025c1
Remove unneeded index restriction from GetUDMFInt/Fixed
2015-02-20 20:42:30 -06:00
Randy Heit
a64ebc720b
Fix assert
2015-02-20 20:35:32 -06:00
Randy Heit
19ab774dc8
Fixed: A_CStaffCheck needed more NULL pointer checks
2015-02-20 20:17:15 -06:00
Randy Heit
2827c13d0c
Rewrite new quake stuff for correctness
...
- Quake scaling should be handled for each quake. The former
implementation was potentially taking flags from one quake and applying
them to another, which is broken.
- Remove all the int<->float conversions.
2015-02-20 19:36:13 -06:00
Randy Heit
8e0151b4c1
Add FRandomPick
...
- This is RandomPick but for floats. Considering what RandomPick
translates into in the scripting branch, I hope I don't regret not using
type inference on RandomPick instead of creating a new keyword.
2015-02-20 17:52:52 -06:00
Randy Heit
173dbd6bce
Add FxFloatCast
...
- The master branch really didn't have this already?
2015-02-20 17:48:48 -06:00
MajorCooke
fb9231a38d
- Added QF_FULLINTENSITY.
...
- When using both scaling flags, by default, the effect only reaches half peak going either way. This forces it to go all the way to the top (or bottom if using QF_MAX) before scaling back to its original height..
2015-02-20 11:06:41 -06:00
MajorCooke
aa3c3d6546
- Fixed: Smoothing in to out reached only half strength.
2015-02-20 10:55:06 -06:00
MajorCooke
140a650442
- Added QF_SCALEUP and QF_MAX.
...
- QF_SCALEUP behaves like QF_SCALEDOWN: it gradually scales the tremors, only going upwards.
- QF_SCALEUP and QF_SCALEDOWN can be combined to make an earthquake that gradually smoothes in and out.
- QF_MAX can be used to invert this behavior, where it starts at the peak of the amplitude, fades out half way, and then grows back to maximum.
2015-02-20 10:46:37 -06:00
Christoph Oelckers
3019f2cc23
- fixed savegame code for quakes.
2015-02-20 16:50:03 +01:00
MajorCooke
475bc65eba
- Better safe than sorry, even if it apparently had no effect.
2015-02-20 08:35:42 -06:00
MajorCooke
49d9482363
- Cleaned out of the code and converted it to taking a struct instead.
...
- This will make it much easier on me to add future changes. Big thanks to Graf for the idea.
2015-02-20 08:26:45 -06:00
MajorCooke
d6e4a7a081
- Changed QuakePower back to fixed_t and just had it return FLOAT2FIXED instead.
2015-02-20 07:36:37 -06:00
MajorCooke
3bf24204d8
- Ensure save games don't break.
2015-02-20 01:41:59 -06:00
MajorCooke
2939194ae3
- Forgot this tiny little one.
2015-02-20 01:36:53 -06:00
MajorCooke
9c5d90e4cb
- Removed QF_SCALEUP until I can figure out a proper way to implement it.
2015-02-20 01:33:30 -06:00
MajorCooke
0948b95e08
- Changed QuakePower to take doubles on everything but intensity. This lets the camera shake until it truly reaches 0 as the limitations of integers were actually cutting it short.
2015-02-19 23:19:24 -06:00
MajorCooke
045ab9fd5b
Initial groundwork for QF_SCALEDOWN.
2015-02-19 21:42:32 -06:00
MajorCooke
284fd3e20f
- Fixed: relz was never initialized.
...
- This could cause problems in places like the GZDoom renderer in the odd circumstance, causing the camera to become stuck in the floor or ceiling until the quake expires.
2015-02-19 16:30:00 -06:00
Randy Heit
2d4f02c560
Merge branch 'MajorCooke-quakeex'
2015-02-18 15:01:45 -06:00
Randy Heit
e377c2c4f8
Change XYZ Quaking from Major Cooke
...
- Relative quakes are different from other quakes; all quakes affecting
the camera do not become relative if one of them is relative.
- Use a single function call to get quake visual parameters instead of four.
- Thrust things in a psuedo-ellipse if they're inside a damaging quake whose
IntensityX != IntensityY.
- Don't break old savegames.
2015-02-18 14:48:52 -06:00
rheit
c23b7cd378
Merge pull request #273 from MajorCooke/transferroll
...
- Added SXF_TRANSFERROLL.
2015-02-18 11:28:13 -06:00
MajorCooke
0f4bca8607
- Added SXF_TRANSFERROLL.
2015-02-14 16:51:05 -06:00
MajorCooke
7050d03222
Added A_QuakeEx(intensity x, y, z, duration, damrad, tremrad, sound, flags)
...
- Unlocks the full potential of using quakes, including the Z axis. Each intensity applies to X/Y/Z planes whenever a player is experiencing it.
- Flags:
- QF_RELATIVE - Adjusts the quaking of the camera to go in the direction its aiming (X: forward/backward. Y: Left/right.)
- Plans for including pitch will be implemented in the future for the Z axis with relativity.
2015-02-14 15:58:39 -06:00
Alexey Khokholov
fa2e2a8528
Update nukedopl3.cpp
2015-02-14 00:01:54 +09:00
Christoph Oelckers
d8d2058ec6
Merge branch 'NetBug' of https://github.com/ChillyDoom/zdoom
2015-02-12 19:12:13 +01:00
Christoph Oelckers
93c12cf259
- addressed the problem that prompted setting NOGRAVITY for all floatbobbing items for real:
...
Hexen uses the spawn height value from the mapthing_t structure to offset the item when floatbobbing. With proper gravity handling enabled this method doesn't really work so as a workaround ZDoom will now enable a hidden compatibility option when playing any map with a Hexen format MAPINFO so that any positive value in this field will make P_ZMovement revert to the original method of setting the items height (excluding the floatbob offset, of course.)
This also removes some code from P_NightmareRespawn that originate from the original Hexen method for floatbobbing which aren't needed anymore
2015-02-12 18:57:06 +01:00
Christoph Oelckers
337682934c
- fixed: CF_FLY cannot be part of the player_t structure and be tracked properly. It needs to be part of the actor itself that has MF2_FLY set so it got moved to flags7.
...
- removed some fudging code that tried to work around the shortcomings of CF_FLY but was ultimately causing more problems than it solved.
2015-02-10 23:40:53 +01:00
Christoph Oelckers
c0eb39ec72
- fixed: The exploding ArtiTimeBomb must disable movement interpolation for its position change needed to display the explosion frames correctly.
2015-02-10 23:09:57 +01:00
Christoph Oelckers
5fc6ff1303
- fixed: invisible 3D floors were treated as solid, not translucent when building the sorted lists, resulting in the top plane not being rendered in case of an overlap.
2015-02-10 23:01:58 +01:00
Christoph Oelckers
a3bdbff052
- fixed: 3Dmidtex opening checks didn't take per-sidedef scaling into account.
2015-02-10 21:30:52 +01:00
ChillyDoom
3d7934f1a1
- Fixed: Part of Net_CheckLastReceived treated Net_Arbitrator as a node number rather than a player number.
2015-02-09 20:16:57 +00:00
Christoph Oelckers
6423b2fece
- fixed: Dehacked text patching needs to alter all occurences of the source string.
2015-02-09 10:15:11 +01:00
Randy Heit
867bfd2751
Typo fix: concidered -> considered
2015-02-08 21:07:28 -06:00
Randy Heit
79791629ec
Add missing break to FxGlobalVariable::Resolve()
...
- Not like it matters much when there are no global variables of types
float, fixed, or angle.
2015-02-08 21:01:49 -06:00
Randy Heit
a063b48d7a
Add a needed break in FxAbs::Resolve()
...
- Fixed: FxAbs could not resolve floating point constants because it fell
through to the error case.
2015-02-08 20:56:30 -06:00
Randy Heit
c3227729e7
Remove superfluous if in DoGiveInv()
...
- I'm assuming this check was here for a reason, but when both branches of
the if do the same thing and it's been this way since before recorded
history, it's not obvious what was intended here.
2015-02-08 20:54:13 -06:00
Randy Heit
711ac77915
defitem != NULL -> defitem == NULL
2015-02-08 20:51:14 -06:00
Randy Heit
fd7ed2bc25
Undo most of ZzZombo's changes
...
- "If it ain't broke, don't fix it."
- Some of the changes were downright wrong and some were pointless, so undo
everything that doesn't look like an actual improvement.
2015-02-08 20:44:18 -06:00
Randy Heit
2d7592c2c3
Restore nodebuilder files to their previous versions
...
- For easy comparison, changes between the built-in nodebuilder and ZDBSP
must be kept to a minimum.
2015-02-08 19:49:08 -06:00
Christoph Oelckers
e047902d56
- resanitation of FDynamicBuffer::SetData.
2015-02-08 17:58:24 +01:00
Christoph Oelckers
57ae77412d
Merge branch 'althud_ammo' of https://github.com/alexey-lysiuk/gzdoom
2015-02-08 11:52:08 +01:00
Christoph Oelckers
ae78aeaacb
- if this buffer is freed, the pointer referring to it must also be deleted.
2015-02-08 11:48:41 +01:00
Christoph Oelckers
45117b2603
Merge branch 'codesanity' of https://github.com/ZzZombo/zdoom
...
Conflicts:
src/info.h
2015-02-08 11:47:49 +01:00
ZzZombo
0be3341031
- Missed some unused variables.
2015-02-08 18:04:11 +08:00
alexey.lysiuk
003817f415
Added customization of ammo display in alternative HUD
...
Added hud_showammo CVAR with three states:
* If value is 0, show ammo for current weapon only
* If value is 1, show ammo for available weapons
* If value is greater than 1, show ammo for all weapons
Default value is 2, so initial ammo display behavior isn't changed
2015-02-08 11:08:02 +02:00
ZzZombo
c4b742ebf0
- Part 2 of the sanity crusade.
2015-02-08 17:03:49 +08:00
Christoph Oelckers
4959932df7
Merge branch 'changemap2-fix' of https://github.com/Edward850/zdoom
2015-02-08 09:07:12 +01:00
Christoph Oelckers
0688247ee1
Merge branch 'NewChaseDir-opt' of https://github.com/Edward850/zdoom
2015-02-08 09:06:53 +01:00
ZzZombo
2c06987f67
- Fixed the sanity commit.
2015-02-08 14:35:45 +08:00
Christoph Oelckers
3a504da675
- forgot to save this before committing.
2015-02-07 19:04:43 +01:00
Christoph Oelckers
7c567979d9
Merge branch 'transferspriteframe' of https://github.com/MajorCooke/zdoom
2015-02-07 17:13:21 +01:00
MajorCooke
b37a98689a
- Added SXF_TRANSFERSPRITEFRAME. Now it's possible to make starting frames that start with "####" "#" 0 in Spawn.
...
- Fixed a compile warning with FAF_NODISTFACTOR.
2015-02-07 10:04:33 -06:00
Christoph Oelckers
7789975b6c
- reverted a few of Zzombo's changes.
2015-02-07 17:02:46 +01:00
Christoph Oelckers
4e2763e5fa
Merge branch 'master' of https://github.com/ZzZombo/zdoom-modified
2015-02-07 16:45:44 +01:00
Christoph Oelckers
5d75df4869
Merge branch 'polydoor_swing_overshoot_fix' of https://github.com/edward-san/zdoom
2015-02-07 16:44:38 +01:00
Christoph Oelckers
c4f932022c
- added 'listsoundchannels' CCMD for debugging.
2015-02-07 16:44:24 +01:00
ZzZombo
322742d4b1
- Fixed various instances of unused variables, accessing arrays out of bounds, initialization of non-primitive members in constructor's body, dead code, passing parameters by value instead of reference, usage of uninitialized variables, as reported by cppcheck.
2015-02-07 23:35:23 +08:00
Christoph Oelckers
ec58178695
- replace all \0 characters in Dehacked patches with spaces.
...
This is needed to make some old and broken patches in some WolfenDoom mods load.
2015-02-07 15:27:31 +01:00
Edoardo Prezioso
60b735dc60
Remove redundant code in polydoor swing code.
...
'Perpetual' check does not make sense for poly doors.
2015-02-07 15:03:16 +01:00
Christoph Oelckers
2d4299608c
Merge branch 'Inventory.Transfer-flag' of https://github.com/Edward850/zdoom
2015-02-07 13:12:15 +01:00
Christoph Oelckers
6801d0faec
Merge branch 'pause' of https://github.com/Edward850/zdoom
2015-02-07 13:03:33 +01:00
Christoph Oelckers
c54a4fe06b
Merge branch 'ext_skin_check' of https://github.com/alexey-lysiuk/gzdoom
2015-02-07 13:02:19 +01:00
Christoph Oelckers
5a52c4007d
Merge branch 'faceaddons' of https://github.com/MajorCooke/zdoom
2015-02-07 13:01:31 +01:00
Christoph Oelckers
cb4ef09b69
Merge branch 'mirrorfix' of https://github.com/MajorCooke/zdoom
2015-02-07 12:59:53 +01:00
Edward Richardson
291861bf52
Removed debug output
2015-02-05 23:53:34 +13:00
Edward Richardson
5164b78c31
Camera paths would hold indeterminate of the level
2015-02-05 22:44:51 +13:00
Edward Richardson
cbb066f1fb
Keep gameticker running to let the thread sleep
2015-02-05 22:43:42 +13:00
Edward Richardson
1e0a1466a3
Moved and rearranged transfer task
...
- Some inventory pickup conditions weren't properly covered
2015-02-05 20:13:54 +13:00
Edward Richardson
de4097cc7b
Added INVENTORY.TRANSFER
...
- INVENTORY.TRANSFER allows transferring all owned inventory to a new
owner on pickup.
2015-02-05 14:52:52 +13:00
Braden Obrzut
8e1b1aa201
- Defer SDL subsystem initialization since it seems to cause conflicts with GUI toolkits on some systems.
2015-02-02 19:36:08 -05:00
Randy Heit
dc6b45804d
Don't lose the cursor when scrolling up in option menus
...
- Fixed: If the menu cursor was on the topmost-displayed item, pressing up
would not scroll the view up. The check for scrolling only tested if the
newly selected item was the topmost one, since the menu code had
assumed the only time the cursor would be on the topmost visible line
was when it was the very first line of the menu. Using PgDn breaks this
assumption.
2015-01-31 20:10:18 -06:00
alexey.lysiuk
cce5066bea
Improved check for skins and maps in the same WAD
...
The corresponding warning is shown for Doom I mods too. Good example of it is Hyena TC: http://www.doomworld.com/idgames/index.php?file=levels/doom/Ports/megawads/hyena.zip
Reduced chance of false positive for the mentioned warning
2015-01-31 13:14:30 +02:00
MajorCooke
53fd57d6b7
- Added ang_offset and pitch_offset to A_Face, along with 4 new flags:
...
- ang_offset: the extra angle to apply to the actor after calculating the maximum turn.
- pitch_offset: Just like ang_offset, with pitch instead.
- FAF_BOTTOM: Aim straight for the actor's z coordinate, not with +32 units.
- FAF_MIDDLE: Aims for the direct middle of the actor.
- FAF_TOP: Aims for the very top of the actor.
- FAF_NODISTFACTOR: Use the raw pitch offset without calculating it into the distance of the aimed actor.
2015-01-30 16:48:24 -06:00
MajorCooke
6bb0849984
- Fixed: MIRRORREFLECT was broken after my last patch to fix the always 0 angle issue. Also simplified the speed change -- it's the same thing without having to recalculate the angle into it.
...
- Also ensure that the check for AIMREFLECT happens no matter what.
2015-01-30 16:34:24 -06:00
Randy Heit
b69edbbec1
Redo commit a4c07a9
...
- Line endings are inconsistant in this file, but at least the commit
doesn't touch the whole file.
2015-01-29 19:50:52 -06:00
Randy Heit
d828173ce3
Revert "- fixed: Since A_Give/TaketoChildren/siblings use the same code as A_Give/TakeInventory but do not use the third parameter this must be ignored by the code. This is merely a band-aid fix, because this problem doesn't exist in the same form in the scripting branch."
...
This reverts commit a4c07a9ee3
.
- This commit touched every line of thingdef_codeptr.cpp, which would make
merging it into the scripting branch a pain in the ass.
2015-01-29 19:30:26 -06:00
Braden Obrzut
72506fa6e9
- Fixed: Regression with centered coordinates.
2015-01-26 15:00:36 -05:00
Edoardo Prezioso
78b4cbdf6c
- Fixed a very old issue with rotating polydoors.
...
This happened when the polydoor was open. If a mobj blocked the poly door, such that the door could not move from its open position, the poly door could rotate a little bit more than needed, making the door partially closing when the door managed to close later.
2015-01-26 02:20:54 +01:00
Christoph Oelckers
a4c07a9ee3
- fixed: Since A_Give/TaketoChildren/siblings use the same code as A_Give/TakeInventory but do not use the third parameter this must be ignored by the code. This is merely a band-aid fix, because this problem doesn't exist in the same form in the scripting branch.
2015-01-25 20:15:58 +01:00
Edoardo Prezioso
04c6c5ca55
Fix missing 'victim' replace in ALoreShot code.
2015-01-24 14:17:47 +01:00
Christoph Oelckers
92fbe47ade
- fixed and cleaned up ALoreShot::DoSpecialDamage.
2015-01-24 14:04:06 +01:00
Edward Richardson
b2fbeb24c4
DEM_CHANGEMAP2 wasn't properly skipped
2015-01-24 16:09:15 +13:00
Christoph Oelckers
d1cca79c31
- Use SpawnHealth() when calling A_ResetHealth.
2015-01-23 20:29:38 +01:00
MajorCooke
301c061ec3
- Added pointer for A_SetRoll.
2015-01-23 10:24:23 -06:00
MajorCooke
19b43d4752
- Added A_ResetHealth(ptr). Defaults to AAPTR_DEFAULT (the action caller).
...
- Added pointers to the following functions, all of them set to AAPTR_DEFAULT:
- A_SetAngle
- A_SetPitch
- A_SetScale
- A_SetSpeed
- A_ScaleVelocity
2015-01-23 09:26:34 -06:00
Christoph Oelckers
7157db89b7
- fixed: A_VileAttack didn't check for MF7_DONTTHRUST.
...
This is a fixed version of Major Cookes pull request.
2015-01-22 14:13:25 +01:00
Christoph Oelckers
73bdd06ceb
- removed bogus angle modification from reflection code.
2015-01-22 14:10:55 +01:00
Christoph Oelckers
667c4ba5fc
Merge branch 'reflectfixsolo' of https://github.com/MajorCooke/zdoom
2015-01-22 14:01:27 +01:00
Christoph Oelckers
ae282eea53
Merge branch 'sethealthredux' of https://github.com/MajorCooke/zdoom
2015-01-22 13:59:59 +01:00
Christoph Oelckers
afb90040c2
Merge branch 'changevelptr' of https://github.com/MajorCooke/zdoom
2015-01-22 13:58:20 +01:00
MajorCooke
4fd87a1ce9
- Redid A_SetHealth.
...
- This function will not take the actor's health below 1, and any attempts to do so will simply set it to 1 in its place.
2015-01-20 22:54:30 -06:00
MajorCooke
fa411af1da
- Fixed: Reflected projectiles were always changing their angles to 0.
2015-01-20 09:10:58 -06:00
Christoph Oelckers
2a0fc16ce3
Merge branch 'master' of https://github.com/rheit/zdoom
2015-01-20 10:26:30 +01:00