zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 15:21:48 +00:00
Code Issues Projects Releases Packages Wiki Activity
4877 commits 2 branches 1 tag 128 MiB
Commit graph

3273 commits

Author SHA1 Message Date
helixhorned
ce6176757b Add forgotten events_defs.h, oops. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4711 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-31 21:09:26 +00:00
helixhorned
96541f3521 Lunatic: fix building and startup up to tilesizx[] failure. DONT_BUILD. 
- Needed to rip out enum GameEvent_t into own header file to prevent what
  would be a circular #include otherwise
- Added some forgotten #ifdef LUNATIC
- updated structure and function declarations on the Lua FFI side

git-svn-id: https://svn.eduke32.com/eduke32@4710 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-30 21:44:22 +00:00
helixhorned
ae63745eb3 C-CON: fix possible crash when a CON error is raised due to access of invalid sprite. 
For example, in
    CON_ERRPRINTF("invalid target sprite (%d) %d %d\n", iActor, vm.g_i, TrackerCast(vm.g_sp->picnum));
vm.g_i can be -1 and vm.g_sp can be NULL then. (Not anymore.)

DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4709 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-30 21:44:21 +00:00
helixhorned
8605285f7f compat.h: pedantic whitespace formatting. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4708 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-30 04:59:23 +00:00
terminx
7f232bcbd1 Alter weapon switching to cycle through GROW_WEAPON when using next/previous weapon keys. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4707 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-29 17:08:03 +00:00
terminx
633cb8764b Default map zoom to something a bit more useful on Android. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4706 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-29 17:07:47 +00:00
terminx
ce210a9fd7 Clean up some player code a bit... make bobposx/bobposy a vec2_t, make fricxv/fricyv a per-player vec2_t (TODO: CON access), promote angvel in input_t to int16_t and allow for player angle changes that result in odd numbered angles (we were effectively artificially limiting the angle to 1024 values before), fix some HUD model ID stuff that should help with the weapons in the HRP, clean up a bunch of random functions (P_FireWeapon(), P_DisplayTip(), P_DisplayAccess(), P_DisplayWeapon(), P_GetInput(), etc). Also clean up G_SetupFilenameBasedMusic() to loop through flac/ogg/mid when searching for usermap music replacements. Some of this really needs a BYTEVERSION bump, but these commits aren't for synthesis to build so we're not doing it yet. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4703 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-29 17:07:11 +00:00
terminx
183b34f48e More EDUKE32_PREDICT_FALSE, mostly in OSD_Printf(OSD_ERROR...) cases 
git-svn-id: https://svn.eduke32.com/eduke32@4699 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-29 17:05:46 +00:00
terminx
6f5726e015 Aligned gamevar/gamearray allocation 
git-svn-id: https://svn.eduke32.com/eduke32@4698 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-29 17:05:29 +00:00
terminx
384aec522a Fix a couple of clang warnings. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4697 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-29 17:05:15 +00:00
terminx
ec83998c89 Android updates from Emile. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4693 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-29 17:03:50 +00:00
hendricks266
3d43f1c346 Fix the menu animations so that they are what I actually intended. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4689 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-28 20:46:14 +00:00
hendricks266
5bbb4afd76 Menu transition animations. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4688 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-27 10:14:50 +00:00
hendricks266
5dd1abd647 Two files forgotten in the previous commit. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4687 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-27 07:24:37 +00:00
hendricks266
1ed4df36f1 Update the menu code so that everything drawn to the screen is relative to an origin point, which for now remains zero. 
The three things using windowx/y hackery to crop tiles (user map menu background, color correction panels, automatic scrolling indicators) have been rewritten not to, so that the origin point would work properly with them. All three are slightly different now.

The changes are more extensive than you might predict, because I had to modify every rotatesprite/*text call to add its coordinates (shifted left by 16 if they weren't already) to the origin point.

DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4686 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-27 07:09:41 +00:00
hendricks266
5241070ab3 Fix a few lingering issues with recent menu changes. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4682 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 10:16:49 +00:00
terminx
8934226bb2 Another 5000 lines of pain and tears. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4680 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:36:34 +00:00
terminx
1c68e84e5a Hi-res security viewscreens 
git-svn-id: https://svn.eduke32.com/eduke32@4679 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:35:21 +00:00
terminx
1e2fdef0e2 Forgot this in a previous commit, just removes a function prototype I moved elsewhere 
git-svn-id: https://svn.eduke32.com/eduke32@4677 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:34:50 +00:00
terminx
57fd527308 Fix in-game sound menu (F4) 
git-svn-id: https://svn.eduke32.com/eduke32@4676 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:34:38 +00:00
terminx
62f13fad76 Rename VM_OnEvent to VM_OnEvent_ and add move the checks for whether the event is actually defined or not to a wrapper declared static inline 
git-svn-id: https://svn.eduke32.com/eduke32@4673 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:33:53 +00:00
terminx
f15a25a144 Adjust default security camera refresh times 
git-svn-id: https://svn.eduke32.com/eduke32@4672 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:33:38 +00:00
terminx
088808eb3e Mapster32 build fix 
git-svn-id: https://svn.eduke32.com/eduke32@4668 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:32:42 +00:00
terminx
36e2aa01cd if 0 the input check at the beginning of animation playback as it seems to cause some cutscenes to be skipped. 
git-svn-id: https://svn.eduke32.com/eduke32@4662 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:30:51 +00:00
terminx
508595cac8 Fix a couple of botched FindDistance3D calls 
git-svn-id: https://svn.eduke32.com/eduke32@4659 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:29:38 +00:00
terminx
6c6b68d534 Various additional optimizations: add CLASSIC_SLICE_BY_4 mode to unroll some of the loops in a-c, replace integer divisions by a divisor unknown at compile time with usage of libdivide, clean up pragmas further by removing more old stuff that wasn't used anywhere. This is another one of those nasty commits that make people cry. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4658 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:29:21 +00:00
terminx
6f332e645d Fix r4643, NUM_HARDCODED_ANIMS was increased for a reason. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4657 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:27:50 +00:00
terminx
06a0350af0 Fix a bug where if you had a savegame with an active viewscreen, the tile in the world wouldn't update until totalclock > what totalclock was when the game was saved. 
git-svn-id: https://svn.eduke32.com/eduke32@4655 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:27:13 +00:00
terminx
b7b0b2c7ba Fix up some incorrect PWEAPON macro usage 
git-svn-id: https://svn.eduke32.com/eduke32@4654 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:27:01 +00:00
terminx
3eaf78da8b Tie a few random things previously hardcoded to p->curr_weapon == KNEE_WEAPON to curr_weapon being a weapon with a workslike of KNEE_WEAPON instead, and do the same with stuff hard coded for HANDREMOTE_WEAPON 
git-svn-id: https://svn.eduke32.com/eduke32@4650 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:25:57 +00:00
terminx
57cc3fe82a Clean up GL background tinting a little bit. Remove access to glRectd in favor of glRecti. 
git-svn-id: https://svn.eduke32.com/eduke32@4649 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-25 03:25:35 +00:00
hendricks266
62b37ddb68 Further work on the Xcode project. 
git-svn-id: https://svn.eduke32.com/eduke32@4648 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-20 07:37:29 +00:00
hendricks266
8771614f87 Fix the Wii build and clean up remaining warnings. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4647 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-19 00:44:23 +00:00
hendricks266
6ff363a049 OS X: Add a preliminary Xcode project. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4646 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-18 04:50:47 +00:00
hendricks266
f46d901fe2 Fix warnings in menus.c. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4645 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-16 22:21:00 +00:00
hendricks266
295cf82323 Clean up warnings and build issues when building under OS X 10.9. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4644 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-16 21:03:24 +00:00
helixhorned
ff7d664d1e Fix an oob access in parsedefinitions_game(). DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4643 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-05 18:32:59 +00:00
terminx
706aec5527 Rename crc32() to Bcrc32() to avoid conflicts with the crc32() function in libpng/libz. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4642 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-10-01 17:09:54 +00:00
terminx
a46994a668 I thought I was clever, MinGW thought I should eat shit. 
git-svn-id: https://svn.eduke32.com/eduke32@4633 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:16:47 +00:00
terminx
71bb5e5c8e Gamevar cleanup: drop "register" qualifiers, shuffle a few things around. 
git-svn-id: https://svn.eduke32.com/eduke32@4631 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:16:21 +00:00
terminx
c2517d0d99 Suppress tile and sound remapping debug output in debug builds when not using -condebug 
git-svn-id: https://svn.eduke32.com/eduke32@4630 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:16:06 +00:00
terminx
f553d6ad10 Add assertion for memory error handler in debug builds, add .def load time information to log, call Gv_ResetSystemDefaults() at startup to populate fake tilesizx/tilesizy arrays for CON 
git-svn-id: https://svn.eduke32.com/eduke32@4629 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:15:53 +00:00
terminx
8e98cbe083 Free h_labels table when done compiling CONs 
git-svn-id: https://svn.eduke32.com/eduke32@4628 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:15:41 +00:00
terminx
10474ad635 CON VM: get rid of extra VM_Execute() calls on CON_LEFTBRACE and get rid of returns on CON_RIGHTBRACE 
git-svn-id: https://svn.eduke32.com/eduke32@4627 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:15:29 +00:00
terminx
9839802457 Optimize .anm playback; update frames on screen at the .anm's framerate instead of blindly looping as fast as possible 
git-svn-id: https://svn.eduke32.com/eduke32@4626 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:15:17 +00:00
terminx
423b87a707 Faster CRC32 implementation (slicing-by-4 for 32-bit platforms and slicing-by-8 for 64-bit) 
git-svn-id: https://svn.eduke32.com/eduke32@4625 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:15:04 +00:00
terminx
31d2f15b24 Use option name for menubar title for options that display as a separate menu page with a scrolling list 
git-svn-id: https://svn.eduke32.com/eduke32@4624 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:14:35 +00:00
terminx
144a4798ce More Polymost cleanup, also consolidate tilesizx and tilesizy into a single tilesiz vec2_t to ensure both x and y are always in the same cache line. I may add a new vec2_16t later. Still need to take care of emulating the old flat array for the sake of CON access. 
git-svn-id: https://svn.eduke32.com/eduke32@4623 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:14:21 +00:00
terminx
e20f297774 r_showfps 2, displaying min and max fps 
git-svn-id: https://svn.eduke32.com/eduke32@4622 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:13:14 +00:00
terminx
5d1475b26c Remove some #if 0'd functions from audiolib 
git-svn-id: https://svn.eduke32.com/eduke32@4621 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:12:57 +00:00
terminx
f8b340de02 Next time I'll test with sound enabled when attempting to fix a warning in audiolib ;) 
git-svn-id: https://svn.eduke32.com/eduke32@4616 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:09:03 +00:00
terminx
3681d5e553 Respect ud.bgstretch when displaying the title screen during netplay 
git-svn-id: https://svn.eduke32.com/eduke32@4614 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:08:35 +00:00
terminx
0a62ba1a21 On Android, remove the counter that automatically proceeds from the startup screen to the main menu and require a button press instead. 
git-svn-id: https://svn.eduke32.com/eduke32@4613 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:08:23 +00:00
terminx
f4a8cdfa28 Don't display QUOTE_F1HELP on Android when starting a new game with the shareware version. 
git-svn-id: https://svn.eduke32.com/eduke32@4612 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:08:10 +00:00
terminx
c97d01111a Change vid_brightness/contrast/gamma cvars to float vs double and do the same for OSD text scaling 
git-svn-id: https://svn.eduke32.com/eduke32@4611 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:07:57 +00:00
terminx
ee82c62afc Allow loading the header from savegames with a different version. This is needed to allow starting a new game on the episode/level/skill saved in an incompatible savegame. 
git-svn-id: https://svn.eduke32.com/eduke32@4610 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:07:41 +00:00
terminx
b8c8f153ac WIP menu restructuring and updates. Revolt is in the air... 
git-svn-id: https://svn.eduke32.com/eduke32@4609 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:07:29 +00:00
terminx
bd26dd5612 Fix a compile warning 
git-svn-id: https://svn.eduke32.com/eduke32@4608 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:07:14 +00:00
terminx
1a286d1e52 Default r_osdhightile to 1 
git-svn-id: https://svn.eduke32.com/eduke32@4603 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:05:19 +00:00
terminx
599ff50ca0 Misc Android changes and fixes, add alternate HUD mode that displays at the top of the screen, add support for replacing the DREALMS tile during startup with a 3dr.anm/3dr.ivf, fix usage of widescreen menu background or status bar tiles, limit - key from actually sizing down the screen (which has decreased performance instead of increasing it for a long, long time). The size can still be set manually from the console for special cases. 
git-svn-id: https://svn.eduke32.com/eduke32@4602 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:05:07 +00:00
terminx
0d68e1d4a9 Allow old version savegames to "load" by just starting a new game on the volume, level and skill written in the savegame header. 
git-svn-id: https://svn.eduke32.com/eduke32@4596 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:03:30 +00:00
terminx
cd713abf1e HUD on the top of the screen and extra wide autoaim mode for Android 
git-svn-id: https://svn.eduke32.com/eduke32@4595 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 04:03:17 +00:00
hendricks266
45641db803 Update the known locations of the addons in a Megaton installation. DONT_BUILD. 
git-svn-id: https://svn.eduke32.com/eduke32@4594 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-30 03:53:14 +00:00
helixhorned
c3102f2c89 astub.c: fix warnings with CPLUSPLUS=1 related to forgotten TrackerCast(). 
git-svn-id: https://svn.eduke32.com/eduke32@4593 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-07 18:10:18 +00:00
helixhorned
ef8c2f14c4 Fix taking over floor pal in the unlikely event that no fog pals are defined. 
This DOES NOT fix the more complex issue discussed at the forums.

git-svn-id: https://svn.eduke32.com/eduke32@4592 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-07 18:10:18 +00:00
helixhorned
40c2fc7d07 Lunatic: add actor.move() static function and documentation stub. 
git-svn-id: https://svn.eduke32.com/eduke32@4590 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-07 18:10:16 +00:00
helixhorned
32e1e362c9 For usermaps, save and restore currently playing music index with savegames. 
The volume and level number for the music are stored in the last two bytes
of the board file name array. No version bump is required.

git-svn-id: https://svn.eduke32.com/eduke32@4589 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-07 18:10:15 +00:00
helixhorned
2713bc3d75 Get rid of EnvMusicFilename[] and use MapInfo[].musicfn for that. 
The additional space was there all the time, so it's not understandable why
another array was necessary.
CON: for 'music', error if volume number is outside [0 .. MAXVOLUMES+1], and
in LunaCON, additionally warn if it's MAXVOLUMES+1 (0 is preferred for that).

git-svn-id: https://svn.eduke32.com/eduke32@4588 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-07 18:10:14 +00:00
helixhorned
3dc5c9e144 Allow DEFining music for which there is no CON music; Add 'music' OSD command. 
The OSD command is invoked like "music E5L3" (case insensitively).

git-svn-id: https://svn.eduke32.com/eduke32@4587 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-07 18:10:13 +00:00
helixhorned
73a252a73e More music-related cleanup. 
git-svn-id: https://svn.eduke32.com/eduke32@4586 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-07 18:10:12 +00:00
helixhorned
5597f3faab Some cleanup around S_PlayMusic() and related functionality. 
git-svn-id: https://svn.eduke32.com/eduke32@4585 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-09-07 18:10:09 +00:00
helixhorned
e8f67a9271 Fix USE_OPENGL=0 build. 
git-svn-id: https://svn.eduke32.com/eduke32@4584 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-31 11:15:23 +00:00
helixhorned
3493302e6c LunaCON: implement 'qsubstr' command. Add source/lunatic/test/qsubstr.con. 
In C-CON's qsubstr, error if <start> is not in [0 .. MAXQUOTELEN-1]
or <length> is negative.

git-svn-id: https://svn.eduke32.com/eduke32@4583 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-31 11:15:22 +00:00
helixhorned
7254bf7ac4 Fix crash using INTERNAL DEFAULTS after CON error when CON modules were given. 
git-svn-id: https://svn.eduke32.com/eduke32@4582 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-31 11:15:21 +00:00
helixhorned
fea848c486 LunaCON: ignore internal flag in gamevar redef check; allow "Pals" member. 
git-svn-id: https://svn.eduke32.com/eduke32@4581 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-31 11:15:20 +00:00
helixhorned
96b3408dbd Mapster32: demote wall check "corruptions" introduced in r4569 to level 2. 
The winding of a loop -- with clockdir() -- is determined by examining the
two line segments spanned between the points following a leftmost point of
the loop. If the loop contains a leftmost point that belongs to the "right"
side (as can happen with sliding door constructions), there's a chance that
an outer loop is misclassified.

git-svn-id: https://svn.eduke32.com/eduke32@4580 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-31 11:15:19 +00:00
helixhorned
77dc743f09 Factor out [l]dist() implementations into static inline functions in common.h. 
And use these in jmact/mathutil.c's FindDistance2D()/FindDistance3D().
The main use is to allow passing dx/dy instead of sprite positions; the code
that actually uses this is not committed.

git-svn-id: https://svn.eduke32.com/eduke32@4579 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-31 11:15:17 +00:00
helixhorned
21b630d294 Amend r4378 to hopefully make "stuck in water" fix work properly. 
NOTE: lizmen may walk on water. I don't yet know why.

git-svn-id: https://svn.eduke32.com/eduke32@4575 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-20 17:58:21 +00:00
helixhorned
ceaa661304 Properly consider sprites with a clipshape as bridge (p->spritebridge). 
git-svn-id: https://svn.eduke32.com/eduke32@4574 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-17 19:42:01 +00:00
helixhorned
9969efd8d1 Mapster32: fix a crash when m32_settings.cfg contains video setting. 
Such as "vid_gamma". In that case, setbrightness() would have been
called without basepaltableptr having been initialized.
The fix is by moving the preparational setbasepaltable() call from
ExtPostStartupWindow() to ExtInit(), just before the OSD command
dispatching.

git-svn-id: https://svn.eduke32.com/eduke32@4573 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-16 18:32:49 +00:00
helixhorned
3aaf167d6b game.c: fix -game_dir and -j by moving G_ExtInit() after G_CheckCommandLine(). 
git-svn-id: https://svn.eduke32.com/eduke32@4571 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-08 20:02:56 +00:00
helixhorned
757dbe9d6b LunaCON: properly initialize values of session (NODEFAULT) gamevars. 
git-svn-id: https://svn.eduke32.com/eduke32@4570 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-08 20:02:55 +00:00
helixhorned
363f0b3af6 Mapster32: prototypical checker for wall loops, enabled partially. 
Inspired by
 http://forums.duke4.net/topic/7506-tror-question/page__view__findpost__p__199151
the corruption checker now checks for certain conditions of the loops of each
sector. Recall that CW loops are outer and CCW loops are inner.

- If a sector has no or more than one outer loop, count that as corruption
  (level 4 and 3, respectively).
- (Disabled) For sectors with exactly one outer loop, check that all inner
  ones are inside it. This is currently not compiled due to an asymmetry of
  loopinside() for degenerate cases, similar to pre-r3898 inside().

git-svn-id: https://svn.eduke32.com/eduke32@4569 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-08 20:02:54 +00:00
helixhorned
21b852cd0d Clean up astub.c:CheckMapCorruption() and some build.c code a little. 
There are no intended changes of functionality, it's readability tweaks only.

git-svn-id: https://svn.eduke32.com/eduke32@4568 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-08 20:02:53 +00:00
helixhorned
1486a2937b A couple of Lunatic updates. DONT_BUILD. 
- LunaCON: support for setting userdef[].m_volume_number, getting .last_level
- bump con_lang.MAXEVENTS
- fix compilation of astub.c

git-svn-id: https://svn.eduke32.com/eduke32@4567 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-08-02 17:24:39 +00:00
hendricks266
9a4a4a627b Nuke rev.h. 
Note to MSVC users: You can get the revision number if you run `make rev o=obj` with MinGW before you build.

DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4565 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-28 08:59:58 +00:00
hendricks266
b0e82d4264 Split parts of loadlookups() into generatefogpals() and fillemptylookups(), and move Duke-specific LOOKUP.DAT behavior to G_LoadLookups() in source/common.c, which contains the call to loadlookups() as factored out from astub.c and game.c. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4564 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-28 06:45:53 +00:00
hendricks266
cf4473c4d7 Move implementation details of Mapster32's sound system from m32exec.c into sounds_mapster32.c, and set up a sound system stub in KenBuild Editor. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4563 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-28 06:45:18 +00:00
hendricks266
61b956cd41 Progress towards KenBuild Editor, part 3. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4562 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-28 06:44:58 +00:00
hendricks266
a7fb2721e4 Move code non-specific to Duke Nukem 3D from astub.c to a new m32common.c. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4561 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-28 06:44:37 +00:00
hendricks266
16cd8b8aaa Progress towards KenBuild Editor, part 2. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4560 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-28 06:44:14 +00:00
hendricks266
5237346f5b Move code non-specific to Duke Nukem 3D from source/common.c to a new build/src/common.c. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4559 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-28 06:43:46 +00:00
hendricks266
b48f3b44e3 Progress towards KenBuild Editor, part 1. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4558 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-28 06:43:16 +00:00
hendricks266
e8949e1c31 Elimininate some codedup between game.c and astub.c. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4557 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-28 06:42:28 +00:00
hendricks266
97a53be977 Fix C++ -Woverflow warnings in KenBuild. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4556 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-28 06:41:54 +00:00
hendricks266
4f67f8f969 KenBuild. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4555 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-24 14:01:44 +00:00
hendricks266
4e5788a32d Delete empty folders and update ignore properties. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4554 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-23 07:58:03 +00:00
hendricks266
e79a2fe828 MSVC build system consolidation. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4553 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-23 07:21:29 +00:00
hendricks266
a187bbd8f3 Normalize all rotatesprite calls to fullscreen panels so that they are centered at (160, 100) instead of top-lefted at (0, 0). 
git-svn-id: https://svn.eduke32.com/eduke32@4550 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-22 11:20:13 +00:00
hendricks266
34f3e59c39 Menus: Rearrange drawing so that MENUBAR (#2457) is always the first thing drawn after a menu's background, and its caption is always drawn last. 
git-svn-id: https://svn.eduke32.com/eduke32@4549 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-22 11:19:58 +00:00
hendricks266
b332189ae5 Ball-busting Makefile restructure. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4543 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-22 07:25:54 +00:00
hendricks266
6ef05fe07c Delete a bunch of crusty old outdated unused files. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4542 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-22 07:25:09 +00:00
hendricks266
c1c01f0e0b Replace the funkily-formatted GNU.TXT with the FSF's official gpl-2.0.txt. Also, update the FSF's address in all source files that contain it. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4541 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-20 08:55:56 +00:00
hendricks266
af28013f39 Lunatic fixes: 
1 compiler error.
2 compiler warnings.
1 runtime warning.

Note that at this time, CPLUSPLUS=1 LUNATIC=1 fails to build due to C++ function mangling, and Win64 Lunatic crashes.

DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4540 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-10 09:01:48 +00:00
hendricks266
0352b4ad11 Windows: Update libraries. 
- libpng to 1.6.12
- LuaJIT to Git HEAD >= 2.0.3
- instructions.txt

DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4539 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-10 09:01:15 +00:00
hendricks266
43eb98fdec Extend ebacktrace in two ways. 
1. The application must specify its proper name and technical name. Instead of eduke32_or_mapster32.crash.log, we now have eduke32.crash.log and mapster32.crash.log.
2. The exception handler will display a message box informing the user of a crash and requesting they send in the crash log. The box has three options: "Quit", the DLL's current behavior, "Continue", which passes the exception to the next handler, and "Ignore", which resumes execution immediately. These should allow the user to skip bogus exceptions picked up by ebacktrace, such as one I get with my laptop that causes EDuke32 no issues.

git-svn-id: https://svn.eduke32.com/eduke32@4538 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-06 22:38:02 +00:00
hendricks266
bc0614dd22 Miscellaneous get/set(this)projectile cleanup. 
git-svn-id: https://svn.eduke32.com/eduke32@4537 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-06 22:36:34 +00:00
terminx
06072db493 WIP OSD refactor, committing now before it stops applying cleanly to current svn. This shouldn't break anything in an obvious or major way. 
git-svn-id: https://svn.eduke32.com/eduke32@4536 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-06 00:12:25 +00:00
terminx
690c0abb16 I don't even remember which platform this fixes building on... probably MSVC. Cleaning out my tree. 
git-svn-id: https://svn.eduke32.com/eduke32@4533 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-06 00:11:32 +00:00
terminx
7dae4a8e96 MSVC build fix 
git-svn-id: https://svn.eduke32.com/eduke32@4530 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-06 00:10:46 +00:00
terminx
9eb8efa442 Android updates from Emile 
git-svn-id: https://svn.eduke32.com/eduke32@4529 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-06 00:10:33 +00:00
terminx
398d20fc5f Enable -usecwd for Mapster32 on Windows (same functionality as EDuke32) 
git-svn-id: https://svn.eduke32.com/eduke32@4526 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-07-06 00:09:41 +00:00
hendricks266
ca03f7af44 Hotfix to allow display of E1L8's par time and 3DR time if no usermap has been played yet. 
Note that the user map function still overwrites everything in slot E1L8 for the time being, which is a deeper problem I need to address.

git-svn-id: https://svn.eduke32.com/eduke32@4525 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-23 02:25:20 +00:00
hendricks266
beec5ec512 Keep track of allocated cache space for ANM files so they aren't allocated multiple times. Also, unlock the handles after playback is done so they can be freed if necessary. 
git-svn-id: https://svn.eduke32.com/eduke32@4524 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-23 02:25:07 +00:00
hendricks266
1497a75ef0 Disable the diagnostic log message upon successfully using the "animsounds" def command. 
git-svn-id: https://svn.eduke32.com/eduke32@4523 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-23 02:24:53 +00:00
hendricks266
879b3e406b Fix a warning in menus.c, introduced in r4519. 
git-svn-id: https://svn.eduke32.com/eduke32@4521 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-23 02:24:28 +00:00
hendricks266
24728ba291 Allow EVENT_SOUND to return -1 to cancel a sound without printing a warning to the console and log. 
NOTE: Other negative values are reserved!

git-svn-id: https://svn.eduke32.com/eduke32@4520 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-23 02:24:10 +00:00
hendricks266
fc43cc666c Fix saving a savegame's name. 
git-svn-id: https://svn.eduke32.com/eduke32@4519 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-21 15:31:01 +00:00
hendricks266
41fb46b1bc Fix a display error with the bonus screen when a map's 3DR time was zero. 
git-svn-id: https://svn.eduke32.com/eduke32@4518 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-21 15:30:48 +00:00
hendricks266
27c9651fde Fix a problem with r4514. 
git-svn-id: https://svn.eduke32.com/eduke32@4517 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-21 15:30:33 +00:00
hendricks266
f4becd06d5 Instead of displaying "Unknown GRP - EDuke32", simply display "EDuke32". 
Much classier this way.

git-svn-id: https://svn.eduke32.com/eduke32@4516 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-16 23:17:11 +00:00
hendricks266
fd78e9f954 By request, implement EVENT_ACTIVATECHEAT. 
git-svn-id: https://svn.eduke32.com/eduke32@4515 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-16 23:16:55 +00:00
hendricks266
45deabc782 Add the following LOGO_FLAGS: 
LOGO_NOE1ENDSCREEN
LOGO_NOE2ENDSCREEN
LOGO_NOE3RADLOGO
LOGO_NODUKETEAMTEXT
LOGO_NODUKETEAMPIC

As part of this, the LOGO_NOE*BONUSSCENE flags no longer remove the entire end sequence in one go. They now only remove the primary cinematic. If you want their previous effect, you'll have to add these additional bits.

git-svn-id: https://svn.eduke32.com/eduke32@4514 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-16 23:16:37 +00:00
hendricks266
015acc9fb9 Fix Wii build. 
git-svn-id: https://svn.eduke32.com/eduke32@4512 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-16 23:16:08 +00:00
hendricks266
71cf9af5f5 Clean up the menu input layer. 
git-svn-id: https://svn.eduke32.com/eduke32@4511 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-16 23:15:49 +00:00
hendricks266
ec3717167e Menus: Fix a bug that crept in with r4508 that prevented any editing of savegame names. 
git-svn-id: https://svn.eduke32.com/eduke32@4510 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-16 23:15:31 +00:00
hendricks266
a7714f2c74 Menus: Bring MenuFileSelect_t up to speed with MenuMenu_t. 
>They see me scrollin'
>They hatin'

git-svn-id: https://svn.eduke32.com/eduke32@4509 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-13 09:04:31 +00:00
hendricks266
2281e287dd Menus: Fix the recently introduced bug where blank savegames would have their autogenerated names clobbered by the new menu code. 
git-svn-id: https://svn.eduke32.com/eduke32@4508 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-13 09:04:17 +00:00
hendricks266
7f3708b55d Menus: Fix the recently introduced bug that would take the keypress given at "PRESS OPEN TO RESTART LEVEL" as a yes at the following prompt to load your most recent savegame, seemingly without asking. 
git-svn-id: https://svn.eduke32.com/eduke32@4507 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-13 09:04:05 +00:00
hendricks266
4424648917 Menus: Revise the MenuFileSelect_t structure to remove the unnecessary dir pointer and rename currentlist to currentList. 
git-svn-id: https://svn.eduke32.com/eduke32@4506 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-13 09:03:52 +00:00
hendricks266
de35d4ee8c Menus: When at the top or bottom of a scrolling section, show the up/down indicator darkened instead of not at all. 
git-svn-id: https://svn.eduke32.com/eduke32@4505 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-13 09:03:38 +00:00
hendricks266
a03f9bce40 Wrap most calls to exit() with a macro that will print the exit status, file name, line number, and function name to the log when using a debug build. 
git-svn-id: https://svn.eduke32.com/eduke32@4502 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-13 09:02:37 +00:00
helixhorned
4780912b40 lunatic/util/build.lua: in readdefs(), add option of requesting picnum->name mapping. 
That is, the reverse of what is returned with the first outarg. Use that in
lunatic/util/foreachmap.lua. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4499 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-06-01 20:50:14 +00:00
hendricks266
d4cfdb7da0 Fix non-Windows building. 
DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4497 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-31 15:36:41 +00:00
hendricks266
11e9b8f4ce Ball-busting new menus. Still WIP. 
Mouse/touch/pointer support is yet to come. #SOON.

Exposure to scripting is a LONG way off. Months. The spec and data structure needs time for comment and revision. The eventual scripting access will be Lua-only.

git-svn-id: https://svn.eduke32.com/eduke32@4496 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-31 12:26:41 +00:00
hendricks266
c24c08599f Better compile timestamp handling. 
git-svn-id: https://svn.eduke32.com/eduke32@4495 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-31 12:26:13 +00:00
hendricks266
26db62d77d Re-fix the C++ warnings in ENet. 
git-svn-id: https://svn.eduke32.com/eduke32@4494 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-31 12:25:44 +00:00
helixhorned
2153c81afb Mapster32: when pasting onto the bottom part of a [2]-wall, take over y-flipping. 
Note that x-flipping is determined by the cstat of the upper part of the wall
(that is, the wall facing the player, not the nextwall, from which the picnum
for the bottom part is taken.)

git-svn-id: https://svn.eduke32.com/eduke32@4493 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-30 19:39:08 +00:00
helixhorned
66f5b547cf Replace two missed literal numbers with SE_* enum labels. 
git-svn-id: https://svn.eduke32.com/eduke32@4492 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-30 19:39:06 +00:00
helixhorned
0900f4066c Bye, bye, B*alloc(), all hail X*alloc()! Replace large portion of the calls... 
... and cull code that is dead with the X*alloc() versions since they never
return NULL on requesting memory.

Use something like
 git grep '[^Xx]\(m\|c\|re\)alloc *('
and
 git grep '[^Xx]strdup *('
to see places where I left the B*alloc() calls intact.

BUILD_LUNATIC.

git-svn-id: https://svn.eduke32.com/eduke32@4491 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-30 00:02:19 +00:00
helixhorned
1d26121514 Add X{m,c,re}alloc and Xstrdup macros that call an out-of-memory handler on failure. 
These wrap the x*alloc or xstrdup functions in compat.c. The handler gets passed
__FILE__, __LINE__ and __func__ (if available) in debugging builds.

Terminating the application process immediately in case of allocation failure
will let us prune many error handling paths and simplify a good portion of code.

git-svn-id: https://svn.eduke32.com/eduke32@4490 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-30 00:02:16 +00:00
helixhorned
69c867b8e3 Replace various GL rendering related literal flags with enum labels. 
- pthtyp pth->flags bits
- Flags of the <dameth> argument of various functions
- hictinting[].f / gloadtile_hi() and daskinloader() <effect> arg bits
- hicreplctyp hicr->flags bits
- texcacheheader cachead.flags bits

git-svn-id: https://svn.eduke32.com/eduke32@4486 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-28 22:40:16 +00:00
helixhorned
1fab90da10 lunatic/util/mapypan.lua: omit MIRROR, don't print maps w/o problematic tiles. 
git-svn-id: https://svn.eduke32.com/eduke32@4483 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-28 22:40:12 +00:00
helixhorned
e61afe6d88 Rip out S_FindMusicSFX() from A_CallSound() and use in SE6/14 on-spawn init. 
This makes the subway sound not played once on map initialization.

git-svn-id: https://svn.eduke32.com/eduke32@4481 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-23 20:25:29 +00:00
helixhorned
123906a9d7 shadexfog.lua: in menu, move creation of debugging shade tables below DEBUG line. 
BUILD_LUNATIC.

git-svn-id: https://svn.eduke32.com/eduke32@4480 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-22 11:17:52 +00:00
helixhorned
b9b0b3f79b lunatic/test/shadexfog.lua: add function create_brightpass_trans(). 
Also hook it up in the [;]+[F] menu.

git-svn-id: https://svn.eduke32.com/eduke32@4479 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-22 11:17:51 +00:00
helixhorned
0c2776e7fc game.c: in A_Spawn(), protect CSTAT_SPRITE_NOSHADE of spawned MASKWALL* sprites. 
git-svn-id: https://svn.eduke32.com/eduke32@4478 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-22 11:17:50 +00:00
helixhorned
3ecf4ca4e5 actors.c: fix a A_CheckSpriteFlags() call for zombie actor to STANDABLE change. 
This only affects zombie actors in a sector with a parallaxed ceiling. If they
have SFLAG_NOSHADE clear, their shade is taken from the ceiling upon
changing the statnum. Previously, A_CheckSpriteFlags() received a value that
could only be 0 or 1 for the sprite index (typo).

git-svn-id: https://svn.eduke32.com/eduke32@4477 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-22 08:56:56 +00:00
helixhorned
e810071cfc LunaCON: add read-only variable 'Numsprites', r/w userdef member .mouseaiming. 
git-svn-id: https://svn.eduke32.com/eduke32@4475 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-18 09:55:42 +00:00
helixhorned
8974228a20 C-CON: scan label names according to stricter LunaCON rules instead of char blacklist. 
These ones: http://lunatic.eduke32.com/lunacon.html#_ambiguous_lexical_elements
Seriously, defining a token kind by excluding certain characters (instead of
allowing a given set) is really, really broken.

git-svn-id: https://svn.eduke32.com/eduke32@4474 1a8010ca-5511-0410-912e-c29ae57300e0
 2014-05-18 09:55:41 +00:00