Christoph Oelckers
6d3b26f94c
- scriptified the WeaponGiver.
2017-01-19 14:00:00 +01:00
Christoph Oelckers
42f3ccc602
- scriptified a few parts of p_pspr.cpp.
...
- added a speed parameter to A_Lower and A_Raise in the process.
2017-01-19 13:26:46 +01:00
alexey.lysiuk
0376c8ba24
Removed no longer present file from CMakeLists.txt
2017-01-19 10:08:00 +02:00
Christoph Oelckers
9f550941d2
- fixed loop ordering in P_SetRenderSector.
2017-01-19 01:39:05 +01:00
Christoph Oelckers
8256f25a84
- no need to keep AArmor native, now that all child classes have been scriptified.
2017-01-18 23:46:19 +01:00
Christoph Oelckers
632a29e365
- scriptified HexenArmor.
2017-01-18 23:42:08 +01:00
Christoph Oelckers
2fcffd1fc1
- removed the remaining native parts of ABasicArmor.
...
- simplified some FindInventory calls using PClass::FindActor to call the variant taking a name directly.
2017-01-18 22:57:47 +01:00
Christoph Oelckers
3148496f57
- scriptified BasicArmor and fixed a few errors in the conversion.
2017-01-18 22:15:48 +01:00
Christoph Oelckers
2dd6fb9595
- scriptified BasicArmorBonus.
2017-01-18 20:23:13 +01:00
Christoph Oelckers
87b9b6111d
- scriptified the BeginPlay methods of the VavoomLight classes.
...
- moved m_Radius back to arg[3] and arg[4], so that scripts have access to light sizes again.
2017-01-18 19:10:25 +01:00
Christoph Oelckers
1ce7b80158
- scriptified the rest of the weapon pieces.
2017-01-18 18:46:24 +01:00
Christoph Oelckers
30a8541a15
- scriptified the weapon piece functions.
...
- fixed: ClearInventory did not process depleted items properly.
- changed HexenArmor from UNDROPPABLE to UNTOSSABLE because this allowed to remove some special handling in ClearInventory. The only other place which checks this flag also checks UNTOSSABLE.
2017-01-18 17:26:12 +01:00
Christoph Oelckers
d8acf774a6
- scriptified the remains of AKey.
...
- replaced Key.KeyNumber with special1. This is only for internal bookkeeping purposes so there's really no need to complicate this with a new variable when this one works just as well.
2017-01-18 15:17:12 +01:00
Christoph Oelckers
d9fd2d509f
- scriptified the remains of AAmmo.
2017-01-18 14:18:17 +01:00
Christoph Oelckers
cfdd580044
- deleted a_artifacts files.
2017-01-18 10:44:51 +01:00
Christoph Oelckers
534b2ebbfb
- scriptified the remains of APowerup.
...
- ensure that actor defaults contain a valid virtual table and class pointer so that they can actually use virtual and class-dependent method functions. This is needed for retrieving script variables from them.
2017-01-18 10:33:03 +01:00
Christoph Oelckers
b41d4d9f84
- initialize variable to make Valgrind happy.
2017-01-18 01:53:15 +01:00
Christoph Oelckers
ade9e4c3da
- implemented processing of multiple return values in script functions.
2017-01-18 01:27:50 +01:00
Christoph Oelckers
232b64d332
- eliminated the native PowerupGiver class.
...
- scriptified the respawn invulnerability code into a virtual OnRespawn function for PlayerPawn so that custom effects can be implemented.
2017-01-18 00:11:04 +01:00
Christoph Oelckers
98f9219334
- scriptified the remaining functions in a_artifacts.cpp.
...
- added some helpers to set scripted member variables through the native property parser.
Unfortunately some classes, e.g. PowerMorph, MorphProjectile and the powerup contain some that cannot be handled through the 'property' definition on the script side so they need to be done from the native side.
2017-01-17 20:30:17 +01:00
Christoph Oelckers
14f2c39e58
- scriptified cht_Give and cht_Take and made them virtual function of PlayerPawn so that this can be better configured for mods that want other options in here.
...
- improved the class pointer to string cast to print the actual type it describes and not the class pointer's own type.
- fixed: The 'is' operator created non-working code when checking the inheritance of a class pointer, it only worked for objects.
2017-01-17 17:34:39 +01:00
Christoph Oelckers
75d3f42d4f
- scriptified APowerup.
2017-01-17 17:34:07 +01:00
Edoardo Prezioso
0da1142bdb
- Run libsndfile before libmpg123 when reading an audio lump.
...
libmpg123 spews quite a lot of debug stuff in stdout when encountering files like WAV or Ogg Vorbis, while libsndfile is silent when encountering an MP3 file.
2017-01-17 16:47:37 +01:00
alexey.lysiuk
c4aaeef6b1
Removed homebrew MP3 format detection
...
It didn't work for all files so let libmpg123 handle all quirks for us
See https://mantis.zdoom.org/view.php?id=60
2017-01-17 11:26:51 +02:00
Edoardo Prezioso
c317a4cbf3
- Fixed: wrong FString 'Replace' action function.
...
The function replaced only the first character of the first argument with the first character of the second argument.
2017-01-17 10:00:35 +01:00
Edoardo Prezioso
bfb7b82bcc
- Fixed uninitialized data for libsndfile.
...
According to the API docs, when opening a file for read, SF_INFO::format must be set to 0.
Discovered with Valgrind while running Deus Vult 2 map01.
2017-01-17 00:21:27 +01:00
Christoph Oelckers
8f6571241d
- scriptified AÃœpwerInvulnerable.
2017-01-16 23:45:25 +01:00
Christoph Oelckers
6990a46daf
- scriptified PowerStrength.
...
This revealed an interesting bug: When the berserk fadout formula was changed in 2005 the result was essentially broken, resulting in values around 7000 - it only worked by happenstance because the lower 8 bits of the resulting values just happened to work to some degree and never overflowed. But the resulting fade was far too weak and a slightly different handling of the color composition code for the VM made it break down entirely.
This restores the pre-2005 formula but weakened intensity which now comes a lot closer to how it is supposed to look.
2017-01-16 22:27:49 +01:00
Christoph Oelckers
c5f100a61d
- fixed class name checks for custom properties.
2017-01-16 20:44:52 +01:00
Christoph Oelckers
d3ab691afb
- scriptified APowerInvisibility.
...
- changed AlterWeaponSprite so that it doesn't expose renderer internals to the script code.
2017-01-16 20:34:12 +01:00
Christoph Oelckers
616f954153
- scriptified PowerIronFeet and PowerMask.
2017-01-16 19:04:03 +01:00
Christoph Oelckers
65b7e344f7
- added custom property parsing to DECORATE as well.
2017-01-16 10:36:56 +01:00
Christoph Oelckers
cd1d96b83a
- fixed compilation.
2017-01-16 10:36:56 +01:00
Christoph Oelckers
cd0d17dbd5
- made AbsorbDamage work iteratively to avoid large stack use in the VM.
2017-01-16 10:36:56 +01:00
Braden Obrzut
ae7b95fc52
- There are more DYN options than just fluidsynth so unconditionally use CMAKE_DL_LIBS.
2017-01-16 02:19:03 -05:00
Christoph Oelckers
d207b571d9
- scriptified PowerLightAmp and PowerTorch.
...
- allow calling qualified super methods so skipping some levels is possible.
2017-01-16 00:46:15 +01:00
Christoph Oelckers
d2d6e5d486
- scriptified PowerFlight and PowerWeaponLevel2.
2017-01-15 23:21:38 +01:00
Christoph Oelckers
4837e1e770
- partially scriptified APowerSpeed.
2017-01-15 20:58:52 +01:00
Christoph Oelckers
7503937a84
- scriptified PowerTargeter.
2017-01-15 19:44:43 +01:00
Christoph Oelckers
bf52ce19e4
- fixed: AActor::ClearInventory should respect IF_KEEPDEPLETED for all items.
2017-01-15 18:58:17 +01:00
Christoph Oelckers
03c7b10fd6
- fully scriptified HealthPickup.
2017-01-15 18:46:40 +01:00
Christoph Oelckers
156f9c488e
- added script variable access for native code so that many more classes can be fully exported. Tested with the puzzle items.
2017-01-15 18:16:36 +01:00
Christoph Oelckers
179b6e1a39
- added property definitions to the ZScript parser. This will allow defining custom properties for the default block in custom base classes. See 'Health' for an example.
...
- support transient object member variables for information that does not need to be put in a savegame.
- fixed: special initialization of objects needs to pass the proper defaults along, otherwise the parent classes will use their own, inappropriate one.
2017-01-15 16:55:30 +01:00
Christoph Oelckers
267600826f
- sxriptified key and puzzleitem base classes.
2017-01-15 10:37:54 +01:00
Christoph Oelckers
87617b588a
- some minor optimization in the VM.
2017-01-15 01:27:01 +01:00
Christoph Oelckers
9f9cea4b4a
- scriptified the health items.
2017-01-15 01:02:38 +01:00
Christoph Oelckers
4759f9a399
- scriptified the backpack.
...
- added GetParentClass builtin to compiler.
2017-01-14 23:34:47 +01:00
Christoph Oelckers
a597979738
- scriptified ammo.
...
- moved inventory stuff into its own directory.
2017-01-14 21:27:31 +01:00
Edoardo Prezioso
d91023ba0b
- Fixed GCC/Clang compile errors.
2017-01-14 18:30:01 +01:00
Christoph Oelckers
e16713492f
- scriptified A_FreezeDeath(Chunks).
2017-01-14 18:26:59 +01:00
Christoph Oelckers
6dc1bb8475
- skriptified the skybox actors.
...
- fixed code generation for internal pointed arrays, they were missing a pointer dereference.
2017-01-14 18:04:49 +01:00
Christoph Oelckers
a9ef73528d
- removed all skybox class types from code in preparation for exporting these classes.
...
- moved SectorPortal struct to FLevelLocals and exported it.
2017-01-14 16:05:40 +01:00
Christoph Oelckers
96777273c4
- scriptified ASoundSequence.
...
- exported virtual Actor.MarkPrecacheSounds function.
2017-01-14 14:37:29 +01:00
alexey.lysiuk
0b62645a35
Fixed compilation warnings reported by GCC/Clang
...
gl/data/gl_setup.cpp:430:11: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
gl/data/gl_setup.cpp:527:19: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
gl/data/gl_setup.cpp:542:19: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
nodebuild.cpp:1056:63: warning: format specifies type 'ptrdiff_t' (aka 'long') but the argument has type 'int' [-Wformat]
p_glnodes.cpp:379:50: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
p_saveg.cpp:381:18: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
p_scroll.cpp:532:11: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
p_setup.cpp:2304:43: warning: format specifies type 'int' but the argument has type 'unsigned long' [-Wformat]
p_setup.cpp:2302:12: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
scripting/codegeneration/codegen.cpp:8488:20: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
scripting/codegeneration/codegen.cpp:8606:15: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
2017-01-14 15:03:14 +02:00
Christoph Oelckers
f83444f3cc
- exported the sound sequence interface to scripting.
...
- split out the map data definitions from base.txt into their own file.
2017-01-14 13:02:08 +01:00
Christoph Oelckers
386c00f17e
- scriptified ASoundEnvironment.
...
This also exposes the functionality as a member function of Sector for easier script access.
2017-01-14 11:43:08 +01:00
Christoph Oelckers
40e7fa5be2
- scriptified the RandomSpawner.
...
- fixed: String constants were not processed by the compiler backend.
- added an explicit name cast for class types.
2017-01-14 02:05:52 +01:00
Christoph Oelckers
4d68f066a0
- fixed: sector.gravity was not serialized.
2017-01-13 23:29:52 +01:00
Christoph Oelckers
f759b6757a
- scriptified the teleport fog.
2017-01-13 23:17:04 +01:00
ZZYZX
a8beb51ca3
Changed opcode implementation to native function implementation
2017-01-13 22:59:45 +01:00
ZZYZX
ee2ecf1450
Added %c (from int) and %p (from pointer) support to format()
2017-01-13 22:59:45 +01:00
ZZYZX
fcc5f4b77b
Fixed EFX_ enum for FxFormat
2017-01-13 22:59:45 +01:00
ZZYZX
e75aa08d0a
Implemented format() builtin call
2017-01-13 22:59:45 +01:00
Christoph Oelckers
4be0767d7b
- scriptified the moving camera.
2017-01-13 22:13:03 +01:00
Christoph Oelckers
51cc7feb4c
- scriptified the particle fountains.
2017-01-13 19:29:54 +01:00
Christoph Oelckers
8e7e1ed757
- don't use local TObjPtr variables.
2017-01-13 15:44:16 +01:00
Edoardo Prezioso
6eb9015303
- Fixed GCC/Clang compile errors.
2017-01-13 15:42:53 +01:00
Christoph Oelckers
d338ca3ec1
- scriptified the sector actions.
2017-01-13 13:51:47 +01:00
Edoardo Prezioso
3b7d18c129
- Fixed crash while exiting if compiled by GCC -O3.
2017-01-13 12:02:00 +01:00
Christoph Oelckers
e621b43dd3
- removed the upper limit of 20 for autosaves.
2017-01-13 11:59:55 +01:00
Christoph Oelckers
d73db8c1e8
- added a 'local' parameter to the A_Log family.
...
- complete "give quakes their own damage type." (was only partially saved.)
2017-01-13 11:48:05 +01:00
Christoph Oelckers
a388327acb
- give earthquakes their own damage type.
2017-01-13 11:19:40 +01:00
Christoph Oelckers
6cbc0a80e8
- let 'forcenoskystretch' also apply to sky mode 2 and OpenGL, to reflect its true meaning the internal flag has been renamed to FORCETILEDSKY which it always was about.
2017-01-13 11:12:43 +01:00
alexey.lysiuk
4001e7e6bd
Fixed compilation with macOS SDK earlier than 10.7
2017-01-13 10:52:35 +02:00
alexey.lysiuk
7e0c870d0f
Added missing OpenGL extension for PowerPC Macs
2017-01-13 10:51:56 +02:00
Christoph Oelckers
76870beb2e
- fixed the final bit of sector actions.
...
The IsActivatedByUse implementation was essentially useless because the value was not serialized so it got lost as soon as the game was reloaded from a savegame.
With the refactoring this is no longer an issue but the access function needed to be changed over to read the info from 'health'.
2017-01-13 01:44:17 +01:00
Christoph Oelckers
1400f401e7
- fixed use of multiple sector actions in the same sector.
...
The entire setup was quite broken with each item using its own activation result and the ones of the subsequent items in the list as the return value.
This rendered the STANDSTILL check in the main function totally unpredictable because the value it depended on could come from any item in the list.
Changed it so that the main dispatcher function is part of sector_t and does the stepping through the list iteratively instead of letting each item recursively call its successor and let this function decide for each item alone whether it should be removed.
The broken setup also had the effect that any MusicChanger would trigger all following SecActEnter specials right on msp start.
2017-01-13 01:34:43 +01:00
Christoph Oelckers
cf39af0642
- consolidated the sector action classes.
...
This can be done with a lot less overhead by using one of the object's properties to store the activation flag, so that all the nearly redundant trigger methods can be folded into one.
2017-01-13 01:06:37 +01:00
Christoph Oelckers
85a84b5e94
- scriptified FastProjectile.
2017-01-13 00:35:56 +01:00
Christoph Oelckers
cc58f13e4e
- scriptified the sector silencer.
2017-01-12 23:35:24 +01:00
Christoph Oelckers
3d73919092
- scriptified CustomBridge.OnDestroy.
2017-01-12 22:56:06 +01:00
Christoph Oelckers
7b7623d2c4
- split DObject::Destroy into the main method, a native OnDestroy and a scripted OnDestroy method and made the main method non-virtual
...
This was done to ensure it can be properly overridden in scripts without causing problems when called during engine shutdown for the type and symbol objects the VM needs to work and to have the scripted version always run first.
Since the scripted OnDestroy method never calls the native version - the native one is run after the scripted one - this can be simply skipped over during shutdown.
2017-01-12 22:49:18 +01:00
Christoph Oelckers
0b94d4e0a3
- scriptified the bridge things, except the Destroy method which still requires work to allow virtually calling this.
2017-01-12 19:55:25 +01:00
alexey.lysiuk
de6a66851e
Fixed issue with extraction of built GL nodes
...
See https://mantis.zdoom.org/view.php?id=39
2017-01-12 16:24:55 +02:00
Christoph Oelckers
8e19dc8f10
- restored dialog ID and removed commented-out old code.
2017-01-12 11:54:53 +01:00
Christoph Oelckers
23482735a0
- removed PClassAmmo.
...
No need to maintain these clunky meta class for one single property. The overhead the mere existence of this class creates is far more than 100 spawned ammo items would cost.
There is no need to serialize AAmmo::DropAmount, this value has no meaning on an already spawned item.
2017-01-12 11:44:33 +01:00
Christoph Oelckers
da43576035
- updated IWAD picker template to the one submitted by Gez for QZDoom.
2017-01-12 10:11:43 +01:00
Christoph Oelckers
bcd73292d3
- checked P_GetRenderSector against the original implementation from before the glsegextras were added and reinstated all checks from that version.
2017-01-12 09:58:13 +01:00
Christoph Oelckers
0d575a20cc
- added new PRINTNAME_ constants for retrieving next and secret next level.
2017-01-12 01:11:26 +01:00
Christoph Oelckers
85488f2f30
- added GetActorFloorTexture and GetActorFloorTerrain ACS functions.
2017-01-12 00:49:40 +01:00
Christoph Oelckers
ea163f3898
- exported FCheckPosition to the VM and completed the parameter lists for Actor.CheckPosition and Actor.TryMove.
2017-01-12 00:26:16 +01:00
Christoph Oelckers
5ef9429ae4
- added the ability to attach a constructor or destructor to an internally defined struct.
...
There are a few which require explicit native construction or destruction that need to be exported to the VM, e.g. FCheckPosition.
The VM cannot handle this directly, it needs two special functions to be attached to handle such elements.
2017-01-11 23:46:03 +01:00
Christoph Oelckers
ca2ac4e4fd
- reverted debug stuff.
2017-01-11 17:16:07 +01:00
Christoph Oelckers
7f3e18a6cc
- fixed a few memory leaks.
2017-01-11 11:37:27 +01:00
Christoph Oelckers
72101473d0
- fixed: The texture for legacy dynamic light handling was always allocated, even if not needed, and it was never freed.
2017-01-11 10:47:45 +01:00
Christoph Oelckers
d1ce098d59
- fixed a crash with GL nodes not having partner segs where both sides have a sidedef. This can happen for some render hacks.
2017-01-11 10:46:26 +01:00
Christoph Oelckers
f4edaa2662
- fixed the railgun's spiral duration was set incorrectly.
2017-01-11 01:46:17 +01:00
Christoph Oelckers
385ebf2ed2
- fixed: Stairs_BuildUpDoomCrush wasn't in the special dispatcher list.
2017-01-11 01:13:39 +01:00
Christoph Oelckers
de4153ceaf
some groundwork for the implementation of dynamic arrays
...
- created script exports for all relevant functions with all integral types.
- created script side definitions for the underlying data types.
- added a void pointer type so that the prototype for the pointer array can use a generic type every pointer can be assigned to.
2017-01-11 00:57:31 +01:00
Christoph Oelckers
11d93cb030
- removed r_columnmethod 1 because the code was broken and already gone from QZDoom.
2017-01-10 22:28:15 +01:00
Christoph Oelckers
6552e5a7a1
- fixed: 'stat music' tried to access a non-existent stream decoder for any music played through Timidity++ on OpenAL.
2017-01-10 22:16:32 +01:00
Christoph Oelckers
2abd16f117
- fixed: Any inventory item that is about to be placed in an inventory must stop all its sounds.
2017-01-10 22:01:29 +01:00
Christoph Oelckers
3e4f799bbc
- made Actor.DamageMobj virtual.
2017-01-10 21:31:52 +01:00
Christoph Oelckers
3f94a15cfe
- added a virtual PostSpawn method to RandomSpawner, this will get called when the actor has been spawned so that the spawner can do some special setup with it.
2017-01-10 20:14:48 +01:00
Christoph Oelckers
06c97d898b
- added a new parameter to A_CustomRailgun to customize the inaccuracy induced by a moving target.
2017-01-10 20:08:23 +01:00
Christoph Oelckers
3696d34806
- added IF_NOSCREENBLINK flag, see http://mantis.zdoom.org/view.php?id=9
2017-01-10 19:57:51 +01:00
alexey.lysiuk
d9efeb206d
Fixed crash on loading GL nodes
...
See http://mantis.zdoom.org/view.php?id=21
2017-01-10 17:16:18 +02:00
Christoph Oelckers
46179936ec
- added global per-mod precaching lists, to be defined in MAPINFO's Gameinfo section.
2017-01-10 01:00:06 +01:00
Christoph Oelckers
96788850d3
- added a workaround for a crashing condition in FThinkerIterator.
...
It can actually happen that the thinker chain gets broken if an actor being iterated happens to destroy the immediately following actor in the chain as well. In that case both actors lose their chain links and the iterator cannot advance any further, the only solution to avoid a crash is to terminate the iteration of the current list.
2017-01-10 00:38:08 +01:00
Christoph Oelckers
26170419f4
- fixed: The stair builder code tried to access a member of a null pointer after finding no more stair sectors.
2017-01-09 23:24:00 +01:00
Edoardo Prezioso
815a440014
- Fixed the wrong handling of empty command line argument.
2017-01-09 22:00:48 +01:00
Christoph Oelckers
5396e8d07d
- fixed: The Windows CreateFramebuffer methods need to check the desired screen size for an actual resolution when switching to fullscreen.
2017-01-09 21:26:19 +01:00
Christoph Oelckers
cc8c20adf8
- fixed: non-existent partner segs were not properly initialized.
2017-01-09 20:54:22 +01:00
alexey.lysiuk
bc492a0b7f
Autoaim is now updated when adjusting slider with mouse
...
Fixes #208 Autoaim slider in Player Setup does not save if changed with cursor
2017-01-09 16:52:15 +02:00
Kyle Evans
8cc52dab5e
Fix build on GCC/Clang
...
Obtained from: kcat/Csonicgo (IRC)
2017-01-09 10:11:13 +02:00
Christoph Oelckers
472ace1bea
- removed the needless copying around of the vertexdatas array. The slope code can just use this from the TArray created by the UDMF parser.
2017-01-09 01:40:14 +01:00
Christoph Oelckers
b9ac44e8f2
- fixed: The sight checker's portalgroup variable was not initialized.
...
- got rid of glsegextras.
This was probably one of the most ill-conceived means to save some memory in ZDoom, but now, when a pure software rendered engine no longer needs to be considered it's just totally useless to keep this mess in.
2017-01-09 01:28:07 +01:00
Christoph Oelckers
12037fdc95
- made the vertexes array VM friendly.
2017-01-09 00:46:16 +01:00
Christoph Oelckers
f78927500e
- exported all meaningful parts of side_t to the VM.
2017-01-08 21:42:26 +01:00
Christoph Oelckers
97a90c52e0
- fixed: Particles should disappear if their alpha goes below zero.
2017-01-08 19:44:00 +01:00
Christoph Oelckers
c9964d36d6
- fixed: A single sight check iteration may not succeed if origin and end point are in different portal groups. All those may do is collect more portals.
2017-01-08 19:34:04 +01:00
Christoph Oelckers
7a5171a2e9
- fixed: The check for virtual function overrides was never done if the overriding function had no qualifier at all.
...
- fixed several occurences where an 'override' qualifier was missing.
2017-01-08 19:07:26 +01:00
Christoph Oelckers
cd7986b1b1
- refactored global sides array to be more VM friendly.
...
- moved FLevelLocals to its own header to resolve some circular include conflicts.
2017-01-08 18:46:17 +01:00
alexey.lysiuk
e188047d70
Fixed compilation with GCC/Clang
2017-01-08 17:20:27 +02:00
Christoph Oelckers
a54d2d8a55
- fixed UDMF initialization for linedef portal info.
2017-01-08 16:09:21 +01:00
Christoph Oelckers
1c74faea73
- exported line_t's functions to the VM.
2017-01-08 15:45:37 +01:00
Christoph Oelckers
cb89a1a81a
- fixed inconsistent use of line_t::portaltransferred.
...
Some parts used 0 as 'nothing' others used UINT_MAX. 0 should refer to the map's default sky, not to nothing.
2017-01-08 14:59:31 +01:00
Christoph Oelckers
71d1138376
- refactored the global lines array into a more VM friendly form, moved it to FLevelLocals and exported it to ZScript.
...
- disabled the Build map loader after finding out that it has been completely broken and nonfunctional for a long time. Since this has no real value it will probably removed entirely in an upcoming commit.
2017-01-08 14:39:16 +01:00
Christoph Oelckers
5ee52f159e
- refactored the level backup data needed by the serializer into p_saveg.h.
2017-01-08 12:11:31 +01:00
Christoph Oelckers
5ec786eef7
- removed the 'dumpmap' CCMD because it was mostly broken anyway and would require a complete rewrite in UDMF to get back on track.
2017-01-08 11:52:35 +01:00
Christoph Oelckers
d2a51a57e1
- added new Stairs_BuildUpDoomCrush special from Eternity and used it to fix the bad implementation to make Doom's turbo stairs crush. This also removes the crushing from Generic_Stairs entirely, just like it was in Boom.
2017-01-08 01:15:45 +01:00
Christoph Oelckers
3beed216dd
- exported all relevant functions from sector_t.
...
Please note that currently most of these have little use, they are for future feature support.
2017-01-08 00:50:40 +01:00
Christoph Oelckers
82adc5bf1e
- exported secplane_t to scripting.
2017-01-07 21:29:43 +01:00
Christoph Oelckers
91981e25a8
- moved all 'sectorptr - &level.sectors[0]' constructs into a subfunction.
2017-01-07 20:02:25 +01:00
Christoph Oelckers
c02281a439
- refactored the global sectors array into a more VM friendly type and moved it into FLevelLocals.
2017-01-07 19:32:24 +01:00
Christoph Oelckers
d381fb5e3f
- fixed: A_SetInventory must check for voodoo dolls and delegate the action to the real player because it will always break the real player's inventory if done so.
2017-01-07 15:44:39 +01:00
Christoph Oelckers
581cd27818
- floatified the translucency values in particle_t to elimintate the gross inaccuracies with fadeout time.
...
- widened ttl variable in particle_t to short to allow longer living particles than 6 seconds.
- reordered fields in particle_t to reduce struct size a bit.
2017-01-07 15:44:39 +01:00
Christoph Oelckers
42b1432b64
- fixed: initialization of local vector variables did not properly allocate registers if the initializer was a subelement of another local vector variable.
2017-01-07 15:44:38 +01:00
Christoph Oelckers
acf66d9f8f
- fixed some edge cases with visible player sprites through non-static line portals. This required reinstating some code which I thought was no longer needed.
2017-01-07 15:44:38 +01:00
Christoph Oelckers
62ea83a35a
- let the prediction code handle all 4 threaded lists an actor gets linked into.
...
This is mostly a straight refactoring of the existing code to work independently of specific member variables in the involved classes, using a bit of template magic to avoid redundancy and moving the work code into subfunctions.
It still needs some testing to see if it a) helps fix the crash issues and b) doesn't break anything-
2017-01-06 15:06:17 +01:00
Christoph Oelckers
c52bc06e9b
- use a memory arena to allocate msecnodes.
...
These are rather small and extremely frequently allocated, so they are prime candidates for memory arena, because it not only avoids fragmentation and internal overhead due to mass allocation of small memory blocks but it also makes it a lot faster to free the memory when finishing a level.
2017-01-06 13:09:58 +01:00
Christoph Oelckers
ed25cf61c5
- moved the msecnode code to its own file.
...
Note that this originates from Boom so it needs to keep the Doom license.
2017-01-06 12:54:01 +01:00
Christoph Oelckers
b11c8fef57
- renamed a few variables for clarity.
2017-01-06 11:56:17 +01:00
Christoph Oelckers
44ad55602d
- got rid of uint32(-1) casts.
2017-01-06 11:43:27 +01:00
alexey.lysiuk
b297047060
Removed useless integer type size expansion
...
Fixed Apple's Clang warnings:
absolute value function 'abs' given an argument of type 'long long' but has parameter of type 'int' which may cause truncation of value
2017-01-06 10:40:51 +01:00
alexey.lysiuk
1a0d8dffd9
Fixed harmless initialization order mismatch
...
No more 'field ... will be initialized after field ...' warnings reported by GCC/Clang
2017-01-06 10:40:51 +01:00
alexey.lysiuk
0e9f52f9e5
Added virtual destructor to FPresentShaderBase class
...
No more 'delete called on non-final class that has virtual functions but non-virtual destructor' warnings reported by GCC/Clang
2017-01-06 10:40:51 +01:00
alexey.lysiuk
d77718d422
Fixed harmless uninitialized variables warnings
...
No more 'variable is used uninitialized whenever switch default is taken' warnings reported by GCC/Clang
2017-01-06 10:40:51 +01:00
alexey.lysiuk
9ed2da176e
Fixed signed/unsigned mismatch in comparisons
...
No more 'comparison of integers of different signs' warnings reported by GCC/Clang
2017-01-06 10:40:51 +01:00
Christoph Oelckers
e0540c6b37
- fixed uninitialized variable warning in codegen.cpp
2017-01-06 10:33:58 +01:00
Christoph Oelckers
fcb1c1edc4
- only print GL extensions to the log, but not to the console.
...
The list has become so long by now that it's more of a distraction than help. Besides, searching on-screen for specific extensions is futile anyway.
2017-01-05 12:01:00 +01:00
Christoph Oelckers
c87836c3f3
- fixed check for Mesa driver.
2017-01-05 11:51:15 +01:00
Christoph Oelckers
b74c374a66
- fixed: The CheckReturn check for FxSwitchStatement was not strict enough.
...
It may only return true if there is no default case because without that any non-matching value will go past the statement.
2017-01-05 11:39:29 +01:00
Christoph Oelckers
e13627e9d8
- fixed: portal offsets at frame start were not applied to ViewActorPos.
2017-01-05 11:28:08 +01:00
Christoph Oelckers
4be9222646
- fixed: Dehacked must flag all states it touched for use in weapons.
2017-01-04 11:13:19 +01:00
Christoph Oelckers
b132782c49
- scriptified PowerBuddha and PowerFrightener.
2017-01-03 21:03:05 +01:00
Christoph Oelckers
15f30886cd
- scriptified the TimeFreezer powerup.
2017-01-03 20:06:20 +01:00
Christoph Oelckers
341d9abdd0
- fixed: 'out' parameters must always allocate an address register, regardless of type.
2017-01-03 16:00:25 +01:00
Christoph Oelckers
96623b3052
- disabled OpenGL 3.0 on the Open Source Mesa driver for Linux because it appears to be broken.
2017-01-03 12:01:03 +01:00
alexey.lysiuk
2dec45ca39
Fixed compilation with GCC/Clang
...
Fixes #175
2017-01-03 09:45:53 +02:00
Christoph Oelckers
1261046f1a
- fixed: The check for explicitly not splitting wall polygons at seg vertices was inverted.
2017-01-02 23:21:28 +01:00
Christoph Oelckers
e7cd5ec2bb
- fixed: The conditional operator could clobber a local variable if it was the result of the true expression.
2017-01-02 22:26:36 +01:00
Christoph Oelckers
1a16f664e4
- added a TStaticArray class that allows safe access to resizable static data (like the sectors, linedefs, etc.) for the VM.
...
- used this to replace the line list in Sector because that gets already used and implemented proper bounds checks for this type of array.
2017-01-02 21:40:52 +01:00
Christoph Oelckers
b31b6589e7
- fixed: PPointer was unable to handle pointers to class types for savegames.
2017-01-02 13:37:09 +01:00
Christoph Oelckers
7c3c886a90
- use the attenuated light definitions from QZDoom.
...
- apply them also to Freedoom.
- to compensate for the increase in light size required for attenuated lights to look correct, when running in legacy mode, they to be reduced in size to 2/3 of their defined size because the textured lighting method does not support real attenuation.
- removed the ancient size limit of 255 for light sizes which comes from a time when args were bytes.
2017-01-02 13:17:03 +01:00
Christoph Oelckers
6ab8e90911
- parse GLDEFS and its game-specific variants in lump order instead of both names sequentially.
2017-01-02 00:28:30 +01:00
Christoph Oelckers
9948189193
- scriptified PowerProtection and PowerDamage.
...
- made ModifyDamage calls iterative instead of recursive. With going through the VM they'd be too costly otherwise.
- small optimization: Detect empty VM functions right when entering the VM and shortcut them. This is to reduce the overhead of virtual placeholders, which in a few cases (e.g. CanCollideWith and ModifyDamage) can be called quite frequently.
2017-01-01 23:11:48 +01:00
Christoph Oelckers
1d3afce59b
- let SBARINFO treat 'null' as 'untranslated'. Strictly speaking this wasn't a bug but apparently some people tend to use 'null' as a general placeholder for 'nothing', even where not intended.
2017-01-01 22:52:11 +01:00
Christoph Oelckers
5de3d662cb
- re-added the glow properties for UDMF which somehow got lost.
2017-01-01 19:36:51 +01:00
Christoph Oelckers
66cc68606f
- scriptified the methods of APowerMorph.
...
- made some changes to PowerMorph to better deal with recursive calls from UndoPlayerMorph. The flag hackery was only needed because the 'alternative' pointers were cleared far too late.
2017-01-01 19:23:43 +01:00
Christoph Oelckers
2d2963ead4
- fixed: The StripRight fix left some code from a previous fix in that no longer applies.
2017-01-01 16:55:45 +01:00
Christoph Oelckers
5d9cea9e0e
- fixed: FString::StripRight's space checking counter was broken and would cause deletion of the last valid character in the string.
2017-01-01 14:44:16 +01:00
Christoph Oelckers
356c5f2e08
- removed the ZScript warning.
2017-01-01 12:29:03 +01:00
Edoardo Prezioso
9575715b1e
- Added support to GCC/Clang sanitizers.
2017-01-01 00:17:42 +01:00
Christoph Oelckers
e4c63563e3
- fixed: The 3D floor light splitting code for sprites did not copy the sector's fog density.
...
- fixed: fog calculations for fuzz effects were wrong.
2017-01-01 00:16:53 +01:00
Edoardo Prezioso
6b943043d1
- Update the list of dummy actor flags from Zandronum.
2016-12-31 23:02:01 +01:00
Christoph Oelckers
28d79cc2b0
- added some profiling code to the VM.
2016-12-31 17:59:48 +01:00
ZZYZX
c845fc126a
Enabled user shader for a cameratexture
2016-12-31 12:17:24 +01:00
Christoph Oelckers
267b1842b4
- scriptified a few more of the simpler powerups.
2016-12-31 01:08:09 +01:00
Christoph Oelckers
3b524cbed4
- scriptified PowerInfiniteAmmo to test the exported functions.
2016-12-31 00:20:02 +01:00
Christoph Oelckers
fe0f19e1e0
- exported Powerup.InitEffect and EndEffect to scripting.
2016-12-30 23:32:43 +01:00
Christoph Oelckers
5e34bad03b
- fixed: AActor::Tick must call CallDoEffect, not DoEffect for its inventory items or scripted overrides won't be called.
2016-12-30 21:32:06 +01:00
Christoph Oelckers
a105a08bd6
- restored the original implementation of DONTOVERLAP, because Heretic depends on it being somewhat broken.
...
A side effect of the incorrect implementation is that Gargoyles hitting other Gargoyles won't call P_DamageMobj.
2016-12-30 20:00:24 +01:00
Christoph Oelckers
a000b57204
- fixed player visibility determination by tracking and translating the actual actor position in addition to the camera position through portals. I hope this fixes the randomly appearing player sprites for good.
2016-12-29 22:19:09 +01:00
Christoph Oelckers
f52744e8a4
- fixed: When looking through a plane mirror the portal plane exclusion logic needs to be flipped, because the mirror inverts the vertical view direction.
2016-12-29 19:54:38 +01:00
Christoph Oelckers
125a30307a
Merge branch 'master' of https://github.com/rheit/zdoom
2016-12-29 14:34:13 +01:00
Christoph Oelckers
a3070e8846
- fixed: FGLTexture::CreateTexBuffer needs to be more careful with setting the texture's translucency information.
...
First, if it has already been determined the value should be left alone and second, for translated textures the generated buffer is inconclusive so in that case it cannot be used at all.
2016-12-29 14:33:53 +01:00
Christoph Oelckers
4f21ff275c
- removed duplicate portal_ceil_alpha and portal_floor_alpha UDMF properties.
...
These already existed as 'alphafloor' and 'alphaceiling' and got accidentally duplicated by Eternity.
2016-12-29 11:44:07 +01:00
Rachael Alexanderson
605a60d1d6
- Removed headers from c_functions.cpp, added forward struct declaration for FTranslatedLineTarget in c_functions.h.
2016-12-29 01:30:54 +01:00
Rachael Alexanderson
cab1b60ffc
- Some cleanups for c_cmds.cpp, exported some functions as well as functions used for "print/targetinv" to their own file.
2016-12-29 01:30:54 +01:00
Christoph Oelckers
d748b6ad70
- added explicit fog density as a sector property, accessible through UDMF and ACS.
...
- allow changing sector glow information through ACS.
2016-12-29 01:12:17 +01:00
Christoph Oelckers
11bea8249a
. added SetMusicVolume script function.
2016-12-28 21:41:06 +01:00
Christoph Oelckers
02c3b3613f
- added UDMF properties to set glows per sector.
...
- for explicitly defined glows, use the one for the current animation frame, if an animated texture is active. For default glows it will still use the base texture's to avoid inconsistencies.
2016-12-28 21:35:42 +01:00
alexey.lysiuk
5dff3d5af0
Do not apply viewport scaling in fullscreen mode
...
See https://forum.drdteam.org/viewtopic.php?t=7339
2016-12-28 16:11:24 +02:00
alexey.lysiuk
efaaefcb70
gl_scale_viewport CVAR is now saved to config file
...
See https://forum.drdteam.org/viewtopic.php?t=7339
2016-12-28 16:11:10 +02:00
ZZYZX
ed2b73833b
Enabled simple intermission for hubs
2016-12-28 14:06:28 +01:00
alexey.lysiuk
c03cb2c97a
Added support for long lines in config file
...
Single line key-value pair can now exceed 255 characters
Long path names and additional command line parameters (macOS only) are no longer cut off
2016-12-28 11:38:38 +01:00
Christoph Oelckers
6322c81719
- added UDMF_fields for sector plane reflectiveness.
2016-12-28 01:09:42 +01:00
Christoph Oelckers
80f1661931
- fixed: The player checking code after loading a savegame was not changed when tracer was replaced with alternative for holding the player's unmorphed version.
2016-12-27 22:44:22 +01:00
Christoph Oelckers
721b2fb21d
- fixed: Instant floor movers should disable z-interpolation for all affected actors.
2016-12-27 21:16:42 +01:00
Christoph Oelckers
8708c69f83
- added GetClassName script function.
2016-12-27 19:25:55 +01:00
Christoph Oelckers
2478cd0467
- changed locking mechanism for ACS strings.
...
It will now store the level numbers that lock a string instead of just incrementing a counter. This should make it more robust because each level can lock a string only once and some possible leftover garbage data won't be able to cause a lock decrease when a savegame is being reloaded.
2016-12-27 18:53:30 +01:00
Christoph Oelckers
e956d19769
- preserve the factor set by I_SetMusicVolume when starting new music.
2016-12-27 15:44:06 +01:00
Christoph Oelckers
4bf19fb665
- don't let monsters block teleports of non-solid inventory items. Doom's code never considered such a possibility and would consider the move blocking, despite the item being non-solid.
2016-12-27 15:34:44 +01:00
Christoph Oelckers
4da8b1a3b7
- delete r_ headers from portal.cpp.
2016-12-27 13:04:46 +01:00
alexey.lysiuk
2f9d5e285d
Removed deprecated code from macOS SDL backend
2016-12-27 13:18:33 +02:00
Christoph Oelckers
a37db1c4d7
- fixed: All missiles which can bounce off actors need the CANPASS/PASSMOBJ flag so setting this in the 'bouncetype' property is insufficient, it needs to be done when the actor has been completely parsed.
2016-12-27 00:32:54 +01:00
Christoph Oelckers
e9574276a5
- added CanCollideWith calls to a few more places where they are needed.
2016-12-26 22:33:07 +01:00
Christoph Oelckers
58316c821d
- fixed: The pitch shifting info for sounds needs to be taken from the sfxinfo currently being played, not the one it links to.
2016-12-26 21:07:21 +01:00
Christoph Oelckers
5327055495
- fixed: Source for nailbomb damage in A_Explode should be the caller's target, if defined and the caller is a missile.
2016-12-26 20:37:04 +01:00
Christoph Oelckers
b9f7e0eb36
Merge remote-tracking branch 'remotes/zdoom/master'
2016-12-26 19:33:16 +01:00
Edoardo Prezioso
3f7c057f92
- Fixed heap use after free issue with lights.
2016-12-26 18:23:17 +01:00
Christoph Oelckers
625e97dfd1
- fixed: UpdateRenderSectorList needs to reset the sector before traversing floor portals.
2016-12-26 16:22:28 +01:00
alexey.lysiuk
aeee80c8fa
Fixed endianness issue in script VM
...
See https://forum.zdoom.org/viewtopic.php?t=54549
2016-12-26 15:31:59 +01:00
Christoph Oelckers
be508bc670
- adjust to using msecnode_t's.
2016-12-26 12:11:55 +01:00
Christoph Oelckers
9cb2a8f931
Merge remote-tracking branch 'remotes/zdoom/master'
2016-12-26 12:04:13 +01:00
Christoph Oelckers
7f72de6b71
- use msecnode_t's for the touching_renderlists instead of std::forward_list.
...
- preparations for checking the proper sector to get a sprite's lighting info.
2016-12-26 11:58:08 +01:00
ZZYZX
6f16597668
GL renderer now uses RenderRadius links too
2016-12-25 23:46:03 +01:00
Christoph Oelckers
19856d6ccb
Merge branch 'master' of https://github.com/rheit/zdoom
2016-12-25 22:56:35 +01:00
Christoph Oelckers
c5d75c18b4
- make gl_finishbeforeswap more useful by handling the case where it causes stalls on NVidia.
2016-12-25 22:56:18 +01:00
Christoph Oelckers
04ff4282ef
- removed the global 'sector_list' variable.
...
If the calling code wants to recycle this it will have to pass a container variable to AActor::UnlinkFromWorld and AActor::LinkToWorld.
This was changed because keeping such data in a global variable is dangerous for a set of functions that can be called from a script.
Note that the scripted versions do not yet support saving of the touching_sectorlist.
2016-12-25 22:40:26 +01:00
Christoph Oelckers
5723f10cc3
- use 'for' iterator syntax to check touching_renderlists.
2016-12-25 19:37:07 +01:00
Christoph Oelckers
663b305eec
- include proper headers for std::find.
2016-12-25 19:25:19 +01:00
Christoph Oelckers
2ce55e5416
- fixed: non-damaging attacks should not cause infighting, unless some relevant pain flags are being set.
2016-12-25 19:19:49 +01:00
Christoph Oelckers
89b7cf4262
- fixed: RenderRadius needs to be serialized.
...
- fixed: CustomBridge can be visible so it shouldn't be completely excluded from the render lists.
2016-12-25 14:35:35 +01:00
Christoph Oelckers
ad2993950a
- fixed light level calculation for low light levels.
2016-12-25 12:58:29 +01:00
ZZYZX
44c19b5ad9
Changed zero RenderRadius logic - negative values now used for 'no rendering', restored old logic with max(radius, renderradius)
2016-12-25 13:40:21 +02:00
ZZYZX
40a180c15f
Changed zero RenderRadius logic - thing should still link to own sector
2016-12-25 13:37:45 +02:00
ZZYZX
fcd8a0ce92
Reverted STYLE_None change to P_LinkRenderSectors, implemented zero RenderRadius that effectively disables rendering of an actor entirely
2016-12-25 13:35:03 +02:00
ZZYZX
98657f6844
STYLE_None actors are no more subject to P_LinkRenderSectors
2016-12-25 13:19:45 +02:00
ZZYZX
87b23d160b
Ported RenderRadius and related code from gzdoom branch
2016-12-25 13:09:32 +02:00
Christoph Oelckers
4ee2d4a1a4
- print proper information in zcc_compile.cpp.
2016-12-24 23:52:52 +01:00
alexey.lysiuk
5d8d15ecc3
Fixed additional format string warning reported by GCC/Clang
...
See https://forum.zdoom.org/viewtopic.php?t=54541
2016-12-24 23:51:08 +01:00
alexey.lysiuk
e825918451
Fixed format strings warnings reported by GCC/Clang
...
See https://forum.zdoom.org/viewtopic.php?t=54541 and https://forum.zdoom.org/viewtopic.php?t=54709
2016-12-24 23:51:08 +01:00
Christoph Oelckers
54822c29eb
- changed pitch math in P_RailAttack to avoid having to deal with bogus math throughout the entire function. Effectively the only thing this changes is passing the correct pitch to P_DrawRailTrail.
2016-12-24 18:24:44 +01:00
Christoph Oelckers
39d2945016
fixed two more places where a negative pitch was calculated:
...
- A_CustomRailgun when missing the target.
- A_FaceMovementDirection which ironically had some bad compensation inside. It is not restored to how the code looked in 2.8.1.
2016-12-24 18:10:37 +01:00
Christoph Oelckers
287974968a
- renamed A_FireCustomMissile and added a deprecated compatibility wrapper to deal with the inverted pitch this function used.
2016-12-24 16:34:45 +01:00
Christoph Oelckers
b807f50bde
- fixed: AimBulletMissile used negative pitch to calculate the projectile's trajectory, presumably because A_Face calculated it wrong in recent devbuilds.
2016-12-24 15:10:07 +01:00
Christoph Oelckers
d4c0ee9e43
- address bad use of pitch in A_CustomMissile.
...
This function calculated everything correctly but ultimately set the vertical velocity wrong. Most importantly this meant that the actual velocity vector and actor pitch - if CMF_SAVEPITCH was used - did not match.
Since this bug has been present since the pitch parameter was added, this deprecates A_CustomMissile and replaces it with a properly implemented A_SpawnProjectile function and handling the compatibility case with a new flag and a scripted wrapper function.
All internal uses of A_CustomMissile have been replaced as well.
2016-12-24 14:46:34 +01:00
Christoph Oelckers
78737f9bc7
- fixed: The cycler for a pulse light needs to be reinitialized when new light properties get applied.
...
- do not clamp the cycler's output to a byte.
2016-12-23 15:25:39 +01:00
alexey.lysiuk
2327359d74
Fixed sector floor offset compatibility parameter after floatification
...
See https://forum.zdoom.org/viewtopic.php?t=54690
2016-12-23 10:21:53 +01:00
Christoph Oelckers
a825d1d92f
Merge branch 'ssao' of https://github.com/dpjudas/dpDoom
2016-12-22 12:40:57 +01:00
Christoph Oelckers
3b823fa3eb
Merge branch 'master' of https://github.com/rheit/zdoom
...
# Conflicts:
# wadsrc/static/compatibility.txt
2016-12-22 11:29:44 +01:00
Rachael Alexanderson
3810328193
- More options for the IWAD picker.
...
- Rearranged some options around a bit.
- Disable auto load is now an archived cvar.
# Conflicts:
# src/win32/zdoom.rc
2016-12-22 11:26:23 +01:00
Rachael Alexanderson
cb2c1e591a
- Added Zandronum-specific copyright notices for IWAD picker.
2016-12-22 11:26:23 +01:00
Rachael Alexanderson
5fa6094e4f
- Changed QZDoom messages to GZDoom.
2016-12-22 11:26:23 +01:00
Rachael Alexanderson
240f973f0c
- Implemented Gez's suggestion for disable autoload checkbox on the IWAD selection box.
...
(cherry picked from commit 578e3270e2
)
2016-12-22 11:26:23 +01:00
Rachael Alexanderson
8a9ea2eda8
- Mostly implemented Zandronum's IWAD selection box. Currently, this change only affects Windows.
...
(cherry picked from commit b3bed807de
)
2016-12-22 11:26:23 +01:00
Christoph Oelckers
36f87b7135
- removed gl_light_ambient.
...
This really serves no use anymore and is mostly a remnant of old times with dark CRT monitors. The default ambient level was set at 20, meaning a sector light level of 40. This is a value actual levels rarely get to, except when using some lighting effects - but it's for those that the ambient clamping did the most damage.
2016-12-22 11:14:13 +01:00
alexey.lysiuk
7dd51d6d1c
Fixed infinite execution of error CCMD
...
https://forum.zdoom.org/viewtopic.php?t=54659
2016-12-22 10:33:21 +01:00