d0df4c1744
Upgraded the portal code to work with the new tagManager system. Was uncompilable
2015-06-07 21:27:20 +03:00
7ba577e1b0
Merge branch 'master' into scripting
...
Conflicts:
src/g_heretic/a_hereticweaps.cpp
src/thingdef/thingdef_codeptr.cpp
2015-06-07 09:43:54 +02:00
4444d3c0c5
- removed the _3DFLOOR #define because we really do not want to comment this out anymore, right?
2015-06-07 09:41:44 +02:00
78ea00be59
Put line ID from args[1] for Hexen maps
2015-06-07 04:19:18 +03:00
cd39c4b8a6
Merged mirrors with portals; Render part of mirrors done, render part of portals needs further testing
2015-06-07 04:19:17 +03:00
1effaa4c8e
Merge branch 'master' into scripting
2015-04-29 10:53:37 +02:00
7d90c65427
- mask out Strife mapthing flags when starting an original Hexen map.
2015-04-29 08:42:54 +02:00
2e0f999fea
Merge branch 'master' into scripting
...
Conflicts:
src/p_effect.cpp
src/p_effect.h
src/p_local.h
src/p_map.cpp
src/thingdef/thingdef_codeptr.cpp
wadsrc/static/actors/actor.txt
wadsrc/static/actors/shared/inventory.txt
zdoom.vcproj
2015-04-28 14:45:13 +02:00
8447990889
Merge commit '2719ce86dc07c9f7b1ad6d61a9a49c974896abf2' into scripting
...
Conflicts:
src/info.h
src/thingdef/thingdef_codeptr.cpp
(until right before the main work for multiple tags.)
2015-04-28 13:32:50 +02:00
ddced06be2
Merge commit '6e45c565a0bc8d05279b0b2458a3fb718ae0924c' into scripting
...
Conflicts:
src/p_mobj.cpp
(This stops right before moving the conversation IDs into MAPINFO because that feature is quite conflict-heavy and will have to merged by itself.)
2015-04-28 12:59:20 +02:00
065c0a79cd
Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting
...
Conflicts:
src/d_main.cpp
src/info.cpp
src/info.h
src/p_acs.cpp
src/p_interaction.cpp
src/p_mobj.cpp
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_properties.cpp
(scripting branch update part 5)
2015-04-28 12:48:33 +02:00
792cad89b3
Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting
...
Conflicts:
src/g_hexen/a_clericstaff.cpp
src/g_hexen/a_hexenspecialdecs.cpp
src/p_acs.cpp
src/p_enemy.cpp
src/p_interaction.cpp
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_expression.cpp
(Scripting branch update part 4)
2015-04-28 11:59:33 +02:00
d6e3fc0567
Merge commit 'fb9231a38db2025eb77bfd246f36d985cbbccd2e' into scripting
...
Conflicts:
src/info.cpp
src/thingdef/thingdef_expression.cpp
wadsrc/static/actors/constants.txt
(Scripting branch update part 2)
2015-04-28 09:57:01 +02:00
cad282142d
- fixed some last issues with the tag manager.
2015-04-19 18:22:39 +02:00
db61c1cb57
- allow multiple line IDs as well using the same method as for sector tags.
2015-04-19 17:51:34 +02:00
b921157f57
- uncouple sector tag storage from the sector data to allow multiple tags per sector.
...
Tags are now handled by a tag manager class which stores sector/tag pairs. This way multiple entries can be added per sector.
Since UDMF does not have any arrays the additional tags are stored as a space separated string as 'MoreIDs'.
2015-04-19 12:33:27 +02:00
203f88ce6e
- some sanitizing of sector tag/line id management:
...
* make setting the line ID with P_TranslateLineDef explicit because there's one FraggleScript function that needs to work around the changes caused by this. There's also some functions setting only a temporary linedef. These would inevitably cause problems if the underlying data gets changed.
* remove FS function 'ChangeTag'. Fortunately this was just some long forgotten test stuff that can be removed without affecting any maps, but the feature would cause some serious problems in a more complex system.
With these changes it is guaranteed that after map setup the tag/ids won't change anymore.
2015-04-15 20:10:27 +02:00
902593198b
- wrapped all line ID accesss just like sector tags
2015-04-15 09:37:06 +02:00
2faf836aa1
- some minor rework of tag access interface after I realized that some stuff (e.g. Strife's scrolling sector special) need the primary tag to treated specially.
2015-04-14 18:48:19 +02:00
238046655c
- wrapped all accesses to the sector tag into accessor functions, as preparation for allowing multiple tags per sector.
2015-04-14 18:32:14 +02:00
51591d10b0
- handle slope things through new definition tables as well. Since these get processed outside P_SpawnMapThing it required some restructuring so that the actual spawn data is present when slope things get processed.
...
- removed FMapThing::Serialize because it isn't used anywhere - it was rather broken anyway.
2015-04-04 10:25:01 +02:00
9e5bf38123
- handle all special mapthing items (player starts, polyobj spots) via the new MAPINFO method instead of hard coding them in the spawn function.
...
(Note: The buildmap loading code should be adjusted to the new functionality as well eventually.)
2015-04-03 21:17:10 +02:00
d84c85d40f
Remove warnings warned by Clang
2015-03-08 17:21:15 -05:00
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
c4b742ebf0
- Part 2 of the sanity crusade.
2015-02-08 17:03:49 +08:00
b5e4153c78
Merge branch 'master' into gonesolong
...
Conflicts:
src/CMakeLists.txt
src/b_think.cpp
src/g_doom/a_doomweaps.cpp
src/g_hexen/a_clericstaff.cpp
src/g_hexen/a_fighterplayer.cpp
src/namedef.h
src/p_enemy.cpp
src/p_local.h
src/p_mobj.cpp
src/p_teleport.cpp
src/sc_man_tokens.h
src/thingdef/thingdef_codeptr.cpp
src/thingdef/thingdef_function.cpp
src/thingdef/thingdef_parse.cpp
wadsrc/static/actors/actor.txt
wadsrc/static/actors/constants.txt
wadsrc/static/actors/shared/inventory.txt
- Added register reuse to VMFunctionBuilder for FxPick's code emitter.
- Note to self: Need to reimplement IsPointerEqual and CheckClass, which
were added to thingdef_function.cpp over the past year, as this file no
longer exists in this branch.
2014-12-21 21:15:11 -06:00
2d87eb0ba2
Merge branch 'master' into gonesolong
...
Conflicts:
src/CMakeLists.txt
src/actor.h
src/g_heretic/a_hereticmisc.cpp
src/g_heretic/a_hereticweaps.cpp
src/g_heretic/a_ironlich.cpp
src/info.h
src/namedef.h
src/p_buildmap.cpp
src/p_enemy.cpp
src/p_map.cpp
src/p_mobj.cpp
src/thingdef/thingdef_codeptr.cpp
zdoom.vcproj
2014-12-20 19:13:14 -06:00
ee977f94d7
- Moved bot thinking logic into DBot.
2014-11-14 16:54:56 +00:00
c400dcf736
- Made DBot inherit from DObject.
2014-10-15 17:54:12 +01:00
a2c81f1ca9
-fixed the file validity checks in MapData::GetChecksum.
...
They need to be done per lump, because MapData::Seek can alter the FileReader being used for a specific lump. Even worse, the FileReader will be NULL when the function as it was is called for a map inside a Zip-file.
2014-09-12 20:59:23 +02:00
4cf468452c
Remove slopetype from line_t.
...
- Recomputing it in the only two places where it's used is trivial, so
it's basically a waste of space to precompute it.
2014-07-31 19:15:08 -05:00
00854dd09e
Don't reopen the reader for encrypted maps
...
- Fixed: Memory leak when loading Blood maps.
2014-07-29 20:42:17 -05:00
e92032e8ff
- fixed: The map setup code was still truncating texture names in several places.
2014-05-16 22:48:37 +02:00
a375454474
- removed 8 character limit for map names.
2014-05-14 00:52:16 +02:00
24886b6734
- removed the last static character arrays from FLevelLocals.
2014-05-13 23:16:13 +02:00
1c50b5dd6f
Fixed initialization of Hexen-style things
...
Recently added pitch and roll members were not initialized with zeroes when loading Hexen-style maps
At least, hitscan attack can be fired in random direction because of this
2014-04-20 13:37:59 +03:00
c54f5571ea
Typo.
2014-04-15 17:24:01 +02:00
6f2fd8edbf
Hexen also needs to init 0 fields.
2014-04-15 17:22:56 +02:00
8e3360453f
Hexen too.
2014-04-15 17:18:55 +02:00
e5578934ad
Init new non-0 fields for non-UDMF maps.
2014-04-15 17:16:33 +02:00
ae49044f96
- let 'showloadtimes' measure UDMF parsing.
2013-12-19 17:59:58 +01:00
251cdacf26
Merge branch 'master' into scripting
...
Conflicts:
src/g_shared/a_randomspawner.cpp
src/g_strife/a_strifeweapons.cpp
src/thingdef/thingdef_parse.cpp
wadsrc/static/actors/constants.txt
2013-09-03 09:01:28 +02:00
b0371e1804
Don't abort when merely checking if a non-map is a map
...
- When P_OpenMapData() is called by P_CheckMapData(), we don't actually
care if any required lumps are missing. This just means it isn't a valid
map, so don't abort with I_Error().
2013-08-30 22:38:57 -05:00
6aee7833d0
Use PField instead of PSymbolVariable for SetMapThingUserData()
2013-08-21 22:51:12 -05:00
3e4678765b
Merge branch 'master' into scripting
...
Conflicts:
src/actor.h
src/thingdef/thingdef_codeptr.cpp
2013-08-18 12:18:59 +02:00
0a258f95ea
- added gravity property to UDMF things. Positive values are multiplied with the class's gravity property, negative values are used as their absolute.
2013-08-09 16:25:16 +02:00
bba092cc0b
Merge branch 'master' into scripting
...
Conflicts:
src/d_player.h
src/g_doom/a_archvile.cpp
src/thingdef/thingdef.h
src/thingdef/thingdef_properties.cpp
2013-08-09 13:03:28 +02:00
bb494292c6
- Fixed P_CheckMapData allowed non-map lump names to pass resulting in a crash when actually trying to load the map.
2013-08-08 23:47:58 -04:00
459ad5abff
- Updated scripting branch to latest version in trunk.
...
SVN r4337 (scripting)
2013-06-07 03:31:30 +00:00
1d4fbc05a5
- Fixed: glbsp nodes in a wad file inside a pk3 would not be loaded.
...
- Fixed: Typo from r4270.
SVN r4273 (trunk)
2013-05-20 20:39:34 +00:00
e434ccc3f6
- Add support for user variables on things in UDMF maps. If you include an actor's user variable
...
in its UDMF thing definition, that user variable will be set to the desired value for that
actor when the map is loaded.
SVN r4140 (trunk)
2013-02-17 00:23:58 +00:00
7714a45e02
- Fixed: Because P_OpenMapData() now reopens the containing file for the map, P_LoadGLNodes() needs a new check for if the map came from a regular wad.
...
SVN r4136 (trunk)
2013-02-14 05:06:05 +00:00
afabf7e018
- Force node building for garrison.wad from The Master Levels so that the teleporter to the
...
red key won't leave you in the ground.
SVN r4071 (trunk)
2013-02-07 21:32:06 +00:00
787c338871
- Added MAPINFO flag "SpawnWithWeaponRaised".
...
SVN r4013 (trunk)
2013-01-03 02:08:08 +00:00
deff47ea18
- fixed: The map loader did not check for the new node formats.
...
SVN r3982 (trunk)
2012-12-07 07:40:41 +00:00
d77297e969
- Added support for loading ZGL3/XGL3 nodes.
...
- Added additional debug spew for the nodebuilder.
- Restore the nodebuilder's debug spew that was present in ZDBSP but not the internal version.
Use the CRT's printf for this output to ensure that it is identical to ZDBSP's output for the
same input.
SVN r3980 (trunk)
2012-12-07 06:16:07 +00:00
7aa4c55bfc
- added Gez's patch to fix map checksum calculation.
...
SVN r3970 (trunk)
2012-11-19 00:43:45 +00:00
d393434d56
- Fixed: Broke UDMF in PK3 loader.
...
SVN r3905 (trunk)
2012-10-24 23:49:34 +00:00
b52c3238eb
- Instead of implementing the wad code in three places, use the normal resource code for map loading and GL node loading.
...
SVN r3897 (trunk)
2012-10-22 01:28:11 +00:00
0c8e4c37d9
- The complete FMapThing is overkill for storing player starts, so use a new minimal structure for them.
...
SVN r3750 (trunk)
2012-07-08 02:18:15 +00:00
71601f91d1
- Added MAPINFO flag RandomPlayerStarts. In this mode, no voodoo dolls are spawned. Instead, all
...
player starts are added to a pool, and players spawn at a random spot.
SVN r3749 (trunk)
2012-07-08 01:43:47 +00:00
14730a89be
- changed calculation of soundorg for triangular sectors. In many cases the center of the bounding box won't be inside the sector but on one of the outer lines so something different is needed
...
SVN r3517 (trunk)
2012-04-04 17:33:43 +00:00
cfd5b84535
- Replace >>MAPBLOCKSHIFT with GetSafeBlockX/GetSafeBlockY from Mocha Doom.
...
SVN r3486 (trunk)
2012-03-28 03:49:38 +00:00
ac0c1eb64b
- Fixed: If the znodes were based on a map with more vertexes than the one it is being loaded
...
for, reject them.
SVN r3477 (trunk)
2012-03-23 23:04:32 +00:00
2e9abe7408
- Fixed: When checking the REJECT contents one byte at a time, P_LoadReject() used rejectsize
...
instead of i as an index into rejectmatrix.
SVN r3456 (trunk)
2012-03-20 02:09:48 +00:00
914ef44c59
- Fixed: In non-UDMF maps, projectile impact activation implies projectile cross activation as well.
...
SVN r3439 (trunk)
2012-03-15 22:57:00 +00:00
58ed367280
- Fixed: If the first four bytes of the NODES lump are all zero, the nodes would not be loaded,
...
nor would they be generated.
SVN r3423 (trunk)
2012-03-11 03:25:04 +00:00
472ac1b07c
- Fixed: The nodebuilder is highly likely to renumber vertices, so we need to remember how the
...
original vertices map to the new ones until after vertex slopes are handled.
SVN r3380 (trunk)
2012-02-21 21:52:42 +00:00
7714ee3ffd
- Fix more errors found with static code analysis.
...
SVN r3288 (trunk)
2011-09-01 22:57:49 +00:00
ba661308d4
- added GZDoom's option not to count monsters in E1M8-style end of level sectors, but controlled by a dmflag.
...
SVN r3267 (trunk)
2011-07-07 21:55:55 +00:00
55bb4afac8
- backported GZDoom extensions to renderer interface.
...
SVN r3266 (trunk)
2011-07-07 21:43:49 +00:00
4ef68ded5d
- fixed some leftover references to the software renderer.
...
SVN r3264 (trunk)
2011-07-07 19:53:42 +00:00
463c276014
- removed more r_ header dependencies from the rest of the code.
...
SVN r3260 (trunk)
2011-07-06 15:31:05 +00:00
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
5c6fd66ed5
- rename src/resources to src/r_data.
...
SVN r3254 (trunk)
2011-07-06 07:35:36 +00:00
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
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
ee8ca0de87
Fixed: Light levels outside the range [0,255] really do matter.
...
SVN r3223 (trunk)
2011-06-11 23:58:33 +00:00
37aab20cb3
- Colorize missing texture messages.
...
SVN r3193 (trunk)
2011-05-08 00:35:17 +00:00
6c70afe0a7
- Place a limit on the number of reports per missing texture. On maps with many lines and many
...
sides of missing textures, this can take a very long time, because each missing textures causes
a scan of every single line (for the sake of packed sidedefs), and each output line also requires
an update of the hidden RichEdit logging control.
SVN r3192 (trunk)
2011-05-08 00:30:32 +00:00
1993e969b7
- GCC warning fixes (GCC stupidity for the most part.)
...
SVN r3154 (trunk)
2011-02-19 08:59:43 +00:00
060d740275
- Fixed: Fake floor's validcounts were not initialized.
...
- Fixed: When loading non-UDMF maps, things did not have their conversation field zero'ed.
- Added an assert for the FAKE3D_REFRESHCLIP case at the end of R_RenderMaskedSegRange(), because Valgrind indicates this is being run
without ds->bkup being set to something valid. I do not immediately know how this should be fixed.
SVN r3130 (trunk)
2011-02-02 02:07:36 +00:00
fae8ed444c
- merged 3dfloors2 branch into trunk.
...
SVN r3124 (trunk)
2011-01-29 11:09:38 +00:00
5d79cfd303
- fixed: The internal blockmap builder still used 16 bit WORDs to reference linedefs so it failed on USMF maps which exceed this value.
...
SVN r3092 (trunk)
2011-01-09 11:01:04 +00:00
e33d1a989f
- set all 'num' variables to 0 in P_FreeLevelData so that any code using them won't try to read the deleted map data.
...
SVN r3044 (trunk)
2010-12-15 23:10:08 +00:00
e7eb43a343
- added Gez's automap patch to mark trigger lines.
...
SVN r3040 (trunk)
2010-12-15 00:14:42 +00:00
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
79c5080dda
- added DavidPH's submission for specifying vertex heights directly in UDMF.
...
SVN r3037 (trunk)
2010-12-14 00:56:44 +00:00
f0f17e531c
- move static AM color initialization into the AM_StaticInit function.
...
- move D_LoadWadSettings to keysections.cpp.
- made some more data reloadable.
- data structures filled by P_SetupLevel should be cleared before loading the level. They can remain non-empty in case of an error. There's probably more to fix here...
- fixed: MidiDevices and MusicAliases were not cleared before reloading local SNDINFOs.
- fixed signed/unsigned warnings in AddSwitchPair for real (GCC really allows -1u? MSVC prints a warning for that.)
SVN r3036 (trunk)
2010-12-14 00:50:02 +00:00
24ab37613a
- moved switch definitions into texture manager and split all associated code off p_switches.cpp into its own file.
...
SVN r3027 (trunk)
2010-12-11 23:02:46 +00:00
6309d90be0
- moved texture counting code into FTextureManager.
...
- moved all code and data for Build tile management into FTextureManager.
- moved texture animation management into FTextureManager.
- changed: Animate textures only once per frame, not per view. Otherwise with animations that have sub-frame accuracy camera textures of the same area can show different animation frames if the frame changes falls between the rendering of the different views.
SVN r3026 (trunk)
2010-12-11 12:00:40 +00:00
5e7753d7e8
- fixed: The floor plane's alpha was not initialized.
...
SVN r3003 (trunk)
2010-11-08 20:18:06 +00:00
492bead360
- add alpha property to sector_t::splane. Not used yet.
...
SVN r2992 (trunk)
2010-11-07 16:17:14 +00:00
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
3f420c97bd
- allow setting the startup screen's title through GAMEINFO lump.
...
SVN r2850 (trunk)
2010-09-24 14:27:52 +00:00
610ff3956e
- fixed P_LoopSideDefs could crash on the second P_LoopSidedefs call if there were unconnected linedefs in the map.
...
SVN r2716 (trunk)
2010-09-08 08:53:39 +00:00
092cbfd55b
- Fixed: When the game nodes were the same as the render nodes, their pointers would not be NULLed.
...
SVN r2676 (trunk)
2010-09-03 02:11:35 +00:00
d4b03e2b77
-
...
SVN r2629 (trunk)
2010-08-29 03:52:02 +00:00
ece980d372
- fixed check for GL nodebuild
...
SVN r2613 (trunk)
2010-08-27 17:34:25 +00:00
3afa8149de
- added a fix from GZDoom to handle levels with compressed sidedefs that were processed by older ZDBSPs.
...
SVN r2612 (trunk)
2010-08-27 16:53:11 +00:00
ZZYZX
Christoph Oelckers
Randy Heit
ZzZombo
Randy Heit
ChillyDoom
Christoph Oelckers
alexey.lysiuk
Gaerzi
Braden Obrzut